niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

netfilter: conntrack: avoid unconditional local_bh_disable

Browse source 
Now that the conntrack entry isn't placed on the pcpu list anymore the
bh only needs to be disabled in the 'expectation present' case.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal 2022-04-11 13:01:25 +02:00 • committed by Pablo Neira Ayuso
parent 8a75a2c174
commit 0bcfbafbcd
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/netfilter/nf_conntrack_core.c
View file

@ -1736,10 +1736,9 @@ init_conntrack(struct net *net, struct nf_conn *tmpl,
ecache ? ecache->expmask : 0, ecache ? ecache->expmask : 0,
GFP_ATOMIC); GFP_ATOMIC);
local_bh_disable();
cnet = nf_ct_pernet(net); cnet = nf_ct_pernet(net);
if (cnet->expect_count) { if (cnet->expect_count) {
spin_lock(&nf_conntrack_expect_lock); spin_lock_bh(&nf_conntrack_expect_lock);
exp = nf_ct_find_expectation(net, zone, tuple); exp = nf_ct_find_expectation(net, zone, tuple);
if (exp) { if (exp) {
pr_debug("expectation arrives ct=%p exp=%p\n", pr_debug("expectation arrives ct=%p exp=%p\n",
@ -1762,7 +1761,7 @@ init_conntrack(struct net *net, struct nf_conn *tmpl,
#endif #endif
NF_CT_STAT_INC(net, expect_new); NF_CT_STAT_INC(net, expect_new);
} }
spin_unlock(&nf_conntrack_expect_lock); spin_unlock_bh(&nf_conntrack_expect_lock);
} }
if (!exp) if (!exp)
__nf_ct_try_assign_helper(ct, tmpl, GFP_ATOMIC); __nf_ct_try_assign_helper(ct, tmpl, GFP_ATOMIC);
@ -1770,8 +1769,6 @@ init_conntrack(struct net *net, struct nf_conn *tmpl,
/* Now it is going to be associated with an sk_buff, set refcount to 1. */ /* Now it is going to be associated with an sk_buff, set refcount to 1. */
refcount_set(&ct->ct_general.use, 1); refcount_set(&ct->ct_general.use, 1);
local_bh_enable();
if (exp) { if (exp) {
if (exp->expectfn) if (exp->expectfn)
exp->expectfn(ct, exp); exp->expectfn(ct, exp);