From nobody Sat Apr 11 10:10:38 2026 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 4FD57C6FD18 for ; Mon, 6 Mar 2023 03:04:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229748AbjCFDEQ (ORCPT ); Sun, 5 Mar 2023 22:04:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229543AbjCFDEJ (ORCPT ); Sun, 5 Mar 2023 22:04:09 -0500 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2064.outbound.protection.outlook.com [40.107.223.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 743F09035; Sun, 5 Mar 2023 19:03:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JufbEIp/V2gAiTqctqaKH7UTmRL1GVlKHdZafsuQ/2BR1/ZFAi7MVK1rnD1Dz0wtHYjgGja3oaEVpmXOOzrCWqvK9/dqcw/FAvKzArQf4dHdH5NelPm8N1bpQM9jEVIeS5O3utlIp6gERYT6DZ5D142FCNg4wZV8whwM0N8W/ETFDQzeTyWqux5BHMV2aRaALRR0iBHJL/D52ET8Uw5ycaCgamGNBhvKqg2DY8oIIhywz61eQD/7BouTlYn9zUZX7hlhNVeX372RuEz64mIYT4apeP5Y7327+CpQFE74qUwbIbCy1NKdBNSgm7TjEP4rUZ+CHwLp7WTVUtJb5rxFGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ujul2KGrmfcoaS9XrNmTunJFhP8wR2gVoIlq74Lykb0=; b=EKkSDCHTYwRchVQDJ8W0oUpVlA24GcP4SLDWDwbBwIEgs6U0nE2AJof7/jc61J2h4kKVDARwfG7PrS6PPKsSk1WXHky2GKc0makbIxytLvNkxJJvFyGA7R/Xd48WLCd2z5b5TrK4XHf9gfd0jmckoFWwRVfh3p03TrP4J06GOWawWrxto9ABrYl8ubsqgbRssJP3oiQXZ7ctlVHxLtshvxCwteCcE+MdhZ1dBuSsa5C6/8ON2z/bzPpZikIn8iNtjheDOIqw6ljGFNs0mepgDULoCHFu1wy8abgfw0PEOHNcuozZDQV7ElqIDxr0+mglxnpj9x0SZBDzYlELrhq6/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ujul2KGrmfcoaS9XrNmTunJFhP8wR2gVoIlq74Lykb0=; b=MV415suvDSlV5+eDGX14Uv2DBmzpTAwXNGlkw32i32RBMqDMVfTdQ2jh2Pw1otPMP7PQf1CYuXSnzjdWF9XeI2/W5oifDHLWiRYqkNxcb4laK/xFt0LV9X2ZIytBUMKh0ImE8Sa4qCk1tFyQvGO6KXWamJrGGYJBgc3SQhMemIBy7Nzdj8SyBkHDx48W7I/hYpyZyKnbYoGQlk3EHjWRb/ZiQC05hYt/4jFqlbIvV8ZwtfOFUuV1mmIra20bpVq8xbXiFs8YVpAkNhblDnSFX82pXlcSM9TSMxwrXH7S2niULhuqQvdew0mAUtGx+wCteXwf8or3XHLPMU1X2jOAAg== Received: from DM5PR07CA0084.namprd07.prod.outlook.com (2603:10b6:4:ad::49) by IA1PR12MB8080.namprd12.prod.outlook.com (2603:10b6:208:3fd::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.23; Mon, 6 Mar 2023 03:03:52 +0000 Received: from DM6NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:4:ad:cafe::e) by DM5PR07CA0084.outlook.office365.com (2603:10b6:4:ad::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.28 via Frontend Transport; Mon, 6 Mar 2023 03:03:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT034.mail.protection.outlook.com (10.13.173.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.15 via Frontend Transport; Mon, 6 Mar 2023 03:03:51 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 5 Mar 2023 19:03:42 -0800 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 5 Mar 2023 19:03:38 -0800 From: Gavin Li To: , , , , , , CC: , , , , , , Simon Horman Subject: [PATCH RESEND net-next v4 1/4] vxlan: Remove unused argument from vxlan_build_gbp_hdr( ) and vxlan_build_gpe_hdr( ) Date: Mon, 6 Mar 2023 05:02:59 +0200 Message-ID: <20230306030302.224414-2-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306030302.224414-1-gavinl@nvidia.com> References: <20230306030302.224414-1-gavinl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT034:EE_|IA1PR12MB8080:EE_ X-MS-Office365-Filtering-Correlation-Id: 99fe44c5-32f5-48c8-4a59-08db1def6a2a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /6Ngr1l56NPrSxE7kHvTpyCXWPJ4tCNhQMHjbMBeaqY09wpgq//xR7TWejcQqEwhrlBVxOuSFwdFd2/AqlJHVQAoIrr67TuY2WaYci2aZDx5NdFWsnnR0Gs45gemSnTH/kVojyxuzXNEbE7MehfxthUUQDRtKEChS9EXFlD+tAtKMvnbQ8BbvoBROPUKLj04R3L0A7f8Zj0QIb890Kk/B9QWBCChdW9b8hTu3twG1v3qKNorvMMEM8TLswn9MWHXlXiSIWp+XmE2dX4RiYlSWI6VGAxXLCdn4zu5teJnZnGmLOkWTormiiXZKdl4sS2E5hyS+ASzYVBVkQ/BJ3oytidJCPfE+5cQtNVLuYMkJw78aki450Ybx9AEC2CDd5VOQFd1ERsUb9IrupIi09fNbjZhvvTWuJFKz0X5cocbBm3wjg3MeLHCEOMpzjGQsCbPlANn2oGgVUY4ptZ8xsw8R4FOYsi1kZikHJyQdZWpJIEt7XgebBA4J/DzCMomBIGRWJ+PNd31Ol704WZBZW/t3F8AgfSsng4/a4C8b8Fx4qAbOe6FOveQE3MaYrLJhw9QELO0RVuVOz44QIlcinLi2/9GWG6nsJ9uYs1E3hHMmiloZfHbd6ELWie7KWp6RZxpDYPKuhKHEc/k+oNtWxgqCG2pI5/ldmq59sOacWRt9quk10SZjdAJwoq3LldXrIIN5HAevpg4ndfRT5R8KqnBuw== X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230025)(4636009)(136003)(346002)(396003)(376002)(39860400002)(451199018)(40470700004)(36840700001)(46966006)(6666004)(36756003)(82310400005)(47076005)(83380400001)(426003)(36860700001)(478600001)(7696005)(1076003)(6286002)(336012)(186003)(26005)(16526019)(70586007)(8936002)(2906002)(41300700001)(40480700001)(70206006)(4326008)(8676002)(5660300002)(2616005)(40460700003)(86362001)(110136005)(82740400003)(54906003)(356005)(55016003)(316002)(7636003);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2023 03:03:51.7196 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 99fe44c5-32f5-48c8-4a59-08db1def6a2a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8080 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove unused argument (i.e. u32 vxflags) in vxlan_build_gbp_hdr( ) and vxlan_build_gpe_hdr( ) function arguments. Signed-off-by: Gavin Li Reviewed-by: Simon Horman --- drivers/net/vxlan/vxlan_core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c index b1b179effe2a..86967277ab97 100644 --- a/drivers/net/vxlan/vxlan_core.c +++ b/drivers/net/vxlan/vxlan_core.c @@ -2140,8 +2140,7 @@ static bool route_shortcircuit(struct net_device *dev= , struct sk_buff *skb) return false; } =20 -static void vxlan_build_gbp_hdr(struct vxlanhdr *vxh, u32 vxflags, - struct vxlan_metadata *md) +static void vxlan_build_gbp_hdr(struct vxlanhdr *vxh, struct vxlan_metadat= a *md) { struct vxlanhdr_gbp *gbp; =20 @@ -2160,8 +2159,7 @@ static void vxlan_build_gbp_hdr(struct vxlanhdr *vxh,= u32 vxflags, gbp->policy_id =3D htons(md->gbp & VXLAN_GBP_ID_MASK); } =20 -static int vxlan_build_gpe_hdr(struct vxlanhdr *vxh, u32 vxflags, - __be16 protocol) +static int vxlan_build_gpe_hdr(struct vxlanhdr *vxh, __be16 protocol) { struct vxlanhdr_gpe *gpe =3D (struct vxlanhdr_gpe *)vxh; =20 @@ -2224,9 +2222,9 @@ static int vxlan_build_skb(struct sk_buff *skb, struc= t dst_entry *dst, } =20 if (vxflags & VXLAN_F_GBP) - vxlan_build_gbp_hdr(vxh, vxflags, md); + vxlan_build_gbp_hdr(vxh, md); if (vxflags & VXLAN_F_GPE) { - err =3D vxlan_build_gpe_hdr(vxh, vxflags, skb->protocol); + err =3D vxlan_build_gpe_hdr(vxh, skb->protocol); if (err < 0) return err; inner_protocol =3D skb->protocol; --=20 2.31.1 From nobody Sat Apr 11 10:10:38 2026 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 28649C678DB for ; Mon, 6 Mar 2023 03:04:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229770AbjCFDEa (ORCPT ); Sun, 5 Mar 2023 22:04:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229771AbjCFDEZ (ORCPT ); Sun, 5 Mar 2023 22:04:25 -0500 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2061.outbound.protection.outlook.com [40.107.100.61]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F07AA9034; Sun, 5 Mar 2023 19:03:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JBCz6MeSEAyxvd3YhYwM9y2JIfj7VZK/EY1+IE8eTMG4e6leiyvGM68mxRTin0tedr9449lTPoDKcFByFYBsMxJQV4kLMskVWEnd2wDrTL4APPxUTuGxyeRNXIKf3IWoy1iNdgONeOQvs9FB2ZK09+aqXK/d0xJGSN6HZ6Qyh8W2hFmtNtJEFr6LWgqqc+Z4xL8I9JDy7cznqmfmZBw5LTAG+MzgHohrmPS0zljb8QEvTpbP2nZ3/LUZY7Fq/iizOK6wDcLKlmRsyoByG4Gc3imWE3s4qGXe85c56grvSa84nI03WmMGvACJTR/r0d+oK+EDAS3luiUnFJ9IeW8EvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=x6jhJVBD9VDkGSbFbfkRjF65IBJnh1t3/5wWG0GoYnw=; b=gAu8NpPXYdFO/wn5WwQ8xKDE8BrFX73ndDe61KFi0B40xnVsTkvls0gn6BR/XLnMsPu9olNa7KUY95y5Q3zBJsF7d78tNpoVmw4CnCGmgDms73DujSEtRkqviZIJ333ofxPfWO+UykSvj0ALr7vZ1Nzpx4kX/KkZ3oT5rsrdAiJHUeWZqicSoShmNwf5GB1jBMyv0ClxYNZFE8NShv85L60IlAOeuM01G7dEYPd/4qnDQOz7g9COS9KDz+N+171XPR3HvM8gJzEUmkMzmPif/GS1Q1Q6zzSUEVK+N7PuIAu7OLvNEcPnuVIvPomApCuZcHxNjVwpRM7l2LZkYoLHzA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=x6jhJVBD9VDkGSbFbfkRjF65IBJnh1t3/5wWG0GoYnw=; b=tEOPlrjI5TNYK7cWSXCXSD9kvq0rpbMCV56X/S+TfYhgKoLwQhfnEPl3IjaV0vFtbnbiFWO6b0Wnyhj0+4TTlFcZvtpees7wVw5PiYii3KAL+4TCLVsj9AFTJGXkQ+pvY3O4O0qeb8mW+cRYZfENIIfhx4IdD/WTYtCNR9N5gVn3dv2lbdhxN8b58X6KQRj7m8jAytgGi6zMhmfFFReJ2XPm/a61ihKtcbdPf6GhHPJiIrYfCqU/XRB6Rcy+ug/wVi3JiyjhxnX5LqCvVd7KPI1RQe9JHezCokxE8gJqi7jkia2YVHvNzKz+GA+l0d4G11B/0BQ6P4lPcseEGtIqzw== Received: from DS7PR06CA0013.namprd06.prod.outlook.com (2603:10b6:8:2a::13) by CH0PR12MB8529.namprd12.prod.outlook.com (2603:10b6:610:18d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.27; Mon, 6 Mar 2023 03:03:56 +0000 Received: from DM6NAM11FT110.eop-nam11.prod.protection.outlook.com (2603:10b6:8:2a:cafe::53) by DS7PR06CA0013.outlook.office365.com (2603:10b6:8:2a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.28 via Frontend Transport; Mon, 6 Mar 2023 03:03:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT110.mail.protection.outlook.com (10.13.173.205) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.14 via Frontend Transport; Mon, 6 Mar 2023 03:03:55 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 5 Mar 2023 19:03:46 -0800 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 5 Mar 2023 19:03:42 -0800 From: Gavin Li To: , , , , , , CC: , , , , , , Simon Horman Subject: [PATCH RESEND net-next v4 2/4] vxlan: Expose helper vxlan_build_gbp_hdr Date: Mon, 6 Mar 2023 05:03:00 +0200 Message-ID: <20230306030302.224414-3-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306030302.224414-1-gavinl@nvidia.com> References: <20230306030302.224414-1-gavinl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT110:EE_|CH0PR12MB8529:EE_ X-MS-Office365-Filtering-Correlation-Id: e52ac802-27d7-428c-61db-08db1def6cb0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CulGt8m4lWPhHpB+wCZoCJg4O2RLmk7f/5LtDlZzNKbklX6kLuf5p8P2lqoYMl1cDr0Dcciw+A58rKE+VZb7zWKwD8Om7ImxzqpkiU5RVIx9YpAfPbtCEsZuXIz7AE8wdrOUoaRBp/7J++u87vTBtmYEZNn6iD6zVmYyhXM1FTBlrFqRmcNWqaAXOScCahyV7eXC/yBAHqElgHCpwJnCHCVZaZ1qPppf6laLYMNs0fVaDhRSNdNCRcNIvOQ1cy8ihYcddLPhHFJni7N9vACAJ8injK0x/3UL2mhFB3Cskk5f3xBeQb/hUE2gju10f33pX70RhqdjB9yQaXn6VR2Hy3RCUpgvfS08OhtgjOtGbh00s37vtdw8vWEbcDayiOoOD1gXrFL5AEHMZzyZMEWLprljLP5qr5DVtVzlJK2F3t1XB9NCerZLcCNLvAeNe9jgnLRuuzme8iU7kQpi6xonSJQxHqzPnbOyjXgldDjy0/VG5BO1Y3X3xZYVYHnFVLjeO73f5kKBRY63Rq1K3s0DtPQKopIR9gol27hZRFA/MOXg6iMFResP6+anyIrWIUpEawm6PB7vEi372+cOnpPqNIaB6oPhW8clXAH6BbeGiVQYzRy1ddkoH/EY5SNwbOhrHHAOOQ2W2TaIQqltzxhoaZBPMaCwJ/dr2ihrdEnjwAiLx0Q12buFBAeQrCqsku6FH1cbmO28iwKmoZeJmB9AQw== X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230025)(4636009)(39860400002)(376002)(346002)(396003)(136003)(451199018)(36840700001)(40470700004)(46966006)(7636003)(5660300002)(336012)(2906002)(356005)(1076003)(26005)(6286002)(16526019)(186003)(82740400003)(2616005)(6666004)(86362001)(478600001)(4326008)(8676002)(70206006)(70586007)(40460700003)(36860700001)(426003)(36756003)(40480700001)(55016003)(41300700001)(47076005)(316002)(8936002)(7696005)(83380400001)(82310400005)(54906003)(110136005);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2023 03:03:55.9538 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e52ac802-27d7-428c-61db-08db1def6cb0 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT110.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB8529 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" vxlan_build_gbp_hdr will be used by other modules to build gbp option in vxlan header according to gbp flags. Signed-off-by: Gavin Li Reviewed-by: Gavi Teitz Reviewed-by: Roi Dayan Reviewed-by: Maor Dickman Acked-by: Saeed Mahameed Reviewed-by: Simon Horman --- drivers/net/vxlan/vxlan_core.c | 19 ------------------- include/net/vxlan.h | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c index 86967277ab97..13faab36b3e1 100644 --- a/drivers/net/vxlan/vxlan_core.c +++ b/drivers/net/vxlan/vxlan_core.c @@ -2140,25 +2140,6 @@ static bool route_shortcircuit(struct net_device *de= v, struct sk_buff *skb) return false; } =20 -static void vxlan_build_gbp_hdr(struct vxlanhdr *vxh, struct vxlan_metadat= a *md) -{ - struct vxlanhdr_gbp *gbp; - - if (!md->gbp) - return; - - gbp =3D (struct vxlanhdr_gbp *)vxh; - vxh->vx_flags |=3D VXLAN_HF_GBP; - - if (md->gbp & VXLAN_GBP_DONT_LEARN) - gbp->dont_learn =3D 1; - - if (md->gbp & VXLAN_GBP_POLICY_APPLIED) - gbp->policy_applied =3D 1; - - gbp->policy_id =3D htons(md->gbp & VXLAN_GBP_ID_MASK); -} - static int vxlan_build_gpe_hdr(struct vxlanhdr *vxh, __be16 protocol) { struct vxlanhdr_gpe *gpe =3D (struct vxlanhdr_gpe *)vxh; diff --git a/include/net/vxlan.h b/include/net/vxlan.h index bca5b01af247..b6d419fa7ab1 100644 --- a/include/net/vxlan.h +++ b/include/net/vxlan.h @@ -566,4 +566,23 @@ static inline bool vxlan_fdb_nh_path_select(struct nex= thop *nh, return true; } =20 +static inline void vxlan_build_gbp_hdr(struct vxlanhdr *vxh, const struct = vxlan_metadata *md) +{ + struct vxlanhdr_gbp *gbp; + + if (!md->gbp) + return; + + gbp =3D (struct vxlanhdr_gbp *)vxh; + vxh->vx_flags |=3D VXLAN_HF_GBP; + + if (md->gbp & VXLAN_GBP_DONT_LEARN) + gbp->dont_learn =3D 1; + + if (md->gbp & VXLAN_GBP_POLICY_APPLIED) + gbp->policy_applied =3D 1; + + gbp->policy_id =3D htons(md->gbp & VXLAN_GBP_ID_MASK); +} + #endif --=20 2.31.1 From nobody Sat Apr 11 10:10:38 2026 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 08191C61DA4 for ; Mon, 6 Mar 2023 03:04:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229809AbjCFDEf (ORCPT ); Sun, 5 Mar 2023 22:04:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229716AbjCFDE0 (ORCPT ); Sun, 5 Mar 2023 22:04:26 -0500 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2073.outbound.protection.outlook.com [40.107.102.73]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94D1ACDD2; Sun, 5 Mar 2023 19:04:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gw1Fwhdii/3qXVBb0EVEaVcNgmOlfgbjk3AFacUxy3uynOyywN63kN5ngp+dr7RnZwbXo8rK+/BEUMFIBoRV1p6q7HCNDPnt64p4PzyTZ74LoBOuTH29+Yrmk1mvkUU5662hKn/LrnFUv5esD8co8fO7idjzIsj0TGgVA/DGh2SGu3/xUjAw5107XxWB7Pk7hDWeS3TydKdnqhgYtl5nPb0YjrMaNcPtF/nYnD6d2pK2FtFgzBMVZRmCd6SD6UxmTRaqtrLzbg06oHofm87/AUmMFAi2lY/v5nwUTPbB/9cL+LCRKYR9Uy5KGvmP5ZrnzQOFlvdrZuNF0FvINgUysg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=N179DlG4Bn/W8g7JOeG9FuYbjDYjXPaJecv7CzHK2fc=; b=UTNn8xf7tF8QyMpoMJfwYjCgjmgFB/Bvc5QczGNxTQTFZaygy0hyziHYwcnNNJOUZrjBAoRMCtFO7fkmIc7KDhqz6S2fsitHA61DnWN9EXhbtpjebBEiNAkNbCHMdMSo/D4n9WsOUZ2GQxE+jOHrJlFTSLhrB8CLSCZ6JPNcmoteNbtI3vTDla5mwj9QgvvkPW9L+HEsc4PobAt2u4sZwulAjego3nyb0tBqXN/Aqntvow8UWem6Xy4NFG1XDSRtP1K/2S5z46s86OEnnnXG66S7k4DIJ6BOSAzxmThhRFcPMICL9+VqV00V1GWJzfeJxaRzBuBC62R+Y7j8q2O/Hg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N179DlG4Bn/W8g7JOeG9FuYbjDYjXPaJecv7CzHK2fc=; b=k7FsGJfd7x01mK+kD8FdHT+tSmc+tZ/xgsRg1JbrSO3uyNGGk5IxIVpqOQYJoOMY/Z6c2MyX9qg/HpiX1txyguHBWPo4VGx41ij/TJe1obVM+mrsbDkwZywZUqq53vXc9rtOqljQ0vDxStZY5H+i59AqO1wZDd9slzvd6fU7VMjEND77BX80eb8gDLa+wvzhHvwvltcZ8Yb9Gyz79QERAlkzrCjUJoX1byxlVBd7NVYvXHt0l91RYBJdIJtDU9PeNkgysIqyITeSrgFkCjyfW9dZt118NfApWgydN+YxCked+THjzP5No7yKMYJs2iuorAQzH0pV4e0PKK15VZxOjQ== Received: from DS7PR03CA0022.namprd03.prod.outlook.com (2603:10b6:5:3b8::27) by SN7PR12MB7933.namprd12.prod.outlook.com (2603:10b6:806:342::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.26; Mon, 6 Mar 2023 03:03:59 +0000 Received: from DM6NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b8:cafe::aa) by DS7PR03CA0022.outlook.office365.com (2603:10b6:5:3b8::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.28 via Frontend Transport; Mon, 6 Mar 2023 03:03:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT034.mail.protection.outlook.com (10.13.173.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.15 via Frontend Transport; Mon, 6 Mar 2023 03:03:59 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 5 Mar 2023 19:03:50 -0800 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 5 Mar 2023 19:03:46 -0800 From: Gavin Li To: , , , , , , CC: , , , , , Subject: [PATCH RESEND net-next v4 3/4] net/mlx5e: Add helper for encap_info_equal for tunnels with options Date: Mon, 6 Mar 2023 05:03:01 +0200 Message-ID: <20230306030302.224414-4-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306030302.224414-1-gavinl@nvidia.com> References: <20230306030302.224414-1-gavinl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT034:EE_|SN7PR12MB7933:EE_ X-MS-Office365-Filtering-Correlation-Id: ce4d2113-c303-4cce-10f3-08db1def6ee3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iAflozl0a4g7vwlEChQmzkrFWGxGrz/ONYEaOhO4IPYOre2lx2pozo9sSn22dRR23ztx4Mqjn0fwaQkIt8NnbU+ZWr62/r/axL79ub4O/zkbLVaTXUE5zioK2zfn+aozF+t2/lSo6Z1cu49epbQOoH6Ljot2gNFb9ONIqShmGe/qLwvqVNYEuCLPlTpIe2Wk3peTQU346MsmAceLNpJ8DPBGLiPahckGsgD1lR6GqkH2EwPu+Af/2aUr2CA/ic4C9qdF8ybFVqIXJI1h6ovlZsxWgxcoJg/6VrsRWQNe3GjSqFbsAIkCvEwTG0cAtD9ihdGWie3TYfrzjZr4mY/T5CO0e8A964igypsrei6SLL2LR9pNUqZsp8gIP/f1LR9/iCg3eA99UztVUgmOM2XqHL2SD2M4bFNzfl4sm2LVq4MR4tNleNy32WinUznZA1uRBLB8akqoWjvy2fe7W3z2X0qj3rZuimXAefVg0SU2MQG0ImeCvXIQEf0KTbfDrpE46nBQ1rL6WRNpAnr9qwYXt3NUSDfCMG7bUEbE+6gMUZL3iGe2vKY9bwXbrEEW6s5fDytLxUu8h8D45D4qtNOFuMi8mmgh1ubACCdT2ptpZHZULgLcQBNqwLeQo0jUFLJYtGlfXx+Ignc6qG8Q9250oC8A2/J9ep+oAQ5wVeafw8X0MvbkQAh9RfPAnR5xwmjufu1XX74t/gH26hSpDIe0EA== X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230025)(4636009)(39860400002)(396003)(346002)(376002)(136003)(451199018)(36840700001)(46966006)(40470700004)(26005)(1076003)(107886003)(6666004)(36756003)(36860700001)(426003)(47076005)(40460700003)(82310400005)(82740400003)(356005)(86362001)(55016003)(40480700001)(83380400001)(7636003)(6286002)(16526019)(2616005)(336012)(186003)(70586007)(70206006)(41300700001)(8676002)(4326008)(2906002)(8936002)(5660300002)(478600001)(7696005)(54906003)(110136005)(316002);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2023 03:03:59.6258 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ce4d2113-c303-4cce-10f3-08db1def6ee3 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7933 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" For tunnels with options, eg, geneve and vxlan with gbp, they share the same way to compare the headers and options. Extract the code as a common function for them. Signed-off-by: Gavin Li Reviewed-by: Gavi Teitz Reviewed-by: Roi Dayan Reviewed-by: Maor Dickman Acked-by: Saeed Mahameed --- .../ethernet/mellanox/mlx5/core/en/tc_tun.h | 3 ++ .../mellanox/mlx5/core/en/tc_tun_encap.c | 32 +++++++++++++++++++ .../mellanox/mlx5/core/en/tc_tun_geneve.c | 24 +------------- 3 files changed, 36 insertions(+), 23 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h b/drivers/= net/ethernet/mellanox/mlx5/core/en/tc_tun.h index b38f693bbb52..92065568bb19 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h @@ -115,6 +115,9 @@ int mlx5e_tc_tun_parse_udp_ports(struct mlx5e_priv *pri= v, bool mlx5e_tc_tun_encap_info_equal_generic(struct mlx5e_encap_key *a, struct mlx5e_encap_key *b); =20 +bool mlx5e_tc_tun_encap_info_equal_options(struct mlx5e_encap_key *a, + struct mlx5e_encap_key *b, + __be16 tun_flags); #endif /* CONFIG_MLX5_ESWITCH */ =20 #endif //__MLX5_EN_TC_TUNNEL_H__ diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c b/dr= ivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c index 780224fd67a1..a108e73c9f66 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c @@ -3,6 +3,7 @@ =20 #include #include +#include #include "tc_tun_encap.h" #include "en_tc.h" #include "tc_tun.h" @@ -571,6 +572,37 @@ bool mlx5e_tc_tun_encap_info_equal_generic(struct mlx5= e_encap_key *a, a->tc_tunnel->tunnel_type =3D=3D b->tc_tunnel->tunnel_type; } =20 +bool mlx5e_tc_tun_encap_info_equal_options(struct mlx5e_encap_key *a, + struct mlx5e_encap_key *b, + __be16 tun_flags) +{ + struct ip_tunnel_info *a_info; + struct ip_tunnel_info *b_info; + bool a_has_opts, b_has_opts; + + if (!mlx5e_tc_tun_encap_info_equal_generic(a, b)) + return false; + + a_has_opts =3D !!(a->ip_tun_key->tun_flags & tun_flags); + b_has_opts =3D !!(b->ip_tun_key->tun_flags & tun_flags); + + /* keys are equal when both don't have any options attached */ + if (!a_has_opts && !b_has_opts) + return true; + + if (a_has_opts !=3D b_has_opts) + return false; + + /* options stored in memory next to ip_tunnel_info struct */ + a_info =3D container_of(a->ip_tun_key, struct ip_tunnel_info, key); + b_info =3D container_of(b->ip_tun_key, struct ip_tunnel_info, key); + + return a_info->options_len =3D=3D b_info->options_len && + !memcmp(ip_tunnel_info_opts(a_info), + ip_tunnel_info_opts(b_info), + a_info->options_len); +} + static int cmp_decap_info(struct mlx5e_decap_key *a, struct mlx5e_decap_key *b) { diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c b/d= rivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c index 054d80c4e65c..2bcd10b6d653 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c @@ -337,29 +337,7 @@ static int mlx5e_tc_tun_parse_geneve(struct mlx5e_priv= *priv, static bool mlx5e_tc_tun_encap_info_equal_geneve(struct mlx5e_encap_key *a, struct mlx5e_encap_key *b) { - struct ip_tunnel_info *a_info; - struct ip_tunnel_info *b_info; - bool a_has_opts, b_has_opts; - - if (!mlx5e_tc_tun_encap_info_equal_generic(a, b)) - return false; - - a_has_opts =3D !!(a->ip_tun_key->tun_flags & TUNNEL_GENEVE_OPT); - b_has_opts =3D !!(b->ip_tun_key->tun_flags & TUNNEL_GENEVE_OPT); - - /* keys are equal when both don't have any options attached */ - if (!a_has_opts && !b_has_opts) - return true; - - if (a_has_opts !=3D b_has_opts) - return false; - - /* geneve options stored in memory next to ip_tunnel_info struct */ - a_info =3D container_of(a->ip_tun_key, struct ip_tunnel_info, key); - b_info =3D container_of(b->ip_tun_key, struct ip_tunnel_info, key); - - return a_info->options_len =3D=3D b_info->options_len && - memcmp(a_info + 1, b_info + 1, a_info->options_len) =3D=3D 0; + return mlx5e_tc_tun_encap_info_equal_options(a, b, TUNNEL_GENEVE_OPT); } =20 struct mlx5e_tc_tunnel geneve_tunnel =3D { --=20 2.31.1 From nobody Sat Apr 11 10:10:38 2026 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 42C2DC6FA9E for ; Mon, 6 Mar 2023 03:04:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229758AbjCFDE5 (ORCPT ); Sun, 5 Mar 2023 22:04:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229766AbjCFDEa (ORCPT ); Sun, 5 Mar 2023 22:04:30 -0500 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2089.outbound.protection.outlook.com [40.107.100.89]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 422B6D50E; Sun, 5 Mar 2023 19:04:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ElPTe6jpzKcXnfv9dzPlIWgUE8nzRr8jL7VT0P+7EN+ZNu80aYxzGTN+HrxNHM5+KniVqOVHMcs8ftAZpu0RT23Ji7YX7911bgIEwgIaG76XtmTcl7sF6kxzqIyUP+wWHwpt0Mkpk6D4i9PLRuXKE85SzAJNThV9yBPzeOzqIUIhAKJ4sPMhYrxwgTI7NEZ+2d8aK/VPO9ZJhSaAvdWAZcF90fXW12GJv2nd9/MldBxbetrwCS8JZI9sAVIlYt1lojO5oQDgENMi2xRZOq1MD1MwNVevN7NuVmDxvI3pkuJJPBEeRdz/4XrFMUp1J7l4kMLtz6cVmGFphx1Ve4RU0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YCWmb8/p2CBxoU+BDmHMpIFm63uWTYumfqZiQDFDVNs=; b=B33NFn3CA+P4Acx81TsqTey6cB/5I0rMLG/owsa8t1mQ2Y4NK7FXY2tdGw3B8qrZx9CrybkDmPq3KzL34CnLvq9akpQYBm7kVfeU91yoas9zYR1SZgkPGGzmW08kpzKzzluNwSIQViey7CiZxv5tOIWMQA5nwIrQmetN5qGXPS0a059e7UqQPbzvm6X0dmXJJ68a84BAi/E8V+nOYzd6U4Xg+U13JDzb3kgRuftbK8d1v/cKFtvGmIKq+dUJI6BhMJLT75DsQQe3kl9muWr/A503llNtRvAnx8n6xsvHCjAaRZewADiM3h0ykTmJ7iHLWbrqJetujTAJDOtqHpuLIQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=davemloft.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YCWmb8/p2CBxoU+BDmHMpIFm63uWTYumfqZiQDFDVNs=; b=k6E71tPbnyF3tDKeTiHNNZrKaz6fSD2/ObaKiHmAkKM+6wBoWgai2vmAwshOmL/61Vosdm1ohcAHO2ZJC8DRcqSHOJcGdXDFQBgIA0jKpBkTmqkZDW1z1QP0JD337KDGyw4P3WSl21VI1R276+evy5Ya6YjUJQ+XwlkgUqG9BOBzWq/kpE4WfFNmlJis8VQ+wfdJ2UnXtLj2C4tzF1MAEb9yHkl+7/kBeWbgLIDpUTU5KhkZKA+Vn/VmpVxRX/H+5J7Io5EFrJ7TUPropbMlJYoSJO1TYMxdeRCN63K64maEfKMq5EHWU/7zBLfh5vUEott9yJzLHS67Ki54UdlRcw== Received: from BN8PR03CA0024.namprd03.prod.outlook.com (2603:10b6:408:94::37) by MN6PR12MB8489.namprd12.prod.outlook.com (2603:10b6:208:474::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.27; Mon, 6 Mar 2023 03:04:05 +0000 Received: from BN8NAM11FT092.eop-nam11.prod.protection.outlook.com (2603:10b6:408:94:cafe::db) by BN8PR03CA0024.outlook.office365.com (2603:10b6:408:94::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.28 via Frontend Transport; Mon, 6 Mar 2023 03:04:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT092.mail.protection.outlook.com (10.13.176.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.14 via Frontend Transport; Mon, 6 Mar 2023 03:04:04 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 5 Mar 2023 19:03:54 -0800 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 5 Mar 2023 19:03:50 -0800 From: Gavin Li To: , , , , , , CC: , , , , , , Simon Horman Subject: [PATCH RESEND net-next v4 4/4] net/mlx5e: TC, Add support for VxLAN GBP encap/decap flows offload Date: Mon, 6 Mar 2023 05:03:02 +0200 Message-ID: <20230306030302.224414-5-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306030302.224414-1-gavinl@nvidia.com> References: <20230306030302.224414-1-gavinl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT092:EE_|MN6PR12MB8489:EE_ X-MS-Office365-Filtering-Correlation-Id: 56ba1979-6387-48c3-6828-08db1def71bc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lLRiFQ/q0coD6CngJrfwFXCsPimWLTDNcIzyC5mQwp4BnIsa6t60K/PjimXpK+PTyZfBFRZh9OpwEwiek5FiFgCybvmz+zket1ZImJm98O6hKQ8zD8H3pcSEeI7PbaGVD0FqSENYB8z67rotpjLinMzhB4RiK35lJ3x0d4TaAFZeZp0gIjhReJLQzaRAKMk3vN44erAPmuOeniEfF7u0vk9jsr6BrUG0so4Iql8xcuY1fB//LX92X1IFkiHW90/qpGK7WQFOi9HUPx0xBtPK30wqvpjVI1S7/h4Chb1CenZ0FgrPSASM8pU5tNjvhE8DTe2GAA/9+j4TJQckH67MCIKqQo12vA8/E5eqKzKSXG0hmjauw712kXBLv0KeY06JjFA8ed0sx6oxybHVWmqrpshpautgrB/s+t/Bgnvyd/GqAejT0e5bkm0qWzIivvJ7z5YgLPsFZ1RcbvEUDnKyVoP1vki0jt1O6BNWr62dI3FJk8Gl/GfGAOuhaOJMKW11tE1gyIdflaOZHALbhb9bDfxue8AG4UChn5YIH/RThlpWKbpr3/wbeQtq+59NpJOFdCZnIWtvHw6z9aadjxaubqlMEW4qKZRmOfnczuf6n6s90vJHia3gCQY+leBE0dk1C2uJwN8ybVRPeeGiEgMHn0lKcUUJzg8w6bdPhu9Rjm7xrTUSIV4XwjZTxXvCI0CvZmotuRRQiPIdVkqs34qyvA== X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230025)(4636009)(396003)(346002)(39860400002)(376002)(136003)(451199018)(46966006)(36840700001)(40470700004)(16526019)(40460700003)(186003)(6286002)(6666004)(7636003)(356005)(82740400003)(8936002)(70206006)(41300700001)(4326008)(36860700001)(8676002)(2906002)(70586007)(5660300002)(47076005)(426003)(7696005)(478600001)(2616005)(1076003)(26005)(336012)(316002)(110136005)(54906003)(36756003)(40480700001)(55016003)(86362001)(82310400005)(83380400001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2023 03:04:04.3588 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 56ba1979-6387-48c3-6828-08db1def71bc X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT092.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR12MB8489 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add HW offloading support for TC flows with VxLAN GBP encap/decap. Example of encap rule: tc filter add dev eth0 protocol ip ingress flower \ action tunnel_key set id 42 vxlan_opts 512 \ action mirred egress redirect dev vxlan1 Example of decap rule: tc filter add dev vxlan1 protocol ip ingress flower \ enc_key_id 42 enc_dst_port 4789 vxlan_opts 1024 \ action tunnel_key unset action mirred egress redirect dev eth0 Signed-off-by: Gavin Li Reviewed-by: Gavi Teitz Reviewed-by: Roi Dayan Reviewed-by: Maor Dickman Acked-by: Saeed Mahameed Reviewed-by: Simon Horman --- .../mellanox/mlx5/core/en/tc_tun_vxlan.c | 76 ++++++++++++++++++- include/linux/mlx5/device.h | 6 ++ include/linux/mlx5/mlx5_ifc.h | 13 +++- 3 files changed, 91 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c b/dr= ivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c index 1f62c702b625..8ee5d9e67e0a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB /* Copyright (c) 2018 Mellanox Technologies. */ =20 +#include #include #include "lib/vxlan.h" #include "en/tc_tun.h" @@ -86,9 +87,11 @@ static int mlx5e_gen_ip_tunnel_header_vxlan(char buf[], const struct ip_tunnel_key *tun_key =3D &e->tun_info->key; __be32 tun_id =3D tunnel_id_to_key32(tun_key->tun_id); struct udphdr *udp =3D (struct udphdr *)(buf); + struct vxlan_metadata *md; struct vxlanhdr *vxh; =20 - if (tun_key->tun_flags & TUNNEL_VXLAN_OPT) + if ((tun_key->tun_flags & TUNNEL_VXLAN_OPT) && + e->tun_info->options_len !=3D sizeof(*md)) return -EOPNOTSUPP; vxh =3D (struct vxlanhdr *)((char *)udp + sizeof(struct udphdr)); *ip_proto =3D IPPROTO_UDP; @@ -96,6 +99,61 @@ static int mlx5e_gen_ip_tunnel_header_vxlan(char buf[], udp->dest =3D tun_key->tp_dst; vxh->vx_flags =3D VXLAN_HF_VNI; vxh->vx_vni =3D vxlan_vni_field(tun_id); + if (tun_key->tun_flags & TUNNEL_VXLAN_OPT) { + md =3D ip_tunnel_info_opts((struct ip_tunnel_info *)e->tun_info); + vxlan_build_gbp_hdr(vxh, md); + } + + return 0; +} + +static int mlx5e_tc_tun_parse_vxlan_gbp_option(struct mlx5e_priv *priv, + struct mlx5_flow_spec *spec, + struct flow_cls_offload *f) +{ + struct flow_rule *rule =3D flow_cls_offload_flow_rule(f); + struct netlink_ext_ack *extack =3D f->common.extack; + struct flow_match_enc_opts enc_opts; + void *misc5_c, *misc5_v; + u32 *gbp, *gbp_mask; + + flow_rule_match_enc_opts(rule, &enc_opts); + + if (memchr_inv(&enc_opts.mask->data, 0, sizeof(enc_opts.mask->data)) && + !MLX5_CAP_ESW_FT_FIELD_SUPPORT_2(priv->mdev, tunnel_header_0_1)) { + NL_SET_ERR_MSG_MOD(extack, "Matching on VxLAN GBP is not supported"); + netdev_warn(priv->netdev, "Matching on VxLAN GBP is not supported\n"); + return -EOPNOTSUPP; + } + + if (enc_opts.key->dst_opt_type !=3D TUNNEL_VXLAN_OPT) { + NL_SET_ERR_MSG_MOD(extack, "Wrong VxLAN option type: not GBP"); + netdev_warn(priv->netdev, "Wrong VxLAN option type: not GBP\n"); + return -EOPNOTSUPP; + } + + if (enc_opts.key->len !=3D sizeof(*gbp) || + enc_opts.mask->len !=3D sizeof(*gbp_mask)) { + NL_SET_ERR_MSG_MOD(extack, "VxLAN GBP option/mask len is not 32 bits"); + netdev_warn(priv->netdev, "VxLAN GBP option/mask len is not 32 bits\n"); + return -EINVAL; + } + + gbp =3D (u32 *)&enc_opts.key->data[0]; + gbp_mask =3D (u32 *)&enc_opts.mask->data[0]; + + if (*gbp_mask & ~VXLAN_GBP_MASK) { + NL_SET_ERR_MSG_FMT_MOD(extack, "Wrong VxLAN GBP mask(0x%08X)\n", *gbp_ma= sk); + netdev_warn(priv->netdev, "Wrong VxLAN GBP mask(0x%08X)\n", *gbp_mask); + return -EINVAL; + } + + misc5_c =3D MLX5_ADDR_OF(fte_match_param, spec->match_criteria, misc_para= meters_5); + misc5_v =3D MLX5_ADDR_OF(fte_match_param, spec->match_value, misc_paramet= ers_5); + MLX5_SET(fte_match_set_misc5, misc5_c, tunnel_header_0, *gbp_mask); + MLX5_SET(fte_match_set_misc5, misc5_v, tunnel_header_0, *gbp); + + spec->match_criteria_enable |=3D MLX5_MATCH_MISC_PARAMETERS_5; =20 return 0; } @@ -122,6 +180,14 @@ static int mlx5e_tc_tun_parse_vxlan(struct mlx5e_priv = *priv, if (!enc_keyid.mask->keyid) return 0; =20 + if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_OPTS)) { + int err; + + err =3D mlx5e_tc_tun_parse_vxlan_gbp_option(priv, spec, f); + if (err) + return err; + } + /* match on VNI is required */ =20 if (!MLX5_CAP_ESW_FLOWTABLE_FDB(priv->mdev, @@ -143,6 +209,12 @@ static int mlx5e_tc_tun_parse_vxlan(struct mlx5e_priv = *priv, return 0; } =20 +static bool mlx5e_tc_tun_encap_info_equal_vxlan(struct mlx5e_encap_key *a, + struct mlx5e_encap_key *b) +{ + return mlx5e_tc_tun_encap_info_equal_options(a, b, TUNNEL_VXLAN_OPT); +} + static int mlx5e_tc_tun_get_remote_ifindex(struct net_device *mirred_dev) { const struct vxlan_dev *vxlan =3D netdev_priv(mirred_dev); @@ -160,6 +232,6 @@ struct mlx5e_tc_tunnel vxlan_tunnel =3D { .generate_ip_tun_hdr =3D mlx5e_gen_ip_tunnel_header_vxlan, .parse_udp_ports =3D mlx5e_tc_tun_parse_udp_ports_vxlan, .parse_tunnel =3D mlx5e_tc_tun_parse_vxlan, - .encap_info_equal =3D mlx5e_tc_tun_encap_info_equal_generic, + .encap_info_equal =3D mlx5e_tc_tun_encap_info_equal_vxlan, .get_remote_ifindex =3D mlx5e_tc_tun_get_remote_ifindex, }; diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h index 71b06ebad402..af4dd536a52c 100644 --- a/include/linux/mlx5/device.h +++ b/include/linux/mlx5/device.h @@ -1357,6 +1357,12 @@ enum mlx5_qcam_feature_groups { #define MLX5_CAP_ESW_INGRESS_ACL_MAX(mdev, cap) \ MLX5_CAP_ESW_FLOWTABLE_MAX(mdev, flow_table_properties_esw_acl_ingress.ca= p) =20 +#define MLX5_CAP_ESW_FT_FIELD_SUPPORT_2(mdev, cap) \ + MLX5_CAP_ESW_FLOWTABLE(mdev, ft_field_support_2_esw_fdb.cap) + +#define MLX5_CAP_ESW_FT_FIELD_SUPPORT_2_MAX(mdev, cap) \ + MLX5_CAP_ESW_FLOWTABLE_MAX(mdev, ft_field_support_2_esw_fdb.cap) + #define MLX5_CAP_ESW(mdev, cap) \ MLX5_GET(e_switch_cap, \ mdev->caps.hca[MLX5_CAP_ESWITCH]->cur, cap) diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h index 5ad5126615a1..163cc0638c37 100644 --- a/include/linux/mlx5/mlx5_ifc.h +++ b/include/linux/mlx5/mlx5_ifc.h @@ -404,10 +404,13 @@ struct mlx5_ifc_flow_table_fields_supported_bits { u8 metadata_reg_c_0[0x1]; }; =20 +/* Table 2170 - Flow Table Fields Supported 2 Format */ struct mlx5_ifc_flow_table_fields_supported_2_bits { u8 reserved_at_0[0xe]; u8 bth_opcode[0x1]; - u8 reserved_at_f[0x11]; + u8 reserved_at_f[0x1]; + u8 tunnel_header_0_1[0x1]; + u8 reserved_at_11[0xf]; =20 u8 reserved_at_20[0x60]; }; @@ -895,7 +898,13 @@ struct mlx5_ifc_flow_table_eswitch_cap_bits { =20 struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_esw_acl= _egress; =20 - u8 reserved_at_800[0x1000]; + u8 reserved_at_800[0xC00]; + + struct mlx5_ifc_flow_table_fields_supported_2_bits ft_field_support_2_esw= _fdb; + + struct mlx5_ifc_flow_table_fields_supported_2_bits ft_field_bitmask_suppo= rt_2_esw_fdb; + + u8 reserved_at_1500[0x300]; =20 u8 sw_steering_fdb_action_drop_icm_address_rx[0x40]; =20 --=20 2.31.1