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 AB44DC00144 for ; Mon, 1 Aug 2022 19:06:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234666AbiHATGL (ORCPT ); Mon, 1 Aug 2022 15:06:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234544AbiHATFG (ORCPT ); Mon, 1 Aug 2022 15:05:06 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A0053336F; Mon, 1 Aug 2022 12:03:28 -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 dfw.source.kernel.org (Postfix) with ESMTPS id D049F61172; Mon, 1 Aug 2022 19:03:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5691C4314F; Mon, 1 Aug 2022 19:03:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659380607; bh=DiNStDhc8f9jVXz6FaKN9TB72QC5VBXV6hUncDDUwm0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kASD9hIDY8Dm+IYIjGHYM2EEIJ085D/X9xhbCresiy8J0A5iVeEVGA0lsBd1tzNTN x4LDFoxRVmBUdHrH52u602ilzpE70iBzg6Sb0F3S4RbYUOMpu3KEJBczkplvDmGchG +2R2DsDiFDEzjM1Xd8NuJKk7MKf9O5cFyKvXiH0Sws5PBY6t+K0WEmqZ6y8+lmEAfJ 5y2Oqw65JT89hO+qHgR9RaVjEPT0kUXN20NInklhpSGQZ3IB52GhXbU+H3rCYUFe8m WZsAvlvvCWTuC9/ZDOV3OfSy0Sj1y5XOxtGoT9PtIrPojuQHMY7MmvAT/2TUbhcbd9 XAvFkjA92Z4Lw== 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.4 5/6] netfilter: nf_tables: add rescheduling points during loop detection walks Date: Mon, 1 Aug 2022 15:03:16 -0400 Message-Id: <20220801190317.3819520-5-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220801190317.3819520-1-sashal@kernel.org> References: <20220801190317.3819520-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: linux-kernel@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 58a7d89719b1..d60067c5221e 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -2684,6 +2684,8 @@ int nft_chain_validate(const struct nft_ctx *ctx, const struct nft_chain *chain) if (err < 0) return err; } + + cond_resched(); } return 0; @@ -7310,9 +7312,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