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 E009C43835 for ; Tue, 5 Mar 2024 16:36:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 86E5242E90; Tue, 5 Mar 2024 16:36:24 +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 60AD942E86 for ; Tue, 5 Mar 2024 16:36:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652983; 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=DL7cbCbAzXt5zJwcBK1oOqNw+E35F6jnON5JRM8WkX4=; b=jH2urrLhkocUwl5IDkY8umwkBqF/cPvmYuw/TKK8z4Fobf6RjqTSLHATjVzlDJSZcU3JdW lKp3sIsAJPSE/XZI4cmb5+SAzbv7g8CS89SbBcUoBEtiTdKnsiLW4yG1+/d1MfGZ2Se8c8 LEooxrPXzidSmCHYpu2ze0zxM9sAtqQ= 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-499-1kI_aWP0O9u6lrktcD2zow-1; Tue, 05 Mar 2024 10:36:19 -0500 X-MC-Unique: 1kI_aWP0O9u6lrktcD2zow-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7E5393801FE5; Tue, 5 Mar 2024 15:36:19 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id CFD8A2022BD2; Tue, 5 Mar 2024 15:36:18 +0000 (UTC) From: Kevin Traynor To: Michael Baum Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix jump action validation' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:39 +0000 Message-ID: <20240305153449.263666-66-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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.7 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/11/24. 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/9fe858d7b9758f06d06f29bb2aa09905e88e729e Thanks. Kevin --- >From 9fe858d7b9758f06d06f29bb2aa09905e88e729e Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Mon, 27 Nov 2023 14:42:59 +0200 Subject: [PATCH] net/mlx5: fix jump action validation [ upstream commit 9c289272ae692bd03d1dc9726ef19785beedd313 ] Currently PMD doesn't allow to jump to the same group in order to avoid dead loop. But this also prevent experienced user to create flow with less Hops in order to have better performance. For example, rules in [1] should have better performance then [2]. Furthermore, this protection will not really prevent dead loop, i.e [3]. So just remove this protection and user should take the responsibility to avoid dead loop. This patch enables jumping to the same group. [1]: flow create 0 group 1 priority 1 pattern eth / ipv4 / udp / gtp / end actions raw_decap / raw_encap / jump group 1 / end flow create 0 group 1 priority 0 pattern eth / ipv4 src is 1.0.0.1 / tcp / end actions queues index 1 / end [2]: flow create 0 group 1 priority 0 pattern eth / ipv4 / udp / gtp / end actions raw_decap / raw_encap / jump group 2 / end flow create 0 group 2 priority 0 pattern eth / ipv4 src is 1.0.0.1 / tcp / end actions queues index 1 / end [3]: flow create 0 group 1 pattern eth / end actions jump group 2 / end flow create 0 group 2 pattern eth / end actions jump group 1 / end Fixes: f78f747f41d0 ("net/mlx5: allow jump to group lower than current") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 0c66c76ef5..7cddeab48f 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -4999,11 +4999,4 @@ flow_dv_validate_action_jump(struct rte_eth_dev *dev, if (ret) return ret; - if (attributes->group == target_group && - !(action_flags & (MLX5_FLOW_ACTION_TUNNEL_SET | - MLX5_FLOW_ACTION_TUNNEL_MATCH))) - return rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ACTION, NULL, - "target group must be other than" - " the current flow group"); if (table == 0) return rte_flow_error_set(error, EINVAL, -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:56.208759837 +0000 +++ 0066-net-mlx5-fix-jump-action-validation.patch 2024-03-05 14:08:54.738520998 +0000 @@ -1 +1 @@ -From 9c289272ae692bd03d1dc9726ef19785beedd313 Mon Sep 17 00:00:00 2001 +From 9fe858d7b9758f06d06f29bb2aa09905e88e729e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9c289272ae692bd03d1dc9726ef19785beedd313 ] + @@ -35 +36,0 @@ -Cc: stable@dpdk.org @@ -44 +45 @@ -index 52620be262..f881dae6e8 100644 +index 0c66c76ef5..7cddeab48f 100644 @@ -47 +48 @@ -@@ -5485,11 +5485,4 @@ flow_dv_validate_action_jump(struct rte_eth_dev *dev, +@@ -4999,11 +4999,4 @@ flow_dv_validate_action_jump(struct rte_eth_dev *dev,