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 4CEBF45A19; Tue, 24 Sep 2024 08:00:23 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B84E6402BD; Tue, 24 Sep 2024 08:00:21 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2083.outbound.protection.outlook.com [40.107.92.83]) by mails.dpdk.org (Postfix) with ESMTP id 4E5FA402BD; Tue, 24 Sep 2024 08:00:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uHvOCLc6twqq9XcTaEALUYst2D83bLbwfX44+UmbeiXbUCunjJB5Xprf5kue+TRJikK6W6xGvHEKdS8bB1OhguJeNpC96uYrXqyQ61LU6S+6S03yPVxRfM/mOmokmCUYv4vU7kY4yU6/yqrAZCYJwov78w1iWotMBy9r4lC4zViVn7VzP0j7YJEr28likeXoQCOxNfnJbbKJd2O4sRfGLPLvzPrMqR0tMVNlmgUnJxqLfvr3jkqX+wF6rd4/tea00aTSsT9JGTZQUkW4i9Nx082ORR7E/x03P8zg1N4U2xjh+eXiWvbnRI0TEt6R1tC0GS5mf6gnU94y3XaLDttNug== 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=QLeyo4w1FVQ5rjO3tdD5C/DjDUoSoJdwyS8uDbsuNMA=; b=UjiJGE9Z1IH+1hsngrv2XFejp1NA5WtGXvVk93ShaE3H1WkTbVAp256CUmDNPTLUCYkT8731rTR2/pw9qX+2ZRiuqFzHH2di8jRFyHjlpz1VUuynus2rrRcnDMmr4Mcw3s+Op0Ftg8yLul+P9N7wJSqx3IjRQSX3FY0Heq4pZO9AdciJPPEyYXiRY/R7uhyGtpizGCSh038U5gdofe+9oJOyllxgXp2AR2S8+0J/hQ0RE1bFwv/3WOQoHPnWWCB83Sn4pDTk4dydQzi63k+MJLpe8frA5wy6aFsq05h4xhmi/0SsYsGOZfc+dQtiv6usRkGfR0SO7rEK8Dlq1rvAiQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=monjalon.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 (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=QLeyo4w1FVQ5rjO3tdD5C/DjDUoSoJdwyS8uDbsuNMA=; b=ENGjDkzJzz6Dc68x/GDvJkKcVXEMEz6jQCPk6yq8U0dnEOahLbCtGmxxE3/wTNYbo0G0ASVQOeV5fata2mXblUO2exlmU67ZcGSKe7/pRO8FoFLmbfHPH299SsFgaYomaAV6AeoLHi2Ei/pWy0fe23iiGyxR7apdKPEsD1Rzcuexp9bZ4mBlWzPVkzFT/yiJVV8scvwzQwLWn0O5kCMctrEZoGpwqOSTXDzJ61WXjxhj05X7lDS7u2/hWRol6SCjQOiVe1iXmdZRRVZyVnpHUGiKfySMPa9SNBc6tLClMh7ZiM1aQWTj6oxXIh2xZYZOxMq4dYt8E7PI1WlH9KQb+A== Received: from MN2PR19CA0018.namprd19.prod.outlook.com (2603:10b6:208:178::31) by DM6PR12MB4313.namprd12.prod.outlook.com (2603:10b6:5:21e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7982.26; Tue, 24 Sep 2024 06:00:14 +0000 Received: from BL6PEPF0001AB4C.namprd04.prod.outlook.com (2603:10b6:208:178:cafe::aa) by MN2PR19CA0018.outlook.office365.com (2603:10b6:208:178::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.25 via Frontend Transport; Tue, 24 Sep 2024 06:00:14 +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 BL6PEPF0001AB4C.mail.protection.outlook.com (10.167.242.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.13 via Frontend Transport; Tue, 24 Sep 2024 06:00:14 +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; Mon, 23 Sep 2024 22:59:59 -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; Mon, 23 Sep 2024 22:59:56 -0700 From: "Minggang Li(Gavin)" To: , , , , Dariusz Sosnowski , Bing Zhao , Suanming Mou , Alexander Kozyrev CC: , , Subject: [PATCH V2 1/3] net/mlx5: set rte errno if malloc failed Date: Tue, 24 Sep 2024 08:59:36 +0300 Message-ID: <20240924055938.48374-2-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240924055938.48374-1-gavinl@nvidia.com> References: <20240910075853.292823-4-gavinl@nvidia.com> <20240924055938.48374-1-gavinl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB4C:EE_|DM6PR12MB4313:EE_ X-MS-Office365-Filtering-Correlation-Id: 3eda83db-38f0-473a-6700-08dcdc5e2874 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?He2MAD44eaoBlrcFPBgvIH8TTzqk2757q9Q+iv9p1nktDDUlmbBw695k6k9K?= =?us-ascii?Q?0FeSMekIiCmdj+x7NND0wtBCwRGF3zV3fjFEGgIJxkjPnt3pmsGO2zfYW/u7?= =?us-ascii?Q?MGeOGwFDVQKUrTp6yAQK+0L+hY6c4oWFQ+YpED05I0avwoBFZhOUCZWWYfrH?= =?us-ascii?Q?OL0P2BmhqzWa5yqqW9FPOTu7yUHltlFPsLixon2GOPoYQvTgtB2hcVGubTtC?= =?us-ascii?Q?ERa89TtsrPIPsjtHeMY7b+J0f6M9/XUAxzcFEsdqsNLz8zX5gtKY0AN/buJZ?= =?us-ascii?Q?tNnKxcFDUHZ5TW8Zdi+4Myfz8CVjbpt2UJtYwT5yVxiRG+NEPUYrhkO8a0Pi?= =?us-ascii?Q?jgytV9IwYbwxjJ0Itn/p5vOou8xvh5/DH7w2rwHwCai9Gu+KPGNCMsM8A6ap?= =?us-ascii?Q?YpWNHn/E8cvjVoIQ8IsbWvoQXnDqUnD7R5rmkknRoQDJnmn6Ytt5yUUGBKaN?= =?us-ascii?Q?DIWUunkErkoxlDFTC99YfT7Z8o/a0y5ZcdnyP0/1VBJhumT4hDSD/FdPBO+Y?= =?us-ascii?Q?kyB0QKD9M+dAZ3y3q2c1NZ9eB+RiMwwJeA/1Lo2EjBFwo2n3MISCC3tryIJP?= =?us-ascii?Q?dE01JqnYif6ODfiWXpkTXHBeuDGO9+WmXFmcnzH0vs4gOGJxSxSsBImDy3/2?= =?us-ascii?Q?k78SK277bu39+gWnxU5r9RZ+v3IJBVEVykX49MEW0KgtVf77zq4GFp7D01AS?= =?us-ascii?Q?6/HLeAm34UkntiDyLWcdjTnxrPTR4XyqFNMyy1kWhksPqFQ8xYIAsDw+rg8X?= =?us-ascii?Q?GFSL34PSY2Du2Svub+6Vcx4PvGVyjr9gKYiVhDYgDrJhmwcX5bKDM9VjZCeZ?= =?us-ascii?Q?80VzHfYQw/470vSImMtnGN6a0aiTQp4Srls2CYuovujShJy6KzCGETOowMy7?= =?us-ascii?Q?3mgyJIMGIzVSiW8xat6Bs8O6HSx0MfeMYibMOABxOYMQDAXJ2dR6y6+BLTlD?= =?us-ascii?Q?rdoVlTu4Bo/vWfGYg3ZRrH0CD1l/c9ojIIsQzHicYZpGn+040CmiaK9XNCtq?= =?us-ascii?Q?XrRRgx+8ulmM8/DKCT/09CkZHLeSd4aEfzNavhqaF1k/jz6PHZ44cUknc3LS?= =?us-ascii?Q?EP3+qiia6BfVtgQ96lrLII0R3XxDGU++MA9rr4HOsQBR/zQxTE709SRb4HCG?= =?us-ascii?Q?poo1P5Ismd1uBMNsFLJ0SCAnp9AUsEex7v1VfQGmWPMQ1LITyg0802JjoaQf?= =?us-ascii?Q?Ock25cxN4aXrqVTT++pNCV6WjwFd15C2wmObk18scwRqPyXQDfLVQrND7Sed?= =?us-ascii?Q?HdIkySbjbOAH2/ZlF1yeJ9o3jlZVGRZ7HlNVOk9IYYY/CzKPtloKeZGYhhLv?= =?us-ascii?Q?6B4MS1h2qccQKRr7geQnh5aESGxmT+aPOnMqNKd8DBlXxbzMgyK2iJlW0iSr?= =?us-ascii?Q?ueksXi0=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)(1800799024)(82310400026)(36860700013)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2024 06:00:14.1490 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3eda83db-38f0-473a-6700-08dcdc5e2874 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: BL6PEPF0001AB4C.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4313 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 rte_errno should be set if anything wrong happened in under layer so that user can figure out what's going on. There were some cases that did not set it when ipool allocation failed. To fix the issue, set rte_errno to ENOMEM if mlx5_ipool_malloc failed to allocate ID. Fixes: c40c061a02 ("net/mlx5: add basic flow queue operation") Fixes: 48fbb0e93d ("net/mlx5: support flow meter mark indirect action with HWS") cc: stable@dpdk.org Signed-off-by: Minggang Li(Gavin) Acked-by: Bing Zhao --- drivers/net/mlx5/mlx5_flow_hw.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index a275154d4b..f34670b3ec 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -1905,7 +1905,7 @@ flow_hw_meter_mark_alloc(struct rte_eth_dev *dev, uint32_t queue, const struct rte_flow_action_meter_mark *meter_mark = action->conf; struct mlx5_aso_mtr *aso_mtr; struct mlx5_flow_meter_info *fm; - uint32_t mtr_id; + uint32_t mtr_id = 0; uintptr_t handle = (uintptr_t)MLX5_INDIRECT_ACTION_TYPE_METER_MARK << MLX5_INDIRECT_ACTION_TYPE_OFFSET; @@ -1917,8 +1917,15 @@ flow_hw_meter_mark_alloc(struct rte_eth_dev *dev, uint32_t queue, if (meter_mark->profile == NULL) return NULL; aso_mtr = mlx5_ipool_malloc(pool->idx_pool, &mtr_id); - if (!aso_mtr) + if (!aso_mtr) { + rte_flow_error_set(error, ENOMEM, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "failed to allocate aso meter entry"); + if (mtr_id) + mlx5_ipool_free(pool->idx_pool, mtr_id); return NULL; + } /* Fill the flow meter parameters. */ aso_mtr->type = ASO_METER_INDIRECT; fm = &aso_mtr->fm; @@ -3926,8 +3933,10 @@ flow_hw_async_flow_create(struct rte_eth_dev *dev, return NULL; } flow = mlx5_ipool_malloc(table->flow, &flow_idx); - if (!flow) + if (!flow) { + rte_errno = ENOMEM; goto error; + } rule_acts = flow_hw_get_dr_action_buffer(priv, table, action_template_index, queue); /* * Set the table here in order to know the destination table @@ -3938,8 +3947,10 @@ flow_hw_async_flow_create(struct rte_eth_dev *dev, flow->idx = flow_idx; if (table->resource) { mlx5_ipool_malloc(table->resource, &res_idx); - if (!res_idx) + if (!res_idx) { + rte_errno = ENOMEM; goto error; + } flow->res_idx = res_idx; } else { flow->res_idx = flow_idx; @@ -4070,8 +4081,10 @@ flow_hw_async_flow_create_by_index(struct rte_eth_dev *dev, return NULL; } flow = mlx5_ipool_malloc(table->flow, &flow_idx); - if (!flow) + if (!flow) { + rte_errno = ENOMEM; goto error; + } rule_acts = flow_hw_get_dr_action_buffer(priv, table, action_template_index, queue); /* * Set the table here in order to know the destination table @@ -4082,8 +4095,10 @@ flow_hw_async_flow_create_by_index(struct rte_eth_dev *dev, flow->idx = flow_idx; if (table->resource) { mlx5_ipool_malloc(table->resource, &res_idx); - if (!res_idx) + if (!res_idx) { + rte_errno = ENOMEM; goto error; + } flow->res_idx = res_idx; } else { flow->res_idx = flow_idx; @@ -4218,8 +4233,10 @@ flow_hw_async_flow_update(struct rte_eth_dev *dev, nf->idx = of->idx; if (table->resource) { mlx5_ipool_malloc(table->resource, &res_idx); - if (!res_idx) + if (!res_idx) { + rte_errno = ENOMEM; goto error; + } nf->res_idx = res_idx; } else { nf->res_idx = of->res_idx; -- 2.34.1