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 B0CD3A0A02 for ; Mon, 17 May 2021 18:12:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A9E4540041; Mon, 17 May 2021 18:12:44 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id CE28140041 for ; Mon, 17 May 2021 18:12:42 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifrG-0007ms-K1; Mon, 17 May 2021 16:12:42 +0000 From: Christian Ehrhardt To: Jiawei Wang Cc: Ori Kam , dpdk stable Date: Mon, 17 May 2021 18:08:00 +0200 Message-Id: <20210517161039.3132619-51-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix NVGRE encap configuration' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/75a0b1a8c14999ce893bc4a8df34e818e95b0b9f Thanks. Christian Ehrhardt --- >From 75a0b1a8c14999ce893bc4a8df34e818e95b0b9f Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Tue, 16 Mar 2021 06:18:27 +0200 Subject: [PATCH] app/testpmd: fix NVGRE encap configuration [ upstream commit 9b0da816bdec98c0d6c5d17ccdd337bdbafc3f75 ] For NVGRE protocol, the default value of 'c_k_s_rsvd0_ver' must be 0x2000, and protocol type must be 0x6558 in the NVGRE header. This patch updates these two configurations while parsing the nvgre encap. Fixes: dcd962fc6b4e ("app/testpmd: add NVGRE encap/decap") Signed-off-by: Jiawei Wang Acked-by: Ori Kam --- app/test-pmd/cmdline_flow.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index da3533c557..894546f2c0 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -4250,6 +4250,8 @@ parse_vc_action_nvgre_encap(struct context *ctx, const struct token *token, .src_addr = nvgre_encap_conf.ipv4_src, .dst_addr = nvgre_encap_conf.ipv4_dst, }, + .item_nvgre.c_k_s_rsvd0_ver = RTE_BE16(0x2000), + .item_nvgre.protocol = RTE_BE16(RTE_ETHER_TYPE_TEB), .item_nvgre.flow_id = 0, }; memcpy(action_nvgre_encap_data->item_eth.dst.addr_bytes, -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:31.557227581 +0200 +++ 0051-app-testpmd-fix-NVGRE-encap-configuration.patch 2021-05-17 17:40:29.187809602 +0200 @@ -1 +1 @@ -From 9b0da816bdec98c0d6c5d17ccdd337bdbafc3f75 Mon Sep 17 00:00:00 2001 +From 75a0b1a8c14999ce893bc4a8df34e818e95b0b9f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9b0da816bdec98c0d6c5d17ccdd337bdbafc3f75 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 49d9f9c043..2c40c6996e 100644 +index da3533c557..894546f2c0 100644 @@ -26 +27 @@ -@@ -5439,6 +5439,8 @@ parse_vc_action_nvgre_encap(struct context *ctx, const struct token *token, +@@ -4250,6 +4250,8 @@ parse_vc_action_nvgre_encap(struct context *ctx, const struct token *token,