From: Saeed Mahameed <saeedm@nvidia.com>
To: Jakub Kicinski <kuba@kernel.org>
Cc: <netdev@vger.kernel.org>, "David S. Miller" <davem@davemloft.net>,
"Maxim Mikityanskiy" <maximmi@mellanox.com>,
Tariq Toukan <tariqt@nvidia.com>,
"Saeed Mahameed" <saeedm@nvidia.com>
Subject: [PATCH net 2/2] net: Call skb destructor on NAPI_GRO_FREE_STOLEN_HEAD
Date: Tue, 17 Nov 2020 12:33:55 -0800 [thread overview]
Message-ID: <20201117203355.389661-2-saeedm@nvidia.com> (raw)
In-Reply-To: <20201117203355.389661-1-saeedm@nvidia.com>
From: Maxim Mikityanskiy <maximmi@mellanox.com>
All GRO flows except one call skb->destructor, however, GRO_MERGED_FREE
doesn't do it in case of NAPI_GRO_FREE_STOLEN_HEAD. For better
consistency and to add resiliency against the drivers that may pass SKBs
with a destructor, this patch changes napi_skb_free_stolen_head to use
skb_release_head_state, which should perform all the needed cleanups,
including a call to the destructor. This way the code of GRO_MERGED_FREE
becomes similar to kfree_skb_partial.
Fixes: e44699d2c280 ("net: handle NAPI_GRO_FREE_STOLEN_HEAD case also in napi_frags_finish()")
Fixes: d7e8883cfcf4 ("net: make GRO aware of skb->head_frag")
Signed-off-by: Maxim Mikityanskiy <maximmi@mellanox.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
---
For -stable: 5.4
net/core/dev.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index 82dc6b48e45f..85dcc7f19902 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6048,8 +6048,7 @@ EXPORT_SYMBOL(gro_find_complete_by_type);
static void napi_skb_free_stolen_head(struct sk_buff *skb)
{
- skb_dst_drop(skb);
- skb_ext_put(skb);
+ skb_release_head_state(skb);
kmem_cache_free(skbuff_head_cache, skb);
}
--
2.26.2
next prev parent reply other threads:[~2020-11-17 20:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-17 20:33 [PATCH net 1/2] net/tls: Protect from calling tls_dev_del for TLS RX twice Saeed Mahameed
2020-11-17 20:33 ` Saeed Mahameed [this message]
2020-11-18 19:22 ` [PATCH net 2/2] net: Call skb destructor on NAPI_GRO_FREE_STOLEN_HEAD Jakub Kicinski
2020-11-18 20:02 ` Eric Dumazet
2020-11-18 20:14 ` Jakub Kicinski
2020-11-18 20:21 ` Eric Dumazet
2020-11-25 22:11 ` Saeed Mahameed
2020-11-19 1:13 ` [PATCH net 1/2] net/tls: Protect from calling tls_dev_del for TLS RX twice Jakub Kicinski
2020-11-25 22:14 ` Saeed Mahameed
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=20201117203355.389661-2-saeedm@nvidia.com \
--to=saeedm@nvidia.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=maximmi@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=tariqt@nvidia.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).