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 86569C19F2C for ; Mon, 1 Aug 2022 19:06:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234810AbiHATGd (ORCPT ); Mon, 1 Aug 2022 15:06:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234716AbiHATFn (ORCPT ); Mon, 1 Aug 2022 15:05:43 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8EC50422E6; Mon, 1 Aug 2022 12:03:39 -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 312C3B81640; Mon, 1 Aug 2022 19:03:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89512C4347C; Mon, 1 Aug 2022 19:03:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659380617; bh=k77Ap2u4m66l4QE1TlhQzOEyFvjLfjUA9Jqi3kJlRt4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G6CcUikp135AxZySeRoR8zazJBHZPlS3AlQKroHCAhS8RtE1PQZdsCjnPbIacqSLx 2OJG5lWxHkIlK/4gmXkyXWpIWkKHR2AAIZ2SC8nhA9oc8ukci2jc4Lx46r/ferbEqU YTeD8tAIa7zPh1HPpf5vLlaKR54vL9U/yGehDaN2yYEViGxZq8Dvaru5B/pUZ+5RiD zehkzG/IMLztL1lc5oVKGPjwp7wGeeOmDxQFOAYT5fQYeIf1Ik3wJU2pL+UUWP5oEF H9Nvenmga+5YiucwZe9kG8xUwI4ue+5uGEYZMwDYw3N/3kTFfSI9+pq2XdWaJC9O2b QniK1t9qG2YYA== 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 4.19 3/4] netfilter: nf_tables: add rescheduling points during loop detection walks Date: Mon, 1 Aug 2022 15:03:30 -0400 Message-Id: <20220801190331.3819791-3-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220801190331.3819791-1-sashal@kernel.org> References: <20220801190331.3819791-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 ab68076d2cba..a50cdd92f33f 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -2550,6 +2550,8 @@ int nft_chain_validate(const struct nft_ctx *ctx, const struct nft_chain *chain) if (err < 0) return err; } + + cond_resched(); } return 0; @@ -6907,9 +6909,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