From: Xin Long <lucien.xin@gmail.com>
To: network dev <netdev@vger.kernel.org>, linux-sctp@vger.kernel.org
Cc: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>,
Neil Horman <nhorman@tuxdriver.com>,
Michael Tuexen <tuexen@fh-muenster.de>,
Tom Herbert <therbert@google.com>,
davem@davemloft.net
Subject: [PATCH net-next 14/15] sctp: support for sending packet over udp6 sock
Date: Tue, 29 Sep 2020 21:49:06 +0800 [thread overview]
Message-ID: <6388faf30ca428c5026e5a62fdf484dcad7e0da2.1601387231.git.lucien.xin@gmail.com> (raw)
Message-ID: <20200929134906.nHXZKHPoN49aK5mF4rOgUedrL3pXPLkTY-E8LrD6niU@z> (raw)
In-Reply-To: <82b358f40c81cfdecbfc394113be40fd1f682043.1601387231.git.lucien.xin@gmail.com>
In-Reply-To: <cover.1601387231.git.lucien.xin@gmail.com>
This one basically does the similar things in sctp_v6_xmit as does for
udp4 sock in the last patch, just note that:
1. label needs to be calculated, as it's the param of
udp_tunnel6_xmit_skb().
2. The 'nocheck' param of udp_tunnel6_xmit_skb() is false, as
required by RFC.
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
net/sctp/ipv6.c | 47 +++++++++++++++++++++++++++++++++++------------
1 file changed, 35 insertions(+), 12 deletions(-)
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index a064bf2..5c831f3 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -55,6 +55,7 @@
#include <net/inet_common.h>
#include <net/inet_ecn.h>
#include <net/sctp/sctp.h>
+#include <net/udp_tunnel.h>
#include <linux/uaccess.h>
@@ -191,33 +192,55 @@ static int sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
return ret;
}
-static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport)
+static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *t)
{
+ struct dst_entry *dst = dst_clone(t->dst);
+ struct flowi6 *fl6 = &t->fl.u.ip6;
struct sock *sk = skb->sk;
struct ipv6_pinfo *np = inet6_sk(sk);
- struct flowi6 *fl6 = &transport->fl.u.ip6;
+ struct net *net = sock_net(sk);
__u8 tclass = np->tclass;
- int res;
+ __be32 label;
pr_debug("%s: skb:%p, len:%d, src:%pI6 dst:%pI6\n", __func__, skb,
skb->len, &fl6->saddr, &fl6->daddr);
- if (transport->dscp & SCTP_DSCP_SET_MASK)
- tclass = transport->dscp & SCTP_DSCP_VAL_MASK;
+ if (t->dscp & SCTP_DSCP_SET_MASK)
+ tclass = t->dscp & SCTP_DSCP_VAL_MASK;
if (INET_ECN_is_capable(tclass))
IP6_ECN_flow_xmit(sk, fl6->flowlabel);
- if (!(transport->param_flags & SPP_PMTUD_ENABLE))
+ if (!(t->param_flags & SPP_PMTUD_ENABLE))
skb->ignore_df = 1;
- SCTP_INC_STATS(sock_net(sk), SCTP_MIB_OUTSCTPPACKS);
+ SCTP_INC_STATS(net, SCTP_MIB_OUTSCTPPACKS);
- rcu_read_lock();
- res = ip6_xmit(sk, skb, fl6, sk->sk_mark, rcu_dereference(np->opt),
- tclass, sk->sk_priority);
- rcu_read_unlock();
- return res;
+ if (!t->encap_port || !net->sctp.udp_port) {
+ int res;
+
+ skb_dst_set(skb, dst);
+ rcu_read_lock();
+ res = ip6_xmit(sk, skb, fl6, sk->sk_mark,
+ rcu_dereference(np->opt),
+ tclass, sk->sk_priority);
+ rcu_read_unlock();
+ return res;
+ }
+
+ if (skb_is_gso(skb))
+ skb_shinfo(skb)->gso_type |= SKB_GSO_UDP_TUNNEL_CSUM;
+
+ skb->encapsulation = 1;
+ skb_reset_inner_mac_header(skb);
+ skb_reset_inner_transport_header(skb);
+ skb_set_inner_ipproto(skb, IPPROTO_SCTP);
+ label = ip6_make_flowlabel(net, skb, fl6->flowlabel, true, fl6);
+
+ return udp_tunnel6_xmit_skb(dst, sk, skb, NULL, &fl6->saddr,
+ &fl6->daddr, tclass, ip6_dst_hoplimit(dst),
+ label, htons(net->sctp.udp_port),
+ htons(t->encap_port), false);
}
/* Returns the dst cache entry for the given source and destination ip
--
2.1.0
next prev parent reply other threads:[~2020-09-29 13:51 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-29 13:48 [PATCH net-next 00/15] sctp: Implement RFC6951: UDP Encapsulation of SCTP Xin Long
2020-09-29 13:48 ` Xin Long
2020-09-29 13:48 ` [PATCH net-next 01/15] udp: check udp sock encap_type in __udp_lib_err Xin Long
2020-09-29 13:48 ` Xin Long
2020-09-29 13:48 ` [PATCH net-next 02/15] udp6: move the mss check after udp gso tunnel processing Xin Long
2020-09-29 13:48 ` Xin Long
2020-09-29 13:48 ` [PATCH net-next 03/15] udp: do checksum properly in skb_udp_tunnel_segment Xin Long
2020-09-29 13:48 ` Xin Long
2020-09-29 13:48 ` [PATCH net-next 04/15] udp: support sctp over udp " Xin Long
2020-09-29 13:48 ` Xin Long
2020-09-29 13:48 ` [PATCH net-next 05/15] sctp: create udp4 sock and add its encap_rcv Xin Long
2020-09-29 13:48 ` Xin Long
2020-09-29 13:48 ` [PATCH net-next 06/15] sctp: create udp6 sock and set " Xin Long
2020-09-29 13:48 ` Xin Long
2020-09-29 13:48 ` [PATCH net-next 07/15] sctp: add encap_err_lookup for udp encap socks Xin Long
2020-09-29 13:48 ` Xin Long
2020-09-29 13:49 ` [PATCH net-next 08/15] sctp: add encap_port for netns sock asoc and transport Xin Long
2020-09-29 13:49 ` Xin Long
2020-09-29 13:49 ` [PATCH net-next 09/15] sctp: add SCTP_REMOTE_UDP_ENCAPS_PORT sockopt Xin Long
2020-09-29 13:49 ` Xin Long
2020-09-29 13:49 ` [PATCH net-next 10/15] sctp: allow changing transport encap_port by peer packets Xin Long
2020-09-29 13:49 ` Xin Long
2020-09-29 13:49 ` [PATCH net-next 11/15] sctp: add udphdr to overhead when udp_port is set Xin Long
2020-09-29 13:49 ` Xin Long
2020-09-29 13:49 ` [PATCH net-next 12/15] sctp: call sk_setup_caps in sctp_packet_transmit instead Xin Long
2020-09-29 13:49 ` Xin Long
2020-09-29 13:49 ` [PATCH net-next 13/15] sctp: support for sending packet over udp4 sock Xin Long
2020-09-29 13:49 ` Xin Long
2020-09-29 13:49 ` Xin Long [this message]
2020-09-29 13:49 ` [PATCH net-next 14/15] sctp: support for sending packet over udp6 sock Xin Long
2020-09-29 13:49 ` [PATCH net-next 15/15] sctp: enable udp tunneling socks Xin Long
2020-09-29 13:49 ` Xin Long
2020-10-03 4:12 ` Marcelo Ricardo Leitner
2020-10-03 4:12 ` Marcelo Ricardo Leitner
2020-10-03 8:20 ` Xin Long
2020-10-03 8:20 ` Xin Long
2020-09-29 16:25 ` [PATCH net-next 13/15] sctp: support for sending packet over udp4 sock kernel test robot
2020-09-29 16:25 ` kernel test robot
2020-09-30 6:26 ` Xin Long
2020-09-30 6:26 ` Xin Long
2020-09-29 19:19 ` kernel test robot
2020-09-29 19:19 ` kernel test robot
2020-10-03 4:09 ` [PATCH net-next 12/15] sctp: call sk_setup_caps in sctp_packet_transmit instead Marcelo Ricardo Leitner
2020-10-03 4:09 ` Marcelo Ricardo Leitner
2020-10-03 7:45 ` Xin Long
2020-10-03 7:45 ` Xin Long
2020-09-29 19:00 ` [PATCH net-next 11/15] sctp: add udphdr to overhead when udp_port is set kernel test robot
2020-09-29 19:00 ` kernel test robot
2020-10-03 4:08 ` Marcelo Ricardo Leitner
2020-10-03 4:08 ` Marcelo Ricardo Leitner
2020-10-03 7:57 ` Xin Long
2020-10-03 8:12 ` Xin Long
2020-10-03 11:23 ` Xin Long
2020-10-03 11:23 ` Xin Long
2020-10-03 12:24 ` Xin Long
2020-10-03 12:24 ` Xin Long
2020-10-05 19:01 ` Marcelo Ricardo Leitner
2020-10-05 19:01 ` Marcelo Ricardo Leitner
2020-10-05 20:08 ` Michael Tuexen
2020-10-05 20:08 ` Michael Tuexen
2020-10-08 9:37 ` Xin Long
2020-10-08 9:37 ` Xin Long
2020-10-03 4:07 ` Marcelo Ricardo Leitner
2020-10-03 4:07 ` Marcelo Ricardo Leitner
2020-10-03 7:54 ` Xin Long
2020-10-03 7:54 ` Xin Long
2020-10-03 4:06 ` [PATCH net-next 10/15] sctp: allow changing transport encap_port by peer packets Marcelo Ricardo Leitner
2020-10-03 4:06 ` Marcelo Ricardo Leitner
2020-10-03 4:05 ` [PATCH net-next 09/15] sctp: add SCTP_REMOTE_UDP_ENCAPS_PORT sockopt Marcelo Ricardo Leitner
2020-10-03 4:05 ` Marcelo Ricardo Leitner
2020-10-03 7:41 ` Xin Long
2020-10-03 7:41 ` Xin Long
2020-10-03 4:04 ` [PATCH net-next 03/15] udp: do checksum properly in skb_udp_tunnel_segment Marcelo Ricardo Leitner
2020-10-03 4:04 ` Marcelo Ricardo Leitner
2020-10-03 7:40 ` Xin Long
2020-10-03 7:40 ` Xin Long
2020-09-29 16:39 ` [PATCH net-next 00/15] sctp: Implement RFC6951: UDP Encapsulation of SCTP Michael Tuexen
2020-09-29 16:39 ` Michael Tuexen
2020-09-29 17:49 ` Xin Long
2020-09-29 18:04 ` Xin Long
2020-10-01 12:41 ` Marcelo Ricardo Leitner
2020-10-01 12:41 ` Marcelo Ricardo Leitner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6388faf30ca428c5026e5a62fdf484dcad7e0da2.1601387231.git.lucien.xin@gmail.com \
--to=lucien.xin@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-sctp@vger.kernel.org \
--cc=marcelo.leitner@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=therbert@google.com \
--cc=tuexen@fh-muenster.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).