aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-11-25 20:20:11 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-25 20:20:11 -0500
commitb8a0ae20b0eecd4b86a113d2abe2fa5a582b30a6 (patch)
tree7425a504250c79c86c69293772a4a4271ed74237 /net
parent630827338585022b851ec0a6335df8e436c900e4 (diff)
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: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/xfrm/xfrm_state.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 1b2a72c8429c..864a97477ae5 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -177,7 +177,6 @@ static DEFINE_RWLOCK(xfrm_state_afinfo_lock);
177static struct xfrm_state_afinfo *xfrm_state_afinfo[NPROTO]; 177static struct xfrm_state_afinfo *xfrm_state_afinfo[NPROTO];
178 178
179static struct work_struct xfrm_state_gc_work; 179static struct work_struct xfrm_state_gc_work;
180static HLIST_HEAD(xfrm_state_gc_list);
181static DEFINE_SPINLOCK(xfrm_state_gc_lock); 180static DEFINE_SPINLOCK(xfrm_state_gc_lock);
182 181
183int __xfrm_state_delete(struct xfrm_state *x); 182int __xfrm_state_delete(struct xfrm_state *x);
@@ -394,7 +393,7 @@ static void xfrm_state_gc_task(struct work_struct *data)
394 struct hlist_head gc_list; 393 struct hlist_head gc_list;
395 394
396 spin_lock_bh(&xfrm_state_gc_lock); 395 spin_lock_bh(&xfrm_state_gc_lock);
397 hlist_move_list(&xfrm_state_gc_list, &gc_list); 396 hlist_move_list(&init_net.xfrm.state_gc_list, &gc_list);
398 spin_unlock_bh(&xfrm_state_gc_lock); 397 spin_unlock_bh(&xfrm_state_gc_lock);
399 398
400 hlist_for_each_entry_safe(x, entry, tmp, &gc_list, gclist) 399 hlist_for_each_entry_safe(x, entry, tmp, &gc_list, gclist)
@@ -527,7 +526,7 @@ void __xfrm_state_destroy(struct xfrm_state *x)
527 WARN_ON(x->km.state != XFRM_STATE_DEAD); 526 WARN_ON(x->km.state != XFRM_STATE_DEAD);
528 527
529 spin_lock_bh(&xfrm_state_gc_lock); 528 spin_lock_bh(&xfrm_state_gc_lock);
530 hlist_add_head(&x->gclist, &xfrm_state_gc_list); 529 hlist_add_head(&x->gclist, &init_net.xfrm.state_gc_list);
531 spin_unlock_bh(&xfrm_state_gc_lock); 530 spin_unlock_bh(&xfrm_state_gc_lock);
532 schedule_work(&xfrm_state_gc_work); 531 schedule_work(&xfrm_state_gc_work);
533} 532}
@@ -2088,6 +2087,7 @@ int __net_init xfrm_state_init(struct net *net)
2088 2087
2089 net->xfrm.state_num = 0; 2088 net->xfrm.state_num = 0;
2090 INIT_WORK(&net->xfrm.state_hash_work, xfrm_hash_resize); 2089 INIT_WORK(&net->xfrm.state_hash_work, xfrm_hash_resize);
2090 INIT_HLIST_HEAD(&net->xfrm.state_gc_list);
2091 INIT_WORK(&xfrm_state_gc_work, xfrm_state_gc_task); 2091 INIT_WORK(&xfrm_state_gc_work, xfrm_state_gc_task);
2092 return 0; 2092 return 0;
2093 2093