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

Commit b8a0ae20 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

netns xfrm: per-netns state GC list 



km_waitq is going to be made per-netns to disallow spurious wakeups
in __xfrm_lookup().

To not wakeup after every garbage-collected xfrm_state (which potentially
can be from different netns) make state GC list per-netns.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 63082733

include/net/netns/xfrm.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ struct netns_xfrm { 
	unsigned int		state_hmask;

	unsigned int		state_hmask;

	unsigned int		state_num;

	unsigned int		state_num;

	struct work_struct	state_hash_work;

	struct work_struct	state_hash_work;

	struct hlist_head	state_gc_list;

};

};





#endif
 
#endif

net/xfrm/xfrm_state.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -177,7 +177,6 @@ static DEFINE_RWLOCK(xfrm_state_afinfo_lock); 
static struct xfrm_state_afinfo *xfrm_state_afinfo[NPROTO];

static struct xfrm_state_afinfo *xfrm_state_afinfo[NPROTO];





static struct work_struct xfrm_state_gc_work;

static struct work_struct xfrm_state_gc_work;

static HLIST_HEAD(xfrm_state_gc_list);

static DEFINE_SPINLOCK(xfrm_state_gc_lock);

static DEFINE_SPINLOCK(xfrm_state_gc_lock);





int __xfrm_state_delete(struct xfrm_state *x);

int __xfrm_state_delete(struct xfrm_state *x);
@@ -394,7 +393,7 @@ static void xfrm_state_gc_task(struct work_struct *data) 
	struct hlist_head gc_list;

	struct hlist_head gc_list;





	spin_lock_bh(&xfrm_state_gc_lock);

	spin_lock_bh(&xfrm_state_gc_lock);

	hlist_move_list(&xfrm_state_gc_list, &gc_list);

	hlist_move_list(&init_net.xfrm.state_gc_list, &gc_list);

	spin_unlock_bh(&xfrm_state_gc_lock);

	spin_unlock_bh(&xfrm_state_gc_lock);





	hlist_for_each_entry_safe(x, entry, tmp, &gc_list, gclist)

	hlist_for_each_entry_safe(x, entry, tmp, &gc_list, gclist)
@@ -527,7 +526,7 @@ void __xfrm_state_destroy(struct xfrm_state *x) 
	WARN_ON(x->km.state != XFRM_STATE_DEAD);

	WARN_ON(x->km.state != XFRM_STATE_DEAD);





	spin_lock_bh(&xfrm_state_gc_lock);

	spin_lock_bh(&xfrm_state_gc_lock);

	hlist_add_head(&x->gclist, &xfrm_state_gc_list);

	hlist_add_head(&x->gclist, &init_net.xfrm.state_gc_list);

	spin_unlock_bh(&xfrm_state_gc_lock);

	spin_unlock_bh(&xfrm_state_gc_lock);

	schedule_work(&xfrm_state_gc_work);

	schedule_work(&xfrm_state_gc_work);

}

}
@@ -2088,6 +2087,7 @@ int __net_init xfrm_state_init(struct net *net) 




	net->xfrm.state_num = 0;

	net->xfrm.state_num = 0;

	INIT_WORK(&net->xfrm.state_hash_work, xfrm_hash_resize);

	INIT_WORK(&net->xfrm.state_hash_work, xfrm_hash_resize);

	INIT_HLIST_HEAD(&net->xfrm.state_gc_list);

	INIT_WORK(&xfrm_state_gc_work, xfrm_state_gc_task);

	INIT_WORK(&xfrm_state_gc_work, xfrm_state_gc_task);

	return 0;

	return 0;