* [PATCH nf] netfilter: nf_tables: add rescheduling points during loop detection walks
@ 2022-07-26 10:44 Florian Westphal
2022-07-26 13:29 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Florian Westphal @ 2022-07-26 10:44 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
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>
---
net/netfilter/nf_tables_api.c | 6 ++++++
1 file changed, 6 insertions(+)
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) ||
--
2.35.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH nf] netfilter: nf_tables: add rescheduling points during loop detection walks
2022-07-26 10:44 [PATCH nf] netfilter: nf_tables: add rescheduling points during loop detection walks Florian Westphal
@ 2022-07-26 13:29 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2022-07-26 13:29 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Tue, Jul 26, 2022 at 12:44:35PM +0200, Florian Westphal wrote:
> 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
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
> net/netfilter/nf_tables_api.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> 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) ||
> --
> 2.35.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-26 13:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-26 10:44 [PATCH nf] netfilter: nf_tables: add rescheduling points during loop detection walks Florian Westphal
2022-07-26 13:29 ` Pablo Neira Ayuso
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.