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 4934843829 for ; Tue, 5 Mar 2024 16:35:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 42FEE415D7; Tue, 5 Mar 2024 16:35:55 +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 98415410D3 for ; Tue, 5 Mar 2024 16:35:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652952; 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=dXJVYiXbDdtTvnJIlHRg/m8Nkh9ve4TQc0WcU3gyTc0=; b=COFNBpQ4maQoG9y/Eu9BbXPLAQJIXl5siGulNFO7sRmOSz3+bmhLXSOwwWp25MWKq50ljA k/D7HQNVG7K8lWCp9lSl7V87CPK/n2a6T+Cq6CfPAavZmoUxQpCOyb3SjQDIQzt43dXzph kNt9vODneWIRhyelbKcJeEJvlMDLtI0= 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-635-qQOB86vtM6quBtn7NYoU3g-1; Tue, 05 Mar 2024 10:35:49 -0500 X-MC-Unique: qQOB86vtM6quBtn7NYoU3g-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 A02B23801FE5; Tue, 5 Mar 2024 15:35:48 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 572752022EDB; Tue, 5 Mar 2024 15:35:46 +0000 (UTC) From: Kevin Traynor To: Sunyang Wu Cc: Joey Xing , Ori Kam , Ferruh Yigit , dpdk stable Subject: patch 'ethdev: fix NVGRE encap flow action description' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:12 +0000 Message-ID: <20240305153449.263666-39-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/b886b2c079cca8a1a675d7c7a11ec3c7bf1d83fe Thanks. Kevin --- >From b886b2c079cca8a1a675d7c7a11ec3c7bf1d83fe Mon Sep 17 00:00:00 2001 From: Sunyang Wu Date: Thu, 30 Nov 2023 14:22:21 +0800 Subject: [PATCH] ethdev: fix NVGRE encap flow action description [ upstream commit f59d78b5803be7b0c0831309c703273bd2c92a50 ] Fix incorrect definition of 'NVGRE_ENCAP', and modified the error comments of 'rte_flow_action_nvgre_encap'. Fixes: c2beb1d469d2 ("ethdev: add missing items/actions to flow object converter") Fixes: 3850cf0c8c37 ("ethdev: add tunnel encap/decap actions") Signed-off-by: Joey Xing Signed-off-by: Sunyang Wu Acked-by: Ori Kam Acked-by: Ferruh Yigit --- lib/ethdev/rte_flow.c | 2 +- lib/ethdev/rte_flow.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c index 3a6b6db725..2df4418aa9 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -218,5 +218,5 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = { MK_FLOW_ACTION(VXLAN_ENCAP, sizeof(struct rte_flow_action_vxlan_encap)), MK_FLOW_ACTION(VXLAN_DECAP, 0), - MK_FLOW_ACTION(NVGRE_ENCAP, sizeof(struct rte_flow_action_vxlan_encap)), + MK_FLOW_ACTION(NVGRE_ENCAP, sizeof(struct rte_flow_action_nvgre_encap)), MK_FLOW_ACTION(NVGRE_DECAP, 0), MK_FLOW_ACTION(RAW_ENCAP, sizeof(struct rte_flow_action_raw_encap)), diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index 1031fb246b..5af9bdd88c 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -3280,5 +3280,5 @@ struct rte_flow_action_vxlan_encap { struct rte_flow_action_nvgre_encap { /** - * Encapsulating vxlan tunnel definition + * Encapsulating nvgre tunnel definition * (terminated by the END pattern item). */ -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.592170386 +0000 +++ 0039-ethdev-fix-NVGRE-encap-flow-action-description.patch 2024-03-05 14:08:54.656520781 +0000 @@ -1 +1 @@ -From f59d78b5803be7b0c0831309c703273bd2c92a50 Mon Sep 17 00:00:00 2001 +From b886b2c079cca8a1a675d7c7a11ec3c7bf1d83fe Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f59d78b5803be7b0c0831309c703273bd2c92a50 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 2cd30d63b7..43a41bdb1d 100644 +index 3a6b6db725..2df4418aa9 100644 @@ -26 +27 @@ -@@ -220,5 +220,5 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = { +@@ -218,5 +218,5 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = { @@ -34 +35 @@ -index 78b6bbb159..440396be78 100644 +index 1031fb246b..5af9bdd88c 100644 @@ -37 +38 @@ -@@ -3469,5 +3469,5 @@ struct rte_flow_action_vxlan_encap { +@@ -3280,5 +3280,5 @@ struct rte_flow_action_vxlan_encap {