diff options
author | Florian Westphal <fw@strlen.de> | 2022-07-26 12:44:35 +0200 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2022-07-26 21:12:42 +0200 |
commit | 81ea010667417ef3f218dfd99b69769fe66c2b67 (patch) | |
tree | 58b996afb7d57d0fe001a2e40518f6395ae8c0db /net/netfilter | |
parent | 99a63d36cb3ed5ca3aa6fcb64cffbeaf3b0fb164 (diff) | |
download | linux-81ea010667417ef3f218dfd99b69769fe66c2b67.tar.bz2 |
netfilter: nf_tables: add rescheduling points during loop detection walks
Add explicit rescheduling points during ruleset walk.
Switching to a faster algorithm is possible but this is a much
smaller change, suitable for nf tree.
Link: https://bugzilla.netfilter.org/show_bug.cgi?id=1460
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/nf_tables_api.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 646d5fd53604..9f976b11d896 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -3340,6 +3340,8 @@ int nft_chain_validate(const struct nft_ctx *ctx, const struct nft_chain *chain) if (err < 0) return err; } + + cond_resched(); } return 0; @@ -9367,9 +9369,13 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx, break; } } + + cond_resched(); } list_for_each_entry(set, &ctx->table->sets, list) { + cond_resched(); + if (!nft_is_active_next(ctx->net, set)) continue; if (!(set->flags & NFT_SET_MAP) || |