Skip to contentSkip to conversation

Move source address selection into route lookup.

RFC PATCH Applied Ville Nuorvala 5 participants 12 messages Oct 17, 2006 – Nov 6, 2006 2 messages not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

RFC PATCH 7/13 Move source address selection into route lookup.

This patch moves the normal source address selection from ip6_dst_lookup() into ip6_pol_route_output(), but shouldn't change the routing or source address selection behavior in any way.

---
 net/ipv6/ip6_output.c |    6 ------
 net/ipv6/route.c      |   37 ++++++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 21 deletions(-)
net/ipv6/ip6_output.c +0 -6
index 6671691..0019007 100644
@@ -855,12 +855,6 @@ static int ip6_dst_lookup_tail(struct so
 	if ((err = (*dst)->error))
 		goto out_err_release;
 
-	if (ipv6_addr_any(&fl->fl6_src)) {
-		err = ipv6_get_saddr(*dst, &fl->fl6_dst, &fl->fl6_src);
-		if (err)
-			goto out_err_release;
-	}
-
 	return 0;
 
 out_err_release:
net/ipv6/route.c +22 -15
index aa96be8..b7b8148 100644
@@ -536,7 +536,7 @@ struct rt6_info *rt6_lookup(struct in6_a
 	int flags = strict ? RT6_LOOKUP_F_IFACE : 0;
 
 	if (saddr) {
-		memcpy(&fl.fl6_src, saddr, sizeof(*saddr));
+		ipv6_addr_copy(&fl.fl6_src, saddr);
 		flags |= RT6_LOOKUP_F_HAS_SADDR;
 	}
 
@@ -629,13 +629,11 @@ static struct rt6_info *ip6_pol_route_in
 {
 	struct fib6_node *fn;
 	struct rt6_info *rt, *nrt;
-	int strict = 0;
+	int strict = flags & RT6_LOOKUP_F_IFACE;
 	int attempts = 3;
 	int err;
 	int reachable = RT6_LOOKUP_F_REACHABLE;
 
-	strict |= flags & RT6_LOOKUP_F_IFACE;
-
 relookup:
 	read_lock_bh(&table->tb6_lock);
 
@@ -726,22 +724,22 @@ static struct rt6_info *ip6_pol_route_ou
 {
 	struct fib6_node *fn;
 	struct rt6_info *rt, *nrt;
-	int strict = 0;
-	int attempts = 3;
-	int err;
+	int has_saddr = flags & RT6_LOOKUP_F_HAS_SADDR;
+	int strict = flags & RT6_LOOKUP_F_IFACE;
 	int reachable = RT6_LOOKUP_F_REACHABLE;
+	int attempts = 3;
+	struct in6_addr saddr;
 
-	strict |= flags & RT6_LOOKUP_F_IFACE;
-
+	ipv6_addr_copy(&saddr, &fl->fl6_src);
 relookup:
 	read_lock_bh(&table->tb6_lock);
 
 restart_2:
-	fn = fib6_lookup(&table->tb6_root, &fl->fl6_dst, &fl->fl6_src);
+	fn = fib6_lookup(&table->tb6_root, &fl->fl6_dst, &saddr);
 
 restart:
 	rt = rt6_select(&fn->leaf, fl->oif, strict | reachable);
-	BACKTRACK(&fl->fl6_src);
+	BACKTRACK(&saddr);
 	if (rt == &ip6_null_entry ||
 	    rt->rt6i_flags & RTF_CACHE)
 		goto out;
@@ -749,6 +747,13 @@ restart:
 	dst_hold(&rt->u.dst);
 	read_unlock_bh(&table->tb6_lock);
 
+	if (!has_saddr) {
+		/* policy rule doesn't restrict source address */
+		if (ipv6_get_saddr(&rt->u.dst, &fl->fl6_dst, &saddr))
+			goto no_saddr;
+		has_saddr = RT6_LOOKUP_F_HAS_SADDR;
+		ipv6_addr_copy(&fl->fl6_src, &saddr);
+	}
 	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP))
 		nrt = rt6_alloc_cow(rt, &fl->fl6_dst, &fl->fl6_src);
 	else {
@@ -764,8 +769,7 @@ #endif
 
 	dst_hold(&rt->u.dst);
 	if (nrt) {
-		err = ip6_ins_rt(nrt);
-		if (!err)
+		if (!ip6_ins_rt(nrt))
 			goto out2;
 	}
 
@@ -778,7 +782,6 @@ #endif
 	 */
 	dst_release(&rt->u.dst);
 	goto relookup;
-
 out:
 	if (reachable) {
 		reachable = 0;
@@ -790,6 +793,10 @@ out2:
 	rt->u.dst.lastuse = jiffies;
 	rt->u.dst.__use++;
 	return rt;
+no_saddr:
+	rt = &ip6_null_entry;
+	dst_hold(&rt->u.dst);
+	goto out2;
 }
 
 struct dst_entry * ip6_route_output(struct sock *sk, struct flowi *fl)
@@ -2044,7 +2051,7 @@ #endif
 		NLA_PUT_U32(skb, RTA_IIF, iif);
 	else if (dst) {
 		struct in6_addr saddr_buf;
-		if (ipv6_get_saddr(&rt->u.dst, dst, &saddr_buf) == 0)
+		if (!ipv6_get_saddr(&rt->u.dst, dst, &saddr_buf))
 			NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
 	}
 
Signature · 1 line
1.4.2.3
maintainer
#1 lore raw

From: Ville Nuorvala <[email protected]>
Date: Tue, 17 Oct 2006 03:13:17 +0300

Quoted 6 lines

This patch moves the normal source address selection from ip6_dst_lookup() into ip6_pol_route_output(), but shouldn't change the routing or source address selection behavior in any way.

Although this conversion is very clean and the next patch is very logic, I'm going to hold on all patches from 7 onward so there is some time for some discussion of the RFC'ness of them :-)

Thanks.

#2 lore raw
Quoted 8 lines · David Miller

From: Ville Nuorvala <[email protected]>
Date: Tue, 17 Oct 2006 03:13:17 +0300

Quoted 5 lines

This patch moves the normal source address selection from ip6_dst_lookup() into ip6_pol_route_output(), but shouldn't change the routing or source address selection behavior in any way.

Quoted 7 lines
Quoted 1 line

Although this conversion is very clean and the next patch is very logic, I'm going to hold on all patches from 7 onward so there is some time for some discussion of the RFC'ness of them :-)

With regard to RFC'ness, passing self tests TAHI "Ready Logo 2" with SUBTREE turned on could be a valuable feedback.

Jean-Mickael

#3 lore raw

In article <[email protected]> (at Tue, 17 Oct 2006 10:01:24 +0200), Jean-Mickael Guerin <[email protected]> says:

Quoted 8 lines
Quoted 5 lines

Although this conversion is very clean and the next patch is very logic, I'm going to hold on all patches from 7 onward so there is some time for some discussion of the RFC'ness of them :-)

