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>, davem@davemloft.net Subject: [PATCHv2 net-next 11/17] sctp: add udphdr to overhead when udp_port is set Date: Thu, 08 Oct 2020 09:48:07 +0000 [thread overview] Message-ID: <1128490426bfb52572ba338e7a631658da49f34c.1602150362.git.lucien.xin@gmail.com> (raw) In-Reply-To: <92d28810a72dee9d0d49e7433b65027cb52de191.1602150362.git.lucien.xin@gmail.com> sctp_mtu_payload() is for calculating the frag size before making chunks from a msg. So we should only add udphdr size to overhead when udp socks are listening, as only then sctp can handle the incoming sctp over udp packets and outgoing sctp over udp packets will be possible. Note that we can't do this according to transport->encap_port, as different transports may be set to different values, while the chunks were made before choosing the transport, we could not be able to meet all rfc6951#section-5.6 recommends. v1->v2: - Add udp_port for sctp_sock to avoid a potential race issue, it will be used in xmit path in the next patch. Signed-off-by: Xin Long <lucien.xin@gmail.com> --- include/net/sctp/sctp.h | 7 +++++-- include/net/sctp/structs.h | 1 + net/sctp/socket.c | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index bfd87a0..86f74f2 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h @@ -578,10 +578,13 @@ static inline __u32 sctp_mtu_payload(const struct sctp_sock *sp, { __u32 overhead = sizeof(struct sctphdr) + extra; - if (sp) + if (sp) { overhead += sp->pf->af->net_header_len; - else + if (sp->udp_port) + overhead += sizeof(struct udphdr); + } else { overhead += sizeof(struct ipv6hdr); + } if (WARN_ON_ONCE(mtu && mtu <= overhead)) mtu = overhead; diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 81464ae..80f7149 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h @@ -178,6 +178,7 @@ struct sctp_sock { */ __u32 hbinterval; + __be16 udp_port; __be16 encap_port; /* This is the max_retrans value for new associations. */ diff --git a/net/sctp/socket.c b/net/sctp/socket.c index c9e86f5..192ab9a 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4926,6 +4926,7 @@ static int sctp_init_sock(struct sock *sk) * be modified via SCTP_PEER_ADDR_PARAMS */ sp->hbinterval = net->sctp.hb_interval; + sp->udp_port = htons(net->sctp.udp_port); sp->encap_port = htons(net->sctp.encap_port); sp->pathmaxrxt = net->sctp.max_retrans_path; sp->pf_retrans = net->sctp.pf_retrans; -- 2.1.0
WARNING: multiple messages have this Message-ID (diff)
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>, davem@davemloft.net Subject: [PATCHv2 net-next 11/17] sctp: add udphdr to overhead when udp_port is set Date: Thu, 8 Oct 2020 17:48:07 +0800 [thread overview] Message-ID: <1128490426bfb52572ba338e7a631658da49f34c.1602150362.git.lucien.xin@gmail.com> (raw) Message-ID: <20201008094807.IxdiGuYtHtytNnu5lQmQt5Q4DT1dKzsVsjIe8Vrp8RE@z> (raw) In-Reply-To: <92d28810a72dee9d0d49e7433b65027cb52de191.1602150362.git.lucien.xin@gmail.com> In-Reply-To: <cover.1602150362.git.lucien.xin@gmail.com> sctp_mtu_payload() is for calculating the frag size before making chunks from a msg. So we should only add udphdr size to overhead when udp socks are listening, as only then sctp can handle the incoming sctp over udp packets and outgoing sctp over udp packets will be possible. Note that we can't do this according to transport->encap_port, as different transports may be set to different values, while the chunks were made before choosing the transport, we could not be able to meet all rfc6951#section-5.6 recommends. v1->v2: - Add udp_port for sctp_sock to avoid a potential race issue, it will be used in xmit path in the next patch. Signed-off-by: Xin Long <lucien.xin@gmail.com> --- include/net/sctp/sctp.h | 7 +++++-- include/net/sctp/structs.h | 1 + net/sctp/socket.c | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index bfd87a0..86f74f2 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h @@ -578,10 +578,13 @@ static inline __u32 sctp_mtu_payload(const struct sctp_sock *sp, { __u32 overhead = sizeof(struct sctphdr) + extra; - if (sp) + if (sp) { overhead += sp->pf->af->net_header_len; - else + if (sp->udp_port) + overhead += sizeof(struct udphdr); + } else { overhead += sizeof(struct ipv6hdr); + } if (WARN_ON_ONCE(mtu && mtu <= overhead)) mtu = overhead; diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 81464ae..80f7149 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h @@ -178,6 +178,7 @@ struct sctp_sock { */ __u32 hbinterval; + __be16 udp_port; __be16 encap_port; /* This is the max_retrans value for new associations. */ diff --git a/net/sctp/socket.c b/net/sctp/socket.c index c9e86f5..192ab9a 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4926,6 +4926,7 @@ static int sctp_init_sock(struct sock *sk) * be modified via SCTP_PEER_ADDR_PARAMS */ sp->hbinterval = net->sctp.hb_interval; + sp->udp_port = htons(net->sctp.udp_port); sp->encap_port = htons(net->sctp.encap_port); sp->pathmaxrxt = net->sctp.max_retrans_path; sp->pf_retrans = net->sctp.pf_retrans; -- 2.1.0
next prev parent reply other threads:[~2020-10-08 9:48 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-08 9:47 [PATCHv2 net-next 00/17] sctp: Implement RFC6951: UDP Encapsulation of SCTP Xin Long 2020-10-08 9:47 ` Xin Long 2020-10-08 9:47 ` [PATCHv2 net-next 01/17] udp: check udp sock encap_type in __udp_lib_err Xin Long 2020-10-08 9:47 ` Xin Long 2020-10-08 9:47 ` [PATCHv2 net-next 02/17] udp6: move the mss check after udp gso tunnel processing Xin Long 2020-10-08 9:47 ` Xin Long 2020-10-08 9:47 ` [PATCHv2 net-next 03/17] udp: do checksum properly in skb_udp_tunnel_segment Xin Long 2020-10-08 9:47 ` Xin Long 2020-10-08 9:48 ` [PATCHv2 net-next 04/17] udp: support sctp over udp " Xin Long 2020-10-08 9:48 ` Xin Long 2020-10-08 9:48 ` [PATCHv2 net-next 05/17] sctp: create udp4 sock and add its encap_rcv Xin Long 2020-10-08 9:48 ` Xin Long 2020-10-08 9:48 ` [PATCHv2 net-next 06/17] sctp: create udp6 sock and set " Xin Long 2020-10-08 9:48 ` Xin Long 2020-10-08 9:48 ` [PATCHv2 net-next 07/17] sctp: add encap_err_lookup for udp encap socks Xin Long 2020-10-08 9:48 ` Xin Long 2020-10-08 9:48 ` [PATCHv2 net-next 08/17] sctp: add encap_port for netns sock asoc and transport Xin Long 2020-10-08 9:48 ` Xin Long 2020-10-08 9:48 ` [PATCHv2 net-next 09/17] sctp: add SCTP_REMOTE_UDP_ENCAPS_PORT sockopt Xin Long 2020-10-08 9:48 ` Xin Long 2020-10-08 9:48 ` [PATCHv2 net-next 10/17] sctp: allow changing transport encap_port by peer packets Xin Long 2020-10-08 9:48 ` Xin Long 2020-10-08 9:48 ` Xin Long [this message] 2020-10-08 9:48 ` [PATCHv2 net-next 11/17] sctp: add udphdr to overhead when udp_port is set Xin Long 2020-10-08 9:48 ` [PATCHv2 net-next 12/17] sctp: call sk_setup_caps in sctp_packet_transmit instead Xin Long 2020-10-08 9:48 ` Xin Long 2020-10-08 9:48 ` [PATCHv2 net-next 13/17] sctp: support for sending packet over udp4 sock Xin Long 2020-10-08 9:48 ` Xin Long 2020-10-08 9:48 ` [PATCHv2 net-next 14/17] sctp: support for sending packet over udp6 sock Xin Long 2020-10-08 9:48 ` Xin Long 2020-10-08 9:48 ` [PATCHv2 net-next 15/17] sctp: add the error cause for new encapsulation port restart Xin Long 2020-10-08 9:48 ` Xin Long 2020-10-08 9:48 ` [PATCHv2 net-next 16/17] sctp: handle the init chunk matching an existing asoc Xin Long 2020-10-08 9:48 ` Xin Long 2020-10-08 9:48 ` [PATCHv2 net-next 17/17] sctp: enable udp tunneling socks Xin Long 2020-10-08 9:48 ` Xin Long 2020-10-08 15:46 ` kernel test robot 2020-10-08 15:46 ` kernel test robot 2020-10-09 2:02 ` Xin Long 2020-10-09 2:02 ` Xin Long 2020-10-08 14:33 ` [PATCHv2 net-next 15/17] sctp: add the error cause for new encapsulation port restart kernel test robot 2020-10-08 14:33 ` kernel test robot 2020-10-08 13:10 ` [PATCHv2 net-next 09/17] sctp: add SCTP_REMOTE_UDP_ENCAPS_PORT sockopt kernel test robot 2020-10-08 13:10 ` kernel test robot 2020-10-08 21:18 ` [PATCHv2 net-next 06/17] sctp: create udp6 sock and set its encap_rcv kernel test robot 2020-10-08 21:18 ` kernel test robot 2020-10-09 1:59 ` Xin Long 2020-10-09 1:59 ` Xin Long 2020-10-08 18:29 ` [PATCHv2 net-next 05/17] sctp: create udp4 sock and add " kernel test robot 2020-10-08 18:29 ` kernel test robot 2020-10-09 1:59 ` Xin Long 2020-10-09 1:59 ` Xin Long 2020-10-08 10:01 ` [PATCHv2 net-next 04/17] udp: support sctp over udp in skb_udp_tunnel_segment Xin Long 2020-10-08 10:01 ` Xin Long 2020-10-08 10:01 ` [PATCHv2 net-next 03/17] udp: do checksum properly " Xin Long 2020-10-08 10:01 ` Xin Long 2020-10-08 12:44 ` [PATCHv2 net-next 02/17] udp6: move the mss check after udp gso tunnel processing Willem de Bruijn 2020-10-08 12:44 ` Willem de Bruijn 2020-10-09 1:48 ` Xin Long 2020-10-09 1:48 ` Xin Long 2020-10-09 13:59 ` Willem de Bruijn 2020-10-09 13:59 ` Willem de Bruijn
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=1128490426bfb52572ba338e7a631658da49f34c.1602150362.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=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: linkBe 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).