Home » Mailing list archives » linux-netdev » 2008 » November » 25

[PATCH 11/53] netns xfrm: per-netns state GC list

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Alexey Dobriyan
Subject: [PATCH 11/53] netns xfrm: per-netns state GC list
Date: Tuesday, November 25, 2008 - 10:26 am

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>
---
 include/net/netns/xfrm.h |    1 +
 net/xfrm/xfrm_state.c    |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
index bd68802..8ceb765 100644
--- a/include/net/netns/xfrm.h
+++ b/include/net/netns/xfrm.h
@@ -20,6 +20,7 @@ struct netns_xfrm {
 	unsigned int		state_hmask;
 	unsigned int		state_num;
 	struct work_struct	state_hash_work;
+	struct hlist_head	state_gc_list;
 };
 
 #endif
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 1b2a72c..864a974 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -177,7 +177,6 @@ static DEFINE_RWLOCK(xfrm_state_afinfo_lock);
 static struct xfrm_state_afinfo *xfrm_state_afinfo[NPROTO];
 
 static struct work_struct xfrm_state_gc_work;
-static HLIST_HEAD(xfrm_state_gc_list);
 static DEFINE_SPINLOCK(xfrm_state_gc_lock);
 
 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;
 
 	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);
 
 	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);
 
 	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);
 	schedule_work(&xfrm_state_gc_work);
 }
@@ -2088,6 +2087,7 @@ int __net_init xfrm_state_init(struct net *net)
 
 	net->xfrm.state_num = 0;
 	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);
 	return 0;
 
