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 8507346BAE for ; Fri, 18 Jul 2025 21:38:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7C86B40611; Fri, 18 Jul 2025 21:38:21 +0200 (CEST) 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 52F3040E4F for ; Fri, 18 Jul 2025 21:38:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867498; 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=omINeExnQQSx3U9xY5GuiFVMqp4xBzf+RRubagqkEk8=; b=GUV6mR4XPEOHmoMBymCd1sO1askW+m8A60Ski+IHuO2yPOmos1kCtEPs0DXm5azpJUj2Df TgEPnla2SCInSZG2MFQ4xGc/S2egl4e6wejz5ZxyRkPrPcSBJy5BgBbxfwXY8mo8mzShO2 s6SSaqs7Ala7oWlCdvoLSN1Qx8W0pok= Received: from mx-prod-mc-03.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-595-Mve43SYtNdqjH4s1lnTszQ-1; Fri, 18 Jul 2025 15:38:17 -0400 X-MC-Unique: Mve43SYtNdqjH4s1lnTszQ-1 X-Mimecast-MFC-AGG-ID: Mve43SYtNdqjH4s1lnTszQ_1752867496 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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6E59419560B4; Fri, 18 Jul 2025 19:38:16 +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 E638718003FC; Fri, 18 Jul 2025 19:38:14 +0000 (UTC) From: Kevin Traynor To: Dariusz Sosnowski Cc: Bing Zhao , dpdk stable Subject: patch 'net/mlx5: fix masked indirect age action validation' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:31:30 +0100 Message-ID: <20250718193247.1008129-156-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: bCTYTKaKHmeeu5vY0wg-fQ9jOy8r0Ie5eKPPzsl3KXE_1752867496 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/70489cbd83bb37f766dc1efebbc71b1b465b5ef2 Thanks. Kevin --- >From 70489cbd83bb37f766dc1efebbc71b1b465b5ef2 Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Tue, 1 Jul 2025 12:32:53 +0200 Subject: [PATCH] net/mlx5: fix masked indirect age action validation [ upstream commit 6ed1ce029d6bd89a47968cd92d99cdf7ece8ac96 ] Masked indirect age flow action is not supported in actions templates. Up to this patch, this case was checked only through debug assertion. As a side effect, in a build without assertions, this lead to a segfault on the attempt to create a table using actions template with masked indirect age action. To prevent the segfault, this patch adds relevant validation to actions template creation and removes the debug assertion which now becomes redundant. Fixes: 04a4de756e14 ("net/mlx5: support flow age action with HWS") Signed-off-by: Dariusz Sosnowski Acked-by: Bing Zhao --- drivers/net/mlx5/mlx5_flow_hw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 6781bad9b7..586500753a 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -1318,8 +1318,4 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev, } break; - case MLX5_INDIRECT_ACTION_TYPE_AGE: - /* Not supported, prevent by validate function. */ - MLX5_ASSERT(0); - break; case MLX5_INDIRECT_ACTION_TYPE_CT: if (flow_hw_ct_compile(dev, MLX5_HW_INV_QUEUE, @@ -6332,4 +6328,8 @@ flow_hw_validate_action_indirect(struct rte_eth_dev *dev, break; case RTE_FLOW_ACTION_TYPE_AGE: + if (action->conf && mask->conf) + return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, + action, + "Fixed indirect age action is not supported"); ret = flow_hw_validate_action_age(dev, action, *action_flags, *fixed_cnt, error); -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:16.446058582 +0100 +++ 0156-net-mlx5-fix-masked-indirect-age-action-validation.patch 2025-07-18 20:29:11.149908002 +0100 @@ -1 +1 @@ -From 6ed1ce029d6bd89a47968cd92d99cdf7ece8ac96 Mon Sep 17 00:00:00 2001 +From 70489cbd83bb37f766dc1efebbc71b1b465b5ef2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6ed1ce029d6bd89a47968cd92d99cdf7ece8ac96 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 4ecc2bacfc..6dc16f80d3 100644 +index 6781bad9b7..586500753a 100644 @@ -29 +30 @@ -@@ -1352,8 +1352,4 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev, +@@ -1318,8 +1318,4 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev, @@ -38 +39 @@ -@@ -6406,4 +6402,8 @@ flow_hw_validate_action_indirect(struct rte_eth_dev *dev, +@@ -6332,4 +6328,8 @@ flow_hw_validate_action_indirect(struct rte_eth_dev *dev,