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

[PATCH 44/53] netns xfrm: ->dst_lookup in netns

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Alexey Dobriyan
Subject: [PATCH 44/53] netns xfrm: ->dst_lookup in netns
Date: Tuesday, November 25, 2008 - 10:27 am

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
 include/net/xfrm.h      |    3 ++-
 net/ipv4/xfrm4_policy.c |    7 ++++---
 net/ipv6/xfrm6_policy.c |    7 ++++---
 net/xfrm/xfrm_policy.c  |    7 ++++---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index f3ea160..b16d4c0 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -266,7 +266,8 @@ struct xfrm_policy_afinfo {
 	unsigned short		family;
 	struct dst_ops		*dst_ops;
 	void			(*garbage_collect)(struct net *net);
-	struct dst_entry	*(*dst_lookup)(int tos, xfrm_address_t *saddr,
+	struct dst_entry	*(*dst_lookup)(struct net *net, int tos,
+					       xfrm_address_t *saddr,
 					       xfrm_address_t *daddr);
 	int			(*get_saddr)(xfrm_address_t *saddr, xfrm_address_t *daddr);
 	struct dst_entry	*(*find_bundle)(struct flowi *fl, struct xfrm_policy *policy);
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index a881ca3..e1cf9ed 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -18,7 +18,8 @@
 static struct dst_ops xfrm4_dst_ops;
 static struct xfrm_policy_afinfo xfrm4_policy_afinfo;
 
-static struct dst_entry *xfrm4_dst_lookup(int tos, xfrm_address_t *saddr,
+static struct dst_entry *xfrm4_dst_lookup(struct net *net, int tos,
+					  xfrm_address_t *saddr,
 					  xfrm_address_t *daddr)
 {
 	struct flowi fl = {
@@ -36,7 +37,7 @@ static struct dst_entry *xfrm4_dst_lookup(int tos, xfrm_address_t *saddr,
 	if (saddr)
 		fl.fl4_src = saddr->a4;
 
-	err = __ip_route_output_key(&init_net, &rt, &fl);
+	err = __ip_route_output_key(net, &rt, &fl);
 	dst = &rt->u.dst;
 	if (err)
 		dst = ERR_PTR(err);
@@ -48,7 +49,7 @@ static int xfrm4_get_saddr(xfrm_address_t *saddr, xfrm_address_t *daddr)
 	struct dst_entry *dst;
 	struct rtable *rt;
 
-	dst = xfrm4_dst_lookup(0, NULL, daddr);
+	dst = xfrm4_dst_lookup(&init_net, 0, NULL, daddr);
 	if (IS_ERR(dst))
 		return -EHOSTUNREACH;
 
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 2df8a78..d7a5b8b 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -27,7 +27,8 @@
 static struct dst_ops xfrm6_dst_ops;
 static struct xfrm_policy_afinfo xfrm6_policy_afinfo;
 
-static struct dst_entry *xfrm6_dst_lookup(int tos, xfrm_address_t *saddr,
+static struct dst_entry *xfrm6_dst_lookup(struct net *net, int tos,
+					  xfrm_address_t *saddr,
 					  xfrm_address_t *daddr)
 {
 	struct flowi fl = {};
@@ -38,7 +39,7 @@ static struct dst_entry *xfrm6_dst_lookup(int tos, xfrm_address_t *saddr,
 	if (saddr)
 		memcpy(&fl.fl6_src, saddr, sizeof(fl.fl6_src));
 
-	dst = ip6_route_output(&init_net, NULL, &fl);
+	dst = ip6_route_output(net, NULL, &fl);
 
 	err = dst->error;
 	if (dst->error) {
@@ -54,7 +55,7 @@ static int xfrm6_get_saddr(xfrm_address_t *saddr, xfrm_address_t *daddr)
 	struct dst_entry *dst;
 	struct net_device *dev;
 
-	dst = xfrm6_dst_lookup(0, NULL, daddr);
+	dst = xfrm6_dst_lookup(&init_net, 0, NULL, daddr);
 	if (IS_ERR(dst))
 		return -EHOSTUNREACH;
 
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 7ebbdd6..2b0a80b 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -92,7 +92,7 @@ int xfrm_selector_match(struct xfrm_selector *sel, struct flowi *fl,
 	return 0;
 }
 
-static inline struct dst_entry *__xfrm_dst_lookup(int tos,
+static inline struct dst_entry *__xfrm_dst_lookup(struct net *net, int tos,
 						  xfrm_address_t *saddr,
 						  xfrm_address_t *daddr,
 						  int family)
@@ -104,7 +104,7 @@ static inline struct dst_entry *__xfrm_dst_lookup(int tos,
 	if (unlikely(afinfo == NULL))
 		return ERR_PTR(-EAFNOSUPPORT);
 
-	dst = afinfo->dst_lookup(tos, saddr, daddr);
+	dst = afinfo->dst_lookup(net, tos, saddr, daddr);
 
 	xfrm_policy_put_afinfo(afinfo);
 
@@ -116,6 +116,7 @@ static inline struct dst_entry *xfrm_dst_lookup(struct xfrm_state *x, int tos,
 						xfrm_address_t *prev_daddr,
 						int family)
 {
+	struct net *net = xs_net(x);
 	xfrm_address_t *saddr = &x->props.saddr;
 	xfrm_address_t *daddr = &x->id.daddr;
 	struct dst_entry *dst;
@@ -129,7 +130,7 @@ static inline struct dst_entry *xfrm_dst_lookup(struct xfrm_state *x, int tos,
 		daddr = x->coaddr;
 	}
 
-	dst = __xfrm_dst_lookup(tos, saddr, daddr, family);
+	dst = __xfrm_dst_lookup(net, tos, saddr, daddr, family);
 
 	if (!IS_ERR(dst)) {
 		if (prev_saddr != saddr)
-- 
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: ->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)