Skip to content

Commit

Permalink
netfilter: nf_tables: add rescheduling points during loop detection w…
Browse files Browse the repository at this point in the history
…alks

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 <[email protected]>
Acked-by: Pablo Neira Ayuso <[email protected]>
  • Loading branch information
Florian Westphal committed Jul 26, 2022
1 parent 99a63d3 commit 81ea010
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions net/netfilter/nf_tables_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) ||
Expand Down

0 comments on commit 81ea010

Please sign in to comment.