From: Florian Westphal <fw@strlen.de>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org, sashal@kernel.org,
gregkh@linuxfoundation.org, stable@vger.kernel.org
Subject: Re: [PATCH -stable,5.10 02/10] netfilter: nf_tables: add rescheduling points during loop detection walks
Date: Wed, 5 Jul 2023 16:31:07 +0200 [thread overview]
Message-ID: <20230705143107.GE3751@breakpoint.cc> (raw)
In-Reply-To: <20230705142213.53418-3-pablo@netfilter.org>
Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> From: Florian Westphal <fw@strlen.de>
>
> [ 81ea010667417ef3f218dfd99b69769fe66c2b67 ]
>
> 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>
> ---
> 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 e3865f29ae83..3c9292d3f826 100644
> --- a/net/netfilter/nf_tables_api.c
> +++ b/net/netfilter/nf_tables_api.c
> @@ -3164,6 +3164,8 @@ int nft_chain_validate(const struct nft_ctx *ctx, const struct nft_chain *chain)
> if (err < 0)
> return err;
> }
> +
> + cond_resched();
> }
>
> return 0;
> @@ -8506,9 +8508,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))
Nack, this is wrong. Either drop this patch or also pick up
2024439bd5ceb145eeeb428b2a59e9b905153ac3
("netfilter: nf_tables: fix scheduling-while-atomic splat")
I suspect it will cherry-pick without problems.
next prev parent reply other threads:[~2023-07-05 14:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-05 14:22 [PATCH -stable,5.10 00/10] stable fixes for 5.10 Pablo Neira Ayuso
2023-07-05 14:22 ` [PATCH -stable,5.10 01/10] netfilter: nf_tables: use net_generic infra for transaction data Pablo Neira Ayuso
2023-07-05 14:22 ` [PATCH -stable,5.10 02/10] netfilter: nf_tables: add rescheduling points during loop detection walks Pablo Neira Ayuso
2023-07-05 14:31 ` Florian Westphal [this message]
2023-07-05 14:33 ` Pablo Neira Ayuso
2023-07-05 14:22 ` [PATCH -stable,5.10 03/10] netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE Pablo Neira Ayuso
2023-07-05 14:22 ` [PATCH -stable,5.10 04/10] netfilter: nf_tables: fix chain binding transaction logic Pablo Neira Ayuso
2023-07-05 14:22 ` [PATCH -stable,5.10 05/10] netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain Pablo Neira Ayuso
2023-07-05 14:22 ` [PATCH -stable,5.10 06/10] netfilter: nf_tables: reject unbound anonymous set before commit phase Pablo Neira Ayuso
2023-07-05 14:22 ` [PATCH -stable,5.10 07/10] netfilter: nf_tables: reject unbound chain " Pablo Neira Ayuso
2023-07-05 14:22 ` [PATCH -stable,5.10 08/10] netfilter: nftables: rename set element data activation/deactivation functions Pablo Neira Ayuso
2023-07-05 14:22 ` [PATCH -stable,5.10 09/10] netfilter: nf_tables: drop map element references from preparation phase Pablo Neira Ayuso
2023-07-05 14:22 ` [PATCH -stable,5.10 10/10] netfilter: nf_tables: unbind non-anonymous set if rule construction fails Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230705143107.GE3751@breakpoint.cc \
--to=fw@strlen.de \
--cc=gregkh@linuxfoundation.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).