With regard to RFC'ness, passing self tests TAHI "Ready Logo 2" with SUBTREE
turned on could be a valuable feedback.

Have you done it?

We've been trying to pass that, but we failed to compile; we probably used wrong tree...

--yoshfuji

#4 lore raw
Quoted 7 lines · YOSHIFUJI Hideaki / 吉藤英明

In article <[email protected]> (at Tue, 17 Oct 2006 10:01:24 +0200), Jean-Mickael Guerin <[email protected]> says:

Quoted 5 lines
Quoted 5 lines

Although this conversion is very clean and the next patch is very logic, I'm going to hold on all patches from 7 onward so there is some time for some discussion of the RFC'ness of them :-)

Quoted 7 lines
Quoted 2 lines

With regard to RFC'ness, passing self tests TAHI "Ready Logo 2" with SUBTREE turned on could be a valuable feedback.

Have you done it?

We've been trying to pass that, but we failed to compile; we probably used wrong tree...

Excuse me. I overlooked an error message from patch command. When I appiled the patch manually, we could compile them.

We will double-check these patches with TAHI, either. And then, we will report the results.

Best Regards,

Signature · 1 line
Mitsuru Chinen <[email protected]>
#7 lore raw

Re: (usagi-core 31424) Re: [PATCH 7/13] [RFC] [IPV6] Move source address selection into route lookup.

In reply to a message not in the archive

On 10/19/06 05:27, Mitsuru Chinen wrote:

Hello Mitsuru-san,

Quoted 11 lines

At the first Echo Request, its source address is a global address.

| # ping6 -n -c 1 -i 1 -s 1452 -p 00 -w 2 -I eth1 FF1E: :1:2
| PATTERN: 0x00
| PING FF1E::1:2(ff1e::1:2) from 3ffe:501:ffff:100:2d0:b7ff:fe9a:455b eth1: 1452 data bytes
|
| --- FF1E::1:2 ping statistics ---
| 3 packets transmitted, 0 received, 100% loss, time 1999ms

