From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 731BFC3F6B0 for ; Mon, 1 Aug 2022 19:05:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234585AbiHATFN (ORCPT ); Mon, 1 Aug 2022 15:05:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234363AbiHATEf (ORCPT ); Mon, 1 Aug 2022 15:04:35 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FF3640BF2; Mon, 1 Aug 2022 12:03:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 08C0EB81645; Mon, 1 Aug 2022 19:03:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E251C4347C; Mon, 1 Aug 2022 19:03:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659380593; bh=5i/Uh9Lzwjfks4Ev5UwH80XDhfl6C/TU08PCFqniRjY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aajZWTzHRxoruXWLw3fF/6q62hhQoLmuyT5tPWR0k+3jzcFnlRdr6o83tW6ISDN74 J/xKOEWP1jhQrrQ/feNaVA2moVa05aJWVRAB2sbaN+D3G8WcFQZEi9DmjV+/TlYwPJ gF4xLMbOpOzAX53cJzCs1lc532v/GqZPOAz1NapemjPEAqFr0IbDKkBc/MUtcjNO0m 0U3rZenx+ZzzDHBTZ+8FyEnMerbAR3+K4D9IOzACAcmYhfT4CcPFq/WuRr1wsgSS7a IWSWF7S310QX4afKaXbTyy/zm403S38UImXAA2tn7M25uTBX2jjyrQ9/TI+6YNTdEz z0UZbM3CrLzeQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Florian Westphal , Pablo Neira Ayuso , Sasha Levin , kadlec@netfilter.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 6/7] netfilter: nf_tables: add rescheduling points during loop detection walks Date: Mon, 1 Aug 2022 15:03:00 -0400 Message-Id: <20220801190301.3819065-6-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220801190301.3819065-1-sashal@kernel.org> References: <20220801190301.3819065-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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: Sasha Levin --- 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 e5622e925ea9..1cc75ac2d9cc 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -3125,6 +3125,8 @@ int nft_chain_validate(const struct nft_ctx *ctx, const struct nft_chain *chain) if (err < 0) return err; } + + cond_resched(); } return 0; @@ -8419,9 +8421,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