From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F1812456B4 for ; Fri, 26 Jul 2024 03:50:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E973B40EF0; Fri, 26 Jul 2024 03:50:35 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2076.outbound.protection.outlook.com [40.107.95.76]) by mails.dpdk.org (Postfix) with ESMTP id 004D840A87; Fri, 26 Jul 2024 03:50:34 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cIbz4JKLvuVnY1AXF1Tf2X3wn0tmrWSn/Sb4IJOPbzEigY0fG0JSyyxWuGZ/tqvKgGU3lk8UTP7D/8NbJUH5+tSx5aY71RG0dPPbQmoDvMK5vhDSLH4gZlakaivCr692OENfOdaJomb52UkbQ7RGICLR0nqav8oZFuy2PSslDB2yq/tJvu1dAAvpNOLKlOJUZZegB3FZhX2JNOa/T9JwK/tKDvVJYweUAgvvdGDNV867LKk/z5EgFqBbbfvonXXyxMvnXZisqNzKQDF8zPriMI1QcwxjfQlBn9OjZGL/6m3bbt1hMSyaea/AWLyPXskriQ1QDEOncEMpavb9+IWzNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=sbn1vQtbZEi1gwkABQuP3hsfzY8fUhh17mnwaVqnJkw=; b=D2B9/kp37Zp7kd9fOQwycsoQuSK+4EojEjLt2u+IW4c0ysBbRK557yOZD6DdYbvIh54PXzqETgF//TNiXPp4ys/hWBVQ/UOM++heg9xoLNp/uU5izFEtMzBvncJ0HgUCb30mUDF59hXtnDlbWyFIHJhuOijURZQDLQGKSfCUb3bWFRwqrPy4x4ZtOIAA1rmuHM6eZ5qhYFs7+/8riFMraJgnGK4LrevA1j5D8P7Tg7RhElUfR/LnXt//12PFF1lfgIrNVlFvXacHbBtrnTRoBfGjMoAUhAT3NNqF3aoCWos8fegJktGn21iXYJPGn9Kt8kvnNuZ0OXXoux5Mb758SQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org 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 (0) 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=sbn1vQtbZEi1gwkABQuP3hsfzY8fUhh17mnwaVqnJkw=; b=lGrbGxUYxQZmeHP4wlv8hUGE0gpm8SnKKQUyTqldNxqXUOePLiGgVDj3D4nQh4HM5PjVaHq3drnMEXTFH08gXzsW7/b4y0X3wTScxo2hiGxKXqYEv4YWRMa5Xe5zIrLtB0eCYIhKeHsusYMoj7HBGV2mJL9360o7diizf7CG6BjSu57WCu6EejfZ5ILJW/nCip9/RohsM1w3U6deDcPd2Q46//4Nu/3V7IljWRXcwDQ8MBWV9VIiumPrfUIBhvjIbHIp4OwmNBW1Cedm8ZZe8AtO8NIOYt9H8vwwPM/FgGcuo0FgWK6IMJZpkbUjgrTIYrl/EM7Xdri1giSULEPDIA== Received: from BN0PR02CA0003.namprd02.prod.outlook.com (2603:10b6:408:e4::8) by SA0PR12MB7076.namprd12.prod.outlook.com (2603:10b6:806:2d5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.29; Fri, 26 Jul 2024 01:50:31 +0000 Received: from BL02EPF0001A0FB.namprd03.prod.outlook.com (2603:10b6:408:e4:cafe::d5) by BN0PR02CA0003.outlook.office365.com (2603:10b6:408:e4::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.17 via Frontend Transport; Fri, 26 Jul 2024 01:50:31 +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 BL02EPF0001A0FB.mail.protection.outlook.com (10.167.242.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.11 via Frontend Transport; Fri, 26 Jul 2024 01:50:30 +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.1544.4; Thu, 25 Jul 2024 18:50:18 -0700 Received: from nvidia.com (10.126.231.35) 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.1544.4; Thu, 25 Jul 2024 18:50:15 -0700 From: Jiawei Wang To: , , Dariusz Sosnowski , Ori Kam , Suanming Mou , Matan Azrad , Gregory Etelson CC: , , Subject: [PATCH] net/mlx5: fix NVGRE item validation for template API Date: Fri, 26 Jul 2024 04:49:58 +0300 Message-ID: <20240726014958.43843-1-jiaweiw@nvidia.com> X-Mailer: git-send-email 2.18.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.126.231.35] 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: BL02EPF0001A0FB:EE_|SA0PR12MB7076:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ba7b711-b6af-479f-76f9-08dcad1554f3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?bGnb6u5mb04k/GePTaIZEdhnzQiNOx1b2w/3is6jpxjpWA+bdqNqe6EPV/LR?= =?us-ascii?Q?Uztp7cIIXhdMco22u5Ds7QJxsd1bkrNU2EbW3iNqZxDlPDkqFK51mrrwQJil?= =?us-ascii?Q?xhNj2iyup+SoZLI9m0qK33LJr1DhCEBz0z4pfdqcWAlhsVsm3hoNUZLSzbFk?= =?us-ascii?Q?8twmDHnaXADs4rPfUTcv3OmfePg5QTzbuDEvGqfMBNC/DNTMCkxjBXQSsC+H?= =?us-ascii?Q?D3ETn18lFRH2tWFFlil+3cxgch6GqP60mIR2TCvSw+YBgqNnLjMNbyQ0Z6EW?= =?us-ascii?Q?k5xd3DF8k9B1tNdV22YgYbkzxpt6BTrPqCyVbHxiXdRkfVHrRldLcmMGyny9?= =?us-ascii?Q?WL6au5FptW0wTUmdJyc3K8fD6FIsegXXa2BoyUe9eHCVJ5jhqbQayUPGKHO/?= =?us-ascii?Q?geA1E59F7RuhUnOcDzSDclG+bPN+1Hv43bH6c+HWc1OmAKPOHV8vK5iJuaIK?= =?us-ascii?Q?At2b2TLYyZlFGXiIjFnvd6s+0PIRbRAWFQVOK5bhV33lyQaT1weeKJUnrlYG?= =?us-ascii?Q?hxz2L6ke+adC+OXgSo7N5nPEkrhWlh0g7B/jHhhn2x+GHjBRtxE19jblW8jl?= =?us-ascii?Q?163D4TmU7rHMCHkjr/IKvwIumTuNPdpv0iYFICU71rV7IX6xuKbkDL7GwDCm?= =?us-ascii?Q?2yBOuJESwZgIGnAmA30q4WJMzbkKLvcWN3orIoiDGim6S/gcwPagwpjDGnO0?= =?us-ascii?Q?5TbFkm/Bcdn6241Q2QME5hEYbfz+S6TDNPZt/TBq9tTxz/jP1pMq3XhvMcUF?= =?us-ascii?Q?jhQ2egh1syZ0KT/cfr8iBwvrh2S3GnTjvIRePxw+6ceCGdn6spltWWlOqB1q?= =?us-ascii?Q?rDBAbIMRPS5orOXwiAVMZIqdwu+hXgE3mV9KgOvlh1wwYyHOnn9VQcrw12ho?= =?us-ascii?Q?hlliOtYM38CNPZJ6Arro5A1Okp9XZXGhx8mhIL0GeZUb/QPBcELTmWBm7WtW?= =?us-ascii?Q?AlnngB3HtK4Zhyy+61kNeUhol4i4I00VOJCWCafWQqgW8sliw1I9fdMoCTbV?= =?us-ascii?Q?W57eKIrtwzZTarS9zdw982nWSNlZjX5CIsvrpPNT7BvfCqFj8KarVkT3Kh1d?= =?us-ascii?Q?ub148Ky40wJ4G7gosrKPT2JGa0QKQMDl5FBAs8BbW4J/ESe0yWH+sGvARYEf?= =?us-ascii?Q?tfbXRMf4P5KfwKf5K6lrnBIF3m/QXLhyJduS4L1TyykpiOOi87kY+qDVzhH5?= =?us-ascii?Q?WY06w0NH6ptaXM4Sf/5OsVY8u7aL71fMBTwx++Fp5A3+cfalRHr+hcg5LzXp?= =?us-ascii?Q?lCxGxV8CO+TA8I7/eo38Ku+B5EH3WHROdjwRpr7PgfChlsohlDzBlsPKeV2g?= =?us-ascii?Q?/uZ3UTQpCrQMEIeRQRTKfzziqoY4/SLJ0jO0Ucf7x5XF3qGeGdkofWRoDVD/?= =?us-ascii?Q?22TXF5BT7msNysS9JKh8jUGVYXEKiESeiYhpA5OqNY7PmaoVmcuS2/DHCllD?= =?us-ascii?Q?rSKefffAAfx6t7nwBzPl44rqFAEDV9Wq?= 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:(13230040)(82310400026)(36860700013)(376014)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2024 01:50:30.9678 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2ba7b711-b6af-479f-76f9-08dcad1554f3 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: BL02EPF0001A0FB.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB7076 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org The template API NVGRE item can support full mask. This patch updates default NVGRE item mask for the template API. Fixes: 80c676259a04 ("net/mlx5: validate HWS template items") Cc: stable@dpdk.org Signed-off-by: Jiawei Wang Acked-by: Bing Zhao --- drivers/net/mlx5/mlx5_flow.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 72fb3a55ba..14720f54ab 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -3867,6 +3867,15 @@ mlx5_flow_validate_item_nvgre(const struct rte_eth_dev *dev, const struct rte_flow_item_nvgre *mask = item->mask; int ret; + const struct rte_flow_item_nvgre hws_nic_mask = { + .c_k_s_rsvd0_ver = RTE_BE16(0xB000), + .protocol = RTE_BE16(UINT16_MAX), + .tni = {0xff, 0xff, 0xff}, + .flow_id = 0xff + }; + const struct rte_flow_item_nvgre *nic_mask = !mlx5_hws_active(dev) ? + &rte_flow_item_nvgre_mask : &hws_nic_mask; + if (target_protocol != 0xff && target_protocol != IPPROTO_GRE) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item, @@ -3884,10 +3893,10 @@ mlx5_flow_validate_item_nvgre(const struct rte_eth_dev *dev, item, "L3 Layer is missing"); } if (!mask) - mask = &rte_flow_item_nvgre_mask; + mask = nic_mask; ret = mlx5_flow_item_acceptable (dev, item, (const uint8_t *)mask, - (const uint8_t *)&rte_flow_item_nvgre_mask, + (const uint8_t *)nic_mask, sizeof(struct rte_flow_item_nvgre), MLX5_ITEM_RANGE_NOT_ACCEPTED, error); if (ret < 0) -- 2.18.1