From: Mat Martineau <mathew.j.martineau at linux.intel.com> To: mptcp at lists.01.org Subject: [MPTCP] [PATCH net-next v5 10/11] tcp: clean ext on tx recycle Date: Thu, 19 Dec 2019 14:34:33 -0800 [thread overview] Message-ID: <20191219223434.19722-11-mathew.j.martineau@linux.intel.com> (raw) In-Reply-To: 20191219223434.19722-1-mathew.j.martineau@linux.intel.com [-- Attachment #1: Type: text/plain, Size: 1426 bytes --] From: Paolo Abeni <pabeni(a)redhat.com> Otherwise we will find stray/unexpected/old extensions value on next iteration. On tcp_write_xmit() we can end-up splitting an already queued skb in two parts, via tso_fragment(). The newly created skb can be allocated via the tx cache and an upper layer will not be aware of it, so that upper layer cannot set the ext properly. Resetting the ext on recycle ensures that stale data is not propagated in to packet headers or elsewhere. An alternative would be add an additional hook in tso_fragment() or in sk_stream_alloc_skb() to init the ext for upper layers that need it. Co-developed-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Paolo Abeni <pabeni(a)redhat.com> Signed-off-by: Mat Martineau <mathew.j.martineau(a)linux.intel.com> --- include/net/sock.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/net/sock.h b/include/net/sock.h index b93cadba1a3b..23efed7f4e70 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1474,6 +1474,7 @@ static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb) sk_mem_uncharge(sk, skb->truesize); if (static_branch_unlikely(&tcp_tx_skb_cache_key) && !sk->sk_tx_skb_cache && !skb_cloned(skb)) { + skb_ext_reset(skb); skb_zcopy_clear(skb, true); sk->sk_tx_skb_cache = skb; return; -- 2.24.1
WARNING: multiple messages have this Message-ID (diff)
From: Mat Martineau <mathew.j.martineau@linux.intel.com> To: netdev@vger.kernel.org, mptcp@lists.01.org Cc: Paolo Abeni <pabeni@redhat.com>, Florian Westphal <fw@strlen.de>, Mat Martineau <mathew.j.martineau@linux.intel.com> Subject: [PATCH net-next v5 10/11] tcp: clean ext on tx recycle Date: Thu, 19 Dec 2019 14:34:33 -0800 [thread overview] Message-ID: <20191219223434.19722-11-mathew.j.martineau@linux.intel.com> (raw) In-Reply-To: <20191219223434.19722-1-mathew.j.martineau@linux.intel.com> From: Paolo Abeni <pabeni@redhat.com> Otherwise we will find stray/unexpected/old extensions value on next iteration. On tcp_write_xmit() we can end-up splitting an already queued skb in two parts, via tso_fragment(). The newly created skb can be allocated via the tx cache and an upper layer will not be aware of it, so that upper layer cannot set the ext properly. Resetting the ext on recycle ensures that stale data is not propagated in to packet headers or elsewhere. An alternative would be add an additional hook in tso_fragment() or in sk_stream_alloc_skb() to init the ext for upper layers that need it. Co-developed-by: Florian Westphal <fw@strlen.de> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> --- include/net/sock.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/net/sock.h b/include/net/sock.h index b93cadba1a3b..23efed7f4e70 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1474,6 +1474,7 @@ static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb) sk_mem_uncharge(sk, skb->truesize); if (static_branch_unlikely(&tcp_tx_skb_cache_key) && !sk->sk_tx_skb_cache && !skb_cloned(skb)) { + skb_ext_reset(skb); skb_zcopy_clear(skb, true); sk->sk_tx_skb_cache = skb; return; -- 2.24.1
next reply other threads:[~2019-12-19 22:34 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-19 22:34 Mat Martineau [this message] 2019-12-19 22:34 ` [PATCH net-next v5 10/11] tcp: clean ext on tx recycle Mat Martineau -- strict thread matches above, loose matches on Subject: below -- 2019-12-20 16:26 [MPTCP] Re: [PATCH net-next v5 05/11] tcp, ulp: Add clone operation to tcp_ulp_ops Eric Dumazet 2019-12-20 16:26 ` Eric Dumazet 2019-12-20 16:21 [MPTCP] " Paolo Abeni 2019-12-20 16:21 ` Paolo Abeni 2019-12-20 16:17 [MPTCP] Re: [PATCH net-next v5 07/11] tcp: coalesce/collapse must respect MPTCP extensions Mat Martineau 2019-12-20 16:17 ` Mat Martineau 2019-12-20 15:39 [MPTCP] Re: [PATCH net-next v5 04/11] tcp: Add MPTCP option number Eric Dumazet 2019-12-20 15:39 ` Eric Dumazet 2019-12-20 15:39 [MPTCP] Re: [PATCH net-next v5 03/11] tcp: Define IPPROTO_MPTCP Eric Dumazet 2019-12-20 15:39 ` Eric Dumazet 2019-12-20 15:37 [MPTCP] Re: [PATCH net-next v5 02/11] sock: Make sk_protocol a 16-bit value Eric Dumazet 2019-12-20 15:37 ` Eric Dumazet 2019-12-20 15:35 [MPTCP] Re: [PATCH net-next v5 01/11] net: Make sock protocol value checks more specific Eric Dumazet 2019-12-20 15:35 ` Eric Dumazet 2019-12-20 15:33 [MPTCP] Re: [PATCH net-next v5 06/11] mptcp: Add MPTCP to skb extensions Eric Dumazet 2019-12-20 15:33 ` Eric Dumazet 2019-12-20 15:31 [MPTCP] Re: [PATCH net-next v5 08/11] tcp: Export TCP functions and ops struct Eric Dumazet 2019-12-20 15:31 ` Eric Dumazet 2019-12-20 15:29 [MPTCP] Re: [PATCH net-next v5 10/11] tcp: clean ext on tx recycle Eric Dumazet 2019-12-20 15:29 ` Eric Dumazet 2019-12-20 15:27 [MPTCP] Re: [PATCH net-next v5 09/11] tcp: Check for filled TCP option space before SACK Eric Dumazet 2019-12-20 15:27 ` Eric Dumazet 2019-12-20 15:26 [MPTCP] Re: [PATCH net-next v5 05/11] tcp, ulp: Add clone operation to tcp_ulp_ops Eric Dumazet 2019-12-20 15:26 ` Eric Dumazet 2019-12-20 15:25 [MPTCP] Re: [PATCH net-next v5 07/11] tcp: coalesce/collapse must respect MPTCP extensions Eric Dumazet 2019-12-20 15:25 ` Eric Dumazet 2019-12-19 22:34 [MPTCP] [PATCH net-next v5 11/11] skb: add helpers to allocate ext independently from sk_buff Mat Martineau 2019-12-19 22:34 ` Mat Martineau 2019-12-19 22:34 [MPTCP] [PATCH net-next v5 09/11] tcp: Check for filled TCP option space before SACK Mat Martineau 2019-12-19 22:34 ` Mat Martineau 2019-12-19 22:34 [MPTCP] [PATCH net-next v5 08/11] tcp: Export TCP functions and ops struct Mat Martineau 2019-12-19 22:34 ` Mat Martineau 2019-12-19 22:34 [MPTCP] [PATCH net-next v5 07/11] tcp: coalesce/collapse must respect MPTCP extensions Mat Martineau 2019-12-19 22:34 ` Mat Martineau 2019-12-19 22:34 [MPTCP] [PATCH net-next v5 06/11] mptcp: Add MPTCP to skb extensions Mat Martineau 2019-12-19 22:34 ` Mat Martineau 2019-12-19 22:34 [MPTCP] [PATCH net-next v5 05/11] tcp, ulp: Add clone operation to tcp_ulp_ops Mat Martineau 2019-12-19 22:34 ` Mat Martineau 2019-12-19 22:34 [MPTCP] [PATCH net-next v5 04/11] tcp: Add MPTCP option number Mat Martineau 2019-12-19 22:34 ` Mat Martineau 2019-12-19 22:34 [MPTCP] [PATCH net-next v5 03/11] tcp: Define IPPROTO_MPTCP Mat Martineau 2019-12-19 22:34 ` Mat Martineau 2019-12-19 22:34 [MPTCP] [PATCH net-next v5 02/11] sock: Make sk_protocol a 16-bit value Mat Martineau 2019-12-19 22:34 ` Mat Martineau 2019-12-19 22:34 [MPTCP] [PATCH net-next v5 01/11] net: Make sock protocol value checks more specific Mat Martineau 2019-12-19 22:34 ` Mat Martineau 2019-12-19 22:34 [MPTCP] [PATCH net-next v5 00/11] Multipath TCP: Prerequisites Mat Martineau 2019-12-19 22:34 ` Mat Martineau
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=20191219223434.19722-11-mathew.j.martineau@linux.intel.com \ --to=unknown@example.com \ /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 an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.