From patchwork Tue Mar 12 02:05:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qingfang Deng X-Patchwork-Id: 1910782 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=xUtuRH5b; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=T+Klfdy6; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TtxrJ3Jmxz1yX8 for ; Tue, 12 Mar 2024 13:08:13 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1bAXNMPtcEx9d2/JvSKmlDP5yKqd9eab8oRAG0Iyj7o=; b=xUtuRH5b3MlJgW 2QKGhUc6rTaMOpviea7ugHYvUWDy2vd5F/eXzhr/3u3oaEHEBGok6vTR6+1or/Y1B3Whd8LSK8xAV uRx+ib+hQDmBzlTZ6o2tHYk4xzJNcdghB+eYKUHHPsFLnrmleOkQEDwPOUiF7w26zGP/3LBsJzv3Y K7dB2Sq74N5rt8d201OjQ1YztgLPNC3ciiXcDr94lI/ZPHwSDHcGaRqo2gRxuBLFIGZvRzQX6zCXg xPQpKu0gHW7LtcfPrdtSKCfp3zJ2CQ1//LcvoWFUFv5HlbVciB1nZBXx5KbrYqIDC0WraF6PyRiLE 8gVLbEWZKaeegTiZeGZA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rjrWb-00000003vdi-3a5N; Tue, 12 Mar 2024 02:05:54 +0000 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rjrWT-00000003vdD-0zfZ for openwrt-devel@lists.openwrt.org; Tue, 12 Mar 2024 02:05:46 +0000 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-6e5c0be115aso3291491b3a.3 for ; Mon, 11 Mar 2024 19:05:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710209143; x=1710813943; darn=lists.openwrt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dCoFJig4oz0GdilGS7UgIdqAs23t0ht+R36TviN0AvI=; b=T+Klfdy6TGiTE3p3bMIsPbk9x324u4hm5lPW8gXxlhe/6ZmDZLVRsv+as7hMZiZXVY Qy9FyrWgSJoThjFjazIGrDssSxqyg4li1D1b+06GE0MMn9zbuYEfswOfXV9LlvaeOjeB Fk2OdsrOpFZf0AtZPfKEjo3ZomulHfoNPT9/wYHQSrHQIbewxav68Bh9fIXAvsUc0piY qjaoR6hCiO0idLygHL61youfXOyZuN8wjqkybT+iHu+miJAyKJOxsJ+zDghO69V1hJeC LgVquKTtC4nQEcSxyU69e+Kz7sUGfFFbTvhjnITutPAY66YraEycmfK5bawKUDE8EKTk 19mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710209143; x=1710813943; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dCoFJig4oz0GdilGS7UgIdqAs23t0ht+R36TviN0AvI=; b=ffuTLfGbI1h0LQo+R32hIqMp2waZINP0KylL0USiWHXBnt2oYiIx2SDSGp4MlEJ++5 k9JQ63d82Teys88J0g0aHR72B12QsEeCOE8AGZ5ifEkmd0G8QM9E39n/FWZwGuzRua7A C02A/4ACM72YTMiEYxK9jQudgETZEv2uvq/cKp6hVJZ5+RIDwMVaR/Y99L8tLXBka9wp usywYkG8mIWorkidWgamZDVbK7L61ap7B+xTzGUnLG3ZDNE4nECU7s1zatmYob/mMqSL /DiDkBiFSo5yp+GDGfS/utPx71FUaI+VJNQ0bCkIPyjcFNc//8bvflrRk8m2+DpQGhDf 66MQ== X-Gm-Message-State: AOJu0YzawkplL2VYZF0YwKfP+7W6rIv2HK7qZ3ve2Q7xY1xz1g0i9YKx gSGi4uj4TfJpWyqxkIus7a08waygJg8g7UeUpqdkHyoytxb247m7nCEnDuVxIu+zWQ== X-Google-Smtp-Source: AGHT+IFljm8kkwVAhVH6aPZow+vV5bythWDbOtzeiia8S9UTd0h0Hg25QEEqq+fD1IVUNEBOyORcuw== X-Received: by 2002:a05:6a00:6ca1:b0:6e6:7af6:2201 with SMTP id jc33-20020a056a006ca100b006e67af62201mr8717285pfb.8.1710209143092; Mon, 11 Mar 2024 19:05:43 -0700 (PDT) Received: from DESKTOP-4R0U3NR.siflower.com ([2a09:bac5:80c9:183c::26a:36]) by smtp.gmail.com with ESMTPSA id a14-20020a62d40e000000b006e6629e6a76sm5224740pfh.137.2024.03.11.19.05.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 19:05:42 -0700 (PDT) From: Qingfang Deng To: openwrt-devel@lists.openwrt.org Cc: Christian Marangi Subject: [PATCH v2] kernel: fix iptables offload build without nftables Date: Tue, 12 Mar 2024 10:05:13 +0800 Message-Id: <20240312020514.2714641-1-dqfext@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240311095124.2440300-1-dqfext@gmail.com> References: <20240311095124.2440300-1-dqfext@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240311_190545_322163_DDF58293 X-CRM114-Status: GOOD ( 10.26 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: When rebasing patches on top of 6.1, a change that removed NF_TABLES from NF_FLOW_TABLE's dependency was dropped accidentally, and iptables flow offload module can only be built when nftables is selec [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [dqfext(at)gmail.com] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:432 listed in] [list.dnswl.org] -0.0 T_SCC_BODY_TEXT_LINE No description available. X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org When rebasing patches on top of 6.1, a change that removed NF_TABLES from NF_FLOW_TABLE's dependency was dropped accidentally, and iptables flow offload module can only be built when nftables is selected. Restore the change to fix it. Fixes: 19a246bb6503 ("generic: 6.1: manually refresh hack patches") Signed-off-by: Qingfang Deng --- v2: also fix 6.6 .../650-netfilter-add-xt_FLOWOFFLOAD-target.patch | 10 +++++++++- .../650-netfilter-add-xt_FLOWOFFLOAD-target.patch | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/target/linux/generic/hack-6.1/650-netfilter-add-xt_FLOWOFFLOAD-target.patch b/target/linux/generic/hack-6.1/650-netfilter-add-xt_FLOWOFFLOAD-target.patch index 59a5fb4d91..aee845d984 100644 --- a/target/linux/generic/hack-6.1/650-netfilter-add-xt_FLOWOFFLOAD-target.patch +++ b/target/linux/generic/hack-6.1/650-netfilter-add-xt_FLOWOFFLOAD-target.patch @@ -8,7 +8,15 @@ Signed-off-by: Felix Fietkau --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -1023,6 +1023,15 @@ config NETFILTER_XT_TARGET_NOTRACK +@@ -726,7 +726,6 @@ config NF_FLOW_TABLE + tristate "Netfilter flow table module" + depends on NETFILTER_INGRESS + depends on NF_CONNTRACK +- depends on NF_TABLES + help + This option adds the flow table core infrastructure. + +@@ -1023,6 +1022,15 @@ config NETFILTER_XT_TARGET_NOTRACK depends on NETFILTER_ADVANCED select NETFILTER_XT_TARGET_CT diff --git a/target/linux/generic/hack-6.6/650-netfilter-add-xt_FLOWOFFLOAD-target.patch b/target/linux/generic/hack-6.6/650-netfilter-add-xt_FLOWOFFLOAD-target.patch index cb7ac007b1..b9a87a671e 100644 --- a/target/linux/generic/hack-6.6/650-netfilter-add-xt_FLOWOFFLOAD-target.patch +++ b/target/linux/generic/hack-6.6/650-netfilter-add-xt_FLOWOFFLOAD-target.patch @@ -8,7 +8,15 @@ Signed-off-by: Felix Fietkau --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -1025,6 +1025,15 @@ config NETFILTER_XT_TARGET_NOTRACK +@@ -729,7 +729,6 @@ config NF_FLOW_TABLE + tristate "Netfilter flow table module" + depends on NETFILTER_INGRESS + depends on NF_CONNTRACK +- depends on NF_TABLES + help + This option adds the flow table core infrastructure. + +@@ -1025,6 +1024,15 @@ config NETFILTER_XT_TARGET_NOTRACK depends on NETFILTER_ADVANCED select NETFILTER_XT_TARGET_CT