From patchwork Thu Nov 24 11:24:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LiXiong Liu X-Patchwork-Id: 1708651 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) 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=pi8tgx1i; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NHwjS75JHz23nT for ; Thu, 24 Nov 2022 22:28:28 +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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MHLT9+XH7NeFzKmVFsfpzUcrb8DKAPukMSRjMU2ER8Y=; b=pi8tgx1igXVGZt lHStbxi3V+Thaw87Q7owMR+ldHsViXYqj4O9fz+4G9/BUg4YUO18CT/hJsqIwAI8pwzrCd+jnx9Zi vrmO37ge2ackTOL11JKknUQvOZo36o99i8QBj4u8UYdr39dEGa+vUc3hU8hIYS3a1OvoXkhbdBUTZ o1CZLZqkAjTs2hyYa2T6MRET4+a5/nqXQytp2tP1UGL0iF1sFpPhBgc68rZTaX2WVpoeaoeC41rJY WzhT/r4egNbHRfb9EWRIG9WUyzArXlYJPD2zeRFUAG/HaW4kvTlOmDfcTYAKtCVJnJnWiqscMBPUE /vHglsc/HvfDQtfDnwPg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oyALz-0082qz-Uz; Thu, 24 Nov 2022 11:25:20 +0000 Received: from smtpbguseast2.qq.com ([54.204.34.130]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oyALX-0082Rg-VM for openwrt-devel@lists.openwrt.org; Thu, 24 Nov 2022 11:24:50 +0000 X-QQ-mid: bizesmtp62t1669289060tzliipny Received: from ikuai8.com ( [114.241.221.187]) by bizesmtp.qq.com (ESMTP) with SMTP id 0 for ; Thu, 24 Nov 2022 19:24:20 +0800 (CST) X-QQ-SSF: 01400000002000W0Z000B00A0000000 X-QQ-FEAT: FFYcggotwZFACoWeKWCNbL4fb04pB5CDshT6LWu0DrwRy5yQHyr0wOhZKUUMY g3wdnhT5qgezYmdNYcN89r8YZov8m8Rf+ZopsAt90Wa5zxKp4eMQ9iDclANLaTdlsSP39eK S+CDFubiLel89GWrbc/4KlGZp3kRp1ACORMq/sbzOBzygw3/RyXxDzRH+HEKgQQaMl5CnrO u8hXAAbCDPm/wpOOqOXjGFmoGI2ojTRw10lxy1rCnlcz2ZQ67/NYw3u5xnwWPlE820Rqw7U RzBuR8shGJaqJouBCf95WS9iMu2WNWq7eWlIA8RUww0+NRAZtXjBeCzh/O9SfQ04usDN5d3 HTXx1YIy9sqE06vylDxAcYgXlfeB7zLVizS7nRTfuFafFPMpmat6yUAwgE5ETrLR7NzCmiy L+KmoMnlzqgDKAdjXem94w== X-QQ-GoodBg: 2 From: LiXiong Liu To: openwrt-devel@lists.openwrt.org Subject: [PATCH-22.03 2/4] kernel: support more encap for flowtable Date: Thu, 24 Nov 2022 19:24:06 +0800 Message-Id: <1669289048-51420-2-git-send-email-lxliu@ikuai8.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1669289048-51420-1-git-send-email-lxliu@ikuai8.com> References: <1669289048-51420-1-git-send-email-lxliu@ikuai8.com> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:ikuai8.com:qybglogicsvr:qybglogicsvr7 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221124_032448_568756_1FB84461 X-CRM114-Status: UNSURE ( 8.89 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) 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: Some need use 8021q + 8021q + pppoe, The current encap number cannot meet the demand. Signed-off-by: LiXiong Liu --- ...02-netfilter-flowtable-support-more-encap.patch | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 target/linux/generi [...] Content analysis details: (-0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [54.204.34.130 listed in list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [54.204.34.130 listed in wl.mailspike.net] 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: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Some need use 8021q + 8021q + pppoe, The current encap number cannot meet the demand. Signed-off-by: LiXiong Liu --- ...02-netfilter-flowtable-support-more-encap.patch | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 target/linux/generic/pending-5.10/706-02-netfilter-flowtable-support-more-encap.patch diff --git a/target/linux/generic/pending-5.10/706-02-netfilter-flowtable-support-more-encap.patch b/target/linux/generic/pending-5.10/706-02-netfilter-flowtable-support-more-encap.patch new file mode 100644 index 0000000..2216a2b --- /dev/null +++ b/target/linux/generic/pending-5.10/706-02-netfilter-flowtable-support-more-encap.patch @@ -0,0 +1,24 @@ +--- a/include/linux/netdevice.h ++++ b/include/linux/netdevice.h +@@ -882,8 +882,8 @@ struct net_device_path { + }; + }; + +-#define NET_DEVICE_PATH_STACK_MAX 5 +-#define NET_DEVICE_PATH_VLAN_MAX 2 ++#define NET_DEVICE_PATH_STACK_MAX 8 ++#define NET_DEVICE_PATH_VLAN_MAX 3 + + struct net_device_path_stack { + int num_paths; +--- a/include/net/netfilter/nf_flow_table.h ++++ b/include/net/netfilter/nf_flow_table.h +@@ -96,7 +96,7 @@ enum flow_offload_xmit_type { + FLOW_OFFLOAD_XMIT_DIRECT, + }; + +-#define NF_FLOW_TABLE_ENCAP_MAX 2 ++#define NF_FLOW_TABLE_ENCAP_MAX 3 + + struct flow_offload_tuple { + union {