netfilter: conntrack: move rcu read lock to nf_conntrack_find_get
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 netfilter: conntrack: move rcu read lock to nf_conntrack_find_get
Move rcu_read_lock/unlock to nf_conntrack_find_get(), this avoids nested rcu_read_lock call from resolve_normal_ct().
Signed-off-by Florian Westphal <[email protected]>
--- net/netfilter/nf_conntrack_core.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
net/netfilter/nf_conntrack_core.c +9 -8
@@ -786,8 +786,6 @@ __nf_conntrack_find_get(struct net *net, const struct nf_conntrack_zone *zone,struct nf_conntrack_tuple_hash *h;struct nf_conn *ct; -rcu_read_lock (); - h =____nf_conntrack_find (net, zone, tuple, hash);if (h) {/* We have a candidate that matches the tuple we're interested
@@ -799,7 +797,7 @@ __nf_conntrack_find_get(struct net *net, const struct nf_conntrack_zone *zone,smp_acquire__after_ctrl_dep ();if (likely (nf_ct_key_equal (h, tuple, zone, net))) - goto found; +return h;/* TYPESAFE_BY_RCU recycled the candidate */ nf_ct_put (ct);
@@ -807,8 +805,6 @@ __nf_conntrack_find_get(struct net *net, const struct nf_conntrack_zone *zone, h =NULL ; } -found: -rcu_read_unlock ();return h; }
@@ -820,16 +816,21 @@ nf_conntrack_find_get(struct net *net, const struct nf_conntrack_zone *zone,unsigned int rid, zone_id =nf_ct_zone_id (zone,IP_CT_DIR_ORIGINAL );struct nf_conntrack_tuple_hash *thash; +rcu_read_lock (); + thash =__nf_conntrack_find_get (net, zone, tuple,hash_conntrack_raw (tuple, zone_id, net));if (thash) -return thash; + goto out_unlock; rid =nf_ct_zone_id (zone,IP_CT_DIR_REPLY );if (rid != zone_id) -return __nf_conntrack_find_get (net, zone, tuple, -hash_conntrack_raw (tuple, rid, net)); + thash =__nf_conntrack_find_get (net, zone, tuple, +hash_conntrack_raw (tuple, rid, net)); + +out_unlock: +rcu_read_unlock ();return thash; }EXPORT_SYMBOL_GPL (nf_conntrack_find_get);
Signature · 1 line
2.37.4