diff options
| author | Florian Westphal <fw@strlen.de> | 2025-12-11 12:55:19 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2025-12-15 15:04:04 +0100 |
| commit | 7e7a817f2dfd79098a706ee5581ea9518b2de878 (patch) | |
| tree | 4d65e13ec4873455c524d163b846af5a812cc717 /net/netfilter | |
| parent | 8e1a1bc4f5a42747c08130b8242ebebd1210b32f (diff) | |
netfilter: nf_tables: avoid softlockup warnings in nft_chain_validate
This reverts commit
314c82841602 ("netfilter: nf_tables: can't schedule in nft_chain_validate"):
Since commit a60a5abe19d6 ("netfilter: nf_tables: allow iter callbacks to sleep")
the iterator callback is invoked without rcu read lock held, so this
cond_resched() is now valid.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nf_tables_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index a9f6babcc781..618af6e90773 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -4171,6 +4171,8 @@ int nft_chain_validate(const struct nft_ctx *ctx, struct nft_chain *chain) if (err < 0) return err; } + + cond_resched(); } nft_chain_vstate_update(ctx, chain); @@ -4195,8 +4197,6 @@ static int nft_table_validate(struct net *net, const struct nft_table *table) err = nft_chain_validate(&ctx, chain); if (err < 0) goto err; - - cond_resched(); } err: |