From nobody Tue Sep 9 12:33: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 918ADC6FD19 for ; Thu, 16 Mar 2023 07:09:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229985AbjCPHJG (ORCPT ); Thu, 16 Mar 2023 03:09:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229999AbjCPHIx (ORCPT ); Thu, 16 Mar 2023 03:08:53 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2042.outbound.protection.outlook.com [40.107.94.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FB84AA705; Thu, 16 Mar 2023 00:08:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vm4QQODugxP21veNxiJbI+Iv8a5kuObjwxh4J6Hr7xUVh1AzgcTyopi6245w5Y3+7srCB9RCaWxpINKtqGl/5iaI5fkzFmqM57GKkzPg2Jt7ntxt0E1bwDIyYmT35lg3OEMEph2qoQEiy9wZZfz6TvBaYA5W+ApfxddrIajS+NEdrRvT4uh9oE/4gi1enbSQKthFP2SA7YqlevJqsGxHO8EfxtFd/RvyPA0o1KZWcVe2m9ih0wEbUpjpF0ZdhoiPpMmM+b5xg5VLYH532FvBr6F/MUdeNdt9ugGGJTuxY6wCFKGnNh4yUAmcPaVVQt3PA8hNues4wdx3ilZqLzmtfQ== 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=867d9tqcipev6pp+cyH/8vIIszW3gb03//lacZcyfDA=; b=KOYP2iWdoHsPM1xU2b+K9mZXcSlY+RUbGq/eQtCk1akE1fi7FuqqncNlHIE2KHhrDUbppcQAUBbmY4YGJyTPPjuJbJ9IHk1SPPgM8TY81LtkvKA6/u+MkjlBFEJNAAciIEJdlbSRQr2h2bswVjAfVppwAqBuTbd+Cy+pmQqek5TOoQimL+qstVrFYrnKynP8K3ZZxOTjltmWVYINWMNyZGdMSqTx7jEjHJnaKN5Rc3Y1YhURsEFqbLvxo7JCeFVrz4I04fC3C1PuQEzAuJF7YBa2qGH87OBHL8LVqfxA8mm/0YWHLIaM5TZw5oQSHxFINDlYZp9Z1KxLp8+tvK9xPg== 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=867d9tqcipev6pp+cyH/8vIIszW3gb03//lacZcyfDA=; b=eGCa7oJVik/g+yXW3d1OSNljyECqSoSXBUuOYqoJLG+b6vn/86y3akZ76c06eYThoCUtCvw3Xvass1PJ9GZsvDDOfVdNbSDfuqIa/kkVOZF6EjrSNHNUA+orMVfcNSL9ykHOkqvmQ4yvMG8Pd8HMm5mSb7PNwMVzDIL/qRqabogCM2BixDH0V5P0yivw82oD21jWXKO0nsCL8YWw3SpXqJ56+WzWuN342d/BvXP2hvawAEUlcAaH7AxDXEcGYxwsuXa4c3/tECmWhELmT1DdR5M/SGuvdLKerT2/AdXMmihbrIUI3O1qkBN7wIvBG4u3nG1tSpYD4XX82SsWykQ5VA== Received: from CYZPR17CA0005.namprd17.prod.outlook.com (2603:10b6:930:8c::21) by DS0PR12MB7874.namprd12.prod.outlook.com (2603:10b6:8:141::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.31; Thu, 16 Mar 2023 07:08:37 +0000 Received: from CY4PEPF0000B8E8.namprd05.prod.outlook.com (2603:10b6:930:8c:cafe::69) by CYZPR17CA0005.outlook.office365.com (2603:10b6:930:8c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.31 via Frontend Transport; Thu, 16 Mar 2023 07:08:37 +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 CY4PEPF0000B8E8.mail.protection.outlook.com (10.167.241.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.7 via Frontend Transport; Thu, 16 Mar 2023 07:08:37 +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; Thu, 16 Mar 2023 00:08:22 -0700 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; Thu, 16 Mar 2023 00:08:18 -0700 From: Gavin Li To: , , , , , , CC: , , , , , , Simon Horman Subject: [PATCH net-next v8 1/5] vxlan: Remove unused argument from vxlan_build_gbp_hdr( ) and vxlan_build_gpe_hdr( ) Date: Thu, 16 Mar 2023 09:07:54 +0200 Message-ID: <20230316070758.83512-2-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230316070758.83512-1-gavinl@nvidia.com> References: <20230316070758.83512-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: CY4PEPF0000B8E8:EE_|DS0PR12MB7874:EE_ X-MS-Office365-Filtering-Correlation-Id: 8ea84ea4-9a8b-4c2f-295a-08db25ed4392 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0Ua2Y069YwcHUtLEMBTdbWkmNw057QaCXwi21ReCNnSGPZn5VXECQf3bWLG+GvCATvxgU06fc+KUlh8ei6NyLokr0PlL34bWYEZpC8T1cGpGtIxM0xwIEfs8hbX/4x19MXPdEHvZ/hD2qysWjHB0clTwoNucb+602t3mqJT3+i7pGPRZL5vYtHPKfvRCUNG7Yy72FhUhztkUOhzSE9QSh7bg0TY7fjUoJY8cKLqMQ7PoJVWMWosfAW9d6V/KPoG8m3gczZcYLYnljJ8KqMiNlGI0ISKyGYGm2HlOk8pICxGAJX2oAplk/sSZHvXjwEvB2Dqy3NKMswfLg1UKpTXi63PW8BYXe92FSPzu+kntXNfQeFTwpwKAJtxpDKsws5FhzGwWWe6txilOBscV84eyD+/JT51JZ+QX6VI3+ZBqcc07I4/Cuar2vznZoOPd1yeXjtUX8viPfB3lCHs5KjVemjLDNy2Fscghx92pChFW/isAM2iveuWWPruswmmv1LQULufyJNgVhv8PFpR7D4vs3ged1l230HCXV+HxLkqUACmiVtoci0FLPhsQyEP3l2cj4M0AEGaYTdKzCVwle/ekIVt8GMohD4l+x2ZLZSyUaw9Q3VKljOIQrTnz85twUQlEsJ7ifPf1gOacPKFCEygv5KaYnmj/4W5v+Iss7vt0JMpjVw66Bc+d9ELBhZr/W7mIlZKp4F8fXXIQ/kWYBKorKW8E0tizWeV630gRDstSxsKgKd9YnFHBaPo70dtHyHJT 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)(136003)(396003)(39860400002)(376002)(451199018)(40470700004)(36840700001)(46966006)(82740400003)(86362001)(36860700001)(356005)(7636003)(36756003)(2906002)(41300700001)(4326008)(8936002)(5660300002)(55016003)(40460700003)(82310400005)(40480700001)(186003)(16526019)(6286002)(2616005)(336012)(83380400001)(1076003)(47076005)(426003)(26005)(110136005)(316002)(54906003)(6666004)(478600001)(70206006)(7696005)(70586007)(8676002);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Mar 2023 07:08:37.2780 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8ea84ea4-9a8b-4c2f-295a-08db25ed4392 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: CY4PEPF0000B8E8.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7874 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 f2c30214cae8..d5e9e1ee033a 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:33: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 956D2C7618A for ; Thu, 16 Mar 2023 07:09:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229581AbjCPHJB (ORCPT ); Thu, 16 Mar 2023 03:09:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229997AbjCPHIx (ORCPT ); Thu, 16 Mar 2023 03:08:53 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2065.outbound.protection.outlook.com [40.107.94.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F1A4AB8A5; Thu, 16 Mar 2023 00:08:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YQgOTg1Eifj5iq9dZMhUoMR6bSOfbMQQGarJCY2bWo5kgb8ngnRhNIGDAvqXnGOc+cV8qeuskt7SDMjGA8wQcoVnMzHHzvk8oBmRQBVpJwqP4cJ5p+icSfI2d+ySE5YPcQcCUbil3JDmfG1ib6nMPadVdx6qkvIgdkUixue+2jQ+wxju7n36TPndujE4LmywTiTFaMu4A09Iaw3Gj4jn8nkFvM91+ImRuqbnHnvhwc8FmwgS9ghj2DB8EpvR2wN3GxantDZleIwpOlb5B2jkw0UWD9C6CfmaTaKg8hguxdBYuy4NVq8oBIlo1NgnwCjmEeRxzAau0pFXhMVs7JAL0Q== 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=5YfL0T1YDsrYwt0J+M/cZtIzjATWwYMf/KzwDTro9HI=; b=NwNOS29Zscaw7zq4ldwHdEJkRidNvYwu5M25Atr2G1v8SYTfs2omhbMOwjVwHKVsTOcA1ATct98vgfQdOWaGAsTydERRFo84OEhja32O9LI6bA7P6vQlhEYF3NgU1Jqbj/zzVtyl54lpNtbCOmvItg3xirJsoYAmR+oKM/PRqfLfLVTKsu1LOwMzs/uqjXuT58FtRxDZFp4+1vWzwygfGeiy23gs16zhE93/DDRaQvupa83CT4TjMiZeystWa6mpRu0eljiKIt6b/5aHPa9hy8+g+9bDht809EeChHkjT/glFXC/3fi0urV5HMnnmLnk1BqNPW8+qN2tmqjhCKyzwg== 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=5YfL0T1YDsrYwt0J+M/cZtIzjATWwYMf/KzwDTro9HI=; b=MsfxrFtAYJeuaoe4YWr+r8yrlDig0GnvZrxRvxOCXPdf07Xg/+rD+a3xeuBCxb/P2dzGeUnXy+2/lMlkMTTmfzEUAokxM+qlA1j27EOO8ROg37ut3N8wSM/pyzMZFbZiX+/Lpou3dVRcWF/FCuwC92o7EwHESqVHPbV+E9jHnoxwVP4D5ewmu3Y4tkVdtZRO2wUoJ9PDz4Q8YB3gbqzNzQCzN51sXSZslUmtnhFJFc6Cb3+M9MITrpKJOsreiaPX4IIbvda6NiEV32PC2CzFJqQALuZ2n9SA76p8XdMspQDqFpgfkBPr2elOzyb40eQxD5FMu49AWYpZKPProQ2d7g== Received: from CY5PR17CA0020.namprd17.prod.outlook.com (2603:10b6:930:17::32) by CH2PR12MB5513.namprd12.prod.outlook.com (2603:10b6:610:68::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.29; Thu, 16 Mar 2023 07:08:41 +0000 Received: from CY4PEPF0000C972.namprd02.prod.outlook.com (2603:10b6:930:17:cafe::82) by CY5PR17CA0020.outlook.office365.com (2603:10b6:930:17::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.30 via Frontend Transport; Thu, 16 Mar 2023 07:08:41 +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 CY4PEPF0000C972.mail.protection.outlook.com (10.167.242.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.13 via Frontend Transport; Thu, 16 Mar 2023 07:08:40 +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; Thu, 16 Mar 2023 00:08:26 -0700 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; Thu, 16 Mar 2023 00:08:22 -0700 From: Gavin Li To: , , , , , , CC: , , , , , , Simon Horman Subject: [PATCH net-next v8 2/5] vxlan: Expose helper vxlan_build_gbp_hdr Date: Thu, 16 Mar 2023 09:07:55 +0200 Message-ID: <20230316070758.83512-3-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230316070758.83512-1-gavinl@nvidia.com> References: <20230316070758.83512-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: CY4PEPF0000C972:EE_|CH2PR12MB5513:EE_ X-MS-Office365-Filtering-Correlation-Id: 15447acc-e94d-416e-be2a-08db25ed45ad X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kR5QRZQckTovw7U0kcaJZUErC9LlxMqp4q4qNGpBNG5Da+64NkGhEGcCokU86N1xvHf8JeHejL6V9XSLZD5QfrQvssAiBbn6IPagO/DwUvlxoVXIluix4fsUglmfBkFc0sCHp+cwn8gL8C8WA8NafVG4IpdTSCRl35pciv0a6B/4I2Zh1RJggYbq1a8Ogmto9BH7wI4Fca7YgbLBBlVuEcexGBh199IzAWE2+t1sOIZA4JScqFqCga1yt7eps1fEKAxeochLoOtEnd9aAKyD67PH3tdUxACqp06ioH41qvFkSGECwD6e4lb0lxA/I8/bj3xAQCEn5Y7TCcdLyvNyifpRny/pzfrcwNEBICrvIDcq+uwYHgMtzTTbo7XNdziOcxtLHZRPe7PB0Ngpv47QaY6YA4KxeeZ7dtvAjcnPvtMgZcvZ2MN/AmwfdShphfHHvSJTgV3VOmx02PXjH62/Es37gXIZjAbMgusyHhmyM1GKmuyoGwhJam69b/qv2jBe2pe4eQrf1Aac6wpqEKDbmt2ZbrvElqC6rkHZVh5wT6rVAnsbm329rkEfdEy2T+rEU6uuzDCrZ2sZCX5UQ60UhKBE920djN6frLTru/kblFaVGifHC1YA6OG5UwJDQA+rpz0ZR2nhU50slzU5RnzEnrScOiH9nJS7IyZ5RVM7z/8w4gVc5L9v1+PDVePlr6RBeSU/sqS8HNn9MzRYj53SLsPKarFVnFigZmW0b8UGul+BOs/NUGbtTK2lpu7AlPnl 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)(376002)(39860400002)(396003)(136003)(346002)(451199018)(46966006)(36840700001)(40470700004)(82740400003)(86362001)(36756003)(36860700001)(7636003)(356005)(41300700001)(2906002)(5660300002)(8936002)(55016003)(82310400005)(40460700003)(40480700001)(4326008)(47076005)(186003)(26005)(83380400001)(16526019)(2616005)(1076003)(336012)(316002)(54906003)(6286002)(426003)(110136005)(6666004)(8676002)(7696005)(478600001)(70206006)(70586007);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Mar 2023 07:08:40.8454 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 15447acc-e94d-416e-be2a-08db25ed45ad 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: CY4PEPF0000C972.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB5513 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 d5e9e1ee033a..3f0416992eb0 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:33: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 D19A3C6FD19 for ; Thu, 16 Mar 2023 07:09:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230056AbjCPHJL (ORCPT ); Thu, 16 Mar 2023 03:09:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230007AbjCPHIy (ORCPT ); Thu, 16 Mar 2023 03:08:54 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2051.outbound.protection.outlook.com [40.107.93.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35BD5ACBB3; Thu, 16 Mar 2023 00:08:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gqFepxGHJZAe+LInCF51PmosFqjuQOS/0OAYfB88EL5OB5KNG0dpIWH5jpGs5GskH5TRXmKwkEFJZiFRwsxtNUQPWNe3Dl+xZVFqbdWsvyxerAV8Mgb0OeJKUvy7LCbWheVOovLMwcXz1A/RqsRyag0NB/+8AhjPlLs6Kmu6boz3mGyI1pOTno1MWMfKRlDKXU0ZUv6jK7+7IBVZxRAiLnDq37G1qYHPWCrD3TJ6kfAYvRg6A8pLTmGLJHeYrwtA2YG9p/fsMdg8KTvrUfJQ/7epaaLPwdAGyLHP0tB6B2n5Dl9Z/pCG18qLnfFGubR18lB3EB+k/NCQUQaDVskmbQ== 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=Vts8FIbYEhrnNnCrd9xcC6rZ9LhosUXOny01KbBwfaIw9CfgJGhSbWsIWtGqmvF36nrQ+ZNsgdVUb9PzPE7IMayjP0/gqDwo+JJXgjihMFu7+vabzZaAhLA3sgbUmcbve89ASDgsu1ogkpYCxUOeXKGJJFwsuPX/GJUidRDeDTJS13eAouAHQ8GphCGFYta43ukgQCOGMRBlI5HCEXIsBr+rRWh1SEWSFaWsTAEI17CA8jOzrPfHtNe7E6w03vrMD2EcsrDE8lzhA0s+P3sxoOXaQmLe/VKx+of7OQFQ4dCz6KSvdY72cWXoVTOBGWbRqgwjNqM4+dywe2EsxxuApA== 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=N179DlG4Bn/W8g7JOeG9FuYbjDYjXPaJecv7CzHK2fc=; b=fKNZwCqJg6XeamyvVh2cj7Kd9BBOkoTUNdnRS10rWfDnRj5rd0wI103uZBIYuyIJ2Kwh28Wovc5R/ZRWe4KR+71EmPVFNrlt/4+fOlORrCrlP4rntorgapVMPBmVA4R3gnfAckFCPhEFHUWBD2S8n5ikfxw12H2rBz0yHiXvW5cOqETq2JYMHd20bFtwUy5cY8MvVSsTONmFgohlgpKa7VJfJLAeqpBOVCOmImyclsx05rEWu0NYLo0ZYzyh5QQ7Zk0HGHwlOFdggBHWmzZdcQ/Y2RX3HjP5gZ/IJINO7s63uxTkhXBtcUyAlLzT95Ml9i7uN8PlN++tup7or40n5A== Received: from CY8PR11CA0024.namprd11.prod.outlook.com (2603:10b6:930:48::24) by IA1PR12MB7542.namprd12.prod.outlook.com (2603:10b6:208:42e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Thu, 16 Mar 2023 07:08:46 +0000 Received: from CY4PEPF0000B8EF.namprd05.prod.outlook.com (2603:10b6:930:48:cafe::c3) by CY8PR11CA0024.outlook.office365.com (2603:10b6:930:48::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.31 via Frontend Transport; Thu, 16 Mar 2023 07:08:45 +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 CY4PEPF0000B8EF.mail.protection.outlook.com (10.167.241.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.8 via Frontend Transport; Thu, 16 Mar 2023 07:08:45 +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; Thu, 16 Mar 2023 00:08:30 -0700 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; Thu, 16 Mar 2023 00:08:26 -0700 From: Gavin Li To: , , , , , , CC: , , , , , Subject: [PATCH net-next v8 3/5] net/mlx5e: Add helper for encap_info_equal for tunnels with options Date: Thu, 16 Mar 2023 09:07:56 +0200 Message-ID: <20230316070758.83512-4-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230316070758.83512-1-gavinl@nvidia.com> References: <20230316070758.83512-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: CY4PEPF0000B8EF:EE_|IA1PR12MB7542:EE_ X-MS-Office365-Filtering-Correlation-Id: 1e7b0830-5cf7-41e1-9021-08db25ed4866 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UlMihTuAFHVlR6GglpWxOQefmrLuov9b1dOzh8Sm1PAD7leyiJBggKJEFfgIJyl4nfGEFZ8v0kPeGTfgaLSl7kSfR+fuzVsUzN27eLZ8xIy4lEqW9XXUoGaCL0qqInYAw34jM+Md7FsCDLhpbZTf8yyFCwLJjsvXzXkvEP8inHYelzW8sEV0j6tNZRO5fa+/mFxHqCirxHmBTtBOFE/aqhYtFr4AKUCMFdqaZQJ5BQ4rmuhlJPheQGzgScb8bL4bEzydHFuUitz99/wvbfd9o2tHMdrNk/XIUoEnA9n0h9aTGUiVydiMT0cfrZtu/80DmuBxmgE4NvGnag3i0a3g6nlQMD1Sa40XoA/352Vatxa3MZG8FxMkeTQzNOM8GNB3ZCyZ4qaZStqRhwv9SiA0pj7e2NYLoqjNE6d9NJ6iYKAji/XXUB50PbInihHrlWu7f2vL+HT/KRtNTe/BhgPSCcRpCUhtsuAt5IZ644JNZ6gjDrBjXATaAjCY2ned6Lhcs1EkntwnZ1KJCNbJ/eqTDjPMO+KlWwdo/0lbp+bxfWYovsv2zN7aH6+PZOeu0EDCtwlVRs0/BguqwfAofX7qttKJDIp3zSXDs+KSePJdUkUVUKnCuuoQXKM49H3cUTz/WhYOhRYpXNHC8Zt2xzBCU28YA4jbKNIxmWXE5URFdzzomURxXjIewkUAoMkUtK/lfgEfqy7L1QeDlAxSSznSxGOCIaPRoaUG8nk/lIHnfm4pVXtTxczwZPFdnAXL7T1K 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)(396003)(346002)(39860400002)(451199018)(36840700001)(46966006)(40470700004)(82310400005)(356005)(36860700001)(7636003)(55016003)(40480700001)(36756003)(70586007)(4326008)(40460700003)(86362001)(41300700001)(54906003)(8676002)(82740400003)(70206006)(110136005)(8936002)(478600001)(7696005)(316002)(2906002)(426003)(83380400001)(336012)(47076005)(2616005)(5660300002)(186003)(6666004)(16526019)(1076003)(6286002)(26005)(107886003);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Mar 2023 07:08:45.3809 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1e7b0830-5cf7-41e1-9021-08db25ed4866 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: CY4PEPF0000B8EF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7542 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 Tue Sep 9 12:33: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 785FEC6FD1F for ; Thu, 16 Mar 2023 07:09:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230004AbjCPHJ3 (ORCPT ); Thu, 16 Mar 2023 03:09:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230026AbjCPHJU (ORCPT ); Thu, 16 Mar 2023 03:09:20 -0400 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2061.outbound.protection.outlook.com [40.107.96.61]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A52DABB2D; Thu, 16 Mar 2023 00:08:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SolOXgWPRALwm2kocqX3BigZZG2xTTcku/ik0AppaWta+uXgpogJOC97sCYX28a4zkyxQudLVKT/ddz2u6IYJHkrlWuuZ5TFzd5P7UaZ6UInCLTeSipxgNJB4nnjsZ/FCaWdcue/VLAn51QLmt0Rh+GNsmALLi5n8ofw0sGlfA4iOgtghSR8EtP4HScYOmseHpAbkBl++5eGqxweO9H2INP1qxqYN8DDgForE0wb1ZnV4HGoyHHisHHMtncnCMBAbctcOCUSQ+uGB3g1PJEO0BdVUZRw9MYTW0QLciUKlnHg3Rg3oV97ZsyvspC79EXmS5jMzkPVsrKRQTfcaWyrIA== 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=Wh1kRVQBO7vonDW6jZkmra8sdH89oNTkM3pbMxGnO7E=; b=jbNsYwmqyKnu7BqosGQt9WsTM9te1JWb0VHXnImMw+unSPn9lgdr7wi5Bm9qkG7ZQbm6eYygdCEVT9+G3GpXxSk/Lf1WypukPgDyh7KQnCDa9hghX2lR07bIWfe5bChSCsGMEvKgmFMWN6gverVPlGZNCTaupmvxUULzIP5q3BT/NJfs3DcpFJWHp+wFIW8zXYwQFa6xQ0ziAswGD4e8KxOkceO67vxfuLubKhYd09+S/0QaVEttyXTU5HYWR/mO4yt08SOF6Vsp2ncCb6VVMpLgFIcLnQtdupx7P4Mt5j16zNyTBMiikatrpxTofr0ezVgfGKJ7H+HE0cwiM5rZpA== 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=Wh1kRVQBO7vonDW6jZkmra8sdH89oNTkM3pbMxGnO7E=; b=LwFWHZYpfHtU0dgoY+hyCpCyY4ytG6WjwdyBO3QADXr0e9+3NZ2ZhSUQRRROj5vE2Ov/7a+Xe7CbwGUZdlT3JVnoGkAn4rcvkThJaCgB3JrhsbH2ukV4T7pdFn4GPJRAvdEg5X6Kjo0Yecw6Z/Uvwl2til9z2BfF5c+gqvtt0iVlHb1/rdOJ2GLaJe4VFlFbYmcZP42glJ3XuX8IJ65HMHPN65q0SdzmmWAY8xI32bKBkK6EilxD3jNg+09mm/l0x5ZdS7m/bRIKJ6wund7eAyTS6RE4EXlI2G4Jl+QMVOI8zERjOhAIeAGWUNcmWf8RtfjWIjIv6iISDK+s6+HBHQ== Received: from CY5PR15CA0192.namprd15.prod.outlook.com (2603:10b6:930:82::18) by CY5PR12MB6345.namprd12.prod.outlook.com (2603:10b6:930:22::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Thu, 16 Mar 2023 07:08:54 +0000 Received: from CY4PEPF0000C971.namprd02.prod.outlook.com (2603:10b6:930:82:cafe::54) by CY5PR15CA0192.outlook.office365.com (2603:10b6:930:82::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.31 via Frontend Transport; Thu, 16 Mar 2023 07:08:54 +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 CY4PEPF0000C971.mail.protection.outlook.com (10.167.242.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.30 via Frontend Transport; Thu, 16 Mar 2023 07:08: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.5; Thu, 16 Mar 2023 00:08:34 -0700 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; Thu, 16 Mar 2023 00:08:30 -0700 From: Gavin Li To: , , , , , , CC: , , , , , , Simon Horman Subject: [PATCH net-next v8 4/5] ip_tunnel: Preserve pointer const in ip_tunnel_info_opts Date: Thu, 16 Mar 2023 09:07:57 +0200 Message-ID: <20230316070758.83512-5-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230316070758.83512-1-gavinl@nvidia.com> References: <20230316070758.83512-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: CY4PEPF0000C971:EE_|CY5PR12MB6345:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ae7f65d-9a5b-44cb-cfba-08db25ed4d4c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gcOr8psfjy5ZAEcpBLkiprHNHUumzYAgDGtOLAmT1aKYX6tlPxelZOsZIVEFr6wwG7MDkYbwyJFQ9fptUuMeKqwC06mjugKYYuirVXELE90EahjCgBTi7Ly3DaFoyyltCIMbjR8e2LEy9vopWt0kSN0/dT6Muod5A8V3v5P/Tn2CcjaIPHqD1gMoVqICkNYjvPL+ooLu88Ei+LqIMAAFHsPJf90mRUk5jnMq6qUKmdKO90NaCWhx6YZQBVQzC8xls1NQSSOGgO2e2POxObNDDkKxPO2gzmFTP6vbfwTjDQnabOimj58yEoVd9NOyqSMyjwbx2MXCsxhoINh8U2C4C19/wMntbjIh6qshOP/uD3BGao0xX8iGNwBmpgOyrrA6iEpYz+YgwvGGy8ptVBnXgbxwf6drPePfHAL/7mBV1/l77Pz5yVZreVVH5aPZAXTQ9rVY2dP9Kb28x/k8vpwc0t/MCDKrVP51klwS1wj/PF42+cNq/jZ8SO8NLuqYBgrv1y1N7tt2KxDwVJRf7+NM5Zm0RRvudxpERr2Gbq0/Ulu+bEz36210BWDOG8s1bYeKVq0e9rtFtZmwf55j959aapyYS9XD+WhvQSaO4lDVCybz5K52qNN6C229r3F6TNeR3sf3Y3ZCGpDeWCpdaEMj9K1+/86iR9J0N0OdpLcik5lDnZCw2LsyKItRFLHBT+HP0dMXkvDU6YQ8wM+KoCc5xxaFtjoot/8jnaLx2a1PIiCJhwB5MYOmXjJ3qu0eFunp 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)(376002)(346002)(396003)(136003)(39860400002)(451199018)(36840700001)(46966006)(40470700004)(426003)(47076005)(336012)(316002)(54906003)(36756003)(40460700003)(110136005)(55016003)(1076003)(86362001)(7636003)(2616005)(82740400003)(36860700001)(6286002)(16526019)(82310400005)(6666004)(356005)(186003)(26005)(5660300002)(8676002)(40480700001)(83380400001)(7696005)(478600001)(8936002)(4326008)(70586007)(41300700001)(70206006)(2906002);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Mar 2023 07:08:53.6163 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2ae7f65d-9a5b-44cb-cfba-08db25ed4d4c 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: CY4PEPF0000C971.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6345 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Change ip_tunnel_info_opts( ) from static function to macro to cast return value and preserve the const-ness of the pointer. Signed-off-by: Gavin Li Reviewed-by: Eric Dumazet Reviewed-by: Simon Horman --- include/net/ip_tunnels.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h index fca357679816..255b32a90850 100644 --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h @@ -67,6 +67,12 @@ struct ip_tunnel_key { GENMASK((sizeof_field(struct ip_tunnel_info, \ options_len) * BITS_PER_BYTE) - 1, 0) =20 +#define ip_tunnel_info_opts(info) \ + _Generic(info, \ + const struct ip_tunnel_info * : ((const void *)((info) + 1)),\ + struct ip_tunnel_info * : ((void *)((info) + 1))\ + ) + struct ip_tunnel_info { struct ip_tunnel_key key; #ifdef CONFIG_DST_CACHE @@ -485,11 +491,6 @@ static inline void iptunnel_xmit_stats(struct net_devi= ce *dev, int pkt_len) } } =20 -static inline void *ip_tunnel_info_opts(struct ip_tunnel_info *info) -{ - return info + 1; -} - static inline void ip_tunnel_info_opts_get(void *to, const struct ip_tunnel_info *info) { --=20 2.31.1 From nobody Tue Sep 9 12:33: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 70611C6FD19 for ; Thu, 16 Mar 2023 07:09:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229489AbjCPHJn (ORCPT ); Thu, 16 Mar 2023 03:09:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230027AbjCPHJX (ORCPT ); Thu, 16 Mar 2023 03:09:23 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2056.outbound.protection.outlook.com [40.107.244.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FD7FACB83; Thu, 16 Mar 2023 00:08:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y3AXoHv8dyMquITZePnPGVTa3AjvcQl+pLJkEcC1gz/eqEotoScr2sjuw7fG7BLVctSTkC3+6smGNv17e9MLPAzoTYt9Omkp1UimYRLfUDaM81k7dfgWbrPeNcE4TDmFXG9sjNtezERJMLq5Jt6Hd2ATJ/3+qqCw9lulSlMG5x4LlnR7M6SGvnpl039aZQxJW+XNaHcRBPcvISorxGSpWXIJQOsfhjo5jM2KdS2uAGJsqWE37H4SS7tT4vBksoyeC+T4MZDkM+JQ6kqmz7BQTi+tumerZxP2zDxPYrTZH17M6RaDaDFqTGmOv/5BqshXJ5P2FgDjE6mnqAxmlSzaQg== 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=cBx1jffNJYqWhyu2H2S/5sCPUkK2MrZICz6Oy5M/cY0=; b=MVVYNMFFEBm2OQPQwwONfa93z4ysHzVl5HyJW76GkarzGcvhoEnkVhLsSB+WOgWO5ytz5PnHyUj6PEiYbjvrkZeM3hiYNjItTlPnBVLGk9HvnS0reEMXAtZdE6Oigk3819ATnSBTxa5v35Ohvflbovt5zeDicTHCJBtfJ2PlUEd2MPdohbhMDQn1ii9YuZaKFTXGMV/C68Xfwo37ANzVkGnKPRmh85r0e+A0Ze+KwEyAEVh0iF+zpJyI+6MXnW+rVcpVNUqaDv323eVWL3w+GYWoBGkYv8FICIQjAqcEPNGtKTR/0tcTbrSsF86fsJha6k8lCSV6MfblNlPoxgKoaA== 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=cBx1jffNJYqWhyu2H2S/5sCPUkK2MrZICz6Oy5M/cY0=; b=e5y7tL5yQ8XBubjxh6soEar4phtigWVy1G2+jdt0gwtCRWOBPnjRghSeu6F2scM7aFQ5/BhvjkbsUxdlcpWegpKRaNBeUvivtH5TgGXo33t4u1JlFd2Yd7oLKZo8mX1K2wkmKd432BHmENDWmtWLPKbTsBjWUvqfnMSQ8D4TVGXHYam/K/rdeFZA7IuWVKNpzPKv4oR1Q6zTUMDFIvwG9DmfdMvbnCtSYGZvWXsRBG5lSglw0zVnHhJ+T8zXHAibHTYmsM+eIXRVSmtc2b9Is7ebn1Yn8v3KIcszTW8kB+0BogiN5DZAkSLC7/M5z+J9+KgQ8SASSCtNtjVj2AJASQ== Received: from CY8PR10CA0044.namprd10.prod.outlook.com (2603:10b6:930:4b::7) by MN0PR12MB6293.namprd12.prod.outlook.com (2603:10b6:208:3c2::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.31; Thu, 16 Mar 2023 07:08:54 +0000 Received: from CY4PEPF0000B8E9.namprd05.prod.outlook.com (2603:10b6:930:4b:cafe::c1) by CY8PR10CA0044.outlook.office365.com (2603:10b6:930:4b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.33 via Frontend Transport; Thu, 16 Mar 2023 07:08:54 +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 CY4PEPF0000B8E9.mail.protection.outlook.com (10.167.241.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6222.7 via Frontend Transport; Thu, 16 Mar 2023 07:08:53 +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; Thu, 16 Mar 2023 00:08:38 -0700 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; Thu, 16 Mar 2023 00:08:34 -0700 From: Gavin Li To: , , , , , , CC: , , , , , Subject: [PATCH net-next v8 5/5] net/mlx5e: TC, Add support for VxLAN GBP encap/decap flows offload Date: Thu, 16 Mar 2023 09:07:58 +0200 Message-ID: <20230316070758.83512-6-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230316070758.83512-1-gavinl@nvidia.com> References: <20230316070758.83512-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: CY4PEPF0000B8E9:EE_|MN0PR12MB6293:EE_ X-MS-Office365-Filtering-Correlation-Id: 4c8c2340-9184-47e9-44d9-08db25ed4d89 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oxBv6Qq3tkJb2lZOdV6g2oRlBgP+Lgd6W3qwXplQMQ4ElCSHf1X+b9w9UxaaSj4C5F+jBTwsVJB8ETANP3CTvVW6OY/RQgpKG5oQ5uD0lG8thatbfJWh7zGjUfR7bB017q59cqyZR2tZKun+t4RchccLa8mWc4pIUeg9EgFocc17+WqSZNBof6PRWkqjWXEof2JVbji60Hw3OcqZRif+vZh1d6yktZ4ssKX4xPC1Ix9Lzsc8/ZdZI2wZjcPx7yi8ZO4U6ZYMyVC3ot9zKwi97ydqu2XWs6/ye6KnbjILldbp8yb84uTAVk5qmYTP+RZ+JOLaeDpCZJwgii0FmyyTy8di67YrJrDTTKLeFcn235NuCTch8gqrxZw1Lge0HBfoNL2b0RZnM4xke8Y+X2WZKLiUf7r8jkkvk6Gc/4KV8uBiCgKGxwqjHNUP1vEBP3iYJucKeRAHGt64S2iHau2uyBH6bmLMVyccC0TIP5RXW3zzXRWCuVnkCVoy0QeRlMIlMNC6FFbzuxJcIR6F6fAbQVgAW6GkLG0Zjps2VwrPX0QMMCS/VIXc+Eb4OVJ+HqodzfLtEWvIE15cVSwgN/C+gZvtUXBiLgFtTbgJHTZLK5KD4pTSmzn9eGzL2QjFb9r/8UhXZJ0dWpqkwo+iZx1EqVehJdIE/LfRN2kUinXd+LvpUPjAIZ8JpqBLi4K3FG+Hia0tT4a1qOG2OPDKfND5SylY0/rRT8Qex8BnCFYDkGT3e0VA9/f87IQy8tgrGQOZ 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)(376002)(346002)(136003)(39860400002)(451199018)(40470700004)(46966006)(36840700001)(40460700003)(36756003)(7696005)(316002)(4326008)(107886003)(6666004)(478600001)(54906003)(41300700001)(2906002)(8936002)(5660300002)(8676002)(70586007)(110136005)(70206006)(82310400005)(7636003)(82740400003)(36860700001)(55016003)(40480700001)(86362001)(356005)(2616005)(336012)(26005)(16526019)(47076005)(6286002)(1076003)(426003)(186003)(83380400001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Mar 2023 07:08:53.9813 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4c8c2340-9184-47e9-44d9-08db25ed4d89 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: CY4PEPF0000B8E9.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6293 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 | 72 ++++++++++++++++++- include/linux/mlx5/device.h | 6 ++ include/linux/mlx5/mlx5_ifc.h | 13 +++- 3 files changed, 87 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..a184d739d5f8 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); + const 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,57 @@ 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(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"); + 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"); + 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"); + 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); + 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 +176,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 +205,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 +228,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 66d76e97a087..70f1788b560d 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