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 3A48B46BAE for ; Fri, 18 Jul 2025 21:33:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 358AC40611; Fri, 18 Jul 2025 21:33:56 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 9BFE440E68 for ; Fri, 18 Jul 2025 21:33:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nJyp7Qy3KpgdsSOasfbSBjCQ7pFRGmO0w0AACDJZjI4=; b=gUZy+mbC2yRsI86LLOoIqGx0r/cIzQvb98vE9MzyyIBJkuMI1HHDCf7sizb9hOxOLtAbWl dxVI16gCdZTl/w+ajkAXIdQmuGM/25/oWgH8GEeZROAE5G13lg4XF0D6VazBlHGipstrVj Di2fu1VODasgi40az9uWVKZa9A1ThDk= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-292-uqKySmAnMrSrsGwqX59HZA-1; Fri, 18 Jul 2025 15:33:50 -0400 X-MC-Unique: uqKySmAnMrSrsGwqX59HZA-1 X-Mimecast-MFC-AGG-ID: uqKySmAnMrSrsGwqX59HZA_1752867230 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0283E1800286; Fri, 18 Jul 2025 19:33:50 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7987418003FC; Fri, 18 Jul 2025 19:33:48 +0000 (UTC) From: Kevin Traynor To: Dariusz Sosnowski Cc: Bing Zhao , dpdk stable Subject: patch 'net/mlx5: fix counter pool init error propagation' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:29:20 +0100 Message-ID: <20250718193247.1008129-26-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: CCntb_gcz740YqF4MmmGIB1L3YVI1YreHV2BJ0ckFGY_1752867230 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 Hi, FYI, your patch has been queued to stable release 24.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/23/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/117b9da5ba3f43274431faab3937abee07d23e88 Thanks. Kevin --- >From 117b9da5ba3f43274431faab3937abee07d23e88 Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Fri, 25 Apr 2025 21:41:04 +0200 Subject: [PATCH] net/mlx5: fix counter pool init error propagation [ upstream commit 8774ac32dfcf42a192f5b7785e956a8b1b754954 ] In case of an error in mlx5_hws_cnt_pool_create(), value stored in ret is used as "error code". There are however a few cases inside this function, when this variable is not set, leading to failed assertions (e.g., when requested number of counters is bigger than maximum supported). This patch addresses these cases, by propagating the rte_errno set by failing functions. Fixes: e1c83d295dd9 ("net/mlx5: support ASO actions with non-template flow") Signed-off-by: Dariusz Sosnowski Acked-by: Bing Zhao --- drivers/net/mlx5/mlx5_hws_cnt.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_hws_cnt.c b/drivers/net/mlx5/mlx5_hws_cnt.c index eaceedd5ba..000c2b1980 100644 --- a/drivers/net/mlx5/mlx5_hws_cnt.c +++ b/drivers/net/mlx5/mlx5_hws_cnt.c @@ -700,6 +700,9 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, mp_name = mlx5_malloc(MLX5_MEM_ZERO, RTE_MEMZONE_NAMESIZE, 0, SOCKET_ID_ANY); - if (mp_name == NULL) + if (mp_name == NULL) { + ret = rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "failed to allocate counter pool name prefix"); goto error; + } snprintf(mp_name, RTE_MEMZONE_NAMESIZE, "MLX5_HWS_CNT_P_%x", dev->data->port_id); pcfg.name = mp_name; @@ -709,6 +712,8 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, pcfg.host_cpool = chost; cpool = mlx5_hws_cnt_pool_init(priv->sh, &pcfg, &cparam, error); - if (cpool == NULL) + if (cpool == NULL) { + ret = -rte_errno; goto error; + } ret = mlx5_hws_cnt_pool_action_create(priv, cpool); if (ret != 0) { @@ -732,6 +737,8 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, cparam.size = HWS_CNT_CACHE_SZ_DEFAULT; cpool = mlx5_hws_cnt_pool_init(priv->sh, &pcfg, &cparam, error); - if (cpool == NULL) + if (cpool == NULL) { + ret = -rte_errno; goto error; + } ret = mlx5_hws_cnt_pool_dcs_alloc(priv->sh, cpool, error); if (ret != 0) @@ -739,6 +746,8 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, sz = RTE_ALIGN_CEIL(mlx5_hws_cnt_pool_get_size(cpool), 4); cpool->raw_mng = mlx5_hws_cnt_raw_data_alloc(priv->sh, sz, error); - if (cpool->raw_mng == NULL) + if (cpool->raw_mng == NULL) { + ret = -rte_errno; goto error; + } __hws_cnt_id_load(cpool); /* -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:12.002963528 +0100 +++ 0026-net-mlx5-fix-counter-pool-init-error-propagation.patch 2025-07-18 20:29:10.848907080 +0100 @@ -1 +1 @@ -From 8774ac32dfcf42a192f5b7785e956a8b1b754954 Mon Sep 17 00:00:00 2001 +From 117b9da5ba3f43274431faab3937abee07d23e88 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8774ac32dfcf42a192f5b7785e956a8b1b754954 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 7b5e7310af..fd12bcd7ec 100644 +index eaceedd5ba..000c2b1980 100644 @@ -29 +30 @@ -@@ -705,6 +705,9 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, +@@ -700,6 +700,9 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, @@ -40 +41 @@ -@@ -714,6 +717,8 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, +@@ -709,6 +712,8 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, @@ -50 +51 @@ -@@ -737,6 +742,8 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, +@@ -732,6 +737,8 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, @@ -60 +61 @@ -@@ -744,6 +751,8 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev, +@@ -739,6 +746,8 @@ mlx5_hws_cnt_pool_create(struct rte_eth_dev *dev,