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 0E6B146BAE for ; Fri, 18 Jul 2025 21:34:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 088B340E2C; Fri, 18 Jul 2025 21:34:12 +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 6556A40611 for ; Fri, 18 Jul 2025 21:34:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867250; 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=X13KYNMFdJImI39OdZtZxvTGNTNO8R4xXktKs5Xbbic=; b=LszPQ0Z8j+4TogwsT95X9kVKQiLxGeJaCrvRXm5dJGvGZHSaOUb5lCrf5gcPY/w96l1yrH 6qMfsDAhJVN3QW4Tac2duzZSoAGFmxbSTAm+J2wvYQUxgmbvfwZBETmX45JkZ0OtrMRovV geUR1dt9JF1Tw1ydBGRJvmcBt1wI6K0= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-558-SfWeayQYN9Kc8pxBgda6vg-1; Fri, 18 Jul 2025 15:34:06 -0400 X-MC-Unique: SfWeayQYN9Kc8pxBgda6vg-1 X-Mimecast-MFC-AGG-ID: SfWeayQYN9Kc8pxBgda6vg_1752867246 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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B2AC419560B0; Fri, 18 Jul 2025 19:34:05 +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 0F70E180045B; Fri, 18 Jul 2025 19:34:03 +0000 (UTC) From: Kevin Traynor To: Gregory Etelson Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix error notification for large flow patterns' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:29:27 +0100 Message-ID: <20250718193247.1008129-33-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: sAgLD856appbB9kfBJ3N5anrX9VoJquHbeHw-_1_TCo_1752867246 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/5d03c253b4498ba929d5f5ee68decb90b4a53df2 Thanks. Kevin --- >From 5d03c253b4498ba929d5f5ee68decb90b4a53df2 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Tue, 6 May 2025 16:31:51 +0300 Subject: [PATCH] net/mlx5: fix error notification for large flow patterns [ upstream commit 3bd95360ac6d2dd761c1af07882d21d34d326ce0 ] HWS has limited resources to translate flow pattern. When pattern translation does not fit STE, HWS translation fails with E2BIG error. The patch verifies that the E2BIG error value is kept during flow error notification. Fixes: e38776c36c8a ("net/mlx5: introduce HWS for non-template flow API") Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/hws/mlx5dr_bwc.c | 2 +- drivers/net/mlx5/mlx5_flow_hw.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_bwc.c b/drivers/net/mlx5/hws/mlx5dr_bwc.c index 9233452118..0086cd2c90 100644 --- a/drivers/net/mlx5/hws/mlx5dr_bwc.c +++ b/drivers/net/mlx5/hws/mlx5dr_bwc.c @@ -138,5 +138,5 @@ mlx5dr_bwc_matcher_create(struct mlx5dr_table *table, &attr); if (!bwc_matcher->matcher) { - rte_errno = EINVAL; + /* rte_errno must be set */ goto free_at; } diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 99cb4eba8d..a0e7a6ba0b 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -13603,5 +13603,5 @@ error: rte_memcpy(error, &sub_error, sizeof(sub_error)); } - return rte_flow_error_set(error, ENOMEM, + return rte_flow_error_set(error, rte_errno, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "fail to register matcher"); @@ -13770,6 +13770,10 @@ flow_hw_create_flow(struct rte_eth_dev *dev, enum mlx5_flow_type type, ret = flow_hw_register_matcher(dev, attr, items, external, *flow, &matcher, error); - if (ret) + if (ret) { + if (rte_errno == E2BIG) + rte_flow_error_set(error, E2BIG, RTE_FLOW_ERROR_TYPE_ITEM, NULL, + "flow pattern is too big"); goto error; + } /* -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:12.265056285 +0100 +++ 0033-net-mlx5-fix-error-notification-for-large-flow-patte.patch 2025-07-18 20:29:10.897907230 +0100 @@ -1 +1 @@ -From 3bd95360ac6d2dd761c1af07882d21d34d326ce0 Mon Sep 17 00:00:00 2001 +From 5d03c253b4498ba929d5f5ee68decb90b4a53df2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3bd95360ac6d2dd761c1af07882d21d34d326ce0 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -35 +36 @@ -index 281f23366f..e26093522f 100644 +index 99cb4eba8d..a0e7a6ba0b 100644 @@ -38 +39 @@ -@@ -13848,5 +13848,5 @@ error: +@@ -13603,5 +13603,5 @@ error: @@ -45,2 +46,2 @@ -@@ -14024,6 +14024,10 @@ flow_hw_create_flow(struct rte_eth_dev *dev, enum mlx5_flow_type type, - } +@@ -13770,6 +13770,10 @@ flow_hw_create_flow(struct rte_eth_dev *dev, enum mlx5_flow_type type, +