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 61E3646468 for ; Mon, 24 Mar 2025 17:18:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5BA5340A71; Mon, 24 Mar 2025 17:18:32 +0100 (CET) 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 E6E6640A71 for ; Mon, 24 Mar 2025 17:18:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742833109; 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=y6osU7Q6oEH8FPYT/FdTZUZdCcU6rVGeNxIKc9qcbWk=; b=J1gCtbQqCG6wD1N5CpIm85ONwfQh4mzgZ4c55d2TEIR4BvbJ2UEi+N3b1bpHzFHWtpWVSY 3fVnP0/A6Sx8F4MF2DKlP2bEKj9oP7wxTq6l0hyK5NyejhuvoRomyTLOWu2tpVBJVFAMt1 PNdNUEGgbLJ8GY6E6u8R+rZ9eKFTX6U= 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-628-54Er7_rPNmG_00hee1a2FA-1; Mon, 24 Mar 2025 12:18:24 -0400 X-MC-Unique: 54Er7_rPNmG_00hee1a2FA-1 X-Mimecast-MFC-AGG-ID: 54Er7_rPNmG_00hee1a2FA_1742833103 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 4E9AB1808868; Mon, 24 Mar 2025 16:18:23 +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 A10AA30001A1; Mon, 24 Mar 2025 16:18:21 +0000 (UTC) From: Kevin Traynor To: Gregory Etelson Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix mark action validation in FDB mode' has been queued to stable release 24.11.2 Date: Mon, 24 Mar 2025 16:16:26 +0000 Message-ID: <20250324161731.63950-19-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: 0tPU3jVSfmFYIgdvVw_iqu11WmSDwwmvSNf-yza7Bh0_1742833103 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/80d22471aebcd9e04fc1699d66567890a5ff4c37 Thanks. Kevin --- >From 80d22471aebcd9e04fc1699d66567890a5ff4c37 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Tue, 11 Mar 2025 14:46:35 +0200 Subject: [PATCH] net/mlx5: fix mark action validation in FDB mode [ upstream commit 3e83c4821d57874b2677d7344bcc26f587ce5ba2 ] The MARK action is supported in FDB SWS mode, but it was not supported in the early FDB HWS implementations. The current MARK action validation reflects the original HWS functionality. Recent MLX5 FW supports the MARK flow action in FDB mode. The patch clears the MARK action for both SWS FDB and HWS FDB. Fixes: d6dc072aeb12 ("net/mlx5: validate flow actions in table creation") Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 9678c94ff3..e909a6ab63 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1945,5 +1945,5 @@ mlx5_flow_validate_action_flag(uint64_t action_flags, */ int -mlx5_flow_validate_action_mark(struct rte_eth_dev *dev, +mlx5_flow_validate_action_mark(__rte_unused struct rte_eth_dev *dev, const struct rte_flow_action *action, uint64_t action_flags, @@ -1978,8 +1978,4 @@ mlx5_flow_validate_action_mark(struct rte_eth_dev *dev, "mark action not supported for " "egress"); - if (attr->transfer && mlx5_hws_active(dev)) - return rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, NULL, - "non-template mark action not supported for transfer"); return 0; } -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-24 16:15:15.521070878 +0000 +++ 0019-net-mlx5-fix-mark-action-validation-in-FDB-mode.patch 2025-03-24 16:15:14.822735794 +0000 @@ -1 +1 @@ -From 3e83c4821d57874b2677d7344bcc26f587ce5ba2 Mon Sep 17 00:00:00 2001 +From 80d22471aebcd9e04fc1699d66567890a5ff4c37 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3e83c4821d57874b2677d7344bcc26f587ce5ba2 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 6169ebc13f..e2f4bd8cef 100644 +index 9678c94ff3..e909a6ab63 100644 @@ -38 +39 @@ -- if (attr->transfer && !mlx5_hws_active(dev)) +- if (attr->transfer && mlx5_hws_active(dev)) @@ -40 +41 @@ -- RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER, NULL, +- RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, NULL,