However, after receiving a Too Big message, the source address of Echo Request is changed to :: at the failure case.

thank you for the thorough test report! I'll try to track down the reason.

Regards,
Ville

#8 lore raw

Re: (usagi-core 31424) Re: [PATCH 7/13] [RFC] [IPV6] Move source address selection into route lookup.

In reply to a message not in the archive

Mitsuru-san,

could you apply patch #12 and rerun the test? I think this particular problem is caused by the routing cache entry not having a valid source address in the first place. As ip6_dst_lookup() doesn't do the source address lookup anymore, it is critical that we only store cache entries with complete address data for both destination and source.

These two patches apparently shouldn't have been split in the first place. Sorry!

Regards,
Ville

#9 lore raw

Re: (usagi-core 31424) Re: [PATCH 7/13] [RFC] [IPV6] Move source address selection into route lookup.

Hello Ville,

Quoted 10 lines · Ville Nuorvala

Mitsuru-san,

could you apply patch #12 and rerun the test? I think this particular problem is caused by the routing cache entry not having a valid source address in the first place. As ip6_dst_lookup() doesn't do the source address lookup anymore, it is critical that we only store cache entries with complete address data for both destination and source.

These two patches apparently shouldn't have been split in the first place. Sorry!

I'm afraid patch #12 doesn't work for this issue.

Although I applied patch #12, I still got fails.
The test log is the same as the last one.
When I applied all patches, I got fails, either.

Best Regards,

Signature · 1 line
Mitsuru Chinen <[email protected]>
#10 lore raw

Re: (usagi-core 31424) Re: [PATCH 7/13] [RFC] [IPV6] Move source address selection into route lookup.

In reply to a message not in the archive

On 10/19/06 05:27, Mitsuru Chinen wrote:

Hello again Mitsuru-san,

I haven't yet had time to follow up on this issue and I would in fact need some help to proceed.

Quoted 1 line

http://testlab.linux-ipv6.org/tahi-autorun.2/net-2.6_20061018/

The host testlab.linux-ipv6.org doesn't seem to be visible to the outside world so could you post the results somewhere where I could take a closer look at the results?

Could you actually also send me the configuration files for the TAHI test, so I could try to set up an identical test environment?

Thanks,
Ville

#11 lore raw

Re: (usagi-core 31424) Re: [PATCH 7/13] [RFC] [IPV6] Move source address selection into route lookup.

In article <[email protected]> (at Thu, 02 Nov 2006 14:46:43 +0200), Ville Nuorvala <[email protected]> says:

Quoted 5 lines
Quoted 1 line

http://testlab.linux-ipv6.org/tahi-autorun.2/net-2.6_20061018/

The host testlab.linux-ipv6.org doesn't seem to be visible to the outside world so could you post the results somewhere where I could take a closer look at the results?

It is visible world-wide, assuming you have IPv6 connection.

Quoted 2 lines

Could you actually also send me the configuration files for the TAHI test, so I could try to set up an identical test environment?

Nothing special.

--yoshfuji

#12 lore raw

Re: !! SPAM Suspect : SPAM-URL-DBL !! Re: (usagi-core 31424) Re: [PATCH 7/13] [RFC] [IPV6] Move source address selection into route lookup.

Quoted 7 lines
Quoted 4 lines

The host testlab.linux-ipv6.org doesn't seem to be visible to the outside world so could you post the results somewhere where I could take a closer look at the results?

It is visible world-wide, assuming you have IPv6 connection.

With IPv4-only connection, one can try to append ".ipv4.sixxs.org":

http://testlab.linux-ipv6.org.ipv4.sixxs.org/tahi-autorun.2/net-2.6_20061018/

Jean-Mickael

#13 lore raw

Re: (usagi-core 31424) Re: [PATCH 7/13] [RFC] [IPV6] Move source address selection into route lookup.

In reply to YOSHIFUJI Hideaki / 吉藤英明

[ reposted, with better subject ]

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

http://testlab.linux-ipv6.org/tahi-autorun.2/net-2.6_20061018/

The host testlab.linux-ipv6.org doesn't seem to be visible to the outside world so could you post the results somewhere where I could take a closer look at the results?

It is visible world-wide, assuming you have IPv6 connection.

With IPv4-only connection, one can try to append ".ipv4.sixxs.org":

http://testlab.linux-ipv6.org.ipv4.sixxs.org/tahi-autorun.2/net-2.6_20061018/

Jean-Mickael