Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7c44247 authored by Florian Westphal's avatar Florian Westphal Committed by Steffen Klassert
Browse files

xfrm: policy: make xfrm_policy_lookup_bytype lockless 



side effect: no longer disables BH (should be fine).

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent e37cc8ad

include/net/netns/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
struct ctl_table_header;



struct xfrm_policy_hash {

	struct hlist_head	*table;

	struct hlist_head	__rcu *table;

	unsigned int		hmask;

	u8			dbits4;

	u8			sbits4;

net/xfrm/xfrm_policy.c

+2 −2
Original line number Diff line number Diff line
@@ -1123,7 +1123,7 @@ static struct xfrm_policy *xfrm_policy_lookup_bytype(struct net *net, u8 type, 
	if (unlikely(!daddr || !saddr))

		return NULL;



	read_lock_bh(&net->xfrm.xfrm_policy_lock);

	rcu_read_lock();

 retry:

	do {

		sequence = read_seqcount_begin(&xfrm_policy_hash_generation);
@@ -1172,7 +1172,7 @@ static struct xfrm_policy *xfrm_policy_lookup_bytype(struct net *net, u8 type, 
	if (ret && !xfrm_pol_hold_rcu(ret))

		goto retry;

fail:

	read_unlock_bh(&net->xfrm.xfrm_policy_lock);

	rcu_read_unlock();



	return ret;

}