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 9292D45BED; Sun, 27 Oct 2024 06:27:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5A9A540289; Sun, 27 Oct 2024 06:27:01 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2067.outbound.protection.outlook.com [40.107.93.67]) by mails.dpdk.org (Postfix) with ESMTP id 209C040279 for ; Sun, 27 Oct 2024 06:26:59 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LGBPQ2Mlolca6nDApSaUJb3coYD8pJtXk4OXJOYfvlTiBHWGFZV0rmHdMOgdP1o0DE2pWmyEZhwQ8qIuO7lsmeeG6mbWyoG43r4LRhqm8aipluiy/0pwHD6ob6bEwvwDW2IU3aJZyxs4PJhcC6WAIIPJS+sAGIuxKm17AsEOU4z2x8t6ENN6dU4RrzHGvlnRSUxUJGyq0Yizn8Ps05DyZUdT0PN72TTG7aBSa6qBPXdTdmUyvapLqDFBbydBtqR22H72fJdlZUvSZ6O31Gd60P804++HGMLTh7C8gh+9dCAB9LDA4HaAOnQX9PugZpCkAaJc+g2Fz9aQwgXT+oqgdw== 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=+Xe6hIWYpJIOrbKAqwZvQ/kxb9NYa6xrXjClU3mkfR0=; b=M0IFQ562gChrawoDQ7pvdT+/FcYDHCPU3//xUcRobp8tw1dHi/PbI3QsaSCZb+FCP64NmON2feLvwGVhi3098ULxGsqB9QcLj96VTy451oepzi0gjKU9YHyOSXSMm/AtOMhcXOzkmkPFZzy6xSwhX5z68isW4VCKtuWEG876V4XQ32k9LpEoiFPXDIOBbYss+8aQQlBZW6m5oUuAF3K4wQgSFXRUvd5g31WayuMwm1QXPIGcced45WvjUeR5wSOzIwG5SZmaj0+LQ2HXq1qliiZwW7i5+2WhJm1zslVHFrq4Gh7BA/ckv/3a6u3WkIV4VLzYI7asPfs4+v3ZAkJ1Pw== 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=+Xe6hIWYpJIOrbKAqwZvQ/kxb9NYa6xrXjClU3mkfR0=; b=bx94VZ05yWSmJsgclFCY5Gr2u1nx3NVXBOYkTJmHWfroA+Yqs9R6GJ8SXWo9HbXppQYttcvIxQM00hFspCi/TDzAcGDuIJKNyV5tYWFf8D2tru79SLhY1wYrvZbg7S5dsXlOApAmzJ0gvY+sojKMTz6VqkW3BNYACHXa2XVS3kvIT2sZIRKoRBZqG/FWd+9PX6y0LEnqhCYKtUvazJGKP18CNocchNwNzKv3J1fTjBoil3g5BAvMGQ7meOJ7kdo3sWrlewTi56K67vl6t5pT2OROY1Cu1Q7Qo936yrISINdfLrIdID08TZesHReQ14g1B0NBHhWQNFjrtUobf5HOTg== Received: from BYAPR21CA0020.namprd21.prod.outlook.com (2603:10b6:a03:114::30) by CY8PR12MB7586.namprd12.prod.outlook.com (2603:10b6:930:99::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.23; Sun, 27 Oct 2024 05:26:53 +0000 Received: from SJ5PEPF00000204.namprd05.prod.outlook.com (2603:10b6:a03:114:cafe::b0) by BYAPR21CA0020.outlook.office365.com (2603:10b6:a03:114::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.2 via Frontend Transport; Sun, 27 Oct 2024 05:26:53 +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 SJ5PEPF00000204.mail.protection.outlook.com (10.167.244.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.14 via Frontend Transport; Sun, 27 Oct 2024 05:26: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.1544.4; Sat, 26 Oct 2024 22:26:41 -0700 Received: from nvidia.com (10.126.230.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; Sat, 26 Oct 2024 22:26:38 -0700 From: Gregory Etelson To: CC: , =?UTF-8?q?=C2=A0?= , , Dariusz Sosnowski , "Viacheslav Ovsiienko" , Bing Zhao , Ori Kam , Suanming Mou , Matan Azrad Subject: [PATCH] net/mlx5: fix raw encap validation Date: Sun, 27 Oct 2024 07:26:25 +0200 Message-ID: <20241027052625.208681-1-getelson@nvidia.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: SJ5PEPF00000204:EE_|CY8PR12MB7586:EE_ X-MS-Office365-Filtering-Correlation-Id: f6fa599a-a936-454b-f85f-08dcf647f756 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?JBCnyUbVE3cAQor8FRUoXzR1eiL/78OVtKT4S5Swiwyv2D1KvU3lKjOYOT/u?= =?us-ascii?Q?n92UZSeI01ggFKKhzPCPJHR8WzmyloaBuWwjBGeZKFYKXLwS4MLdd2xyU+2L?= =?us-ascii?Q?7J2ls161v6XDL/BR1q4gRc6bNJ6hWdZxxeihlQbAyRym6s5+lWKONnlcRZMe?= =?us-ascii?Q?0n/1gCbFV+Zs11J6M/vIcFsx1/ldB7egA0ObVN4fijprWst/qmqZoME47w8N?= =?us-ascii?Q?uUANMbOZMSPRvV8rGyaF6mckylnrMbbSk08YyDXbhFW7h9n6QQvRC7xPJJmQ?= =?us-ascii?Q?fUe6M6gbV3QpsHpYpfdM4+ze3Hv2zZssgnyyt0w8poy5PtIIA7VMcAeKJeFk?= =?us-ascii?Q?wQskzFHAmDCE5TxD1xZ7L2EXGOkhpUnwyX1qk5mnwxGvSoruZGZB52+HSClf?= =?us-ascii?Q?x/ZqNYN6o1/PZ2HjbDQz1B2ua36f37+6ph+dmBCGLayXMa8S2gr4MblszZPS?= =?us-ascii?Q?QO8xoEzQMhY7qe1Vq83iVlP3aL//NJDTqNDSL322lfE8tF7NANDeGp9BwIPB?= =?us-ascii?Q?d/EXxTupElt920C5Tmwedi27jSPfNIPbZddGcnctwoKoxKpOqGI4LIAIAmmo?= =?us-ascii?Q?3+V9ozB4253QcSQhaxaDfMlodKTby9+rA2HY7c11POIxTvIIrNADjO7EGJEI?= =?us-ascii?Q?xvqnNVBhwe3yMevW2k7aczfk0bvnrjL6LygybZ69YGtRG9Z68phXkSt4ZSaH?= =?us-ascii?Q?DQUbKJla3p7IrCeSr/ykHJE55SqKZw4hzPf0bpWQ7YOHDqSkCpaHmLU4AlN6?= =?us-ascii?Q?3rq+bw10pUDEcDKCmB7noTaiU2w8CQNvSQnRCfCG7sJJHIZxZFZySg9izdFx?= =?us-ascii?Q?rx+JhWzjPfExqR6iaSPcSVrPc+IIlX9sbX9TvyUv9H4MwuRaFbqEFPVGbqRx?= =?us-ascii?Q?IcaGXwKob3nnEbpzvOvNHnsVjNny7Q5F0wnTOF0TC9VPDaKB93/NvQZ6nr2v?= =?us-ascii?Q?fykZA6nt7aGpDKMMHhf6jlfDb3opoRwY9jgL/RXmTEFjqp7E3j82fd5MSooK?= =?us-ascii?Q?EsHgbIS6rXf+V2cwMUimHqDyvt4MIzxc4r3XDmJAnAKyvy+LylDnpNEIeM1j?= =?us-ascii?Q?67DjwEWTYYJnrggZbYJ98ek7JPVT01sBFIiQ+QZdTm3KkWfJoC5N5ynQ1MDA?= =?us-ascii?Q?22HhoscdrUUYzM/BA9lqbC+VnBg5HwRvE714vAp9vkWgU1c0ITCfLolQJQtz?= =?us-ascii?Q?MMkl33aQN2Oh5BngLsemFyIOb9C1IGsL5zetzzPmbkghvLpMkhqbnY10HNNP?= =?us-ascii?Q?T5neKi1qdEyBpnC2W3BC9krVWP1fRF6vvb8LRTwoRTME5RloVcBuu6jBgP38?= =?us-ascii?Q?ar2ujP4LJvkoVyXqIauedG0tlclRHXR5u984GhmWBnDgDrfHejuM4/t/wdpc?= =?us-ascii?Q?iyjy+IgY89VSTpG4uKh817cp+rZP4TqaoXNqjKTPxP4snBBqYw=3D=3D?= 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)(376014)(36860700013)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2024 05:26:53.2238 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f6fa599a-a936-454b-f85f-08dcf647f756 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: SJ5PEPF00000204.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7586 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 In SWS, `mlx5_flow_dv_validate_action_raw_encap_decap` is called for flow action. The action validation checks for both size and data parameters. In HWS, `mlx5_flow_dv_validate_action_raw_encap_decap` is called for the action template and validates the action mask. The patch separates encap validation in `mlx5_flow_dv_validate_action_raw_encap_decap` for SWS and HWS cases. Fixes: cbfa4ed03913 ("net/mlx5: update flow actions validation before template creation") Signed-off-by: Gregory Etelson --- drivers/net/mlx5/mlx5_flow_dv.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 89057edbcf..294e23de98 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -4047,10 +4047,19 @@ mlx5_flow_dv_validate_action_raw_encap_decap const struct mlx5_priv *priv = dev->data->dev_private; int ret; - if (encap && (!encap->size || !encap->data)) - return rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ACTION, NULL, - "raw encap data cannot be empty"); + if (encap) { + if (!mlx5_hws_active(dev)) { + if (!encap->size || !encap->data) + return rte_flow_error_set + (error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, NULL, "raw encap data cannot be empty"); + } else { + if (!encap->size) + return rte_flow_error_set + (error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, NULL, "raw encap size cannot be 0"); + } + } if (decap && encap) { if (decap->size <= MLX5_ENCAPSULATION_DECISION_SIZE && encap->size > MLX5_ENCAPSULATION_DECISION_SIZE) -- 2.43.0