SCTP updates for net-next-2.6
Subsystems (3)
v2 cover SCTP updates for net-next-2.6
Hi David
Here is a set of SCTP patches for net-next-2.6, the last part from vlad's lksctp-dev tree, update SCTP IPv6 routing and IPSec issues. Please apply.
Changelog:
- redo the intermediate builds test and function test.
- remove useless ->dst_saddr member of sctp_pf
- merge some fix for original patch
Vlad Yasevich (4):
sctp: cache the ipv6 source after route lookup
sctp: make sctp over IPv6 work with IPsec
sctp: remove useless arguments from get_saddr() call
sctp: clean up route lookup calls
Weixing Shi (1):
sctp: fix sctp to work with ipv6 source address routing
include/net/sctp/structs.h | 18 ++--- net/sctp/ipv6.c | 183 +++++++++++++++++++++++++------------------ net/sctp/protocol.c | 54 ++++++------- net/sctp/socket.c | 2 +- net/sctp/transport.c | 28 ++++--- 5 files changed, 153 insertions(+), 132 deletions(-)
PATCH v2 1/5 sctp: fix sctp to work with ipv6 source address routing
From: Weixing Shi <[email protected]>
In the below test case, using the source address routing, sctp can not work.
Node-A
1)ifconfig eth0 inet6 add 2001:1::1/64
2)ip -6 rule add from 2001:1::1 table 100 pref 100 3)ip -6 route add 2001:2::1 dev eth0 table 100 4)sctp_darn -H 2001:1::1 -P 250 -l &
Node-B
1)ifconfig eth0 inet6 add 2001:2::1/64
2)ip -6 rule add from 2001:2::1 table 100 pref 100 3)ip -6 route add 2001:1::1 dev eth0 table 100 4)sctp_darn -H 2001:2::1 -P 250 -h 2001:1::1 -p 250 -s
root cause:
Node-A and Node-B use the source address routing, and at begining, source address will be NULL,sctp will search the routing table by the destination address, because using the source address routing table, and the result dst_entry will be NULL.
solution:
walk through the bind address list to get the source address and then lookup the routing table again to get the correct dst_entry.
Signed-off-by Weixing Shi <[email protected]>
Signed-off-by Vlad Yasevich <[email protected]>
Signed-off-by Wei Yongjun <[email protected]>
--- net/sctp/ipv6.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletions(-)
net/sctp/ipv6.c +43 -1
@@ -80,6 +80,9 @@#include <asm/uaccess.h> +static inline int sctp_v6_addr_match_len (union sctp_addr *s1, +union sctp_addr *s2); +/* Event handler for inet6 address addition/deletion events. * The sctp_local_addr_list needs to be protocted by a spin lock since * multiple notifiers (say IPv4 and IPv6) may be running at the same
@@ -244,8 +247,14 @@ static struct dst_entry *sctp_v6_get_dst(struct sctp_association *asoc,union sctp_addr *daddr, union sctp_addr *saddr) { - struct dst_entry *dst; + struct dst_entry *dst = NULL;struct flowi6 fl6; +struct sctp_bind_addr *bp; +struct sctp_sockaddr_entry *laddr; +union sctp_addr *baddr =NULL ; +__u8 matchlen =0 ; +__u8 bmatchlen; +sctp_scope_t scope;memset (&fl6,0 ,sizeof (fl6));ipv6_addr_copy (&fl6.daddr, &daddr->v6.sin6_addr);
@@ -261,6 +270,39 @@ static struct dst_entry *sctp_v6_get_dst(struct sctp_association *asoc, } dst =ip6_route_output (&init_net,NULL , &fl6); +if (!asoc || saddr) + goto out; + +if (dst->error) { +dst_release (dst); + dst =NULL ; + bp = &asoc->base.bind_addr; + scope =sctp_scope (daddr); +/* Walk through the bind address list and try to get a dst that +* matches a bind address as the source address. +*/ +rcu_read_lock (); +list_for_each_entry_rcu (laddr, &bp->address_list, list) { +if (!laddr->valid) +continue ; +if ((laddr->state =SCTP_ADDR_SRC ) && + (laddr->a.sa.sa_family =AF_INET6 ) && + (scope <=sctp_scope (&laddr->a))) { + bmatchlen =sctp_v6_addr_match_len (daddr, + &laddr->a); +if (!baddr || (matchlen < bmatchlen)) { + baddr = &laddr->a; + matchlen = bmatchlen; + } + } + } +rcu_read_unlock (); +if (baddr) { +ipv6_addr_copy (&fl6.saddr, &baddr->v6.sin6_addr); + dst =ip6_route_output (&init_net,NULL , &fl6); + } + } +out:if (!dst->error) {struct rt6_info *rt; rt = (struct rt6_info *)dst;
Signature · 1 line
1.6.5.2
PATCH v2 2/5 sctp: cache the ipv6 source after route lookup
In reply to Wei YongjunFrom: Vlad Yasevich <[email protected]>
The ipv6 routing lookup does give us a source address, but instead of filling it into the dst, it's stored in the flowi. We can use that instead of going through the entire source address selection again.
Also the useless ->dst_saddr member of sctp_pf is removed. And sctp_v6_dst_saddr() is removed, instead by introduce sctp_v6_to_addr(), which can be reused to cleanup some dup code.
Signed-off-by Vlad Yasevich <[email protected]>
Signed-off-by Wei Yongjun <[email protected]>
--- include/net/sctp/structs.h | 14 ++-- net/sctp/ipv6.c | 161 ++++++++++++++++++++------------------------ net/sctp/protocol.c | 47 ++++++------- net/sctp/socket.c | 2 +- net/sctp/transport.c | 15 +++-- 5 files changed, 112 insertions(+), 127 deletions(-)
include/net/sctp/structs.h +6 -8
@@ -566,17 +566,15 @@ struct sctp_af { int __user *optlen);struct dst_entry *(*get_dst) (struct sctp_association *asoc,union sctp_addr *daddr, -union sctp_addr *saddr); +union sctp_addr *saddr, +struct flowi *fl, +struct sock *sk);void (*get_saddr) (struct sctp_sock *sk, -struct sctp_association *asoc, -struct dst_entry *dst, +struct sctp_transport *t,union sctp_addr *daddr, -union sctp_addr *saddr); +struct flowi *fl);void (*copy_addrlist) (struct list_head *,struct net_device *); -void (*dst_saddr) (union sctp_addr *saddr, -struct dst_entry *dst, -__be16 port);int (*cmp_addr) (const union sctp_addr *addr1,const union sctp_addr *addr2); void (*addr_copy) (union sctp_addr *dst,
@@ -1061,7 +1059,7 @@ void sctp_transport_set_owner(struct sctp_transport *, struct sctp_association *);void sctp_transport_route (struct sctp_transport *,union sctp_addr *,struct sctp_sock *); -void sctp_transport_pmtu (struct sctp_transport *); +void sctp_transport_pmtu (struct sctp_transport *,struct sock *sk);void sctp_transport_free (struct sctp_transport *);void sctp_transport_reset_timers (struct sctp_transport *);void sctp_transport_hold (struct sctp_transport *);
net/sctp/ipv6.c +73 -88
237 lines not on this page · raw message
net/sctp/protocol.c +22 -25
90 lines not on this page · raw message
net/sctp/socket.c +1 -1
@@ -2287,7 +2287,7 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params, trans->param_flags (trans->param_flags & ~SPP_PMTUD ) | pmtud_change;if (update) { -sctp_transport_pmtu (trans); +sctp_transport_pmtu (trans,sctp_opt2sk (sp));sctp_assoc_sync_pmtu (asoc); } }else if (asoc) {
net/sctp/transport.c +10 -5
@@ -211,11 +211,15 @@ void sctp_transport_set_owner(struct sctp_transport *transport, }/* Initialize the pmtu of a transport. */ -void sctp_transport_pmtu (struct sctp_transport *transport) +void sctp_transport_pmtu (struct sctp_transport *transport,struct sock *sk) {struct dst_entry *dst; +struct flowi fl; - dst = transport->af_specific->get_dst (NULL , &transport->ipaddr,NULL ); + dst = transport->af_specific->get_dst (transport->asoc, + &transport->ipaddr, + &transport->saddr, + &fl, sk);if (dst) { transport->pathmtu =dst_mtu (dst);
@@ -272,15 +276,16 @@ void sctp_transport_route(struct sctp_transport *transport,struct sctp_af *af = transport->af_specific;union sctp_addr *daddr = &transport->ipaddr;struct dst_entry *dst; +struct flowi fl; - dst = af->get_dst (asoc, daddr, saddr); + dst = af->get_dst (asoc, daddr, saddr, &fl,sctp_opt2sk (opt)); + transport->dst = dst;if (saddr)memcpy (&transport->saddr, saddr,sizeof (union sctp_addr ));else - af->get_saddr (opt, asoc, dst, daddr, &transport->saddr); + af->get_saddr (opt, transport, daddr, &fl); - transport->dst = dst;if ((transport->param_flags &SPP_PMTUD_DISABLE ) && transport->pathmtu) {return ; }
Signature · 1 line
1.6.5.2
PATCH v2 3/5 sctp: make sctp over IPv6 work with IPsec
In reply to Wei YongjunFrom: Vlad Yasevich <[email protected]>
SCTP never called xfrm_output after it's v6 route lookups so that never really worked with ipsec. Additioanlly, we never passed port nubmers and protocol in the flowi, so any port based policies were never applied as well. Now that we can fixed ipv6 routing lookup code, using ip6_dst_lookup_flow() and pass port numbers.
Signed-off-by Vlad Yasevich <[email protected]>
Signed-off-by Wei Yongjun <[email protected]>
--- net/sctp/ipv6.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-)
net/sctp/ipv6.c +11 -5
@@ -262,22 +262,27 @@ static struct dst_entry *sctp_v6_get_dst(struct sctp_association *asoc,__u8 matchlen =0 ;__u8 bmatchlen;sctp_scope_t scope; -int err =0 ;memset (fl6,0 ,sizeof (struct flowi6 ));ipv6_addr_copy (&fl6->daddr, &daddr->v6.sin6_addr); + fl6->fl6_dport = daddr->v6.sin6_port; + fl6->flowi6_proto =IPPROTO_SCTP ;if (ipv6_addr_type (&daddr->v6.sin6_addr) &IPV6_ADDR_LINKLOCAL ) fl6->flowi6_oif = daddr->v6.sin6_scope_id;SCTP_DEBUG_PRINTK ("%s: DST=%pI6 " , __func__, &fl6->daddr); +if (asoc) + fl6->fl6_sport =htons (asoc->base.bind_addr.port); +if (saddr) {ipv6_addr_copy (&fl6->saddr, &saddr->v6.sin6_addr); + fl6->fl6_sport = saddr->v6.sin6_port;SCTP_DEBUG_PRINTK ("SRC=%pI6 - " , &fl6->saddr); } - err =ip6_dst_lookup (sk, &dst, fl6); + dst =ip6_dst_lookup_flow (sk, fl6,NULL , false);if (!asoc || saddr) goto out;
@@ -286,7 +291,7 @@ static struct dst_entry *sctp_v6_get_dst(struct sctp_association *asoc,/* ip6_dst_lookup has filled in the fl6->saddr for us. Check * to see if we can use it. */ -if (!err) { +if (!IS_ERR (dst)) {/* Walk through the bind address list and look for a bind * address that matches the source address of the returned dst. */
@@ -330,11 +335,12 @@ static struct dst_entry *sctp_v6_get_dst(struct sctp_association *asoc,rcu_read_unlock ();if (baddr) {ipv6_addr_copy (&fl6->saddr, &baddr->v6.sin6_addr); - err =ip6_dst_lookup (sk, &dst, fl6); + fl6->fl6_sport = baddr->v6.sin6_port; + dst =ip6_dst_lookup_flow (sk, fl6,NULL , false); } out: -if (!err) { +if (!IS_ERR (dst)) {struct rt6_info *rt; rt = (struct rt6_info *)dst; SCTP_DEBUG_PRINTK("rt6_dst:%pI6 rt6_src:%pI6\n",
Signature · 1 line
1.6.5.2
PATCH v2 4/5 sctp: remove useless arguments from get_saddr() call
In reply to Wei YongjunFrom: Vlad Yasevich <[email protected]>
There is no point in passing a destination address to a get_saddr() call.
Signed-off-by Vlad Yasevich <[email protected]>
Signed-off-by Wei Yongjun <[email protected]>
--- include/net/sctp/structs.h | 1 - net/sctp/ipv6.c | 5 +---- net/sctp/protocol.c | 1 - net/sctp/transport.c | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-)
include/net/sctp/structs.h +0 -1
@@ -571,7 +571,6 @@ struct sctp_af { struct sock *sk);void (*get_saddr) (struct sctp_sock *sk,struct sctp_transport *t, -union sctp_addr *daddr,struct flowi *fl);void (*copy_addrlist) (struct list_head *,struct net_device *);
net/sctp/ipv6.c +1 -4
@@ -365,15 +365,12 @@ static inline int sctp_v6_addr_match_len(union sctp_addr *s1,*/ static void sctp_v6_get_saddr (struct sctp_sock *sk,struct sctp_transport *t, -union sctp_addr *daddr,struct flowi *fl) {struct flowi6 *fl6 = &fl->u.ip6;union sctp_addr *saddr = &t->saddr; -SCTP_DEBUG_PRINTK ("%s: asoc:%p dst:%p daddr:%pI6 " , - __func__, t->asoc, t->dst, &daddr->v6.sin6_addr); - +SCTP_DEBUG_PRINTK ("%s: asoc:%p dst:%p\n" , __func__, t->asoc, t->dst);if (t->dst) { saddr->v6.sin6_family =AF_INET6 ;
net/sctp/protocol.c +0 -1
@@ -562,7 +562,6 @@ out:*/ static void sctp_v4_get_saddr (struct sctp_sock *sk,struct sctp_transport *t, -union sctp_addr *daddr,struct flowi *fl) {union sctp_addr *saddr = &t->saddr;
net/sctp/transport.c +1 -1
@@ -284,7 +284,7 @@ void sctp_transport_route(struct sctp_transport *transport,if (saddr)memcpy (&transport->saddr, saddr,sizeof (union sctp_addr ));else - af->get_saddr (opt, transport, daddr, &fl); + af->get_saddr (opt, transport, &fl);if ((transport->param_flags &SPP_PMTUD_DISABLE ) && transport->pathmtu) {return ;
Signature · 1 line
1.6.5.2
PATCH v2 5/5 sctp: clean up route lookup calls
In reply to Wei YongjunFrom: Vlad Yasevich <[email protected]>
Change the call to take the transport parameter and set the cached 'dst' appropriately inside the get_dst() function calls.
This will allow us in the future to clean up source address storage as well.
Signed-off-by Vlad Yasevich <[email protected]>
Signed-off-by Wei Yongjun <[email protected]>
--- include/net/sctp/structs.h | 3 +-- net/sctp/ipv6.c | 17 ++++++++--------- net/sctp/protocol.c | 12 +++++------- net/sctp/transport.c | 23 ++++++++++------------- 4 files changed, 24 insertions(+), 31 deletions(-)
include/net/sctp/structs.h +1 -2
@@ -564,8 +564,7 @@ struct sctp_af {int optname, char __user *optval, int __user *optlen); -struct dst_entry *(*get_dst) (struct sctp_association *asoc, -union sctp_addr *daddr, +void (*get_dst) (struct sctp_transport *t,union sctp_addr *saddr,struct flowi *fl,struct sock *sk);
net/sctp/ipv6.c +8 -9
@@ -247,17 +247,16 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport)/* Returns the dst cache entry for the given source and destination ip * addresses. */ -static struct dst_entry *sctp_v6_get_dst (struct sctp_association *asoc, -union sctp_addr *daddr, -union sctp_addr *saddr, -struct flowi *fl, -struct sock *sk) +static void sctp_v6_get_dst (struct sctp_transport *t,union sctp_addr *saddr, +struct flowi *fl,struct sock *sk) { +struct sctp_association *asoc = t->asoc;struct dst_entry *dst =NULL ;struct flowi6 *fl6 = &fl->u.ip6;struct sctp_bind_addr *bp;struct sctp_sockaddr_entry *laddr;union sctp_addr *baddr =NULL ; +union sctp_addr *daddr = &t->ipaddr;union sctp_addr dst_saddr;__u8 matchlen =0 ;__u8 bmatchlen;
@@ -270,7 +269,6 @@ static struct dst_entry *sctp_v6_get_dst(struct sctp_association *asoc,if (ipv6_addr_type (&daddr->v6.sin6_addr) &IPV6_ADDR_LINKLOCAL ) fl6->flowi6_oif = daddr->v6.sin6_scope_id; -SCTP_DEBUG_PRINTK ("%s: DST=%pI6 " , __func__, &fl6->daddr);if (asoc)
@@ -343,12 +341,13 @@ out:if (!IS_ERR (dst)) {struct rt6_info *rt; rt = (struct rt6_info *)dst; + t->dst = dst;SCTP_DEBUG_PRINTK ("rt6_dst:%pI6 rt6_src:%pI6\n" , &rt->rt6i_dst.addr, &fl6->saddr); -return dst; + }else { + t->dst =NULL ; +SCTP_DEBUG_PRINTK ("NO ROUTE\n" ); } -SCTP_DEBUG_PRINTK ("NO ROUTE\n" ); -return NULL ; }/* Returns the number of consecutive initial bits that match in the 2 ipv6
net/sctp/protocol.c +5 -7
@@ -463,17 +463,16 @@ static sctp_scope_t sctp_v4_scope(union sctp_addr *addr)* addresses. If an association is passed, trys to get a dst entry with a * source address that matches an address in the bind address list. */ -static struct dst_entry *sctp_v4_get_dst (struct sctp_association *asoc, -union sctp_addr *daddr, -union sctp_addr *saddr, -struct flowi *fl, -struct sock *sk) +static void sctp_v4_get_dst (struct sctp_transport *t,union sctp_addr *saddr, +struct flowi *fl,struct sock *sk) { +struct sctp_association *asoc = t->asoc;struct rtable *rt;struct flowi4 *fl4 = &fl->u.ip4;struct sctp_bind_addr *bp;struct sctp_sockaddr_entry *laddr;struct dst_entry *dst =NULL ; +union sctp_addr *daddr = &t->ipaddr;union sctp_addr dst_saddr;memset (fl4,0x0 ,sizeof (struct flowi4 ));
@@ -548,13 +547,12 @@ static struct dst_entry *sctp_v4_get_dst(struct sctp_association *asoc, out_unlock:rcu_read_unlock (); out: + t->dst = dst;if (dst)SCTP_DEBUG_PRINTK ("rt_dst:%pI4, rt_src:%pI4\n" , &rt->rt_dst, &rt->rt_src);else SCTP_DEBUG_PRINTK ("NO ROUTE\n" ); - -return dst; }/* For v4, the source address is cached in the route entry(dst). So no need
net/sctp/transport.c +10 -13
@@ -213,17 +213,17 @@ void sctp_transport_set_owner(struct sctp_transport *transport,/* Initialize the pmtu of a transport. */ void sctp_transport_pmtu (struct sctp_transport *transport,struct sock *sk) { -struct dst_entry *dst;struct flowi fl; - dst = transport->af_specific->get_dst (transport->asoc, - &transport->ipaddr, - &transport->saddr, +/* If we don't have a fresh route, look one up */ +if (!transport->dst || transport->dst->obsolete >1 ) { +dst_release (transport->dst); + transport->af_specific->get_dst (transport, &transport->saddr, &fl, sk); + } -if (dst) { - transport->pathmtu =dst_mtu (dst); -dst_release (dst); +if (transport->dst) { + transport->pathmtu =dst_mtu (transport->dst); }else transport->pathmtu =SCTP_DEFAULT_MAXSEGMENT ; }
@@ -274,12 +274,9 @@ void sctp_transport_route(struct sctp_transport *transport, {struct sctp_association *asoc = transport->asoc;struct sctp_af *af = transport->af_specific; -union sctp_addr *daddr = &transport->ipaddr; -struct dst_entry *dst;struct flowi fl; - dst = af->get_dst (asoc, daddr, saddr, &fl,sctp_opt2sk (opt)); - transport->dst = dst; + af->get_dst (transport, saddr, &fl,sctp_opt2sk (opt));if (saddr)memcpy (&transport->saddr, saddr,sizeof (union sctp_addr ));
@@ -289,8 +286,8 @@ void sctp_transport_route(struct sctp_transport *transport,if ((transport->param_flags &SPP_PMTUD_DISABLE ) && transport->pathmtu) {return ; } -if (dst) { - transport->pathmtu =dst_mtu (dst); +if (transport->dst) { + transport->pathmtu =dst_mtu (transport->dst);/* Initialize sk->sk_rcv_saddr, if the transport is the * association's active path for getsockname().
Signature · 1 line
1.6.5.2
From: Wei Yongjun <[email protected]>
Date: Wed, 27 Apr 2011 15:35:25 +0800
Quoted 10 lines
Hi David
Here is a set of SCTP patches for net-next-2.6, the last part from vlad's lksctp-dev tree, update SCTP IPv6 routing and IPSec issues. Please apply.
Changelog:
- redo the intermediate builds test and function test.
- remove useless ->dst_saddr member ofsctp_pf
- merge some fix for original patch
Applied, thanks!