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 658F243345 for ; Thu, 16 Nov 2023 14:24:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2EEE640E0F; Thu, 16 Nov 2023 14:24:47 +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 E388240DF6 for ; Thu, 16 Nov 2023 14:24:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141085; 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=J8lTOJc15CpcIB3525/L8lVswhvbew2GK48fG5zDuYY=; b=VL5PFx3ZZqOmMxulMXJjsrS+uF8kPFJ2mUEoDHM57PrzbC0xNXbPcdiebj/3QaTnJu7wnO V/1jU286tzuUJlJMUg/7SGf4PtBI4GtJZv6kUgTxfamwg/t1OF1uZH+QQI5U/qFFEEUaQG F51tS4+ThHPrtTKgn03C6TnFawOb7C0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-653-uf8_g6FaNIaWp4U6n4KiVA-1; Thu, 16 Nov 2023 08:24:42 -0500 X-MC-Unique: uf8_g6FaNIaWp4U6n4KiVA-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 0BA88101A52D; Thu, 16 Nov 2023 13:24:42 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 403962166B27; Thu, 16 Nov 2023 13:24:41 +0000 (UTC) From: Kevin Traynor To: Jiawei Wang Cc: Suanming Mou , dpdk stable Subject: patch 'net/mlx5: fix decap action checking in sample flow' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:13 +0000 Message-ID: <20231116132348.557257-31-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/9f2c545da64c50b2863a1edbcbb527e4f4260e4e Thanks. Kevin --- >From 9f2c545da64c50b2863a1edbcbb527e4f4260e4e Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Wed, 11 Oct 2023 09:36:31 +0300 Subject: [PATCH] net/mlx5: fix decap action checking in sample flow [ upstream commit c40023aece2ec9a7899fafecf474d7337212776e ] This patch uses the temp variable to check the current action type, to avoid overlap the sample action following the decap. Fixes: 7356aec64c48 ("net/mlx5: fix mirror flow split with L3 encapsulation") Signed-off-by: Jiawei Wang Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 42229ede78..5d489c7f92 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -5514,4 +5514,5 @@ flow_check_match_action(const struct rte_flow_action actions[], const struct rte_flow_action_sample *sample; const struct rte_flow_action_raw_decap *decap; + const struct rte_flow_action *action_cur = NULL; int actions_n = 0; uint32_t ratio = 0; @@ -5574,10 +5575,10 @@ flow_check_match_action(const struct rte_flow_action actions[], case RTE_FLOW_ACTION_TYPE_RAW_DECAP: decap = actions->conf; - while ((++actions)->type == RTE_FLOW_ACTION_TYPE_VOID) + action_cur = actions; + while ((++action_cur)->type == RTE_FLOW_ACTION_TYPE_VOID) ; - actions_n++; - if (actions->type == RTE_FLOW_ACTION_TYPE_RAW_ENCAP) { + if (action_cur->type == RTE_FLOW_ACTION_TYPE_RAW_ENCAP) { const struct rte_flow_action_raw_encap *encap = - actions->conf; + action_cur->conf; if (decap->size <= MLX5_ENCAPSULATION_DECISION_SIZE && -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.297664782 +0000 +++ 0031-net-mlx5-fix-decap-action-checking-in-sample-flow.patch 2023-11-16 13:21:52.467946425 +0000 @@ -1 +1 @@ -From c40023aece2ec9a7899fafecf474d7337212776e Mon Sep 17 00:00:00 2001 +From 9f2c545da64c50b2863a1edbcbb527e4f4260e4e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c40023aece2ec9a7899fafecf474d7337212776e ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 8ad85e6027..772f6afb66 100644 +index 42229ede78..5d489c7f92 100644 @@ -22 +23 @@ -@@ -6160,4 +6160,5 @@ flow_check_match_action(const struct rte_flow_action actions[], +@@ -5514,4 +5514,5 @@ flow_check_match_action(const struct rte_flow_action actions[], @@ -28 +29 @@ -@@ -6220,10 +6221,10 @@ flow_check_match_action(const struct rte_flow_action actions[], +@@ -5574,10 +5575,10 @@ flow_check_match_action(const struct rte_flow_action actions[],