-- 
1.5.6.5

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 01/53] xfrm: initialise xfrm_policy_gc_work statically, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 02/53] netns xfrm: add netns boilerplate, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 03/53] netns xfrm: add struct xfrm_state::xs_net, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 04/53] netns xfrm: per-netns xfrm_state_all list, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 05/53] netns xfrm: per-netns xfrm_state_bydst hash, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 06/53] netns xfrm: per-netns xfrm_state_bysrc hash, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 07/53] netns xfrm: per-netns xfrm_state_byspi hash, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 08/53] netns xfrm: per-netns xfrm_state_hmask, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 09/53] netns xfrm: per-netns xfrm_state counts, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 10/53] netns xfrm: per-netns xfrm_hash_work, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 11/53] netns xfrm: per-netns state GC list, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 12/53] netns xfrm: per-netns state GC work, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 13/53] netns xfrm: per-netns km_waitq, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 14/53] netns xfrm: add struct xfrm_policy::xp_net, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 15/53] netns xfrm: per-netns policy list, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 16/53] netns xfrm: per-netns xfrm_policy_byidx hash, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 17/53] netns xfrm: per-netns xfrm_policy_byidx hashmask, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 18/53] netns xfrm: per-netns inexact policies, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 19/53] netns xfrm: per-netns xfrm_policy_bydst hash, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 20/53] netns xfrm: per-netns policy counts, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 21/53] netns xfrm: per-netns policy hash resizing work, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 22/53] netns xfrm: propagate netns into bydst/bysrc ..., Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 23/53] netns xfrm: trivial netns propagations, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 24/53] netns xfrm: state flush in netns, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 25/53] netns xfrm: state lookup in netns, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 26/53] netns xfrm: fixup xfrm_alloc_spi(), Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 27/53] netns xfrm: finding states in netns, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 28/53] netns xfrm: state walking in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 29/53] netns xfrm: propagate netns into policy byid ..., Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 30/53] netns xfrm: policy insertion in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 31/53] netns xfrm: policy flushing in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 32/53] netns xfrm: finding policy in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 33/53] netns xfrm: policy walking in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 34/53] netns xfrm: lookup in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 35/53] netns xfrm: xfrm_policy_check in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 36/53] netns xfrm: xfrm_route_forward() in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 37/53] netns xfrm: flushing/pruning bundles in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 38/53] netns xfrm: dst garbage-collecting in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 39/53] netns xfrm: xfrm_input() fixup, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 40/53] netns xfrm: per-netns NETLINK_XFRM socket, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 41/53] netns xfrm: xfrm_user module in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 42/53] netns xfrm: pass netns with KM notifications, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 43/53] netns xfrm: KM reporting in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 44/53] netns xfrm: -&gt;dst_lookup in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 45/53] netns xfrm: -&gt;get_saddr in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 46/53] netns xfrm: flush SA/SPDs on netns stop, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 47/53] netns PF_KEY: part 1, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 48/53] netns PF_KEY: part 2, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 49/53] netns PF_KEY: per-netns /proc/pfkey, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 50/53] netns xfrm: AH/ESP in netns!, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 51/53] netns xfrm: per-netns MIBs, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 52/53] netns xfrm: /proc/net/xfrm_stat in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 53/53] netns xfrm: per-netns sysctls, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
Re: [PATCH 01/53] xfrm: initialise xfrm_policy_gc_work sta ..., David Miller, (Tue Nov 25, 6:14 pm)
Re: [PATCH 02/53] netns xfrm: add netns boilerplate, David Miller, (Tue Nov 25, 6:14 pm)
Re: [PATCH 03/53] netns xfrm: add struct xfrm_state::xs_net, David Miller, (Tue Nov 25, 6:15 pm)
Re: [PATCH 04/53] netns xfrm: per-netns xfrm_state_all list, David Miller, (Tue Nov 25, 6:16 pm)
Re: [PATCH 05/53] netns xfrm: per-netns xfrm_state_bydst hash, David Miller, (Tue Nov 25, 6:17 pm)
Re: [PATCH 06/53] netns xfrm: per-netns xfrm_state_bysrc hash, David Miller, (Tue Nov 25, 6:17 pm)
Re: [PATCH 07/53] netns xfrm: per-netns xfrm_state_byspi hash, David Miller, (Tue Nov 25, 6:17 pm)
Re: [PATCH 08/53] netns xfrm: per-netns xfrm_state_hmask, David Miller, (Tue Nov 25, 6:18 pm)
Re: [PATCH 09/53] netns xfrm: per-netns xfrm_state counts, David Miller, (Tue Nov 25, 6:18 pm)
Re: [PATCH 10/53] netns xfrm: per-netns xfrm_hash_work, David Miller, (Tue Nov 25, 6:19 pm)
Re: [PATCH 11/53] netns xfrm: per-netns state GC list, David Miller, (Tue Nov 25, 6:20 pm)
Re: [PATCH 12/53] netns xfrm: per-netns state GC work, David Miller, (Tue Nov 25, 6:20 pm)
Re: [PATCH 13/53] netns xfrm: per-netns km_waitq, David Miller, (Tue Nov 25, 6:21 pm)
Re: [PATCH 14/53] netns xfrm: add struct xfrm_policy::xp_net, David Miller, (Tue Nov 25, 6:21 pm)
Re: [PATCH 15/53] netns xfrm: per-netns policy list, David Miller, (Tue Nov 25, 6:22 pm)
Re: [PATCH 16/53] netns xfrm: per-netns xfrm_policy_byidx hash, David Miller, (Tue Nov 25, 6:22 pm)
Re: [PATCH 17/53] netns xfrm: per-netns xfrm_policy_byidx ..., David Miller, (Tue Nov 25, 6:23 pm)
Re: [PATCH 18/53] netns xfrm: per-netns inexact policies, David Miller, (Tue Nov 25, 6:23 pm)
Re: [PATCH 19/53] netns xfrm: per-netns xfrm_policy_bydst hash, David Miller, (Tue Nov 25, 6:23 pm)
Re: [PATCH 20/53] netns xfrm: per-netns policy counts, David Miller, (Tue Nov 25, 6:24 pm)
Re: [PATCH 21/53] netns xfrm: per-netns policy hash resizi ..., David Miller, (Tue Nov 25, 6:29 pm)
Re: [PATCH 22/53] netns xfrm: propagate netns into bydst/b ..., David Miller, (Tue Nov 25, 6:29 pm)
Re: [PATCH 23/53] netns xfrm: trivial netns propagations, David Miller, (Tue Nov 25, 6:29 pm)
Re: [PATCH 24/53] netns xfrm: state flush in netns, David Miller, (Tue Nov 25, 6:30 pm)
Re: [PATCH 25/53] netns xfrm: state lookup in netns, David Miller, (Tue Nov 25, 6:30 pm)
Re: [PATCH 26/53] netns xfrm: fixup xfrm_alloc_spi(), David Miller, (Tue Nov 25, 6:31 pm)
Re: [PATCH 27/53] netns xfrm: finding states in netns, David Miller, (Tue Nov 25, 6:31 pm)
Re: [PATCH 28/53] netns xfrm: state walking in netns, David Miller, (Tue Nov 25, 6:32 pm)
Re: [PATCH 29/53] netns xfrm: propagate netns into policy ..., David Miller, (Tue Nov 25, 6:32 pm)
Re: [PATCH 30/53] netns xfrm: policy insertion in netns, David Miller, (Tue Nov 25, 6:33 pm)
Re: [PATCH 31/53] netns xfrm: policy flushing in netns, David Miller, (Tue Nov 25, 6:33 pm)
Re: [PATCH 32/53] netns xfrm: finding policy in netns, David Miller, (Tue Nov 25, 6:34 pm)
Re: [PATCH 33/53] netns xfrm: policy walking in netns, David Miller, (Tue Nov 25, 6:34 pm)
Re: [PATCH 34/53] netns xfrm: lookup in netns, David Miller, (Tue Nov 25, 6:35 pm)
Re: [PATCH 35/53] netns xfrm: xfrm_policy_check in netns, David Miller, (Tue Nov 25, 6:35 pm)
Re: [PATCH 36/53] netns xfrm: xfrm_route_forward() in netns, David Miller, (Tue Nov 25, 6:36 pm)
Re: [PATCH 37/53] netns xfrm: flushing/pruning bundles in ..., David Miller, (Tue Nov 25, 6:36 pm)
Re: [PATCH 38/53] netns xfrm: dst garbage-collecting in netns, David Miller, (Tue Nov 25, 6:37 pm)
Re: [PATCH 39/53] netns xfrm: xfrm_input() fixup, David Miller, (Tue Nov 25, 6:38 pm)
Re: [PATCH 40/53] netns xfrm: per-netns NETLINK_XFRM socket, David Miller, (Tue Nov 25, 6:38 pm)
Re: [PATCH 41/53] netns xfrm: xfrm_user module in netns, David Miller, (Tue Nov 25, 6:50 pm)
Re: [PATCH 42/53] netns xfrm: pass netns with KM notifications, David Miller, (Tue Nov 25, 6:50 pm)
Re: [PATCH 43/53] netns xfrm: KM reporting in netns, David Miller, (Tue Nov 25, 6:51 pm)
Re: [PATCH 44/53] netns xfrm: -&gt;dst_lookup in netns, David Miller, (Tue Nov 25, 6:51 pm)
Re: [PATCH 45/53] netns xfrm: -&gt;get_saddr in netns, David Miller, (Tue Nov 25, 6:56 pm)
Re: [PATCH 46/53] netns xfrm: flush SA/SPDs on netns stop, David Miller, (Tue Nov 25, 6:57 pm)
Re: [PATCH 47/53] netns PF_KEY: part 1, David Miller, (Tue Nov 25, 6:58 pm)
Re: [PATCH 48/53] netns PF_KEY: part 2, David Miller, (Tue Nov 25, 6:58 pm)
Re: [PATCH 49/53] netns PF_KEY: per-netns /proc/pfkey, David Miller, (Tue Nov 25, 6:59 pm)
Re: [PATCH 50/53] netns xfrm: AH/ESP in netns!, David Miller, (Tue Nov 25, 6:59 pm)
Re: [PATCH 51/53] netns xfrm: per-netns MIBs, David Miller, (Tue Nov 25, 6:59 pm)
Re: [PATCH 52/53] netns xfrm: /proc/net/xfrm_stat in netns, David Miller, (Tue Nov 25, 7:00 pm)
Re: [PATCH 53/53] netns xfrm: per-netns sysctls, David Miller, (Tue Nov 25, 7:00 pm)
Re: [PATCH 03/53] netns xfrm: add struct xfrm_state::xs_net, Alexey Dobriyan, (Tue Nov 25, 9:25 pm)