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 12/17] sctp: call sk_setup_caps in sctp_packet_transmit instead Date: Thu, 08 Oct 2020 09:48:08 +0000 [thread overview] Message-ID: <ad362276ba90a8af3178f19aba15a7e67107652f.1602150362.git.lucien.xin@gmail.com> (raw) In-Reply-To: <1128490426bfb52572ba338e7a631658da49f34c.1602150362.git.lucien.xin@gmail.com> sk_setup_caps() was originally called in Commit 90017accff61 ("sctp: Add GSO support"), as: "We have to refresh this in case we are xmiting to more than one transport at a time" This actually happens in the loop of sctp_outq_flush_transports(), and it shouldn't be tied to gso, so move it out of gso part and before sctp_packet_pack(). Signed-off-by: Xin Long <lucien.xin@gmail.com> --- net/sctp/output.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/net/sctp/output.c b/net/sctp/output.c index 1441eaf..fb16500 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c @@ -508,12 +508,6 @@ static int sctp_packet_pack(struct sctp_packet *packet, sizeof(struct inet6_skb_parm))); skb_shinfo(head)->gso_segs = pkt_count; skb_shinfo(head)->gso_size = GSO_BY_FRAGS; - rcu_read_lock(); - if (skb_dst(head) != tp->dst) { - dst_hold(tp->dst); - sk_setup_caps(sk, tp->dst); - } - rcu_read_unlock(); goto chksum; } @@ -593,6 +587,13 @@ int sctp_packet_transmit(struct sctp_packet *packet, gfp_t gfp) } skb_dst_set(head, dst); + rcu_read_lock(); + if (__sk_dst_get(sk) != tp->dst) { + dst_hold(tp->dst); + sk_setup_caps(sk, tp->dst); + } + rcu_read_unlock(); + /* pack up chunks */ pkt_count = sctp_packet_pack(packet, head, gso, gfp); if (!pkt_count) { -- 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 12/17] sctp: call sk_setup_caps in sctp_packet_transmit instead Date: Thu, 8 Oct 2020 17:48:08 +0800 [thread overview] Message-ID: <ad362276ba90a8af3178f19aba15a7e67107652f.1602150362.git.lucien.xin@gmail.com> (raw) Message-ID: <20201008094808.evWcnmeriTz5aNy22aE1aLZGtajhUFUC7U6t-bpGGDM@z> (raw) In-Reply-To: <1128490426bfb52572ba338e7a631658da49f34c.1602150362.git.lucien.xin@gmail.com> In-Reply-To: <cover.1602150362.git.lucien.xin@gmail.com> sk_setup_caps() was originally called in Commit 90017accff61 ("sctp: Add GSO support"), as: "We have to refresh this in case we are xmiting to more than one transport at a time" This actually happens in the loop of sctp_outq_flush_transports(), and it shouldn't be tied to gso, so move it out of gso part and before sctp_packet_pack(). Signed-off-by: Xin Long <lucien.xin@gmail.com> --- net/sctp/output.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/net/sctp/output.c b/net/sctp/output.c index 1441eaf..fb16500 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c @@ -508,12 +508,6 @@ static int sctp_packet_pack(struct sctp_packet *packet, sizeof(struct inet6_skb_parm))); skb_shinfo(head)->gso_segs = pkt_count; skb_shinfo(head)->gso_size = GSO_BY_FRAGS; - rcu_read_lock(); - if (skb_dst(head) != tp->dst) { - dst_hold(tp->dst); - sk_setup_caps(sk, tp->dst); - } - rcu_read_unlock(); goto chksum; } @@ -593,6 +587,13 @@ int sctp_packet_transmit(struct sctp_packet *packet, gfp_t gfp) } skb_dst_set(head, dst); + rcu_read_lock(); + if (__sk_dst_get(sk) != tp->dst) { + dst_hold(tp->dst); + sk_setup_caps(sk, tp->dst); + } + rcu_read_unlock(); + /* pack up chunks */ pkt_count = sctp_packet_pack(packet, head, gso, gfp); if (!pkt_count) { -- 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 ` [PATCHv2 net-next 11/17] sctp: add udphdr to overhead when udp_port is set 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 12/17] sctp: call sk_setup_caps in sctp_packet_transmit instead 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=ad362276ba90a8af3178f19aba15a7e67107652f.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).