bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

netfilter: nf_tables: pass nft_chain to destroy function, not nft_ctx

Browse source 
[ Upstream commit 8965d42bcf54d42cbc72fe34a9d0ec3f8527debd ]

It would be better to not store nft_ctx inside nft_trans object,
the netlink ctx strucutre is huge and most of its information is
never needed in places that use trans->ctx.

Avoid/reduce its usage if possible, no runtime behaviour change
intended.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Stable-dep-of: c03d278fdf35 ("netfilter: nf_tables: wait for rcu grace period on net_device removal")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Florian Westphal 2024-05-13 15:00:45 +02:00 • committed by Greg Kroah-Hartman
parent d122b259a7
commit 825a80817c
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/net/netfilter/nf_tables.h
View file

@ -1157,7 +1157,7 @@ static inline bool nft_chain_is_bound(struct nft_chain *chain)
int nft_chain_add(struct nft_table *table, struct nft_chain *chain); int nft_chain_add(struct nft_table *table, struct nft_chain *chain);
void nft_chain_del(struct nft_chain *chain); void nft_chain_del(struct nft_chain *chain);
void nf_tables_chain_destroy(struct nft_ctx *ctx); void nf_tables_chain_destroy(struct nft_chain *chain);
struct nft_stats { struct nft_stats {
u64 bytes; u64 bytes;

17
net/netfilter/nf_tables_api.c
View file

@ -2068,9 +2068,9 @@ static void nf_tables_chain_free_chain_rules(struct nft_chain *chain)
kvfree(chain->blob_next); kvfree(chain->blob_next);
} }
void nf_tables_chain_destroy(struct nft_ctx *ctx) void nf_tables_chain_destroy(struct nft_chain *chain)
{ {
struct nft_chain *chain = ctx->chain; const struct nft_table *table = chain->table;
struct nft_hook *hook, *next; struct nft_hook *hook, *next;
if (WARN_ON(chain->use > 0)) if (WARN_ON(chain->use > 0))
@ -2082,7 +2082,7 @@ void nf_tables_chain_destroy(struct nft_ctx *ctx)
if (nft_is_base_chain(chain)) { if (nft_is_base_chain(chain)) {
struct nft_base_chain *basechain = nft_base_chain(chain); struct nft_base_chain *basechain = nft_base_chain(chain);
if (nft_base_chain_netdev(ctx->family, basechain->ops.hooknum)) { if (nft_base_chain_netdev(table->family, basechain->ops.hooknum)) {
list_for_each_entry_safe(hook, next, list_for_each_entry_safe(hook, next,
&basechain->hook_list, list) { &basechain->hook_list, list) {
list_del_rcu(&hook->list); list_del_rcu(&hook->list);
@ -2571,7 +2571,7 @@ err_chain_add:
err_trans: err_trans:
nft_use_dec_restore(&table->use); nft_use_dec_restore(&table->use);
err_destroy_chain: err_destroy_chain:
nf_tables_chain_destroy(ctx); nf_tables_chain_destroy(chain);
return err; return err;
} }
@ -9415,7 +9415,7 @@ static void nft_commit_release(struct nft_trans *trans)
if (nft_trans_chain_update(trans)) if (nft_trans_chain_update(trans))
nft_hooks_destroy(&nft_trans_chain_hooks(trans)); nft_hooks_destroy(&nft_trans_chain_hooks(trans));
else else
nf_tables_chain_destroy(&trans->ctx); nf_tables_chain_destroy(nft_trans_chain(trans));
break; break;
case NFT_MSG_DELRULE: case NFT_MSG_DELRULE:
case NFT_MSG_DESTROYRULE: case NFT_MSG_DESTROYRULE:
@ -10406,7 +10406,7 @@ static void nf_tables_abort_release(struct nft_trans *trans)
if (nft_trans_chain_update(trans)) if (nft_trans_chain_update(trans))
nft_hooks_destroy(&nft_trans_chain_hooks(trans)); nft_hooks_destroy(&nft_trans_chain_hooks(trans));
else else
nf_tables_chain_destroy(&trans->ctx); nf_tables_chain_destroy(nft_trans_chain(trans));
break; break;
case NFT_MSG_NEWRULE: case NFT_MSG_NEWRULE:
nf_tables_rule_destroy(&trans->ctx, nft_trans_rule(trans)); nf_tables_rule_destroy(&trans->ctx, nft_trans_rule(trans));
@ -11144,7 +11144,7 @@ int __nft_release_basechain(struct nft_ctx *ctx)
} }
nft_chain_del(ctx->chain); nft_chain_del(ctx->chain);
nft_use_dec(&ctx->table->use); nft_use_dec(&ctx->table->use);
nf_tables_chain_destroy(ctx); nf_tables_chain_destroy(ctx->chain);
return 0; return 0;
} }
@ -11219,10 +11219,9 @@ static void __nft_release_table(struct net *net, struct nft_table *table)
nft_obj_destroy(&ctx, obj); nft_obj_destroy(&ctx, obj);
} }
list_for_each_entry_safe(chain, nc, &table->chains, list) { list_for_each_entry_safe(chain, nc, &table->chains, list) {
ctx.chain = chain;
nft_chain_del(chain); nft_chain_del(chain);
nft_use_dec(&table->use); nft_use_dec(&table->use);
nf_tables_chain_destroy(&ctx); nf_tables_chain_destroy(chain);
} }
nf_tables_table_destroy(&ctx); nf_tables_table_destroy(&ctx);
} }

2
net/netfilter/nft_immediate.c
View file

@ -221,7 +221,7 @@ static void nft_immediate_destroy(const struct nft_ctx *ctx,
list_del(&rule->list); list_del(&rule->list);
nf_tables_rule_destroy(&chain_ctx, rule); nf_tables_rule_destroy(&chain_ctx, rule);
} }
nf_tables_chain_destroy(&chain_ctx); nf_tables_chain_destroy(chain);
break; break;
default: default:
break; break;