From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C949914263 for ; Tue, 25 Jul 2023 11:26:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B1ADC433C8; Tue, 25 Jul 2023 11:26:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1690284400; bh=0nTn+APEI1It+1x0qO7kmSRYY9Il4Enobp52ARqWkwo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BDbOgtCaWYu3YZcq7HbScyTjuKzMuQ9jmALx7d4OdO+1qXs/6aqoLd6SMIMQ3bSbW ySrdGFF+Z2Lhu48j6VSIX5/KGAV3IPTEB4mvWH/sfrW1hsnYdUheslqB/VqFvnEUe7 nmQ6ezGyOPUZiO7ZefnRXxMLKxEJe5zebZxN58PQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org, netfilter-devel@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Florian Westphal , Pablo Neira Ayuso Subject: [PATCH 5.10 313/509] netfilter: nf_tables: add rescheduling points during loop detection walks Date: Tue, 25 Jul 2023 12:44:12 +0200 Message-ID: <20230725104608.073564624@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230725104553.588743331@linuxfoundation.org> References: <20230725104553.588743331@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Florian Westphal [ Upstream commit 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 Acked-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- net/netfilter/nf_tables_api.c | 6 ++++++ 1 file changed, 6 insertions(+) --- 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_ if (err < 0) return err; } + + cond_resched(); } return 0; @@ -8506,9 +8508,13 @@ static int nf_tables_check_loops(const s 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) ||