From e036a2c8d946324f9c645ee144d988d5caaae815 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Tue, 8 Jun 2010 14:11:19 +0200 Subject: [PATCH] --- yaml --- r: 202936 b: refs/heads/master c: 339bb99e4a8ba1f8960eed21d50be808b35ad22a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/netfilter/xt_rateest.h | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2ead384795a3..0e647c23ab91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e12f8e29a8526172b7715881503bae636d60bdd8 +refs/heads/master: 339bb99e4a8ba1f8960eed21d50be808b35ad22a diff --git a/trunk/include/net/netfilter/xt_rateest.h b/trunk/include/net/netfilter/xt_rateest.h index ddbf37e19616..b1d780e21ce3 100644 --- a/trunk/include/net/netfilter/xt_rateest.h +++ b/trunk/include/net/netfilter/xt_rateest.h @@ -2,13 +2,17 @@ #define _XT_RATEEST_H struct xt_rateest { + /* keep lock and bstats on same cache line to speedup xt_rateest_tg() */ + struct gnet_stats_basic_packed bstats; + spinlock_t lock; + /* keep rstats and lock on same cache line to speedup xt_rateest_mt() */ + struct gnet_stats_rate_est rstats; + + /* following fields not accessed in hot path */ struct hlist_node list; char name[IFNAMSIZ]; unsigned int refcnt; - spinlock_t lock; struct gnet_estimator params; - struct gnet_stats_rate_est rstats; - struct gnet_stats_basic_packed bstats; }; extern struct xt_rateest *xt_rateest_lookup(const char *name);