From nobody Wed Feb 11 15:47: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 65D2CC6FD19 for ; Mon, 13 Mar 2023 07:52:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230141AbjCMHwk (ORCPT ); Mon, 13 Mar 2023 03:52:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230135AbjCMHwD (ORCPT ); Mon, 13 Mar 2023 03:52:03 -0400 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2078.outbound.protection.outlook.com [40.107.212.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6762B53721; Mon, 13 Mar 2023 00:51:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XxjR+RF2gbDlqvvi2JI6407bdRAAlQLg+j6eWyF4Gueit4XEEPLz6Vp5nqbV5HzBRQi1aDyE0dobPmQLRbpcUamREHbr5nEtb/nSbJRGCJLsxkbBYlpNXBbnFuKO1QM0paij1PZWywymLoqEyXuCE+9hurW7GmHUofuIJGZuBPlp/d8i4kS0hmkZMGU92qZHLLPoayS2x3g/CA6t+Z8Ev/oTlRPrM2o3M8Ke743nYfP2JYWKeQfxGsus3tgYL7SGtAWX4BQMx8/2u1bV+HSSyT0nqn3e65b2zMWGCNiX/RUsUXh1DfdPCTD/XgqIQzXYzk+hlHi2d3OApeoyIfjQ/A== 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=EQqu8cxVEOWxSviIM3lA7JcuafdzI8ii67iLKZZZ0rziNgmHYB0cO26HSiZ8D6f66UubErjQUaiqkoaM94i/8S7DRchDK4bnep0GYXrDxkXYI3qSooAwE0lgNBwNDjXAWr33cXzIrlhOOqluGR+4S7LGKotyUEWaVhUZGEeVUHN+zk175PqOxyRMlmukDLljh394hhOzJ9h9bE3e29CpfeV9wWUoq8lIKT2Wu2AM7UvLgsnKAprIF2VXTRRqrrC96I72D6gyRc0qTVl1KOMsR/o0pB5L8I7eXbpsqXy4i2X3IzClBhY/XycL6FpxTJamjaSAgQrRR7mNnpG9s6J3RQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ujul2KGrmfcoaS9XrNmTunJFhP8wR2gVoIlq74Lykb0=; b=AIvFeXNZUoGnEBrXueewx+d5/2t7hJw6tvjtxs4VZmYSVEnzoiL2BrJ/hOgCocxGzs0gZ2TSFXdTkzOkM8VXGbe5t+xP3nOJiIQs0usQ5nLYXqikB9SegJrHNk9Jd8VunXfyXQ8ZF0xfbNCphVbJM6HFDNLWOTjoh28jaN0Eft0HJWF6Jd0VW00XA3f2/2U8osVqb+q564EFs2oJIqmzWTDXWcWaPJ0tPixNNTYlT6RpUCXXxQXT+/Gi4aI54gYrKFCyHRbWvqqb2pfURIIUE0/XusOsMsdH0WzbhhO7tHq1AxFcr0Dpao6Er3sD+DseoJYwKbYOeuLf6BDPZt4zew== Received: from CY5PR19CA0091.namprd19.prod.outlook.com (2603:10b6:930:83::16) by LV2PR12MB5848.namprd12.prod.outlook.com (2603:10b6:408:173::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Mon, 13 Mar 2023 07:51:42 +0000 Received: from CY4PEPF0000C982.namprd02.prod.outlook.com (2603:10b6:930:83:cafe::f8) by CY5PR19CA0091.outlook.office365.com (2603:10b6:930:83::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.25 via Frontend Transport; Mon, 13 Mar 2023 07:51:42 +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 CY4PEPF0000C982.mail.protection.outlook.com (10.167.241.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.13 via Frontend Transport; Mon, 13 Mar 2023 07:51:41 +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; Mon, 13 Mar 2023 00:51:35 -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; Mon, 13 Mar 2023 00:51:32 -0700 From: Gavin Li To: , , , , , , CC: , , , , , , Simon Horman Subject: [PATCH net-next v7 1/5] vxlan: Remove unused argument from vxlan_build_gbp_hdr( ) and vxlan_build_gpe_hdr( ) Date: Mon, 13 Mar 2023 09:51:03 +0200 Message-ID: <20230313075107.376898-2-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230313075107.376898-1-gavinl@nvidia.com> References: <20230313075107.376898-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: CY4PEPF0000C982:EE_|LV2PR12MB5848:EE_ X-MS-Office365-Filtering-Correlation-Id: 8480dff1-489c-4f61-7cfb-08db2397c8b9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XE8+7x7y/SznNGA1CdvoorEpy5DpZIDThCfYEV4K8XOPD03nKz2MS25cxVLckCEX61mfNlRF+enUg51WBmhbbVJ6sc+d4SAOSjDB1ht/ncazD5HJGTLnFnfm+pEyJRBkdAuNd9egF8zS35n/GJKIWhYlxXF1pUpgk1xP+4zfAbzJjr4NLo6qVIeU87L/TVAhk0TxvlU+edcdIiuUGTAmXkfVpjQwd9Y7zmzB7OMzHpKbvGtRR+Xi7MfC3PhseaaX8zbLzQci8YRHjvdRAqihuTDKF2y+zfNgF6hh1bM1YVtYxdanxaP207tCNLAJp23T4ohTrOzoHJpqlm1U2fBLpzHODiDOVhAF3+XEXkeuyHSLgvcN+EB8jkjI9RjY0dO5ngorQ7qLY7Ifwc/Gar88EhTFgNwySAmVQ1/tYLUpYdKnLj2Roe7DsxR8pPHsX96HnaZZWJ2zGxS7mvvHR8eEqF8CVnd/cWXDRTkZ+YYjpAQDaPNtNZW1Eqr4Bmx4yk54GlXyMI3l03Ou+Z/mmfARr3WbaeKpkM3G5k6RuJpToQB1BAcaaXUxMInIOjvGmxeLCfhUyhIjWNIHLJ19Lht1JCtsOKrh1vChX04SUw7ENPVipn3VOeOdiUubb5odQ2S67hoRDwIYae6gnVsqImDLgpOWGwO37/+cb/JT0+IIwV+CKPovNjpx0Ig878SiCUZcojSz+kLcuqqGp6Ce96eN/LIzwCNh0lIxShJuSZZ67+vt0dGYkMsNEK+Vpt+KKpqv 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)(39860400002)(136003)(451199018)(36840700001)(40470700004)(46966006)(2906002)(7636003)(83380400001)(36756003)(5660300002)(40460700003)(55016003)(40480700001)(8676002)(70206006)(41300700001)(8936002)(356005)(4326008)(16526019)(70586007)(36860700001)(82740400003)(54906003)(86362001)(316002)(110136005)(82310400005)(478600001)(186003)(47076005)(426003)(7696005)(336012)(6286002)(2616005)(26005)(6666004)(1076003);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2023 07:51:41.6596 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8480dff1-489c-4f61-7cfb-08db2397c8b9 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: CY4PEPF0000C982.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5848 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 Wed Feb 11 15:47: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 703AAC6FD1F for ; Mon, 13 Mar 2023 07:53:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230242AbjCMHxH (ORCPT ); Mon, 13 Mar 2023 03:53:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230240AbjCMHwV (ORCPT ); Mon, 13 Mar 2023 03:52:21 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CFA928EA0; Mon, 13 Mar 2023 00:51:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hFXYiy9/6eSFIZyqb26a9XdbkXhhlSSdBIvMf1mv537MvRku+5rt52PEDZwvI0mBzY9z525A/oh6QNkeIBu1AG7vnXWkqtqotDpJ7rS/IqmsEI1mr2Vd/F4VPslaausjs60oY9A8BVgZSIqzZcFjhVUZbNMAyfaHY4+4Tx0c6s3uW09w15tuYL5hj428xgziNnsQf3qUfx7HIToCSsWPM6bnu4MnB5BKj/HJccFTXAtJj/P/4G5aancln5EGHmKPC3/2GuGrM4NZYsF15yV6In3xdyfBMEpy3CwSjD5COUZOMDE9B8GYLQsyXgKqVwifi72ILFDZtdc4yU+K4dGR2A== 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=kU1ZLTR3b8xvGnS+kVKC+EHwXa2EibVqrmVMFapocwT7Sx1urdfFHd80cgMb3p+LevBuMkZYPVWaNoCT+bSUYG7+iaouHSfne3zvp8aEpV2ssC5+Ee987mUuVJfQHM+MvT6DGLAaPvSz1WZBTOB4qWzo1u8iuQbdjC8g+e1Ai437FmSZgnRAOFnGLBGQ/QXMeZTmTNQtNtJxzFk2QG4n1ppoQXWjXIvxqpsCBRBsZOVs2sJ8kK8pX0tVk4mD3xNNPe9JeaaEivfaakUWFehcq/pw0m2hO4ArTVLEjIa8sYCDkfiuBdhDgs5037qHyRkm3iQABNMLcgESqBuE4Eh//A== 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=l9+KU7YTv70LcPI9sTqYHjSPOzTytRYs0gJXbtLQBCw=; b=hK3+jyQOF3mTXybWZd+NqRwK49bladuzB+UZKv4GHHDEE4m7itQDH8LZQKRnP5+NkrxPLV19zqjQDVWIJc1/qkj3yIoBi2ykHcghH0tBVHYOrHn/ugntbOu+ENyFnhGsOfVOX82cmS44KO9QsGv2tpR5GJxLtPObXPjyJRO2a914utfhDPEO4gnilATvzTSCUFic/f7OkjxE/42oBWw1iFOz7aCRQx1sLaAVd/fzq7qASUCxkWD6ztQWURAC58+D0UNtl9lzfNtHnLMJ0QRsoW3N7IvpUnfVKuqNzroPiAMwzCC3MyfcJlwyn2COyG903bzxm8u53x/2gStay/XYhA== Received: from CYZPR20CA0002.namprd20.prod.outlook.com (2603:10b6:930:a2::10) by BY5PR12MB5015.namprd12.prod.outlook.com (2603:10b6:a03:1db::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Mon, 13 Mar 2023 07:51:45 +0000 Received: from CY4PEPF0000C964.namprd02.prod.outlook.com (2603:10b6:930:a2:cafe::a7) by CYZPR20CA0002.outlook.office365.com (2603:10b6:930:a2::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.25 via Frontend Transport; Mon, 13 Mar 2023 07:51: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 CY4PEPF0000C964.mail.protection.outlook.com (10.167.241.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.13 via Frontend Transport; Mon, 13 Mar 2023 07:51: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; Mon, 13 Mar 2023 00:51:39 -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; Mon, 13 Mar 2023 00:51:35 -0700 From: Gavin Li To: , , , , , , CC: , , , , , , Simon Horman Subject: [PATCH net-next v7 2/5] vxlan: Expose helper vxlan_build_gbp_hdr Date: Mon, 13 Mar 2023 09:51:04 +0200 Message-ID: <20230313075107.376898-3-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230313075107.376898-1-gavinl@nvidia.com> References: <20230313075107.376898-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: CY4PEPF0000C964:EE_|BY5PR12MB5015:EE_ X-MS-Office365-Filtering-Correlation-Id: 07c51c11-7fe5-4b19-afd1-08db2397caf2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xQpxC3khOkdAeYXDnnnR5s8PuLcwTTF1h8hA+3YvyOZqZpPImLVz+9LfpNZRUrJ108kNVDWJ8JNMdqq1RO/wIUPbk1cSqfu/9rIbmvxe52u+icGxGaH3k4t0HpPvQFS/Q1osrLsfGNvut9joyMEBXQJOtTF9qKKNV17yspNbaVVSIn4pjfo3Z7Rki47xyBUOHjO8u2NjUDOsTCEF/k2sbAqjmaFLjWLvG2NvQSUJNzvaM+zliQtEti2x8c/xRGHyxwqCw9Ls3Klzkv5BuQiMNwhKVdl8t7e5+whz263/+GvYmuzD0WaoOXCwsip4Za1iAZMhJbfRFwJt5y66kLQhPcrtcIZ8gCdnHMvsLpdJ6OKDADnNTAiThodio3UYv1qPMKftUPJxRZMLs3wxY5v1c4dsO+OBygP4rcoMPVKwFXmNRnGq90eyccjWMYDJLe1KfmQtFopuCIn1PD37TTIA3NYRZFUigjzViw8CWL+bbvULRp2XxCYO1y2MK6wpS/3yWBg9zI56yRMJaNdk9vG1ipK4DjtGT+2ClXga8mZbMV0LPlS5T22dhFYNQZAhqaxTQ1KJtvn/+oUalZoVaeshXfet6pmynOI1Wxq2Rv+GEyHYXKtP74sWhazBI7HKaQrHslOz7RP9oTSQRziYiU2jnOfkqZ8MiE/ztuK0C7EydVxmUb8muBRWo4SD/lDKwwWFmYjeP1ql/R7tgPCw8HJ4XKu3Q7xJQLH94uuDP9kvSTM= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230025)(4636009)(376002)(396003)(39850400004)(346002)(136003)(451199018)(46966006)(36840700001)(2906002)(83380400001)(6666004)(7696005)(36756003)(26005)(4326008)(5660300002)(8936002)(16526019)(55016003)(186003)(40480700001)(1076003)(6286002)(86362001)(2616005)(41300700001)(426003)(70206006)(47076005)(70586007)(356005)(336012)(8676002)(7636003)(82740400003)(110136005)(316002)(54906003)(36860700001)(82310400005)(478600001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2023 07:51:45.3586 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 07c51c11-7fe5-4b19-afd1-08db2397caf2 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: CY4PEPF0000C964.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB5015 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 Wed Feb 11 15:47: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 D7C09C61DA4 for ; Mon, 13 Mar 2023 07:53:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230180AbjCMHxL (ORCPT ); Mon, 13 Mar 2023 03:53:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230305AbjCMHwb (ORCPT ); Mon, 13 Mar 2023 03:52:31 -0400 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2060.outbound.protection.outlook.com [40.107.212.60]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E14E353D99; Mon, 13 Mar 2023 00:52:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OTjMBfy8p4eCdFR4KuVQA1CJcpIZs6QW9Vchf1En12oj+whvTwSlxRdCxhW6Oq5m3mzswZikkCyLSdYWGc/vYkqVFqxq5YAqQmuBX7hgyIX5x5SrTb6W5gypc8Ln7fpVVOapERJETX/7YGC0WlScptrVUPitXDPKEuLUhkFcMhPLJ56GQdlqzjY345Af5l6KegjmWVh5eArn7tB33U8JxQMnXkW1E9HMWS1dZIIqBzk9BP1m8qWB4avy5nzA7HkeaNRRFOKnQYqA61rlkk02nPqJfmq6pJcmbQfPYiUFFq/Tt0jPL20Yefc76+yhImG44BXxhq2yrEF8LgBDUawAdw== 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=JFP4XgMGqn3N+d7XevgEijnuj99OP5e9jkmTe68lnChBFEdLBjf6jEHOnrIs0sR6sD+8fA6sNl3xHptqay3KvKBRE4O+RDRQxQMM6h3MNrL5Sz9w6zBeRjeQeNmDo9PSMB/Yv/j79RsjgtSkqE8ufzjE8t6cLs0EiaNWw35QZzhNGA9PPxoES/VIfkYGyqThHFt+/IxgUWtHPvQN6Cc0WVn3KddygIknLHrrr7DCMs55jviPDb6UmG0TyzmZ4mdlo37+SpjRnxJ2nzPWWB0ucmMTBHpmFXe2FUaSbNQQPJvv/ZsLywyDpkNPagnQQL+iTPT73pAKsGwZBkzfbSdCrg== 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=WmKlamMIR5NxDyOTqr86Eb8rEy5TbBkK4ShBAdzct5Q+I8IrCiowa7KpP53qOZDWf0vV1FYQNWZrfinW5NJsvlOYrvqj06ewriX7nVsT+Bn8KOCVCWM2cBtMJAvu9564cF/5GMaZH3Gl0sh1+m/GxD3RcAiLau6d2veNDSyX7N8zBYpTotogUaMhYEUUnWr3GB0Osrahy99xH/1rIsVFM179i3PgyVyyqreZH7rgC4lGSYQCS0DFLIn40NOhDw4Aqr+y7iftg25qCL2yLHDSvWxwc+cs/0ug+u00DCCFRIwkdwnfRu+HRUZ2gpbLRV6RifZKGU1JkEoBHgC5KyDAZA== Received: from CY5PR19CA0103.namprd19.prod.outlook.com (2603:10b6:930:83::17) by PH8PR12MB7374.namprd12.prod.outlook.com (2603:10b6:510:216::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Mon, 13 Mar 2023 07:51:48 +0000 Received: from CY4PEPF0000C982.namprd02.prod.outlook.com (2603:10b6:930:83:cafe::c9) by CY5PR19CA0103.outlook.office365.com (2603:10b6:930:83::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.25 via Frontend Transport; Mon, 13 Mar 2023 07:51:48 +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 CY4PEPF0000C982.mail.protection.outlook.com (10.167.241.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.13 via Frontend Transport; Mon, 13 Mar 2023 07:51:48 +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; Mon, 13 Mar 2023 00:51:43 -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; Mon, 13 Mar 2023 00:51:39 -0700 From: Gavin Li To: , , , , , , CC: , , , , , Subject: [PATCH net-next v7 3/5] net/mlx5e: Add helper for encap_info_equal for tunnels with options Date: Mon, 13 Mar 2023 09:51:05 +0200 Message-ID: <20230313075107.376898-4-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230313075107.376898-1-gavinl@nvidia.com> References: <20230313075107.376898-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: CY4PEPF0000C982:EE_|PH8PR12MB7374:EE_ X-MS-Office365-Filtering-Correlation-Id: 7bc6ca57-2292-4947-180e-08db2397ccbd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UoRz5gwFiYo/qr//oJE0c5MuoazsJllT5MTXWgHD7DVZ2kV5M9Xq62ooisJemnIUdi+gvbQqBy/Rj8aOiukygSGGx7TuDmeI8qBkCMlYLsZ8+duvOM8X5ZmtGsYa3Iw5MDmgQnz+UbuHmjIIrJIri36Rq50h+XcLpirdfxZVtIIl44qM8y1mxIUFiLdl1b12kuAmaIJREYUv1YOmUxSiZuBpC12K2Iv5qee0CHkI3mRRfETihxb1PRRnwqNugilt3LZqJtOEQGJ3iThgToTkxaUzfwq+GjA8nd59ruczgAe8C3bzv4KVX/E4Ep6z7gekjWU96D6CnAHxQk4B6Hv7TaWsW0GVi/DasmopfB9VTLG3/Y2uPGYfUlEaiZiteo4ymRP1oyipouaGTBK+Fluv02KjRM7G3X777WnZVNkHrs4NRIMn7+AZpMjuC2vNmH0VkHoqBdSbCjW0WxRvbxkJwvEoG3nAtUa/W+w1tgX0K3OgDm2g171JiV89Ax3cvJSZxfDFzBPaiCJD0EbzFAaziq70QxfTiXoQkmgDWP1IQ3+5wYMgUjXVX0+STuiLJGux+7diJJOT8pQupdo3K6TrHHYfaxvcduVNLiSwSlmvDQWYoBmU7yKosrxfgy3KocLiG8lKnqtknKRVZ7mqrZPYk5yKJh87L5CGRVJdhceWvuZ3kMvttYLKWQgqOjKzWBRjq8J2bOsK8g/3ezTAoUtNGEKteD7zcJduFShoGSNj3fYopXSClzS7hFPe/IyFGapG X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230025)(4636009)(39860400002)(396003)(346002)(376002)(136003)(451199018)(46966006)(40470700004)(36840700001)(86362001)(82310400005)(356005)(36756003)(7636003)(36860700001)(82740400003)(55016003)(40480700001)(40460700003)(4326008)(8676002)(70586007)(70206006)(41300700001)(8936002)(54906003)(110136005)(478600001)(316002)(5660300002)(2906002)(426003)(47076005)(336012)(2616005)(83380400001)(7696005)(16526019)(186003)(107886003)(6666004)(6286002)(1076003)(26005);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2023 07:51:48.3785 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7bc6ca57-2292-4947-180e-08db2397ccbd 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: CY4PEPF0000C982.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7374 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 Wed Feb 11 15:47: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 38C6FC6FD19 for ; Mon, 13 Mar 2023 07:54:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230287AbjCMHyN (ORCPT ); Mon, 13 Mar 2023 03:54:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230202AbjCMHxq (ORCPT ); Mon, 13 Mar 2023 03:53:46 -0400 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2066.outbound.protection.outlook.com [40.107.223.66]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F62D55044; Mon, 13 Mar 2023 00:52:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y6e/YXBg0Z/fY1sm2M8XFk8BJzphxvjB8nPt8Qn3fLAU8EI7prhh9FJo3Zm8SLbbw0XEBb3CDQKXFcUBRuQ4rMUjUvkOBbxpwsZHwVD374tflzWUnV+9YDpmkEXzbJofEnc+Bn3mY8nTfTUOK6/rsnz+D6fz7ZcGoAgSCM2bTB/6xIU+FM95OsNpmN+DWZ57lbKMlMpJ/gtEehdaFUUwfmfBrG3awtGoSflmT5hxwiGU4ACjIzJPlTJGqQBtfK9ED9k5lacPrF1woWtwb2i9SdAA2rtCojDheCBx7AgBx4ys09ZYEpWo7Xo+ZHD0SU0JnrDhiMEQXPKvr0919THyHQ== 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=3LiRfAa2itCYIWXFmGqtdDa59C96LZtJJ1JYHLmSVfM=; b=hNUTC0/CipNcG63cmEj16/Sra1Dd8NiqddjnPrrZSHXTCnlYGgMczV26P575TvvPTHEtK3KA038luPXcXaJFVkvWt7LG1cOaiRsganHSUSaeX4l8ptUSVTzSRSD9yIE1byRwPCMU9mTw1qONgAEx19LWgVcB/e9vxmk/ZFX4JLLAgVAR+FjJ0vQAa1JIMqT2uTfbMDnFNKDFDcnRG9smXzkMST6ak4p4m1dPB2c4PJc+3uu4isqbJZP9u7rTI3Nh2ZShFFyFlT5H0qrv02MtmsLpYAKwj1z1vRL4CISR0gSHTmNXzCQiHHFNSbdXXSYuvxh/glrGL7Kj3UAoQ/vSNA== 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=3LiRfAa2itCYIWXFmGqtdDa59C96LZtJJ1JYHLmSVfM=; b=iV6+HYTYJkpiXazyHKCGswldYl0/rfiFwbu7cnIqGqLr2EyVNi0/uIcbdv5Xe/dIoDbzOHsSj4zfl96WECrZtsGnSmSKxv9R9GGqr94QRF5sIs0Zr5I2E3y0kuWAhgKPdeISpT6M9Nf96Y9Orlg0MVntfCI65UHmIT5bcn1KaQ9dFp+B/qmLmlgKmpiG5fEH1wjuC+mi7aE3IMWiIY3ZMPvE5Xpq5+cbrqODcKlq5OEmRBLqbeZZGqKm1YPlO0LXLvfOuWtDPiAEWii9enfbzQXPCGrPvZYGXatBr0h19H2yN/W6+mpOIWpibuJwS2cRi3NCmH9RktjSfwSLttcLFg== Received: from CY5PR19CA0105.namprd19.prod.outlook.com (2603:10b6:930:83::18) by IA0PR12MB8352.namprd12.prod.outlook.com (2603:10b6:208:3dd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Mon, 13 Mar 2023 07:51:56 +0000 Received: from CY4PEPF0000C982.namprd02.prod.outlook.com (2603:10b6:930:83:cafe::65) by CY5PR19CA0105.outlook.office365.com (2603:10b6:930:83::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.25 via Frontend Transport; Mon, 13 Mar 2023 07:51:55 +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 CY4PEPF0000C982.mail.protection.outlook.com (10.167.241.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.13 via Frontend Transport; Mon, 13 Mar 2023 07:51:55 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Mon, 13 Mar 2023 00:51:46 -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; Mon, 13 Mar 2023 00:51:43 -0700 From: Gavin Li To: , , , , , , CC: , , , , , Subject: [PATCH net-next v7 4/5] ip_tunnel: Preserve pointer const in ip_tunnel_info_opts Date: Mon, 13 Mar 2023 09:51:06 +0200 Message-ID: <20230313075107.376898-5-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230313075107.376898-1-gavinl@nvidia.com> References: <20230313075107.376898-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: CY4PEPF0000C982:EE_|IA0PR12MB8352:EE_ X-MS-Office365-Filtering-Correlation-Id: 5db7aa20-d4fe-4282-9b77-08db2397d129 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3ppH5rWpsuloN/GKY2jTQ2lKxY/qAXtnPIgDvEM4ReI0ipRqEoLkYVjK5uPG858AkK3i0rGDBiS7ArNpQpuqXlpSWiXde1spwD+YEARcDh3f62SPQD8Sq3knX7JusAD+Vw1Gpoq/ZHbILXZgD4U0GJe61tGrbDtA31tluoMq/+qUWF6GJ7xoEMOy7bSsgwDjqkl2aGckLlxgvxtnCbtKtXSEhOD/dZC/dsovQA/MLZT7X4nh1BWRnVRIHvhmwmUfdaHSsPaJ8uLtxnyIrblvDIyzIh+nD2pm8mbT+hcx2nDCY1BX9oZeG5xyEGk9vjYRojh8ppe8MJG/qts0OAt++h2KzcqhAN63x4IMkS37r9l1qOvdXv8eqEm8RvQmrXalej0Tkw2xbJcfJjQoruGJYFUvdD6CAzuvEuKM/uAdS+ayrqSj6KCzaGVZAW1Upze0cjffaG1XeRSGgjczhcyrjDLNYvLXbx5dwBiWbAGnIlYWThLQDtRrNQcLIj2p+6NxSOst0Mk7qAjS3p8ennHPiQp0ThIC8aKoyVnaxfxYIqC+gK1uH/tQFAm+H1fwGvetDyfAAWIqRswmOMItF+zBWdqLMNaA76XFrCXOrGC8uZ3i0ehuBYVDOVzRMV2RRbcrhQrzf6dt8cj6fDHr2Qp7B9WvpWLK407G08c9je5GXvewzut8olc+EyNIFMXPT5Ol3q+IGoVntE+6PsJPGdhnedXlM1QXVXGJDHMYV/vHkEV0idBpKCOsvmBl+KibS5XS X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230025)(4636009)(39860400002)(136003)(396003)(376002)(346002)(451199018)(46966006)(40470700004)(36840700001)(82740400003)(36860700001)(82310400005)(356005)(7696005)(2906002)(70586007)(41300700001)(70206006)(55016003)(40480700001)(8676002)(4326008)(40460700003)(478600001)(316002)(36756003)(54906003)(86362001)(110136005)(7636003)(426003)(47076005)(5660300002)(1076003)(26005)(2616005)(336012)(6286002)(186003)(16526019)(107886003)(6666004)(8936002)(83380400001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2023 07:51:55.8006 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5db7aa20-d4fe-4282-9b77-08db2397d129 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: CY4PEPF0000C982.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8352 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 Wed Feb 11 15:47: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 21771C6FD19 for ; Mon, 13 Mar 2023 07:54:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230268AbjCMHyJ (ORCPT ); Mon, 13 Mar 2023 03:54:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230190AbjCMHxo (ORCPT ); Mon, 13 Mar 2023 03:53:44 -0400 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 ABAE953285; Mon, 13 Mar 2023 00:52:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nOF8U4OV5y4Aj12UWYdbou0KR8YRcAtUtFfnRDxiJhhwdqnTs4Q5bdInE8A1jYGvSLBiiTgpIB55kgu4rG6iPWBbBGrs3oANJBxHThRNI/2IRz4vm8+SSy4245L+Bxo0N1HvZe/9fKvUumEcv6h0gy++7nqq/zOsc+4c5Yijtbl0VNvUFblnbVKVDVoJqjXh/BSW0LhojrgWT7lZTp7BRpdjnAAaqBMl4xpTdyOLZg79PHERkiZN5orXPeYsZ4e0dOd7FdhktKyfadzUqgInBSeiTbsXTakpD2cj8wrJwLn5QaMNvnb3UQQyOEGGzU2by/6jKXM52hvjjH9FKXrLeQ== 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=ECDUJuNnJm8LlrEOk8STOlmoSzFscNLVzXsnQEIa7BM=; b=nDo7PjqIQJ5ZDGCSLVsFf0hsDHRMuOXiQWSVu9AE9CKfsivvNnxkYr3wB1bntcTBT/wHPNDPv39SXaWg0loTNJvQUkRFSiJjoch3irRuPqx1Hrs1YIuN3FWh/FcXC7KdKxFQ/7DryBPesK1WcX7my4zPN6RSQOl2PAzQKTOxjMWzSopS0g61dz7225Ga+eoa2q9FHFjsujatzUHQWbyCE7w2fiHcmSl0OnLWI3hw0qaU6MPyEdLTarPXomngkQcJ+Uds6svOSo+C3EDizNOfYAElKcDib5CuX0n81Dw1+sfIPDtdL7wvqjuvNyfHYL6U7sI4URRLUFW82+b/iB7xaQ== 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=ECDUJuNnJm8LlrEOk8STOlmoSzFscNLVzXsnQEIa7BM=; b=M8e6kzSyHQM12ohOfJVst42Q55fNlLZI/7VPtoILvaYYyK7yww5qgUDK8Fl8CvBSefUQNGiSIPRsYVO/cUvydiInA2wwhkg4Aq09UOztF62Cs/k3oOpY1QnzHoRDVKMma1e3hjGKHq6ZY6cN4Uol8rBQgHOsTCr787pzzjgDR/d58asMlHtsiIAcPf97eMNJdnVJehbybnHtmE/OTdTldiZA+WnUTf8gVIHmsEfS3r+KITsvVX/h2giS33kwxXgkOOVDIgFZ/78w89w91QV8b4Cqq4qF1WvGt/linq8uSRGJ0h9IXs0Q7+xlMTYliTydBasM78Wga6/pbxJ412/1Ww== Received: from CYZPR20CA0002.namprd20.prod.outlook.com (2603:10b6:930:a2::10) by BL1PR12MB5349.namprd12.prod.outlook.com (2603:10b6:208:31f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Mon, 13 Mar 2023 07:51:59 +0000 Received: from CY4PEPF0000C964.namprd02.prod.outlook.com (2603:10b6:930:a2:cafe::e) by CYZPR20CA0002.outlook.office365.com (2603:10b6:930:a2::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.25 via Frontend Transport; Mon, 13 Mar 2023 07:51:58 +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 CY4PEPF0000C964.mail.protection.outlook.com (10.167.241.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.13 via Frontend Transport; Mon, 13 Mar 2023 07:51:58 +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; Mon, 13 Mar 2023 00:51:50 -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; Mon, 13 Mar 2023 00:51:47 -0700 From: Gavin Li To: , , , , , , CC: , , , , , Subject: [PATCH net-next v7 5/5] net/mlx5e: TC, Add support for VxLAN GBP encap/decap flows offload Date: Mon, 13 Mar 2023 09:51:07 +0200 Message-ID: <20230313075107.376898-6-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230313075107.376898-1-gavinl@nvidia.com> References: <20230313075107.376898-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: CY4PEPF0000C964:EE_|BL1PR12MB5349:EE_ X-MS-Office365-Filtering-Correlation-Id: b540027a-1e6e-4562-a849-08db2397d2df X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: az2Aftfl6hM+iD/xKS0r45fH5t0DM3BCiy1zyKksfWlyVkspHnI1mODv6Fi9JpL3L/k589X46TMsoYNmbFgZ47Oa1lblH4nsToRyEBRtxY4oBSgsHsl2NWbtUh0lzTrACg2uEyNBNPzZf9rrYbYIXsJm2idWSU7ajsGxDOxfj57Ap0cS6iJVM1TcSKub1WT1pm9PHAVEC5CsETeVZCA76+9BbrtZ71CN+evUz81tzpAZfMxsLfbvL/uo2U4woJLsjzxwd8oh+dO3DtOxeB4wxrxqOvE6THLphnidYn+sQpsnhJ6i8GeJ9afgO7H8IEPymu8WqW8ZdhlS3MtlNl8eRzgnOYy3XryA47oWJlTCR/PZ6I7FdSp+QOCyMG4fQqlQW41P59kEM+rIyvBwNeyDrJZvUtwcV1Qtss/QBeDbDq34yf8CU0C8OkqzyLZQ+fvKHJE6vKchg+tR8vvMkfQ2CbT1B67Pd6gjsUvv+u2XjrOW9leGud1e1SnSn+KIdNouf0dRT6qLwrrMN5GdQqxECYIIFy9SZ+beVdUORfjAjs/Tck+aiwB09T785M8aACmiFUDMQvG75XjiZ/CWD3oaqvttpJya41NXw0xbIwmIAmRCjZFqRoBOlLm2olXy/QuedtFv5perGh3thFfCiyPQ0mZt9ZSBX2Dc9hXrNbTnPwTCdkrUw0ujFOvwDdBJURiJULS/Vo/9y0ACyT1XerHiogejE0V6K/fM00BO5dhuQsV8RgdzzuuhrjXHHwRuovqC 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)(396003)(346002)(451199018)(46966006)(36840700001)(40470700004)(356005)(82310400005)(36756003)(86362001)(36860700001)(7636003)(82740400003)(55016003)(40480700001)(70206006)(40460700003)(70586007)(8676002)(4326008)(478600001)(41300700001)(110136005)(54906003)(8936002)(316002)(5660300002)(2906002)(47076005)(426003)(336012)(2616005)(83380400001)(16526019)(7696005)(26005)(6286002)(6666004)(107886003)(186003)(1076003);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2023 07:51:58.6401 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b540027a-1e6e-4562-a849-08db2397d2df 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: CY4PEPF0000C964.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5349 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..570561f6a1b7 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,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(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