Commit e2b7606c authored by Martin Josefsson's avatar Martin Josefsson Committed by David S. Miller

[NETFILTER]: More __read_mostly annotations

Place rarely written variables in the read-mostly section by using
__read_mostly
Signed-off-by: default avatarMartin Josefsson <gandalf@wlug.westbo.se>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 8f03dea5
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
static DEFINE_SPINLOCK(afinfo_lock); static DEFINE_SPINLOCK(afinfo_lock);
struct nf_afinfo *nf_afinfo[NPROTO]; struct nf_afinfo *nf_afinfo[NPROTO] __read_mostly;
EXPORT_SYMBOL(nf_afinfo); EXPORT_SYMBOL(nf_afinfo);
int nf_register_afinfo(struct nf_afinfo *afinfo) int nf_register_afinfo(struct nf_afinfo *afinfo)
...@@ -54,7 +54,7 @@ EXPORT_SYMBOL_GPL(nf_unregister_afinfo); ...@@ -54,7 +54,7 @@ EXPORT_SYMBOL_GPL(nf_unregister_afinfo);
* of skbuffs queued for userspace, and not deregister a hook unless * of skbuffs queued for userspace, and not deregister a hook unless
* this is zero, but that sucks. Now, we simply check when the * this is zero, but that sucks. Now, we simply check when the
* packets come back: if the hook is gone, the packet is discarded. */ * packets come back: if the hook is gone, the packet is discarded. */
struct list_head nf_hooks[NPROTO][NF_MAX_HOOKS]; struct list_head nf_hooks[NPROTO][NF_MAX_HOOKS] __read_mostly;
EXPORT_SYMBOL(nf_hooks); EXPORT_SYMBOL(nf_hooks);
static DEFINE_SPINLOCK(nf_hook_lock); static DEFINE_SPINLOCK(nf_hook_lock);
......
...@@ -73,10 +73,10 @@ DEFINE_RWLOCK(nf_conntrack_lock); ...@@ -73,10 +73,10 @@ DEFINE_RWLOCK(nf_conntrack_lock);
atomic_t nf_conntrack_count = ATOMIC_INIT(0); atomic_t nf_conntrack_count = ATOMIC_INIT(0);
void (*nf_conntrack_destroyed)(struct nf_conn *conntrack) = NULL; void (*nf_conntrack_destroyed)(struct nf_conn *conntrack) = NULL;
unsigned int nf_conntrack_htable_size __read_mostly = 0; unsigned int nf_conntrack_htable_size __read_mostly;
int nf_conntrack_max __read_mostly; int nf_conntrack_max __read_mostly;
struct list_head *nf_conntrack_hash __read_mostly; struct list_head *nf_conntrack_hash __read_mostly;
struct nf_conn nf_conntrack_untracked; struct nf_conn nf_conntrack_untracked __read_mostly;
unsigned int nf_ct_log_invalid __read_mostly; unsigned int nf_ct_log_invalid __read_mostly;
LIST_HEAD(unconfirmed); LIST_HEAD(unconfirmed);
static int nf_conntrack_vmalloc __read_mostly; static int nf_conntrack_vmalloc __read_mostly;
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_helper.h>
#include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_core.h>
static LIST_HEAD(helpers); static __read_mostly LIST_HEAD(helpers);
struct nf_conntrack_helper * struct nf_conntrack_helper *
__nf_ct_helper_find(const struct nf_conntrack_tuple *tuple) __nf_ct_helper_find(const struct nf_conntrack_tuple *tuple)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment