Commit 546be240 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[IPSEC] xfrm: Undo afinfo lock proliferation 



The number of locks used to manage afinfo structures can easily be reduced
down to one each for policy and state respectively.  This is based on the
observation that the write locks are only held by module insertion/removal
which are very rare events so there is no need to further differentiate
between the insertion of modules like ipv6 versus esp6.

The removal of the read locks in xfrm4_policy.c/xfrm6_policy.c might look
suspicious at first.  However, after you realise that nobody ever takes
the corresponding write lock you'll feel better :)

As far as I can gather it's an attempt to guard against the removal of
the corresponding modules.  Since neither module can be unloaded at all
we can leave it to whoever fixes up IPv6 unloading :)

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9cb3528c

include/net/xfrm.h

+1 −8
Original line number Diff line number Diff line
@@ -204,8 +204,7 @@ struct xfrm_type; 
struct xfrm_dst;

struct xfrm_policy_afinfo {

	unsigned short		family;

	rwlock_t		lock;

	struct xfrm_type_map	*type_map;

	struct xfrm_type	*type_map[256];

	struct dst_ops		*dst_ops;

	void			(*garbage_collect)(void);

	int			(*dst_lookup)(struct xfrm_dst **dst, struct flowi *fl);
@@ -232,7 +231,6 @@ extern int __xfrm_state_delete(struct xfrm_state *x); 


struct xfrm_state_afinfo {

	unsigned short		family;

	rwlock_t		lock;

	struct list_head	*state_bydst;

	struct list_head	*state_byspi;

	int			(*init_flags)(struct xfrm_state *x);
@@ -264,11 +262,6 @@ struct xfrm_type 
	u32			(*get_max_size)(struct xfrm_state *, int size);

};



struct xfrm_type_map {

	rwlock_t		lock;

	struct xfrm_type	*map[256];

};



extern int xfrm_register_type(struct xfrm_type *type, unsigned short family);

extern int xfrm_unregister_type(struct xfrm_type *type, unsigned short family);

extern struct xfrm_type *xfrm_get_type(u8 proto, unsigned short family);

net/ipv4/xfrm4_policy.c

+0 −6
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
static struct dst_ops xfrm4_dst_ops;

static struct xfrm_policy_afinfo xfrm4_policy_afinfo;



static struct xfrm_type_map xfrm4_type_map = { .lock = RW_LOCK_UNLOCKED };



static int xfrm4_dst_lookup(struct xfrm_dst **dst, struct flowi *fl)

{

	return __ip_route_output_key((struct rtable**)dst, fl);
@@ -237,9 +235,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl) 


static inline int xfrm4_garbage_collect(void)

{

	read_lock(&xfrm4_policy_afinfo.lock);

	xfrm4_policy_afinfo.garbage_collect();

	read_unlock(&xfrm4_policy_afinfo.lock);

	return (atomic_read(&xfrm4_dst_ops.entries) > xfrm4_dst_ops.gc_thresh*2);

}
@@ -299,8 +295,6 @@ static struct dst_ops xfrm4_dst_ops = { 


static struct xfrm_policy_afinfo xfrm4_policy_afinfo = {

	.family = 		AF_INET,

	.lock = 		RW_LOCK_UNLOCKED,

	.type_map = 		&xfrm4_type_map,

	.dst_ops =		&xfrm4_dst_ops,

	.dst_lookup =		xfrm4_dst_lookup,

	.find_bundle = 		__xfrm4_find_bundle,

net/ipv4/xfrm4_state.c

+0 −1
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ __xfrm4_find_acq(u8 mode, u32 reqid, u8 proto, 


static struct xfrm_state_afinfo xfrm4_state_afinfo = {

	.family			= AF_INET,

	.lock			= RW_LOCK_UNLOCKED,

	.init_flags		= xfrm4_init_flags,

	.init_tempsel		= __xfrm4_init_tempsel,

	.state_lookup		= __xfrm4_state_lookup,

net/ipv6/xfrm6_policy.c

+0 −6
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
static struct dst_ops xfrm6_dst_ops;

static struct xfrm_policy_afinfo xfrm6_policy_afinfo;



static struct xfrm_type_map xfrm6_type_map = { .lock = RW_LOCK_UNLOCKED };



static int xfrm6_dst_lookup(struct xfrm_dst **dst, struct flowi *fl)

{

	int err = 0;
@@ -249,9 +247,7 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl) 


static inline int xfrm6_garbage_collect(void)

{

	read_lock(&xfrm6_policy_afinfo.lock);

	xfrm6_policy_afinfo.garbage_collect();

	read_unlock(&xfrm6_policy_afinfo.lock);

	return (atomic_read(&xfrm6_dst_ops.entries) > xfrm6_dst_ops.gc_thresh*2);

}
@@ -311,8 +307,6 @@ static struct dst_ops xfrm6_dst_ops = { 


static struct xfrm_policy_afinfo xfrm6_policy_afinfo = {

	.family =		AF_INET6,

	.lock = 		RW_LOCK_UNLOCKED,

	.type_map = 		&xfrm6_type_map,

	.dst_ops =		&xfrm6_dst_ops,

	.dst_lookup =		xfrm6_dst_lookup,

	.find_bundle =		__xfrm6_find_bundle,

net/ipv6/xfrm6_state.c

+0 −1
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ __xfrm6_find_acq(u8 mode, u32 reqid, u8 proto, 


static struct xfrm_state_afinfo xfrm6_state_afinfo = {

	.family			= AF_INET6,

	.lock			= RW_LOCK_UNLOCKED,

	.init_tempsel		= __xfrm6_init_tempsel,

	.state_lookup		= __xfrm6_state_lookup,

	.find_acq		= __xfrm6_find_acq,

CRA Git | Maintained and supported by SUSTech CRA and CCSE