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 E91EF46468 for ; Mon, 24 Mar 2025 17:18:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DA87440BA5; Mon, 24 Mar 2025 17:18:26 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id EDC7F40BA5 for ; Mon, 24 Mar 2025 17:18:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742833105; 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=Cg9aRZo1rdWKye6TxWaH7R4WkK4623v6ZAuvIr4a1Vw=; b=gLBouJ0/S2lN4BDUVB1p2no9MamMwLe1md0fDpLIK0BKDx0fT2hF0O1PN3vuUOAhqU/xd9 u8DIccFrcKjc0jF/SGEMGRHBOhMZ30vu1FIblACwskT2Y+LeIQnQ3dIVkjeq7pDkzultYt FlHvEbV2gA9t3/oB3mWNPwTmFN+GwGg= 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-611-Oo2VmEZzPDqmpku7xVlA2g-1; Mon, 24 Mar 2025 12:18:08 -0400 X-MC-Unique: Oo2VmEZzPDqmpku7xVlA2g-1 X-Mimecast-MFC-AGG-ID: Oo2VmEZzPDqmpku7xVlA2g_1742833087 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 54B36180AF4E; Mon, 24 Mar 2025 16:18:07 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.16]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A63C330001A1; Mon, 24 Mar 2025 16:18:05 +0000 (UTC) From: Kevin Traynor To: Maayan Kashani Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix error info in actions construct' has been queued to stable release 24.11.2 Date: Mon, 24 Mar 2025 16:16:19 +0000 Message-ID: <20250324161731.63950-12-ktraynor@redhat.com> In-Reply-To: <20250324161731.63950-1-ktraynor@redhat.com> References: <20250324161731.63950-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: xdc_etwtCR2nAhuySI8beoyXS2kflXEuwya4MaZZX-E_1742833087 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/28/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/88c582b391e757c2edf7af59415467fce84fecea Thanks. Kevin --- >From 88c582b391e757c2edf7af59415467fce84fecea Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Thu, 27 Feb 2025 12:45:28 +0200 Subject: [PATCH] net/mlx5: fix error info in actions construct [ upstream commit 562eba858fa4fcd049a797145fcb1f7b72d5a35e ] In some cases in debug it misses the error info. Fix to update the error structure. Fixes: 654ebd8cb7a3 ("net/mlx5: support flow table resizing") Signed-off-by: Maayan Kashani Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index fc78bf2e1d..c82db20bfa 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -3570,5 +3570,6 @@ flow_hw_actions_construct(struct rte_eth_dev *dev, mp_segment = mlx5_multi_pattern_segment_find(table, flow->res_idx); if (!mp_segment || !mp_segment->mhdr_action) - return -1; + return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "No modify header action found"); rule_acts[pos].action = mp_segment->mhdr_action; /* offset is relative to DR action */ @@ -3900,6 +3901,6 @@ flow_hw_actions_construct(struct rte_eth_dev *dev, error: flow_hw_release_actions(dev, queue, flow); - rte_errno = EINVAL; - return -rte_errno; + return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "Action construction failed"); } -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-24 16:15:15.236299333 +0000 +++ 0012-net-mlx5-fix-error-info-in-actions-construct.patch 2025-03-24 16:15:14.747735488 +0000 @@ -1 +1 @@ -From 562eba858fa4fcd049a797145fcb1f7b72d5a35e Mon Sep 17 00:00:00 2001 +From 88c582b391e757c2edf7af59415467fce84fecea Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 562eba858fa4fcd049a797145fcb1f7b72d5a35e ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 7f34af49de..88660c1627 100644 +index fc78bf2e1d..c82db20bfa 100644 @@ -22 +23 @@ -@@ -3616,5 +3616,6 @@ flow_hw_actions_construct(struct rte_eth_dev *dev, +@@ -3570,5 +3570,6 @@ flow_hw_actions_construct(struct rte_eth_dev *dev, @@ -30 +31 @@ -@@ -3947,6 +3948,6 @@ flow_hw_actions_construct(struct rte_eth_dev *dev, +@@ -3900,6 +3901,6 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,