From patchwork Wed Feb 28 13:33:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 137428 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A335D43C27; Wed, 28 Feb 2024 14:34:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9190E432A8; Wed, 28 Feb 2024 14:34:00 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2068.outbound.protection.outlook.com [40.107.243.68]) by mails.dpdk.org (Postfix) with ESMTP id EAC364329C; Wed, 28 Feb 2024 14:33:54 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DlIA037ZydJJJZzk9ck2H7NmXM8ufKxvoiVJE/eelvk9X55k6tEDv+qzTD28YRg7pk2sLxICYk/J07Lztym8QaDFT4a8Vfp+2+/ob/uTxo8/7V7AlHzJC8Dxr2iSDP+d1s1qfsqSI6uT7ZxPU7XAcre3iSVVkz24KpJUTvGA4uAcY34ZWbLd0PexcTdHh7bFw4wLulx+QEhpFaPNBJ7W3CjoLGXxPofqrNZee+Pnz+xibyXWqJs/hP7impKna+7wQAY0m7v18PqaNLI50DrAT08mY6BTVH7LQP3V83EPNtdrNKBbciDLKB4bFoTVy5czQry3Jxlm8snF/ih+Iu1A8g== 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=D/9ycIBQ0V8qF/SEy14URUQ2fs8gL0emMEkZwp9djVo=; b=RZ4OWOuBXRCy1/zfMnpCp5u+3vxE6sVcrgOLqBaqVVtz/g4HYpIH8KsFWyhc+AqM1QCiKQRpeebt4HCthvqSX66oHgNCEythcb0PQDNiKjCZLU8Y+CHndFau0lDIrwX0REmhzuaNsW0KKL/UDg8lGUErTz13O8f85Ad9K9hrZE4cq00ydwYS3HKuJQ2aBJzNtF9lXRMtvTmRnFBGg8h5San6aE2Xoluo5W9++0QKBK2Pctji58iLvtxAvlNq96gqfCkSiyT/LRhdIbTyVdUJBSom/RdBzQ6EnkeaK3w47blJjJV05fT1MPODah80fuCZ2/JzNyVxgWxrRc9mS/UgjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=D/9ycIBQ0V8qF/SEy14URUQ2fs8gL0emMEkZwp9djVo=; b=Bg3KnTFtOoPb2ikHCosxQmdhJ+jr3AI8ILKTwSAcJKKgbpt5WlKvidONy8ueQ1noicqpM2qYe4JGyUxtAM+2K7mk2P1GKHubmbchl1Turv3XyvPCBr/CNkwwAQyal9dngHBJ6GRscz+mD1md0fSt1ValET0jTN6rcKLLRrGJ+g2aux68iMdWcpjfp8M/9YxwplENjF3vj/dWdaaWyPPMq+agXo2+l2phLUhSFfCWqNd5fWGZwnK1ylHAGaxZwrtCmL6/jhTuILsMWmtzqH66B94wQZohLXPPzepzrqk6BN/QLbJSgFsW9TbzhXATI0G+VXaCuUMV5VSn1AwMQ3FVkg== Received: from CH2PR12CA0028.namprd12.prod.outlook.com (2603:10b6:610:57::38) by DS0PR12MB7582.namprd12.prod.outlook.com (2603:10b6:8:13c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.36; Wed, 28 Feb 2024 13:33:51 +0000 Received: from CH2PEPF0000009B.namprd02.prod.outlook.com (2603:10b6:610:57:cafe::1b) by CH2PR12CA0028.outlook.office365.com (2603:10b6:610:57::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.49 via Frontend Transport; Wed, 28 Feb 2024 13:33:51 +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 CH2PEPF0000009B.mail.protection.outlook.com (10.167.244.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Wed, 28 Feb 2024 13:33:51 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Wed, 28 Feb 2024 05:33:37 -0800 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.1258.12; Wed, 28 Feb 2024 05:33:32 -0800 From: Gregory Etelson To: CC: , , , , Dariusz Sosnowski , "Viacheslav Ovsiienko" , Ori Kam , Suanming Mou , Matan Azrad , Rongwei Liu Subject: [PATCH v3 2/4] net/mlx5: fix parameters verification in HWS table create Date: Wed, 28 Feb 2024 15:33:10 +0200 Message-ID: <20240228133312.474474-3-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240228133312.474474-1-getelson@nvidia.com> References: <20240202115611.288892-2-getelson@nvidia.com> <20240228133312.474474-1-getelson@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF0000009B:EE_|DS0PR12MB7582:EE_ X-MS-Office365-Filtering-Correlation-Id: 44637361-da63-460d-c391-08dc3861e6f8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UC1LfRU5Ygr0NnH8qEEHS8RzTUY8PtZr7JRCOb1mCoSfv9r3sVy7oJvnv91b/Vpw/uNpyR5K7hYZkJaKmLAU9XyLrbEEaWN/inwWo+R2DSRtOWXC0XX0GznwP+dIE7um3mzO3QcsO5hSS9pJRqUBQ19rvzBXzb2SpgSsn3W3KfXcfKS7BVfhndB72Fm/3gJwwZeBd3OR1dhkFqcR3ZmDFJE6wYwsYr+59ZaVZqXccC/mQh3wwHzVQHb200RQ9Rb+baD7LriVpdPPWbOayGfuS89gaiiJPGMhMzAhGnz4lEsdsAek8Um9a3Ux6fDs7MgwITqaX7I1dWWr9ColC/iJou0di9a0Ynj3Dh5Ty/mfxeb4b9kHDbaLl7kbCEDW4nVwYObEV5wSiM/jM0l+KPKWfmmCtS+2INJ1cHlwNwkSf4CJi1z/walBsYHLRHXbxj58nBH0+5UeEGSoos9VD3CEmR6CS3VUWj5qvy4D9WXg7bgn/P3tiOS4M0moIBDaqi/dNKa+/C/EyFY6isW0VPwSAdpWpIWH7TkorbjGgiJyU+2keq/k52w2pK/njOOwdUKNbzovfVCa8bImbkJ9PCx6xCbzZ/IALGe6E3Ye+YVwEwJJT6xgDiuf4CxDyxByoUnAjYqyrARovKIpk3Wqnw1o77Vi/gb5Qt062a7x442vpqQSIwgdIW8mX19JynuovplPNfACsn4oUsQ+h+hY+lBoc8UOZP2GvtWYZhqCyx1s7DBb1CkQfbsbx9zxANMWgz9F 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:(13230031)(82310400014)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2024 13:33:51.5469 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 44637361-da63-460d-c391-08dc3861e6f8 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: CH2PEPF0000009B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7582 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Modified the conditionals in `flow_hw_table_create()` to use bitwise AND instead of equality checks when assessing `table_cfg->attr->specialize` bitmask. This will allow for greater flexibility as the bitmask may encapsulate multiple flags. The patch maintains the previous behavior with single flag values, while providing support for multiple flags. Fixes: 240b77cfcba5 ("net/mlx5: enable hint in async flow table") Cc: stable@dpdk.org Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 783ad9e72a..5938d8b90c 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -4390,12 +4390,23 @@ flow_hw_table_create(struct rte_eth_dev *dev, matcher_attr.rule.num_log = rte_log2_u32(nb_flows); /* Parse hints information. */ if (attr->specialize) { - if (attr->specialize == RTE_FLOW_TABLE_SPECIALIZE_TRANSFER_WIRE_ORIG) - matcher_attr.optimize_flow_src = MLX5DR_MATCHER_FLOW_SRC_WIRE; - else if (attr->specialize == RTE_FLOW_TABLE_SPECIALIZE_TRANSFER_VPORT_ORIG) - matcher_attr.optimize_flow_src = MLX5DR_MATCHER_FLOW_SRC_VPORT; - else - DRV_LOG(INFO, "Unsupported hint value %x", attr->specialize); + uint32_t val = RTE_FLOW_TABLE_SPECIALIZE_TRANSFER_WIRE_ORIG | + RTE_FLOW_TABLE_SPECIALIZE_TRANSFER_VPORT_ORIG; + + if ((attr->specialize & val) == val) { + DRV_LOG(INFO, "Invalid hint value %x", + attr->specialize); + rte_errno = EINVAL; + goto it_error; + } + if (attr->specialize & + RTE_FLOW_TABLE_SPECIALIZE_TRANSFER_WIRE_ORIG) + matcher_attr.optimize_flow_src = + MLX5DR_MATCHER_FLOW_SRC_WIRE; + else if (attr->specialize & + RTE_FLOW_TABLE_SPECIALIZE_TRANSFER_VPORT_ORIG) + matcher_attr.optimize_flow_src = + MLX5DR_MATCHER_FLOW_SRC_VPORT; } /* Build the item template. */ for (i = 0; i < nb_item_templates; i++) {