netfilter: nf_tables: add rescheduling points during loop detection walks

[ 81ea010667 ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Florian Westphal 2023-07-05 18:55:08 +02:00 committed by Greg Kroah-Hartman
parent ee863bb80b
commit d8d2bdb7d2

View file

@ -2552,6 +2552,8 @@ int nft_chain_validate(const struct nft_ctx *ctx, const struct nft_chain *chain)
if (err < 0) if (err < 0)
return err; return err;
} }
cond_resched();
} }
return 0; return 0;
@ -6956,9 +6958,13 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx,
break; break;
} }
} }
cond_resched();
} }
list_for_each_entry(set, &ctx->table->sets, list) { list_for_each_entry(set, &ctx->table->sets, list) {
cond_resched();
if (!nft_is_active_next(ctx->net, set)) if (!nft_is_active_next(ctx->net, set))
continue; continue;
if (!(set->flags & NFT_SET_MAP) || if (!(set->flags & NFT_SET_MAP) ||