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 46B5A43C60 for ; Thu, 7 Mar 2024 02:35:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3937642EE3; Thu, 7 Mar 2024 02:35:36 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 0D4D542EF8 for ; Thu, 7 Mar 2024 02:35:34 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-33de4d3483eso152914f8f.3 for ; Wed, 06 Mar 2024 17:35:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775334; x=1710380134; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8GsBQqBbVgDO3YZKC0R8a3ZFb3z1jA8HXS5LHyo0+a4=; b=Y/WRKkdKds+LdKvGghoFsLd8lE2xcfPUGl3jzkyGrNTUhj8iVsKSJ56/aQeGD0tJxB Zw9JKBG1q+nxqE7MqKvKY5T9EtHcQEDMzwVjTEIY0NKubolK71aNr/4zlm99y3iusZ2X rHPlMO/k1GA4/a7b1w+XxoAJ/cxQzdOzYLfIebaz97XnIzRJ3CrRIYpf+/4UJC9A5pqf dTNgZEZb2EmW7/d+w3w9MrjYIdUK33Xv1lqJ7EabJsHfWHwZz5TQPLlqD9zBcTfJgiEr YKqoyhUogv8nktT2fUmdtOdj4Nrke2pfXq1WYc1JrW/+G5NglapRH51Q9cvAJm4FlnzJ OAfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775334; x=1710380134; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8GsBQqBbVgDO3YZKC0R8a3ZFb3z1jA8HXS5LHyo0+a4=; b=wcjCsP2DiY757KXfauzWVchw2CKr+kPTLs7oiv6OOkTZGIWUKsno0X4Z3hzHa5vAcp O11/Euo6rerSDnztPZKVUBHMfkhZxGNNHqjSqyfrNjzRHd0HUTeSfk8M6SN4h1Y7KuUG o2E9oinVwQ6/mSYqI2E/1mzeU6i8EcSbWrdD/69wSa06zqB50vY7nPO3kueCpNS9WYpk XTYBL6R8V4BrvDUD8kWwvKXge6ViEEtNrE8SBKYLEL4f0FVDbBKkL7qrFSEMoKBjHpVW ct+rlLLBwQL89dgwIG9Oxdscm4Ai+5J2vKgC08wTk+xVqTxkVWvJwmS7JuyMvWN/1FvE gUEg== X-Forwarded-Encrypted: i=1; AJvYcCVNSOQkmdXm62kNoQjsLK0OPecc5s4Mo55uNHHAUH2pCN9+MmVSe3A6GaUVXp3xqacsU/o4kP0SuMKl33SgN40= X-Gm-Message-State: AOJu0YxuCJJm0sd2WuntSKIlNtUN2jJx2uA679bE2mkptHfwVgDigcVu 1LNnmXX6txfJ5bsc5gU1MUDHRnuoRMXxOCmfKeUy/arhRT9OKRxq X-Google-Smtp-Source: AGHT+IGP5m77KBVZxC+CTB+bJz43FwC36SZTg9UG3XxTHp+ydZJmLH6Nf2mFyGrWRQIqzL0eppya+Q== X-Received: by 2002:adf:f249:0:b0:33b:87fb:7106 with SMTP id b9-20020adff249000000b0033b87fb7106mr11433922wrp.55.1709775333665; Wed, 06 Mar 2024 17:35:33 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id dp14-20020a0560000c8e00b0033d8ce120f2sm18855071wrb.95.2024.03.06.17.35.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:35:32 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.5 Date: Thu, 7 Mar 2024 01:31:15 +0000 Message-Id: <20240307013159.1735343-58-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.5 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/09/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/636a019a74210f654506d99b3667cb27da52f082 Thanks. Luca Boccassi --- >From 636a019a74210f654506d99b3667cb27da52f082 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 ae22755ee6..2aa51f99ee 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -206,7 +206,7 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = { sizeof(struct rte_flow_action_of_push_mpls)), 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)), MK_FLOW_ACTION(RAW_DECAP, sizeof(struct rte_flow_action_raw_decap)), diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index b60987db4b..706ffba596 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -3138,7 +3138,7 @@ 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). */ struct rte_flow_item *definition; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:39.801681869 +0000 +++ 0058-ethdev-fix-NVGRE-encap-flow-action-description.patch 2024-03-07 01:05:34.822940526 +0000 @@ -1 +1 @@ -From f59d78b5803be7b0c0831309c703273bd2c92a50 Mon Sep 17 00:00:00 2001 +From 636a019a74210f654506d99b3667cb27da52f082 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 ae22755ee6..2aa51f99ee 100644 @@ -26 +27 @@ -@@ -219,7 +219,7 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = { +@@ -206,7 +206,7 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = { @@ -36 +37 @@ -index 78b6bbb159..440396be78 100644 +index b60987db4b..706ffba596 100644 @@ -39 +40 @@ -@@ -3468,7 +3468,7 @@ struct rte_flow_action_vxlan_encap { +@@ -3138,7 +3138,7 @@ struct rte_flow_action_vxlan_encap {