From nobody Tue Sep 9 12:36:04 2025 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 8634DC61DA3 for ; Wed, 22 Feb 2023 02:58:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230510AbjBVC56 (ORCPT ); Tue, 21 Feb 2023 21:57:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231935AbjBVC5q (ORCPT ); Tue, 21 Feb 2023 21:57:46 -0500 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10hn2230.outbound.protection.outlook.com [52.100.155.230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80BD930F1; Tue, 21 Feb 2023 18:57:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fi4yF9nnLy566kzz7PyByNosJhcSx8z0qpY/Jk/+/5RkAmtcqpMevROYvxnGM4iw/p+WkkeYwpY1331xP12lF9tirqh4qVR6Rgqlv6MGZ7Ic4xWnWQYI3mLlSAE6zr3rQ9MZaQT4tur9nfeHwuJGZKMT1mZ27FzjHdJQ/n806U5aJKrAZMBLUbjYnFAsvkAdtHX2/fogN59cFy3FAqf7UG2JQajINpYzowox7wKYLR6dCJL5EbMOm4SjX9qVY/wCQtfmHahdwwFTYWPONc/8Hb8DTqNKg1PqRd8ztWZgVsVyZeU7eWur2xBZQzCrzJjcmHrYZs0k+/62PGH/PPrOYQ== 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=LI81qJdOim5xrCRJ8oa6gFGyO1ef0JaqvcY0aMj63g8gxRshVlEAmHa4abKkIP8L9ncU0PsikT/lVaT9BfTgMfZC7+hGMH3mcgDaG5/5ssXkRpbBLCaIki7iGsb6duWHCM7FfyqNk2SCqnZlGCkqHRkQ+zMKc4SQaXYL5zP9zL3eXA1VOot/5H1ViGvJK90Omek22TPMvKQQ4qEMppMnJVOKFu5aPm25rJGdl0JPgPc++S75FHtvRADe4Mz5qsPxjnuzsXbl0EouWjvuHWHRyu3oHwc7nTFNTlVqMH2NPZGN/nX1BoRXjIJj8XZbsf8AD7+8HLdAy66T/xCkDdrkqQ== 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=Ujul2KGrmfcoaS9XrNmTunJFhP8wR2gVoIlq74Lykb0=; b=fXphH2MJ1mdvUbpjZVwd9kn95t89rxvpU3xOOeG0Bv66/YvpGrYywwUHQkfsxd4GpR2+GsTPddjdm2iizkklIJ/uGoyA1msZV6nnswNXDX2JHaDcCCUdPcx3ybKLWyGEEYsljeLHBtglFS2cihXymwCVSLCUe6XNVSX2/yOZt6MDIxILVnEwXiJVQ4cAIZGg7/vdiKx4oWnqfocGpVvAN/MaJIkuSpiquinTgdNSgd5HP+UAx8qkZmO4EsZICvWcnFB9w4CZr1PG0NQ6mQAWLWPwGVl4keioZXaA0NB/LacP7YEFSn57+CAOS396BOaRVVMroeVEe+Gt16r2aT29xQ== Received: from BN9PR03CA0623.namprd03.prod.outlook.com (2603:10b6:408:106::28) by CH0PR12MB5140.namprd12.prod.outlook.com (2603:10b6:610:bf::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21; Wed, 22 Feb 2023 02:57:43 +0000 Received: from BN8NAM11FT078.eop-nam11.prod.protection.outlook.com (2603:10b6:408:106:cafe::2) by BN9PR03CA0623.outlook.office365.com (2603:10b6:408:106::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21 via Frontend Transport; Wed, 22 Feb 2023 02:57:43 +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 BN8NAM11FT078.mail.protection.outlook.com (10.13.176.251) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.17 via Frontend Transport; Wed, 22 Feb 2023 02:57:43 +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.36; Tue, 21 Feb 2023 18:57:25 -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.36; Tue, 21 Feb 2023 18:57:21 -0800 From: Gavin Li To: , , , , , , CC: , , , , , , Simon Horman Subject: [PATCH net-next v4 1/4] vxlan: Remove unused argument from vxlan_build_gbp_hdr( ) and vxlan_build_gpe_hdr( ) Date: Wed, 22 Feb 2023 04:56:50 +0200 Message-ID: <20230222025653.20425-2-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230222025653.20425-1-gavinl@nvidia.com> References: <20230222025653.20425-1-gavinl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT078:EE_|CH0PR12MB5140:EE_ X-MS-Office365-Filtering-Correlation-Id: c07ded3c-bb1a-41a2-e919-08db14809183 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MTqTX6S19wBnScVnn+QAaFP38zwU5lnByujZx7D7d6iSheKzVBKUUB5GZzMQCW+ZWZTpLhXi5/JES1s509zcAVIrhtnbZYg76t+p2E8glgL66x/Odckx/IxxhuttSdTlddrBrMMFkHggw6zMfwvHVgKTgN0uSbWIKkpq5OmlJMTTB0Bw0LOBoSBWNpWvKSGX+ev4jakbJoAYn3zP9sVY+XTubjHIMs5/CtCLIfBa37gicO8HahTQXaLAi/KRg2pthGyxY4Avx4tCAOPKvIo2aI0Imn9IYhmTchXE1G+KUsYdOYTjuRgsH/RrY8lWy078/HJp9BSeAtbvW9cKY04UZiUMjqxDJYmo/KAG17gzBkpTJINdKFO07e6rrVciSfuj31inycrdOabZkxXblpWClZHVdxXMOeeShCoak4+eJRiAOdkytcqvo8xNaFf0GDniZ96Qi4igAURxTfPDHG3eOJaE0w+IK607wHUW+9jT9OtCzVYLdweaj/GaznCpqW8uWogSrBx62PT8nvnErCfHyDivSeO16AE5NU+d9Qjc941KJOL2FGa/TOm3rCQ49YvGJtUCo+Z1QvnJ9lQp6/bJtrMCEvC3jTOF0LqExhucEE8pCSRdJDWNDVvK6YVw4VYRYwliGMtZu0QxmaFutgx8IW+xEbAJl16d55SixEgkqQamkOkW6TdpvjJavqT2uKJOSCS0LyeNLPCIYVpNmEky7Zn6+drjicFvtkdYou5y995TeP5PtLo/9GJl8yo58nKT617+x+wvaGffN4Rv8RxANQ== 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)(346002)(396003)(376002)(39860400002)(136003)(5400799012)(451199018)(40470700004)(46966006)(36840700001)(7636003)(36860700001)(2906002)(82740400003)(8936002)(34070700002)(5660300002)(26005)(54906003)(6286002)(16526019)(82310400005)(83380400001)(41300700001)(47076005)(186003)(2616005)(8676002)(36756003)(356005)(426003)(4326008)(70206006)(70586007)(86362001)(6666004)(478600001)(7696005)(40460700003)(316002)(1076003)(40480700001)(336012)(55016003)(110136005)(12100799015);DIR:OUT;SFP:1501; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2023 02:57:43.0736 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c07ded3c-bb1a-41a2-e919-08db14809183 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: BN8NAM11FT078.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5140 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 Tue Sep 9 12:36:04 2025 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 476A1C61DA3 for ; Wed, 22 Feb 2023 02:58:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231959AbjBVC6C (ORCPT ); Tue, 21 Feb 2023 21:58:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233626AbjBVC5v (ORCPT ); Tue, 21 Feb 2023 21:57:51 -0500 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10hn2239.outbound.protection.outlook.com [52.100.157.239]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D22E61BC9; Tue, 21 Feb 2023 18:57:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JWxhVBfM/Ft9Z8CWvDKgQiVdvbJsFcjGZSpwNtapwWF4lqli8dLX/+U4LUYQ2okMNDKTEwiXZgiKfXfLBlS9eqHDVMGZTCzdl//Yh2K9cQvHpmNr7c29lVk3T9rxMdNerxjggfiCg08EPCSUbplF+jXN8ljc447bxHNbtJiZCTjD+SXVJ/VHN3V2dUZuCGZvHglFIbUXoIeDqTNvD49Y/jJND9ZhvoaCNoNUBwbUyVlsNtj34bPoWtekBuIeSUwloAVZTtDBgnO/izLBcwwF1faWsob1KzHbpDwbJ+MDEKswCOSTM1sb9WvqTWyIJJq/knAeXUuIYRwNuSUop/2oaw== 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=KF4r95r15cVi1ak0moR/aaqEdMKbhQGpw3XeaDJ5QmlAIpLGfcaR5NyMoo0vYDuYwp1SOlYrWn9ceF2j42ZPQhkTl1t82o2gvUtdb7SEtAe/iyCU6TtinmCCrDpHosRNG5DLPJVSnuU4KqF9hnboJSYXTv/PFJYCmmic/euhOesJg/CARno54Qr+SugOxfcMyojKJ4lD7/LJGXpQqp09q2oT12a1+qS+1ogmJhAxPxldFNzbIDrdSBbHXxDNjvXvU+ohKe5Ljf3zB7Azrqd7q++evchad+QsIsg8tgoKXODAUqFdRhSMOOBkvRC0JD8JZcutoZ/1YGFgRvcf4PWsww== 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=x6jhJVBD9VDkGSbFbfkRjF65IBJnh1t3/5wWG0GoYnw=; b=csWwnSZOYnnZcmbw836V+likE+WNIRawbOTHxtjYzd853OIdJZsrbFgtropbDL31Y1pAjeFzecuPiJhrQ2jsujQOTs/y0B+P3UhDDJiSehzpzNoRO2IIefetJiSJ6/+Kwae4/sR2ViZSPvrWEJNrb9KBbV4hiHCNb8/dL2hnSNCGV094pknBgaPw/W40pI1jRSvvYyIfyPRypV/8hNWpLnUMTDEJa8FK4a3/+8fq4qo4bkOS2uLkA+p91qqpxdaDLCaeTe/R2Iig290FMWZSH0xSQAryb9zLBwp8OFAp1f16tn4RRR9XyIPskSXhWaagmJhl/BHtTw5g6vefHq2Rhg== Received: from BN9PR03CA0601.namprd03.prod.outlook.com (2603:10b6:408:106::6) by DS7PR12MB6007.namprd12.prod.outlook.com (2603:10b6:8:7e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21; Wed, 22 Feb 2023 02:57:46 +0000 Received: from BN8NAM11FT078.eop-nam11.prod.protection.outlook.com (2603:10b6:408:106:cafe::a3) by BN9PR03CA0601.outlook.office365.com (2603:10b6:408:106::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21 via Frontend Transport; Wed, 22 Feb 2023 02:57:46 +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 BN8NAM11FT078.mail.protection.outlook.com (10.13.176.251) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.17 via Frontend Transport; Wed, 22 Feb 2023 02:57:46 +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.36; Tue, 21 Feb 2023 18:57:30 -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.36; Tue, 21 Feb 2023 18:57:25 -0800 From: Gavin Li To: , , , , , , CC: , , , , , , Simon Horman Subject: [PATCH net-next v4 2/4] vxlan: Expose helper vxlan_build_gbp_hdr Date: Wed, 22 Feb 2023 04:56:51 +0200 Message-ID: <20230222025653.20425-3-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230222025653.20425-1-gavinl@nvidia.com> References: <20230222025653.20425-1-gavinl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT078:EE_|DS7PR12MB6007:EE_ X-MS-Office365-Filtering-Correlation-Id: 30c0e10d-a7bc-4c0b-968e-08db14809378 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hOgfoKVMC+iQINOFvDP3gMn/VMRK6F18mjsVhBKkpx/B+S9P05TDQ7AqG+IJ8cuvqHsmcELErgIpqwbPqIn4PTgb2j+FT3SRSxH2uzY8LRxF5Yxx/86lQCTHZbCJApX+uBUa8S517nmgrQ+bUKnkyl789U0Ib1HC4qnJoxsDb3OdRIqubFkcPDfH6aK0HLRjP6G/BeIk9T34jxukKDcP2Ff0ovcwvNqDCZi/EZP1jk9KZf7aaguDl9S2+7esnnQlnqnzBYoNV2WS2FRWHWuCqsts3C9kAUBDAo03HDPFjHzhtMW4Tc4O6VOo3R+61CyUqnzWOQe/Jx6PQdlet+iPxFnywt28QmHisVH/2diZc3ZtAyc/VNx9REWN/zZ0KJyNL1FgbrmMVejK3fI+bO9wYRIvbUK0NkQGQ1uywDNprgXFwelcX/Q6pKN11Dw6yEDXNJVx4P79ceoWSG/9pY/DGuenqEGNfhk1X5EaYl9c1pZ7W7KkcVvwbQibds85Yzbik9w3N8yLI+xoAnxRRW7Xg+WZ0XESjU1bhrFK1usxQw5L7gmerXCrHYZtUs1E+NRVtjAcyVfreDjLDmkagPcdq5IyQx/L6VVok0kIJQLh96qaR51+sj1XMevjYd2pV796vfuS1tVesrDeCxfEuVA5BbIldhhRDtvhTY+PCJx6IT65UNnj//TX9szkXNcmcf44Q7wx7dtpPjHkuHU4IOQkD9seD7P16C3ZvNswNbmPSJDR2EmAijZrQuwSbb/HTKuL9ZqIztHtaowM9Yv11/olfw== 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)(136003)(396003)(39860400002)(376002)(346002)(451199018)(5400799012)(40470700004)(46966006)(36840700001)(70206006)(70586007)(8676002)(4326008)(478600001)(5660300002)(82740400003)(86362001)(6666004)(316002)(26005)(7696005)(41300700001)(8936002)(186003)(1076003)(110136005)(54906003)(6286002)(40460700003)(2616005)(2906002)(16526019)(36756003)(426003)(336012)(47076005)(55016003)(356005)(7636003)(40480700001)(83380400001)(34070700002)(82310400005)(36860700001)(12100799015);DIR:OUT;SFP:1501; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2023 02:57:46.3549 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 30c0e10d-a7bc-4c0b-968e-08db14809378 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: BN8NAM11FT078.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6007 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 Tue Sep 9 12:36:04 2025 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 5D301C64EC7 for ; Wed, 22 Feb 2023 02:58:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233641AbjBVC6I (ORCPT ); Tue, 21 Feb 2023 21:58:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231414AbjBVC5z (ORCPT ); Tue, 21 Feb 2023 21:57:55 -0500 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10hn2212.outbound.protection.outlook.com [52.100.157.212]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E44E61A6; Tue, 21 Feb 2023 18:57:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k3o6SYg4SFGR2zpbnoVq2niV5jq7Uhc/fkUvUvtWmmJ/P1xzYp2q06DuVF3Q5POpylbLeDPEVGSQCs6J94eHLaLZUemAfFrsR5YjXyA0Q4fW3mvVxFTohBFpKfXhXl0gSEjBBESpMQQpdr718QChzgfVbhV7o/OrzfnNkUXOmmJny3CkIOju8/bKSww4mMNuteZg/xoYKjB2f8+JXI3RIhBRkNgpzIwfDN+JMupdmPs2g6x1eZ5nKsFhUm4q10D86t87xIenzvMchjiSfGA0Q9VBqnvbloVuNa0z2Wqz2OxQplvOQBr5apFZdLAZ/ynsyhl9zwQju7hRFPaZAPY8KA== 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=Tu2ICu0s2wYjLnOfl6UtqdKNQ1fAFRawAQ+8tUbcWyU=; b=auxsZ+D6QSi/GRg2sab2u692avvI5munZCo1ZrzNmgddYjurmCuUBO+6XVnosKiJWRIpqN461LcmFYb57EUDjknvsZMjkvf+8gmbP3uL1BVSLBhMO9zEqMR6dj1pT0VafxXS0xYeErqeC6flUnM9bt3vc3Ihr80YgivBTEkmKBJP8Tc/TeCG0AnmlbNeJTmDlxCKuK9/4rjYTTe+lg3JyQymnbmAepwN4juVa++JepKHKV/D6kh3jciRvQ7jzCi0eWaKxLzKH2vPtGfUgGoeJzPV4aXNGwsIv5Gf8fG1u/w5OHBV6fAWkoZQn7NyjUwrHt+eHGUx8viyXwyt+KkU8w== 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=Tu2ICu0s2wYjLnOfl6UtqdKNQ1fAFRawAQ+8tUbcWyU=; b=MuKMqiZ0j+oPU72MMkksimHpt6F9Z4+drsBPUOD85rjce36WqyVLL2D0vpWlgg9TgZ6LJ3/TCBETspCJ/0JTMLFa5wMaW0F4I5n8sLBayqLV1pyZ2k6dzY2JnPcKUHUFWtxBmu/YmUU4X3cFpQpvC45PJ4s/litvtSKxX/KaaDNqHPeQzbFi5zp9T9zwjTBM265DvR81/JzEGoqUz5Bp8t24kWGYbuhYKTUOF2+mOF20p3MB1ES6nRU5inC+n6j/QhFanVShYPnBWQ7mXltr8jADLJDm32SzS6nZuUpxUOaP1rZfwwDET6h2YHpGSaLXPi7W8eHgrI8WMObEhQZ1zg== Received: from BN9PR03CA0970.namprd03.prod.outlook.com (2603:10b6:408:109::15) by IA0PR12MB8085.namprd12.prod.outlook.com (2603:10b6:208:400::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21; Wed, 22 Feb 2023 02:57:52 +0000 Received: from BN8NAM11FT067.eop-nam11.prod.protection.outlook.com (2603:10b6:408:109:cafe::4a) by BN9PR03CA0970.outlook.office365.com (2603:10b6:408:109::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21 via Frontend Transport; Wed, 22 Feb 2023 02:57:52 +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 BN8NAM11FT067.mail.protection.outlook.com (10.13.177.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.19 via Frontend Transport; Wed, 22 Feb 2023 02:57:51 +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.36; Tue, 21 Feb 2023 18:57:34 -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.36; Tue, 21 Feb 2023 18:57:30 -0800 From: Gavin Li To: , , , , , , CC: , , , , , Subject: [PATCH net-next v4 3/4] net/mlx5e: Add helper for encap_info_equal for tunnels with options Date: Wed, 22 Feb 2023 04:56:52 +0200 Message-ID: <20230222025653.20425-4-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230222025653.20425-1-gavinl@nvidia.com> References: <20230222025653.20425-1-gavinl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT067:EE_|IA0PR12MB8085:EE_ X-MS-Office365-Filtering-Correlation-Id: 68ff5748-23dc-4a5f-8e29-08db14809658 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qJcw8tPijGnITMlDnbrf/5X4draFYbEujuI6F7SmAUTI4p6zoYR8a0Vrd0NEOlrgSMx4uHHHD3O6xQIMxHmS4XrZEvD1Pyb31y9/M0xnXkqU6qUbH2PiFWI73eKlrubCiVJ4J8FvtNo8DEOq0ct49rhzbaE3NoEW6Gfy4z1+aAO3NVbGKm/i++VbhBUjndDTQOAEkoABtvBpP1X4YhCMTlbMGeY5DPIAVeReBReoUv55cTrCefelNcyFuVtzspaqyfWY92sZrwzTAj8CTDmFSYGI1ZTya3fDBkKPXD1s9wGXGfSSTJW8ADY3czpoOa4IiM70Kmqt8YLppB8aFGosotluKGFOTYMnpFPL91AKj0pQNp/LVEy0h8MpOIndyIUF8bEea4DCaTjpSHUKCIMCiUaOuMhvVmyl19JcroXbJUytwxlR8HB9B5xYjyOWqKZKLn6HsaRXVsDwNe2vmJwzbeJVjtio3a9EeiFGYnQYYz5ka38DW2DotgMmN44LpeAGgiEJBX1/9B+E0e5vj8YthZHfIUhgSi0xDtWDJJ8PuRmzdfjMozfxTyMlsmzITPNn85pxgcm9QRcOEIzW8dSXC97wrE7YZ1dI1LnZ1aWspCz3HJDUUukx/j938UZ8YwN1HeDoX6JJy7jVL6wYS1tDdRQwdAxjtzArw7I2/nqiRkbjdiTKXeQ6zGX/4AMcxguiTkV3ZDbx47F+yFhS2iUfxpdODontSOnivXFprjzwvCvsZpEaY27Kl8zQSiNdXs7nys3ejq2/8ahjyAATDo2TUQ== 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)(376002)(346002)(136003)(396003)(39860400002)(5400799012)(451199018)(36840700001)(46966006)(40470700004)(36756003)(40460700003)(83380400001)(336012)(426003)(2616005)(47076005)(356005)(82740400003)(7636003)(82310400005)(34070700002)(55016003)(36860700001)(40480700001)(5660300002)(41300700001)(8936002)(2906002)(16526019)(6666004)(6286002)(26005)(186003)(1076003)(7696005)(86362001)(70206006)(316002)(478600001)(110136005)(54906003)(70586007)(4326008)(8676002)(107886003)(12100799015);DIR:OUT;SFP:1501; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2023 02:57:51.1625 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 68ff5748-23dc-4a5f-8e29-08db14809658 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: BN8NAM11FT067.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8085 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..a01f386ae7ca 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 Tue Sep 9 12:36:04 2025 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 2F2A7C636D7 for ; Wed, 22 Feb 2023 02:58:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231423AbjBVC6P (ORCPT ); Tue, 21 Feb 2023 21:58:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231939AbjBVC55 (ORCPT ); Tue, 21 Feb 2023 21:57:57 -0500 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02hn2211.outbound.protection.outlook.com [52.100.160.211]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC72A76AD; Tue, 21 Feb 2023 18:57:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dkuA0bFW7+tVeZEl81+kzmIr/gASXdkuJq75G3ISyzgJ4IaMcwIpb1RGRrWkY2r5p8PUf9obscmc+tBDzB7V+OevJXz9Kw63eGA654O4W0jCgIwmnMDaC+ZoXdpRndbG6Fs0DRO71xKdjixOWxhVIrOvn8YDH8g2FxdhnAh8LWz5vK85E0kr4irWr/OKz7PZ13EWta8cn4gBwpMlN2MLeiliGqtMZkLHhnY1nFi2on7axjaG4hH+B/C30YwmszhrLARddoGTUUvZOF1rpuukTF96zECK7rsh8TAxRBc0sLrpGUAcAtL1iVMhcZtjwRcVinqX2WMPh5cOGoBXuvmonA== 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=LxNvmuJUNDx5oktodj60XeuXvFgWkxaDwRqPCIDRZnY=; b=mbDVUNJL2YK3G1/LxmsNYpAbHVKbdFM+MEG/4Vdn9mML6jYApgjynyugJZsPX9c/u01FVpbIiC+UnytVFvodwPkV/lZt2qgeuzgS7Q38/oORmQ3+LWknAvcejo4nCBZN/JtoUi2pyrXVW2/9h4s/YUKW2kEoQaJuDsBoQQxzUbK0ivMELf3DaVZacA2Bthq1PJy/7Hb2m042C9ZWsvPVv6tW/Djt2iBE4O/zONgUMUYuZ6wk/4LZIwFF7rTtNVi5sWwTfvBwS2E1sEjrbwJ5sJs0sOIHO0CyPamwRDar9x3LMFF09dBMr4SBKBogFVJ9JnrV/MciBYHVIIHU02I+WQ== 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=LxNvmuJUNDx5oktodj60XeuXvFgWkxaDwRqPCIDRZnY=; b=EAVNYp1FxQN7gnyTGnh/a/9KFZnqwIdmnqzKVboag4CcDN2+SMocGBrodN2GFUiJ6kXIWI+RLqZqDak5xJUM/jaArifDa0nVvlIkaVWmTrj1KRUYePMzI9jBTZMw1WApdyyLGjjOdEYtL7oBK+U0p31ffs3Oz2K5IQCMvz4UEa6WRgWlXlbCeg04yvoIcg5K9oqBaKAHRdcAzsnU4b+7FXP0q1S0fhY8yKKPcbDuGuIeS1g5JlhItzCo6uXKpXGi1h/rFrQ8qUZOYcub890Xye4c59/5weMyo3n1JUj4S9NQRPUtkXTk05VGx/IeoE5nInHaeMvQs8N3SIfoqy+CNQ== Received: from DS7PR03CA0108.namprd03.prod.outlook.com (2603:10b6:5:3b7::23) by IA1PR12MB6042.namprd12.prod.outlook.com (2603:10b6:208:3d6::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.19; Wed, 22 Feb 2023 02:57:53 +0000 Received: from DM6NAM11FT061.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b7:cafe::4c) by DS7PR03CA0108.outlook.office365.com (2603:10b6:5:3b7::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21 via Frontend Transport; Wed, 22 Feb 2023 02:57:53 +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 DM6NAM11FT061.mail.protection.outlook.com (10.13.173.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.17 via Frontend Transport; Wed, 22 Feb 2023 02:57:53 +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.36; Tue, 21 Feb 2023 18:57:38 -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.36; Tue, 21 Feb 2023 18:57:34 -0800 From: Gavin Li To: , , , , , , CC: , , , , , , Simon Horman Subject: [PATCH net-next v4 4/4] net/mlx5e: TC, Add support for VxLAN GBP encap/decap flows offload Date: Wed, 22 Feb 2023 04:56:53 +0200 Message-ID: <20230222025653.20425-5-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230222025653.20425-1-gavinl@nvidia.com> References: <20230222025653.20425-1-gavinl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT061:EE_|IA1PR12MB6042:EE_ X-MS-Office365-Filtering-Correlation-Id: d7525812-7837-45dd-03b4-08db148097a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4FYGbFdqZ+RgtSunNTkva//8MBWqqY2tqy+j2FC3oMN2WWv3rc2LqUKuuO6KGjlx8oc9p49rvVR5jRrvHBTSdS1SsrcjseisjfZtAUgIdN+xpm2Sxq/nSZAhXMo+YrriQ5aZLAFIoQQ74lrRTVrf7JecvYNW9/JprPSO4+ET3gn93QEqqbzUvCBEwnVGFWdPjMfVQmvUtlAHVscmsLprNUo1BaT7cc16qvZngSImasOipghAh9H+wU61WNwWAPYFMRVXZ+ZSbjuILr7X3ck7qcbkRKqKaVyVSFKbFHaI/MNR4gTKJthU9XfAeaaPeahGcg2YMD/iUKBkdk0wOIVNy0wbJDcoYE1WSXb1Cde8GMVsQplwOg7Kb53vnUXXcILdVZIT5p0UE4A275aBfy9ZByowDi0dZg59tHpsDPDfg+r6PDM4+D4gVHOf+FLdE3xfDagcuueOFcekq7hV0MWkCwYUKa2BoSMwo0gZ9y3v1pGCsxBNimeHONKLPWWSETibw6n/ba5BqXjDsDjo9fsMhiL8p6dAQ9TvJxGOI5eZ4zfeiQ1hjicm+OT9W/JvQsZQRDw38akBespkw0WQeM5Ah4alCbkSwpNT5gnmkbuE0f0X65e3vMyRezCaSHfGJndESgKAfWauyc4mL0eTfEbltbeDW4XJ7wQrQ6xbdwEP0qWhBTGoBNU8hnBO1MlOhNMHBRNKcDIt0ESVRfwm/OQsUIvakZAMeX+fTDYMn/hsjvQlpAmdePo4yxKXjvls5hPDPS8mWNk3xapYOU0fPG/oxw== 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)(396003)(39860400002)(346002)(376002)(136003)(451199018)(5400799012)(46966006)(36840700001)(40470700004)(41300700001)(186003)(54906003)(316002)(47076005)(110136005)(36860700001)(7636003)(336012)(2616005)(426003)(83380400001)(1076003)(2906002)(34070700002)(16526019)(40460700003)(478600001)(4326008)(8676002)(70206006)(26005)(70586007)(6666004)(6286002)(8936002)(7696005)(36756003)(356005)(40480700001)(82310400005)(82740400003)(86362001)(55016003)(5660300002)(12100799015);DIR:OUT;SFP:1501; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2023 02:57:53.3932 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d7525812-7837-45dd-03b4-08db148097a1 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: DM6NAM11FT061.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6042 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 1e530a8a2cf5..caef6aa20454 100644 --- a/include/linux/mlx5/mlx5_ifc.h +++ b/include/linux/mlx5/mlx5_ifc.h @@ -399,10 +399,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]; }; @@ -890,7 +893,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