GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-30 02:21:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

netfilter: rcu sparse cleanups

Browse source 
Use RCU helpers to reduce number of sparse warnings
(CONFIG_SPARSE_RCU_POINTER=y), and adds lockdep checks.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
Eric Dumazet 2010-11-15 19:45:13 +01:00 • committed by Patrick McHardy
parent ab0cba2512
commit c5d277d29a
4 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
net/netfilter/nf_conntrack_expect.c
View file

@ -337,7 +337,10 @@ static void nf_ct_expect_insert(struct nf_conntrack_expect *exp)
setup_timer(&exp->timeout, nf_ct_expectation_timed_out, setup_timer(&exp->timeout, nf_ct_expectation_timed_out,
(unsigned long)exp); (unsigned long)exp);
if (master_help) { if (master_help) {
p = &master_help->helper->expect_policy[exp->class]; p = &rcu_dereference_protected(
master_help->helper,
lockdep_is_held(&nf_conntrack_lock)
)->expect_policy[exp->class];
exp->timeout.expires = jiffies + p->timeout * HZ; exp->timeout.expires = jiffies + p->timeout * HZ;
} }
add_timer(&exp->timeout); add_timer(&exp->timeout);
@ -373,7 +376,10 @@ static inline int refresh_timer(struct nf_conntrack_expect *i)
if (!del_timer(&i->timeout)) if (!del_timer(&i->timeout))
return 0; return 0;
p = &master_help->helper->expect_policy[i->class]; p = &rcu_dereference_protected(
master_help->helper,
lockdep_is_held(&nf_conntrack_lock)
)->expect_policy[i->class];
i->timeout.expires = jiffies + p->timeout * HZ; i->timeout.expires = jiffies + p->timeout * HZ;
add_timer(&i->timeout); add_timer(&i->timeout);
return 1; return 1;
@ -411,7 +417,10 @@ static inline int __nf_ct_expect_check(struct nf_conntrack_expect *expect)
} }
/* Will be over limit? */ /* Will be over limit? */
if (master_help) { if (master_help) {
p = &master_help->helper->expect_policy[expect->class]; p = &rcu_dereference_protected(
master_help->helper,
lockdep_is_held(&nf_conntrack_lock)
)->expect_policy[expect->class];
if (p->max_expected && if (p->max_expected &&
master_help->expecting[expect->class] >= p->max_expected) { master_help->expecting[expect->class] >= p->max_expected) {
evict_oldest_expect(master, expect); evict_oldest_expect(master, expect);

6
net/netfilter/nf_conntrack_extend.c
View file

@ -140,14 +140,16 @@ static void update_alloc_size(struct nf_ct_ext_type *type)
/* This assumes that extended areas in conntrack for the types /* This assumes that extended areas in conntrack for the types
whose NF_CT_EXT_F_PREALLOC bit set are allocated in order */ whose NF_CT_EXT_F_PREALLOC bit set are allocated in order */
for (i = min; i <= max; i++) { for (i = min; i <= max; i++) {
t1 = nf_ct_ext_types[i]; t1 = rcu_dereference_protected(nf_ct_ext_types[i],
lockdep_is_held(&nf_ct_ext_type_mutex));
if (!t1) if (!t1)
continue; continue;
t1->alloc_size = ALIGN(sizeof(struct nf_ct_ext), t1->align) + t1->alloc_size = ALIGN(sizeof(struct nf_ct_ext), t1->align) +
t1->len; t1->len;
for (j = 0; j < NF_CT_EXT_NUM; j++) { for (j = 0; j < NF_CT_EXT_NUM; j++) {
t2 = nf_ct_ext_types[j]; t2 = rcu_dereference_protected(nf_ct_ext_types[j],
lockdep_is_held(&nf_ct_ext_type_mutex));
if (t2 == NULL || t2 == t1 || if (t2 == NULL || t2 == t1 ||
(t2->flags & NF_CT_EXT_F_PREALLOC) == 0) (t2->flags & NF_CT_EXT_F_PREALLOC) == 0)
continue; continue;

10
net/netfilter/nf_conntrack_helper.c
View file

@ -158,7 +158,10 @@ static inline int unhelp(struct nf_conntrack_tuple_hash *i,
struct nf_conn *ct = nf_ct_tuplehash_to_ctrack(i); struct nf_conn *ct = nf_ct_tuplehash_to_ctrack(i);
struct nf_conn_help *help = nfct_help(ct); struct nf_conn_help *help = nfct_help(ct);
if (help && help->helper == me) { if (help && rcu_dereference_protected(
help->helper,
lockdep_is_held(&nf_conntrack_lock)
) == me) {
nf_conntrack_event(IPCT_HELPER, ct); nf_conntrack_event(IPCT_HELPER, ct);
rcu_assign_pointer(help->helper, NULL); rcu_assign_pointer(help->helper, NULL);
} }
@ -210,7 +213,10 @@ static void __nf_conntrack_helper_unregister(struct nf_conntrack_helper *me,
hlist_for_each_entry_safe(exp, n, next, hlist_for_each_entry_safe(exp, n, next,
&net->ct.expect_hash[i], hnode) { &net->ct.expect_hash[i], hnode) {
struct nf_conn_help *help = nfct_help(exp->master); struct nf_conn_help *help = nfct_help(exp->master);
if ((help->helper == me || exp->helper == me) && if ((rcu_dereference_protected(
help->helper,
lockdep_is_held(&nf_conntrack_lock)
) == me || exp->helper == me) &&
del_timer(&exp->timeout)) { del_timer(&exp->timeout)) {
nf_ct_unlink_expect(exp); nf_ct_unlink_expect(exp);
nf_ct_expect_put(exp); nf_ct_expect_put(exp);

4
net/netfilter/nf_conntrack_proto.c
View file

@ -284,7 +284,7 @@ int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *l4proto)
mutex_lock(&nf_ct_proto_mutex); mutex_lock(&nf_ct_proto_mutex);
if (!nf_ct_protos[l4proto->l3proto]) { if (!nf_ct_protos[l4proto->l3proto]) {
/* l3proto may be loaded latter. */ /* l3proto may be loaded latter. */
struct nf_conntrack_l4proto **proto_array; struct nf_conntrack_l4proto __rcu **proto_array;
int i; int i;
proto_array = kmalloc(MAX_NF_CT_PROTO * proto_array = kmalloc(MAX_NF_CT_PROTO *
@ -296,7 +296,7 @@ int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *l4proto)
} }
for (i = 0; i < MAX_NF_CT_PROTO; i++) for (i = 0; i < MAX_NF_CT_PROTO; i++)
proto_array[i] = &nf_conntrack_l4proto_generic; RCU_INIT_POINTER(proto_array[i], &nf_conntrack_l4proto_generic);
/* Before making proto_array visible to lockless readers, /* Before making proto_array visible to lockless readers,
* we must make sure its content is committed to memory. * we must make sure its content is committed to memory.