From nobody Sat Apr 11 12:59:05 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 514FDC678D5 for ; Tue, 7 Mar 2023 09:48:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229832AbjCGJsH (ORCPT ); Tue, 7 Mar 2023 04:48:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230297AbjCGJro (ORCPT ); Tue, 7 Mar 2023 04:47:44 -0500 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2089.outbound.protection.outlook.com [40.107.101.89]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7EC7356174; Tue, 7 Mar 2023 01:47:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S0VbmbOT2u2PaWgpuh3FM/IgU2Sbgkvx9KUxTmlnSQITRBIfIY/eu/furYtCKkKfGxx1EqUQ6k8O5HIatoN2j3AUAxBV7wCMRUDkj7M7wVXTx6tDg918gnoXXVhQ1iLZi8rCuRhmZYWLgexSSqayE9RGstOmMURuzH18IQltuQbjzK8rFXlgH7Oo5P7VN1jReKXaGabOqXR2vkTizFSDmriX+qfQrIOYKfrs5UQiUNtSDw0VW3qxF2aoD2I3S/II4guEatmADA4gLso8nRe8S0OS6SSsHIx76UWA74WcLkWQHtNPU3hQzGl6NOAR/OdxZTZH2s2SMgLgoXXEZV+O/w== 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=FHJZTRMejMuO/XHP/Cx3XmF3X4PM9ZeyWcuzosGBSTiD0iCePpFdzIYIjGdO/1oRoWfeVKcEKsPDGrmhOYBsjqE0hovSbRODeUvZ2Lquwf/EJsBBQ6DbCPKKWXNPVeomJa9CGw6pGsbDmZmJdmQJvM+7PiuvAAIHcXL/1yfu5EgBrjEqSDhnux1KsDxNQmofXZpYBjgAzt5rhFDwMyLD/9RDUvMNXGBzr7f2AzZNMhdcQbgRC44629GnPWMfhH3BS0KtvXo3fgghafb/jOttGU8q2llaqGjAhBk6S9imYOgP5QutrIsp794lP/DLcg6ShMzyP1N/cFMzOxlkHn0QAw== 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=EoMOQK6UUBCOHm3cqeiiSEsq1jklQo50TcvEqkLarPpIoW+fDFY94buUkIQQGRuJh+LIbwcPzRomu38kyVMARod1Et3khaSi0YdRMx86qKiGq8pyK5TcUeW5QFfO0nGTQD8UMOOqQtFwCJA5U+TzSFjTTkhjZej9gQUBDjc+RR+GyUHPPl0PIqCaS5l79OOP9106ir83ebYvqxGyQldV3dyKvSeiqm3aTFBp6IJKWXQ/rpiF3x285wt++x/CQAq7SjllJpdsR26DEEj/cMa+dnCuDyEuZ/oc48WjLRoWLSkiCpu1Eo3Q2rL7VD5vhPicoHb23VZ0hQGj7OZpjxLh8Q== Received: from DM6PR06CA0064.namprd06.prod.outlook.com (2603:10b6:5:54::41) by DM4PR12MB6493.namprd12.prod.outlook.com (2603:10b6:8:b6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.26; Tue, 7 Mar 2023 09:47:13 +0000 Received: from DM6NAM11FT101.eop-nam11.prod.protection.outlook.com (2603:10b6:5:54:cafe::e) by DM6PR06CA0064.outlook.office365.com (2603:10b6:5:54::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.29 via Frontend Transport; Tue, 7 Mar 2023 09:47:13 +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 DM6NAM11FT101.mail.protection.outlook.com (10.13.172.208) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.16 via Frontend Transport; Tue, 7 Mar 2023 09:47:12 +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; Tue, 7 Mar 2023 01:47:04 -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; Tue, 7 Mar 2023 01:47:01 -0800 From: Gavin Li To: , , , , , , CC: , , , , , , Simon Horman Subject: [PATCH net-next v5 1/4] vxlan: Remove unused argument from vxlan_build_gbp_hdr( ) and vxlan_build_gpe_hdr( ) Date: Tue, 7 Mar 2023 11:46:34 +0200 Message-ID: <20230307094637.246993-2-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230307094637.246993-1-gavinl@nvidia.com> References: <20230307094637.246993-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: DM6NAM11FT101:EE_|DM4PR12MB6493:EE_ X-MS-Office365-Filtering-Correlation-Id: 816c5f04-1bb5-4a6b-854b-08db1ef0ed81 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kFVJSZzYC0aBJgcPF5q5nbx3Q/QEuhxQA6nh89rDagz5uO76Umjeem8Hg28/Dah3D9hOm0x6P13YhpImcqU+YgjxqyTD7eoycSGo9bVYeAZOp0whOuvOSXud75+ctU8UeIoDQsn8Ay8DK1rccl3LZcv9TFs1bQE4Ab0d2ZxvOSfhjX1dumsT6/xU/MUQkQHBxTU4TQOPRXT0l1MqrAMTKDvvpsFM6Ox+2Dp0izYfxre6hCJAaIZB6zDPV+6q1vXugQqe9JOj2Q3XEC19sQ8v58IURdBnCDk2OEbF/6CtR+4TQi7m7TWGaP8k2RWFI5o2dLGkkqfDCIfSrjAooWP9xKEnZjHVNOEKLu76IbSpCgvVMVhFciojyf5Nhd59rClITRaXhulOGdeciFlcziE9PTb7BTgNtN+SA0Rs5ZHZL++mOYRr5SmiRAe4Z/6RfVTfxdBY6sizY3qLuhsmk9L6Y5bzfbidbBSlOO6wbvuwI37AWt2ZUHSGQm8M07lNMdP2rdJ3rR6HTzNCCKHGr7kjh4oKByoUARBd2btqJhESXr0bH4sQesREISJ4F6zgQqMqh31hkL9BV/BrxyTeIHiMfO7Swk3vsYPct7qV4Lq64clsntwWRRQb8opUHAc4fcFmnDfKkBbY2QHGifxac1CzQOxR8+K7AsvtcZRaKWJBGUPr9GoMvHQpm4vh/w7qOYYscOCalxC0zK4TMSZHiiBYEA== 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)(376002)(39860400002)(346002)(396003)(451199018)(40470700004)(36840700001)(46966006)(8936002)(70206006)(41300700001)(5660300002)(2906002)(4326008)(8676002)(110136005)(316002)(54906003)(478600001)(7696005)(1076003)(36756003)(36860700001)(426003)(70586007)(47076005)(6666004)(26005)(40480700001)(186003)(336012)(2616005)(55016003)(86362001)(356005)(82740400003)(83380400001)(40460700003)(7636003)(82310400005)(16526019)(6286002);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2023 09:47:12.7167 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 816c5f04-1bb5-4a6b-854b-08db1ef0ed81 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: DM6NAM11FT101.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6493 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 12:59:05 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 98BF0C678DB for ; Tue, 7 Mar 2023 09:48:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229812AbjCGJsC (ORCPT ); Tue, 7 Mar 2023 04:48:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230250AbjCGJrd (ORCPT ); Tue, 7 Mar 2023 04:47:33 -0500 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2083.outbound.protection.outlook.com [40.107.212.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F38F95616C; Tue, 7 Mar 2023 01:47:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NlyLGutR3gAAaHrQUzWUoztcZwfVijp8v+cYyc1GZrso8GObH24v/uoRlxzP3e5+oytIfbPjC+I3KztgS+x1RYat4k2TvskPaYUrbV5xKf5HagY4wJd99qLw8GO1EX98TT10T7unjiM9EZJfGwrJYd4sGEliGMbTc4vaM/oThuAUZXUWKaptabob+0tUMlKxd6/A6mTnJq7S8RahGTM+h78nB8+sHRZLBklotNf74gHxFErd/VezgRbLGYA3WfIoANOu465wnnStOHTYNve2hMXKStC+j/Mdkk+f8/0QerYamf8Ea0IiVn+fO4UZqkWnHlkwV4Rd728DzjP7VzuSRw== 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=l9+KU7YTv70LcPI9sTqYHjSPOzTytRYs0gJXbtLQBCw=; b=iYmk/v7CX6jrCawdk1cVXbP5vs3X/e4YJxL2miM7w0ZHwT5qoH+Gytiz1EssadI8mP1ATMvM2N5KrjKMg9g/eDHeE1OIRySWWYc2UoO78STWLCy/F454y9rLcMz6s7TZiAHnkPx3luumudUJz1WMPnq3rf/RSARAdsCN9ZwYii0BrGKSGHY4b0nH12J0gK86OlpueIGNENMt+lw7tqIdVAq2B1lCWnKGrKtkAEPP4luRdkWaZkje+q7AEWXMFu/ZS0Yho6GLCBKqv69FYYZWhCqFxewNit5iejiOLWID46SZpZku2fYUgTPjgE8Qm0nZyigs3ShTof5ttcs7EAOCGg== 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=l9+KU7YTv70LcPI9sTqYHjSPOzTytRYs0gJXbtLQBCw=; b=OS2I7PLM7qkKybRdsx8PLyOvfEIcJO0L3lzaJ9nE+YiF4jc3gtYhMqzgUiuODGGaoGyzeTby9CU6d2gyt3+kQe2Nbn9NXkQwMmz8MuMDcx9QAz+07NvrXCfmTYsKJf9vfiQi9uJM61xUeoRqDOSd1g7QewyQ7Lu4r4WJ2Sme0AibykvIp+Wo8HVTuW4U14JXjqnCXnooPmjzD72H/M0oAWdLHyaAomFhe6yoe3eCMTiZ5JBxPkNnGyd9iOiABM2PWPuIHLVC/sZw8t+WMs2cxTdXxj7SkWw5q1V7rgVZOaC3b+fj+4OEl1t9IP5lUFyrkHy99e/me2bFzI0msURX8g== Received: from BN9PR03CA0298.namprd03.prod.outlook.com (2603:10b6:408:f5::33) by DM6PR12MB4499.namprd12.prod.outlook.com (2603:10b6:5:2ab::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.29; Tue, 7 Mar 2023 09:47:13 +0000 Received: from BN8NAM11FT088.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f5:cafe::2a) by BN9PR03CA0298.outlook.office365.com (2603:10b6:408:f5::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.29 via Frontend Transport; Tue, 7 Mar 2023 09:47:13 +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 BN8NAM11FT088.mail.protection.outlook.com (10.13.177.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.16 via Frontend Transport; Tue, 7 Mar 2023 09:47:12 +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; Tue, 7 Mar 2023 01:47:08 -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; Tue, 7 Mar 2023 01:47:05 -0800 From: Gavin Li To: , , , , , , CC: , , , , , , Simon Horman Subject: [PATCH net-next v5 2/4] vxlan: Expose helper vxlan_build_gbp_hdr Date: Tue, 7 Mar 2023 11:46:35 +0200 Message-ID: <20230307094637.246993-3-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230307094637.246993-1-gavinl@nvidia.com> References: <20230307094637.246993-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: BN8NAM11FT088:EE_|DM6PR12MB4499:EE_ X-MS-Office365-Filtering-Correlation-Id: 4b3b545f-0576-47af-3ec6-08db1ef0eda5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kVH1GWLBFBV40WjGU0J2Ty7CCpAIpusatoPHlRO5B8EWDmQihO/aL2WsU/MqunBEPhB/KHUWIIU8AARoejQx6yVZzHXO1IgP2IxPKioTKWTJhg2Ny7wwOjfZGqAMWl7TGuSLvIkDD3bhGhW3WN5qU9wtXzclBqSLR0KZ5QeQvM1jZijDhAyPV3SA4cPfblI1VF+81J2rElXfV4ginFf3/q+6zQIgVpp2DLZN0aAIlw9JGM26fUBMijgOwnuoUfrZ/FokmVwJpEihLNvMGjsJ2kEeRi8JxFK5Ui0KaTzTf2Z8JdV5Zcxv9Bl0/XTrOV3wCCppQBwAwhjTXTsDy7XZ6IqlpgMPw2qIJooxrAVAiJxAaXj8SzA09SoaRRA8qbgkDJtaIvViAsi9jRKEH8kOQsP9ecsiWc7hVnXrtUbcXMBP2P0jB3tcuvQmel4XRkqKlUq/NxpG+lHX7o1m6882ct7KO/HzNm2+w+ODecs8C4c30+N28nXaN3wx4C2xAZXW2eXh971CH0m2KJA+Q15Ucm94fjF+Jo5Tv6JrshoBy2YgIcZX+yS7epAeUM19vLHygBKVD/9uAph/Kvlajwz7WZ3E8uw8zIKD2CQX4Vhg/lIB97Cjc463hVtXsjmQbVtC2sffRmJ7y6GoK0rCUVUPtjqtH3+Bv/oH10UrNSM/NbQGF9OF38NR/oDsRkD5bfIoORYtE6dvARzjLNjXkjm7Wg== 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)(136003)(376002)(39860400002)(346002)(451199018)(36840700001)(40470700004)(46966006)(7636003)(356005)(36860700001)(86362001)(36756003)(2906002)(82740400003)(5660300002)(4326008)(8676002)(41300700001)(70586007)(70206006)(8936002)(40480700001)(82310400005)(40460700003)(336012)(186003)(26005)(16526019)(6286002)(83380400001)(426003)(2616005)(47076005)(55016003)(316002)(478600001)(1076003)(7696005)(54906003)(110136005)(6666004);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2023 09:47:12.9040 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4b3b545f-0576-47af-3ec6-08db1ef0eda5 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: BN8NAM11FT088.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4499 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The function 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 12:59:05 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 BB5E6C6FD1B for ; Tue, 7 Mar 2023 09:48:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230502AbjCGJsL (ORCPT ); Tue, 7 Mar 2023 04:48:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230433AbjCGJrr (ORCPT ); Tue, 7 Mar 2023 04:47:47 -0500 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2076.outbound.protection.outlook.com [40.107.101.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 863A156144; Tue, 7 Mar 2023 01:47:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IwxVMzWcYzTAyO48vo1Yr0H4pxetzgxntXSaSJ9e8CNicKSZo8rFYoSrDu+vjsdtoaFKT6JBosm1E63yqalrQK0G8QhEJihybxAvAFdiuPiexraEQ83Y0ekPTt/1Llul4QvRplqjXHY25N7TKacehHBGM7RYLzzrzG7EH1VgNvZS4tYlIuIlf97bny6sS/QKpMeMDytxT1tQ21gAXph2XjHMtY93Fiy6T9oNjVxApRTJe5lAGD+MQ5IpCV0zOtVPI1PMA6kzdU13PAGCGt8ih5EhiUPcq2dCq9MWAroh6oBb90DJr1S4hCp/pBW4Sn63hyDyYYGbHImoen161xYMpg== 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=RKegf/3rC+aKtUU1TjTZn6GishSeEcEdCtMESb46zBvf48NVkR8k/XHx5Z4pmUSymUY5NFG0iFeIDajrr43r4GbtGO7xN6/RcQt/Aqooa7rjZBRFLfddlHSiPDlIKGJRuMPezIeTmATrxzD20/6fB1/4ffdSMCc0MHw2xuT1V+O2oEwgPvNMb0Z12Pp3+zlhqLEyxyaIJXyD5fzBLArbp8f/ZIq7ruSpbwctrCMcY618iUx+s7H/73EuFWSuu8ttz/wa96hJgYzPi7u/qa5wZFOHaRjDhRW0H9RUY9Ze5j1poL3BnsL/DQJ1diJnQhue2bjW8W4qRUWLyvYUX/XLjg== 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=mSrfNdthtGmbpijozoz4HpQlnPVLieY2QbvgJ13qzMhQIWTdZm6AA6E4jAQ7QciXS349MH1twZU+hjlT0AKmqJt0WupGM9a3rQ9HMAzVaUk/omp5x7dh2ddAl6VfeIV2ZUqnF77tiw3qljlN0kFJTYw4nC1qXdTCjfBv0AJgSAqgRO4IszPvlMoaK1vU5ictXZ22AuCOveqXyoFHmivLjTXHckhawrGTuyTu+SEyOS+Ap1HzJMm5v0dW4mmnd4b4cFmFu0syAqLeRAAJqlLwLwW53i71TY/Vke3qdNDEfXeY1e/PmVJa6IRuJrVHG1bUNcvoGGpPxwFmUlkkLExzpg== Received: from BN0PR04CA0003.namprd04.prod.outlook.com (2603:10b6:408:ee::8) by DM4PR12MB6424.namprd12.prod.outlook.com (2603:10b6:8:be::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.29; Tue, 7 Mar 2023 09:47:18 +0000 Received: from BN8NAM11FT041.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ee:cafe::24) by BN0PR04CA0003.outlook.office365.com (2603:10b6:408:ee::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.28 via Frontend Transport; Tue, 7 Mar 2023 09:47:18 +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 BN8NAM11FT041.mail.protection.outlook.com (10.13.177.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.16 via Frontend Transport; Tue, 7 Mar 2023 09:47:17 +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; Tue, 7 Mar 2023 01:47:12 -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; Tue, 7 Mar 2023 01:47:08 -0800 From: Gavin Li To: , , , , , , CC: , , , , , Subject: [PATCH net-next v5 3/4] net/mlx5e: Add helper for encap_info_equal for tunnels with options Date: Tue, 7 Mar 2023 11:46:36 +0200 Message-ID: <20230307094637.246993-4-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230307094637.246993-1-gavinl@nvidia.com> References: <20230307094637.246993-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: BN8NAM11FT041:EE_|DM4PR12MB6424:EE_ X-MS-Office365-Filtering-Correlation-Id: d4469650-1998-40f5-4af4-08db1ef0f068 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hYZuDYD9ZwAI3vm6vmIEL1siPS0W6ZA/84mWj7o9X3J+spogOkKFgjFfjnBZFAkUotsUsJitYdCWiABo5zbF1ZPfXjQSzcE2Xd9lgS/08CvRyNfjqT8zM2rrWj1UiSO4W2Bw6pCoQz12KgXD+cyRdQHpiP8YltMPE6unjhtN9Xygn9bA2hn1/vlNDrm8XqYj1WkGIByMg3nrYi0qkUSPHlBOa4GE1WtMDZZD+Hhf7rxxqpJUxjfF4MhgTUWUFqUL9LmPPa9CH94/jBqOWHJszVU1LGnS0HiaSvz0JqFdHppyunlMo5nsdSK8nowoa2ZrojYKUXdeeQYB3JjizVDatzpatrYS8PqNxb7Wnu9tN/PN9XmhaSR2jnJ6/7HlXnM01JTVZfH6obYwy+HYuU6OgYhdPG7FSbu0Z1X8HxWA6NH7fqT4+yPVrSD9gXYkaCXMgE3tvPkJ3Jz2rY6wi4072CST9cMJxtKEMZrcKIkCQvig+gyb6rIvzeuFK5iWg0yC7ylb3niylXs5GqMB8oKDemkha255ePVusXEf5SK6dqX5mnkfI9tH+XWqOH10ukpGPNJT0lF0FaSU0IC379/ZOq2nhZSywIlkHvHFXOcM+MREbiOp/hBejQyG0Mb4yvSLNn0GVW3kpzhjkPxoYpqCHFv50FfS3OTKYVMChxBUnQ53mzig0FJEPfvo4g8zo96zI2iHGv85xxFz8ZFinljeiQ== 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)(376002)(39860400002)(346002)(136003)(451199018)(46966006)(40470700004)(36840700001)(426003)(2906002)(47076005)(5660300002)(54906003)(83380400001)(8936002)(36756003)(82310400005)(336012)(41300700001)(70206006)(70586007)(4326008)(40460700003)(316002)(8676002)(86362001)(2616005)(55016003)(40480700001)(110136005)(478600001)(356005)(7636003)(7696005)(82740400003)(26005)(186003)(107886003)(36860700001)(1076003)(6286002)(16526019)(6666004);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2023 09:47:17.5220 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d4469650-1998-40f5-4af4-08db1ef0f068 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: BN8NAM11FT041.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6424 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 12:59:05 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 2620EC678D4 for ; Tue, 7 Mar 2023 09:48:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230515AbjCGJsP (ORCPT ); Tue, 7 Mar 2023 04:48:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230457AbjCGJrt (ORCPT ); Tue, 7 Mar 2023 04:47:49 -0500 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2044.outbound.protection.outlook.com [40.107.101.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 372E256172; Tue, 7 Mar 2023 01:47:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iL+GyceFhH/PsBNT1wf4BmutMc0pAJsuwZxGIxgflU+yOaucKRp/pWBRMC9pckHHb+g6S9f0+zI8sMqNiCe2W06gSmyByDNLRODP8HVQEEypMRLBgyjFudotFewXwcYvt+vgxP/xc8QWm3W+LTm2PmjVVbLw+KchXdbFb2oXadYpS2OPUFwWexqridzwGe8A8It4pSz2Zlp5LpMQue5+Gne1NQY4KKFQhXskfAorAz8ZmFP6+OMlGcSrf8k7ZxWTRSJLB/DilZ4AZ/Y0CHmKypvf3gqX+T0LQ26V0g2Qmrq+Lct90EOwzmB/IUsAxS0PurX/VS8XO8aUX3M6Gi2ftQ== 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=IndVl/PYV8Bk87B05J4YUPzsyZ3g3rQlYeco82wuqHA=; b=CghYXZzer9K98GGyKKF0D5YwST9eO4URGrejAzAelDzwTXWhQA57nUMhSk6EtBx4kaOqzGGNucPbWwTNOA9hxYfXuhxH3UN2a6V/IYoYDVyLcXtsfOR4JYrqN8EwvUINedGQQm3mJJtdImqNhoVk9xM9TWuxEAaj4Nw8cawWcFax9A7XQ3An0oZLYy5AV+1DSd6XxZ36w1XnxarQfo9wOPrZPRlTTBv5I1SnzDu3NBvXv1xxSo7MLg68/UDjGv2KHLjAB+iRynzllPxAi3a5vRsi/7BEYREL1CvmBmoX4seBYAgzUPiYGSe3SpeGheL90Hc9R135y2lUqVviNA0LnQ== 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=IndVl/PYV8Bk87B05J4YUPzsyZ3g3rQlYeco82wuqHA=; b=UylimXyO2bnk5BfBBnY67bSMltTtThyd0Vnapu2DawbQBAhzbP4WQ1ZucioXiSFZqvdLFapsTARt1NZ+YOYjRsgyZrKvJdRiNjqyDxh9GGqlwOPKntfUiETwY+WKPG4HNsexm4JuIzxspMIKMqbvhLtvSRTAjUoSn0Y5yp3G4lCWYbJguSy0GF5yuGvwU7v+DkpU5LGB2l3Awxm+ls4SUUVdI9q9NrQaeiZ0B4DIIM0OMTGvZdCaSEOZvW/4pe+T2g5OMmMmtR7OjeJDsCg1AVP5lQbgxePwzUFPpnut8kFIbWl+vATxKi2Bb4Pn+JaAUpA2w5OnvMJr8WhIYzjyKg== Received: from DM6PR07CA0092.namprd07.prod.outlook.com (2603:10b6:5:337::25) by IA1PR12MB6385.namprd12.prod.outlook.com (2603:10b6:208:38b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.25; Tue, 7 Mar 2023 09:47:25 +0000 Received: from DM6NAM11FT036.eop-nam11.prod.protection.outlook.com (2603:10b6:5:337:cafe::1b) by DM6PR07CA0092.outlook.office365.com (2603:10b6:5:337::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.29 via Frontend Transport; Tue, 7 Mar 2023 09:47:25 +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 DM6NAM11FT036.mail.protection.outlook.com (10.13.172.64) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.15 via Frontend Transport; Tue, 7 Mar 2023 09:47:24 +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; Tue, 7 Mar 2023 01:47:16 -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; Tue, 7 Mar 2023 01:47:12 -0800 From: Gavin Li To: , , , , , , CC: , , , , , Subject: [PATCH net-next v5 4/4] net/mlx5e: TC, Add support for VxLAN GBP encap/decap flows offload Date: Tue, 7 Mar 2023 11:46:37 +0200 Message-ID: <20230307094637.246993-5-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230307094637.246993-1-gavinl@nvidia.com> References: <20230307094637.246993-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: DM6NAM11FT036:EE_|IA1PR12MB6385:EE_ X-MS-Office365-Filtering-Correlation-Id: 69002eb9-5b0a-464a-09d9-08db1ef0f4d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: scZSr7gqD7imqMWKkzGN4lDk3wbmWJwf2xDv/7583FH1gsEntWt1/J9/LDH8rG+f2VvT591D8lrWVj4iuJWkMZcDXJT3ojbqy+qe1203Spu/nSaYhAXl3sa8Xn+D/qH89f+00GnUz9CHzT8NR0ur0ZLG/cY++BGgGf/G1//6xHAEsFWRlt/cnzFaGhXSYUUDWISbJDyTQ/1t0DP/zom8Htgju7jY7q07sUuS2VKH+RTWKRKRmncDoihltADR8OKDUeYk2xTTGrVmci0Oweh1dEidmFmBIrrhwhbSk4K4Pifbu5I/YYlgVGhGy4PUY3GeAdaCpEYuR3WvThPcQ2X39AU5gNkMeqBEwjlf6dJDSMbow8wPtdvQZU09D6KfOHBborr/WWdjR/435it1cVGhgLZt8KnRXPyzCnhn/01wQr32GI64rzPP8ncBtfeOBx1NiBrp+Be569rIWkVnupxtCBdxyMEirsz/Sy5b8fj02k2vFIAVGBj/m0Nut7q7j/bZptUubpGdhUaVkqMCxNNcg9jmSWXhtS2IRb+6l2tb5S0VPfPUeYYaBie747pWlniXJZidZMBcAttyFr5I1VRTrFzLSGQ7upwFsImPJWV3cu/gXrTkrv3EvWboU7fS1x7xWWuKskaOEbfE5jt9VvEy+xtB0sIJXt0RaUpTrzDewBid0nLaOi41H97jMhRJR7q/EtFk3xEWMiRkm8Xj0nFy1w== 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)(346002)(396003)(376002)(39860400002)(451199018)(36840700001)(46966006)(40470700004)(107886003)(36756003)(40460700003)(26005)(186003)(2616005)(16526019)(1076003)(336012)(54906003)(41300700001)(110136005)(4326008)(7696005)(8676002)(70586007)(70206006)(47076005)(316002)(6286002)(7636003)(8936002)(82740400003)(86362001)(5660300002)(6666004)(55016003)(82310400005)(2906002)(356005)(40480700001)(36860700001)(83380400001)(478600001)(426003);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2023 09:47:24.9749 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 69002eb9-5b0a-464a-09d9-08db1ef0f4d0 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: DM6NAM11FT036.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6385 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 --- .../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