From: Xin Long <lucien.xin@gmail.com> To: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Cc: kernel test robot <lkp@intel.com>, network dev <netdev@vger.kernel.org>, linux-sctp@vger.kernel.org, kbuild-all@lists.01.org, Neil Horman <nhorman@tuxdriver.com>, Michael Tuexen <tuexen@fh-muenster.de>, davem <davem@davemloft.net> Subject: Re: [PATCH net-next 11/15] sctp: add udphdr to overhead when udp_port is set Date: Sat, 03 Oct 2020 11:23:33 +0000 [thread overview] Message-ID: <CADvbK_eXnzjDCypRkep9JqxBFV=cMXNkSZr4nyAaMiDc1VGXJg@mail.gmail.com> (raw) In-Reply-To: <CADvbK_cPX1f5jrGsKuvya7ssOFPTsG7daBCkOP-NGN9hpzf5Vw@mail.gmail.com> On Sat, Oct 3, 2020 at 4:12 PM Xin Long <lucien.xin@gmail.com> wrote: > > On Sat, Oct 3, 2020 at 12:08 PM Marcelo Ricardo Leitner > <marcelo.leitner@gmail.com> wrote: > > > > On Wed, Sep 30, 2020 at 03:00:42AM +0800, kernel test robot wrote: > > > Hi Xin, > > > > > > Thank you for the patch! Yet something to improve: > > > > I wonder how are you planning to fix this. It is quite entangled. > > This is not performance critical. Maybe the cleanest way out is to > > move it to a .c file. > > > > Adding a > > #if defined(CONFIG_IP_SCTP) || defined(CONFIG_IP_SCTP_MODULE) > > in there doesn't seem good. > > > > > In file included from include/net/sctp/checksum.h:27, > > > from net/netfilter/nf_nat_proto.c:16: > > > include/net/sctp/sctp.h: In function 'sctp_mtu_payload': > > > >> include/net/sctp/sctp.h:583:31: error: 'struct net' has no member named 'sctp'; did you mean 'ct'? > > > 583 | if (sock_net(&sp->inet.sk)->sctp.udp_port) > > > | ^~~~ > > > | ct > > > > Here is actually another problem, I'm still thinking how to fix it. > > Now sctp_mtu_payload() returns different value depending on > net->sctp.udp_port. but net->sctp.udp_port can be changed by > "sysctl -w" anytime. so: > > In sctp_packet_config() it gets overhead/headroom by calling > sctp_mtu_payload(). When 'udp_port' is 0, it's IP+MAC header > size. Then if 'udp_port' is changed to 9899 by 'sysctl -w', > udphdr will also be added to the packet in sctp_v4_xmit(), > and later the headroom may not be enough for IP+MAC headers. > > I'm thinking to add sctp_sock->udp_port, and it'll be set when > the sock is created with net->udp_port. but not sure if we should > update sctp_sock->udp_port with net->udp_port when sending packets? something like: diff --git a/net/sctp/output.c b/net/sctp/output.c index 6614c9fdc51e..c379d805b9df 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c @@ -91,6 +91,7 @@ void sctp_packet_config(struct sctp_packet *packet, __u32 vtag, if (asoc) { sk = asoc->base.sk; sp = sctp_sk(sk); + sctp_sock_check_udp_port(sock_net(sk), sp, asoc); } packet->overhead = sctp_mtu_payload(sp, 0, 0); packet->size = packet->overhead; diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 21d0ff1c6ab9..f5aba9086d33 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c @@ -1250,6 +1250,7 @@ static inline struct sctp_chunk *sctp_make_op_error_limited( if (asoc) { size = min_t(size_t, size, asoc->pathmtu); sp = sctp_sk(asoc->base.sk); + sctp_sock_check_udp_port(sock_net(sk), sp, asoc); } size = sctp_mtu_payload(sp, size, sizeof(struct sctp_errhdr)); diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 8edab1533057..3e7f81d63d2e 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c @@ -6276,6 +6276,8 @@ static struct sctp_packet *sctp_ootb_pkt_new( sctp_transport_route(transport, (union sctp_addr *)&chunk->dest, sctp_sk(net->sctp.ctl_sock)); + sctp_sock_check_udp_port(net, net->sctp.ctl_sock, NULL); + packet = &transport->packet; sctp_packet_init(packet, transport, sport, dport); sctp_packet_config(packet, vtag, 0); diff --git a/net/sctp/socket.c b/net/sctp/socket.c index d793dfa94682..e5de5f98be0c 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -1550,6 +1550,17 @@ static int sctp_error(struct sock *sk, int flags, int err) return err; } +void sctp_sock_check_udp_port(struct net* net, struct sctp_sock *sp, + struct sctp_association *asoc) +{ + if (likely(sp->udp_port = net->sctp.udp_port)) + return; + + if (asoc && (!sp->udp_port || !net->sctp.udp_port)) + sctp_assoc_update_frag_point(asoc); + sp->udp_port = net->sctp.udp_port; +} + /* API 3.1.3 sendmsg() - UDP Style Syntax * * An application uses sendmsg() and recvmsg() calls to transmit data to @@ -1795,6 +1806,8 @@ static int sctp_sendmsg_to_asoc(struct sctp_association *asoc, goto err; } + sctp_sock_check_udp_port(net, sp, asoc); + if (sp->disable_fragments && msg_len > asoc->frag_point) { err = -EMSGSIZE; goto err;
WARNING: multiple messages have this Message-ID (diff)
From: Xin Long <lucien.xin@gmail.com> To: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Cc: kernel test robot <lkp@intel.com>, network dev <netdev@vger.kernel.org>, linux-sctp@vger.kernel.org, kbuild-all@lists.01.org, Neil Horman <nhorman@tuxdriver.com>, Michael Tuexen <tuexen@fh-muenster.de>, davem <davem@davemloft.net> Subject: Re: [PATCH net-next 11/15] sctp: add udphdr to overhead when udp_port is set Date: Sat, 3 Oct 2020 19:23:33 +0800 [thread overview] Message-ID: <CADvbK_eXnzjDCypRkep9JqxBFV=cMXNkSZr4nyAaMiDc1VGXJg@mail.gmail.com> (raw) Message-ID: <20201003112333.x0wST0owoVTh5bvxFQbevusbsbfnCrf_TmYhnIMzUyA@z> (raw) In-Reply-To: <CADvbK_cPX1f5jrGsKuvya7ssOFPTsG7daBCkOP-NGN9hpzf5Vw@mail.gmail.com> On Sat, Oct 3, 2020 at 4:12 PM Xin Long <lucien.xin@gmail.com> wrote: > > On Sat, Oct 3, 2020 at 12:08 PM Marcelo Ricardo Leitner > <marcelo.leitner@gmail.com> wrote: > > > > On Wed, Sep 30, 2020 at 03:00:42AM +0800, kernel test robot wrote: > > > Hi Xin, > > > > > > Thank you for the patch! Yet something to improve: > > > > I wonder how are you planning to fix this. It is quite entangled. > > This is not performance critical. Maybe the cleanest way out is to > > move it to a .c file. > > > > Adding a > > #if defined(CONFIG_IP_SCTP) || defined(CONFIG_IP_SCTP_MODULE) > > in there doesn't seem good. > > > > > In file included from include/net/sctp/checksum.h:27, > > > from net/netfilter/nf_nat_proto.c:16: > > > include/net/sctp/sctp.h: In function 'sctp_mtu_payload': > > > >> include/net/sctp/sctp.h:583:31: error: 'struct net' has no member named 'sctp'; did you mean 'ct'? > > > 583 | if (sock_net(&sp->inet.sk)->sctp.udp_port) > > > | ^~~~ > > > | ct > > > > Here is actually another problem, I'm still thinking how to fix it. > > Now sctp_mtu_payload() returns different value depending on > net->sctp.udp_port. but net->sctp.udp_port can be changed by > "sysctl -w" anytime. so: > > In sctp_packet_config() it gets overhead/headroom by calling > sctp_mtu_payload(). When 'udp_port' is 0, it's IP+MAC header > size. Then if 'udp_port' is changed to 9899 by 'sysctl -w', > udphdr will also be added to the packet in sctp_v4_xmit(), > and later the headroom may not be enough for IP+MAC headers. > > I'm thinking to add sctp_sock->udp_port, and it'll be set when > the sock is created with net->udp_port. but not sure if we should > update sctp_sock->udp_port with net->udp_port when sending packets? something like: diff --git a/net/sctp/output.c b/net/sctp/output.c index 6614c9fdc51e..c379d805b9df 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c @@ -91,6 +91,7 @@ void sctp_packet_config(struct sctp_packet *packet, __u32 vtag, if (asoc) { sk = asoc->base.sk; sp = sctp_sk(sk); + sctp_sock_check_udp_port(sock_net(sk), sp, asoc); } packet->overhead = sctp_mtu_payload(sp, 0, 0); packet->size = packet->overhead; diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 21d0ff1c6ab9..f5aba9086d33 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c @@ -1250,6 +1250,7 @@ static inline struct sctp_chunk *sctp_make_op_error_limited( if (asoc) { size = min_t(size_t, size, asoc->pathmtu); sp = sctp_sk(asoc->base.sk); + sctp_sock_check_udp_port(sock_net(sk), sp, asoc); } size = sctp_mtu_payload(sp, size, sizeof(struct sctp_errhdr)); diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 8edab1533057..3e7f81d63d2e 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c @@ -6276,6 +6276,8 @@ static struct sctp_packet *sctp_ootb_pkt_new( sctp_transport_route(transport, (union sctp_addr *)&chunk->dest, sctp_sk(net->sctp.ctl_sock)); + sctp_sock_check_udp_port(net, net->sctp.ctl_sock, NULL); + packet = &transport->packet; sctp_packet_init(packet, transport, sport, dport); sctp_packet_config(packet, vtag, 0); diff --git a/net/sctp/socket.c b/net/sctp/socket.c index d793dfa94682..e5de5f98be0c 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -1550,6 +1550,17 @@ static int sctp_error(struct sock *sk, int flags, int err) return err; } +void sctp_sock_check_udp_port(struct net* net, struct sctp_sock *sp, + struct sctp_association *asoc) +{ + if (likely(sp->udp_port == net->sctp.udp_port)) + return; + + if (asoc && (!sp->udp_port || !net->sctp.udp_port)) + sctp_assoc_update_frag_point(asoc); + sp->udp_port = net->sctp.udp_port; +} + /* API 3.1.3 sendmsg() - UDP Style Syntax * * An application uses sendmsg() and recvmsg() calls to transmit data to @@ -1795,6 +1806,8 @@ static int sctp_sendmsg_to_asoc(struct sctp_association *asoc, goto err; } + sctp_sock_check_udp_port(net, sp, asoc); + if (sp->disable_fragments && msg_len > asoc->frag_point) { err = -EMSGSIZE; goto err;
next prev parent reply other threads:[~2020-10-03 11:23 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 ` [PATCH net-next 14/15] sctp: support for sending packet over udp6 sock Xin Long 2020-09-29 13:49 ` 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 [this message] 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='CADvbK_eXnzjDCypRkep9JqxBFV=cMXNkSZr4nyAaMiDc1VGXJg@mail.gmail.com' \ --to=lucien.xin@gmail.com \ --cc=davem@davemloft.net \ --cc=kbuild-all@lists.01.org \ --cc=linux-sctp@vger.kernel.org \ --cc=lkp@intel.com \ --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).