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 051D843345 for ; Thu, 16 Nov 2023 14:25:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F29C840ED2; Thu, 16 Nov 2023 14:25:19 +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 15A4A40F16 for ; Thu, 16 Nov 2023 14:25:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141117; 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=SbuuyGL78KrOT4Tua3+bEyTB3efKyeeiA+6G5/XOhwU=; b=bjvG5S3bqCw2zFyvzXVDQRufItrsgaDQMjh1lqSThLAe4ryHSQh/jun2WjI4pD9gtG70+/ H4sZyBXQ2fm7BMQ6molwPrmzqc7WqjVvCJNWttWFlOsiuB0OMzMgMNvJ+3xz1I8yNzVNwn 2kdx0GRk+z763+H8dQaZyMIjMP99Kwg= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-108-P7b6Br9fNhuEk0Jm4zi6OA-1; Thu, 16 Nov 2023 08:25:16 -0500 X-MC-Unique: P7b6Br9fNhuEk0Jm4zi6OA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id F1DFC1C0315A; Thu, 16 Nov 2023 13:25:15 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id EFDA42166B28; Thu, 16 Nov 2023 13:25:14 +0000 (UTC) From: Kevin Traynor To: Jiawei Wang Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix validation of sample encap flow action' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:41 +0000 Message-ID: <20231116132348.557257-59-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 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 21.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/21/23. 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/02b97af64b1b58ed1e13722367fe9b8a1595c6db Thanks. Kevin --- >From 02b97af64b1b58ed1e13722367fe9b8a1595c6db Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Tue, 7 Nov 2023 17:08:20 +0200 Subject: [PATCH] net/mlx5: fix validation of sample encap flow action [ upstream commit a2a709f0e7b88b785acaae87dd9724821438c969 ] The flow sample/mirror action includes sub-actions for the duplicated packet. In SW steering case, dv_flow_en=1, there is a FW limitation that forces configuring also encap action when port action for the wire port is configured in the duplicated packet's sub-actions. The driver did a wrong validation for the above limitation and forced other actions instead of encap for the wire port. Force only encap action in case of wire port. This patch fixes the wrongly checking for the sample encap action. Fixes: a8697f50f50f ("net/mlx5: fix E-Switch mirror flow rule validation") Signed-off-by: Jiawei Wang Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index a5e1beb769..1b6467e1b1 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -8121,5 +8121,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, "mirror to rep port with encap is not supported"); } else { - if ((sub_action_flags & ~MLX5_FLOW_ACTION_ENCAP) && + if (!(sub_action_flags & MLX5_FLOW_ACTION_ENCAP) && (action_flags & MLX5_FLOW_ACTION_JUMP)) return rte_flow_error_set(error, ENOTSUP, -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.958156732 +0000 +++ 0059-net-mlx5-fix-validation-of-sample-encap-flow-action.patch 2023-11-16 13:21:52.583946762 +0000 @@ -1 +1 @@ -From a2a709f0e7b88b785acaae87dd9724821438c969 Mon Sep 17 00:00:00 2001 +From 02b97af64b1b58ed1e13722367fe9b8a1595c6db Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a2a709f0e7b88b785acaae87dd9724821438c969 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index 154e509707..9753af2cb1 100644 +index a5e1beb769..1b6467e1b1 100644 @@ -32 +33 @@ -@@ -8722,5 +8722,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -8121,5 +8121,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,