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>,
Eric Dumazet <edumazet@google.com>,
Mat Martineau <mathew.j.martineau@linux.intel.com>
Subject: [PATCH net-next v7 10/11] tcp: clean ext on tx recycle
Date: Thu, 9 Jan 2020 07:59:23 -0800 [thread overview]
Message-ID: <20200109155924.30122-11-mathew.j.martineau@linux.intel.com> (raw)
In-Reply-To: <20200109155924.30122-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>
Reviewed-by: Eric Dumazet <edumazet@google.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 8766f9bc3e70..432ff73d20f3 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1464,6 +1464,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 prev parent reply other threads:[~2020-01-09 16:00 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-09 15:59 [PATCH net-next v7 00/11] Multipath TCP: Prerequisites Mat Martineau
2020-01-09 15:59 ` [PATCH net-next v7 01/11] net: Make sock protocol value checks more specific Mat Martineau
2020-01-09 15:59 ` [PATCH net-next v7 02/11] sock: Make sk_protocol a 16-bit value Mat Martineau
2020-01-09 19:05 ` David Miller
2020-01-09 21:25 ` [MPTCP] " Florian Westphal
2020-01-10 2:43 ` David Miller
2020-01-09 15:59 ` [PATCH net-next v7 03/11] tcp: Define IPPROTO_MPTCP Mat Martineau
2020-01-09 15:59 ` [PATCH net-next v7 04/11] tcp: Add MPTCP option number Mat Martineau
2020-01-09 15:59 ` [PATCH net-next v7 05/11] tcp, ulp: Add clone operation to tcp_ulp_ops Mat Martineau
2020-01-09 15:59 ` [PATCH net-next v7 06/11] mptcp: Add MPTCP to skb extensions Mat Martineau
2020-01-09 15:59 ` [PATCH net-next v7 07/11] tcp: coalesce/collapse must respect MPTCP extensions Mat Martineau
2020-01-09 15:59 ` [PATCH net-next v7 08/11] tcp: Export TCP functions and ops struct Mat Martineau
2020-01-09 15:59 ` [PATCH net-next v7 09/11] tcp: Check for filled TCP option space before SACK Mat Martineau
2020-01-09 15:59 ` Mat Martineau [this message]
2020-01-09 15:59 ` [PATCH net-next v7 11/11] skb: add helpers to allocate ext independently from sk_buff Mat Martineau
2020-01-10 2:44 ` [PATCH net-next v7 00/11] Multipath TCP: Prerequisites David Miller
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=20200109155924.30122-11-mathew.j.martineau@linux.intel.com \
--to=mathew.j.martineau@linux.intel.com \
--cc=edumazet@google.com \
--cc=fw@strlen.de \
--cc=mptcp@lists.01.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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: 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).