From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, pablo@netfilter.org
Cc: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH -stable,5.15 2/3] netfilter: nf_tables: wait for rcu grace period on net_device removal
Date: Tue, 20 May 2025 09:36:48 -0400 [thread overview]
Message-ID: <20250520072116-ee51acaeee7e7292@stable.kernel.org> (raw)
In-Reply-To: <20250519233515.25539-3-pablo@netfilter.org>
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
ℹ️ This is part 2/3 of a series
⚠️ Found follow-up fixes in mainline
The upstream commit SHA1 provided is correct: c03d278fdf35e73dd0ec543b9b556876b9d9a8dc
Status in newer kernel trees:
6.14.y | Present (exact SHA1)
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: bfd05c68e4c6)
6.1.y | Not found
Found fixes commits:
b04df3da1b5c netfilter: nf_tables: do not defer rule destruction via call_rcu
Note: The patch differs from the upstream commit:
---
1: c03d278fdf35e ! 1: 14e8d506ade73 netfilter: nf_tables: wait for rcu grace period on net_device removal
@@ Metadata
## Commit message ##
netfilter: nf_tables: wait for rcu grace period on net_device removal
+ commit c03d278fdf35e73dd0ec543b9b556876b9d9a8dc upstream.
+
8c873e219970 ("netfilter: core: free hooks with call_rcu") removed
synchronize_net() call when unregistering basechain hook, however,
net_device removal event handler for the NFPROTO_NETDEV was not updated
@@ Commit message
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
## include/net/netfilter/nf_tables.h ##
-@@ include/net/netfilter/nf_tables.h: struct nft_rule_blob {
- * @name: name of the chain
- * @udlen: user data length
- * @udata: user data in the chain
-+ * @rcu_head: rcu head for deferred release
- * @blob_next: rule blob pointer to the next in the chain
- */
- struct nft_chain {
@@ include/net/netfilter/nf_tables.h: struct nft_chain {
char *name;
u16 udlen;
@@ include/net/netfilter/nf_tables.h: struct nft_chain {
+ struct rcu_head rcu_head;
/* Only used during control plane commit phase: */
- struct nft_rule_blob *blob_next;
+ struct nft_rule **rules_next;
@@ include/net/netfilter/nf_tables.h: static inline void nft_use_inc_restore(u32 *use)
* @sets: sets in the table
* @objects: stateful objects in the table
---
NOTE: These results are for this patch alone. Full series testing will be
performed when all parts are received.
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y | Success | Success |
next prev parent reply other threads:[~2025-05-20 13:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-19 23:35 [PATCH -stable,5.15 0/3] Netfilter fixes for -stable Pablo Neira Ayuso
2025-05-19 23:35 ` [PATCH -stable,5.15 1/3] netfilter: nf_tables: pass nft_chain to destroy function, not nft_ctx Pablo Neira Ayuso
2025-05-20 13:36 ` Sasha Levin
2025-05-19 23:35 ` [PATCH -stable,5.15 2/3] netfilter: nf_tables: wait for rcu grace period on net_device removal Pablo Neira Ayuso
2025-05-20 13:36 ` Sasha Levin [this message]
2025-05-19 23:35 ` [PATCH -stable,5.15 3/3] netfilter: nf_tables: do not defer rule destruction via call_rcu Pablo Neira Ayuso
2025-05-20 13:36 ` Sasha Levin
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=20250520072116-ee51acaeee7e7292@stable.kernel.org \
--to=sashal@kernel.org \
--cc=pablo@netfilter.org \
--cc=stable@vger.kernel.org \
/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