From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id BCF051B8BA for ; Fri, 14 Dec 2018 19:25:38 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2A2A9B67C; Fri, 14 Dec 2018 18:25:38 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-116-106.ams2.redhat.com [10.36.116.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id 269BA600C0; Fri, 14 Dec 2018 18:25:36 +0000 (UTC) From: Kevin Traynor To: Dekel Peled Cc: Ori Kam , dpdk stable Date: Fri, 14 Dec 2018 18:24:21 +0000 Message-Id: <20181214182430.11593-19-ktraynor@redhat.com> In-Reply-To: <20181214182430.11593-1-ktraynor@redhat.com> References: <20181214182430.11593-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 14 Dec 2018 18:25:38 +0000 (UTC) Subject: [dpdk-stable] patch 'app/testpmd: fix MPLSoGRE encapsulation' has been queued to stable release 18.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2018 18:25:39 -0000 Hi, FYI, your patch has been queued to stable release 18.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/18/18. 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. Thanks. Kevin Traynor --- >>From 76f259196183e6f320683410c67ffb0916c9dfb6 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Tue, 4 Dec 2018 15:52:02 +0200 Subject: [PATCH] app/testpmd: fix MPLSoGRE encapsulation [ upstream commit da4d923557050aa51b91a3731f3872cdfe43e283 ] In function cmd_set_mplsogre_encap_parsed(), MPLS label value was set in mplsogre_encap_conf struct without the required offset. As a result the value was copied incorrectly into rte_flow_item_mpls struct. This patch sets MPLS label value in appropriate location at mplsogre_encap_conf struct, so it is correctly copied to rte_flow_item_mpls struct. Fixes: 3e77031be855 ("app/testpmd: add MPLSoGRE encapsulation") Signed-off-by: Dekel Peled Acked-by: Ori Kam --- app/test-pmd/cmdline.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 8630be6c3..3ddc3e02a 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -15568,8 +15568,7 @@ static void cmd_set_mplsogre_encap_parsed(void *parsed_result, union { uint32_t mplsogre_label; - uint8_t label[3]; + uint8_t label[4]; } id = { - .mplsogre_label = - rte_cpu_to_be_32(res->label) & RTE_BE32(0x00ffffff), + .mplsogre_label = rte_cpu_to_be_32(res->label<<12), }; @@ -15584,5 +15583,5 @@ static void cmd_set_mplsogre_encap_parsed(void *parsed_result, else return; - rte_memcpy(mplsogre_encap_conf.label, &id.label[1], 3); + rte_memcpy(mplsogre_encap_conf.label, &id.label, 3); if (mplsogre_encap_conf.select_ipv4) { IPV4_ADDR_TO_UINT(res->ip_src, mplsogre_encap_conf.ipv4_src); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-12-14 18:23:18.788132080 +0000 +++ 0019-app-testpmd-fix-MPLSoGRE-encapsulation.patch 2018-12-14 18:23:18.000000000 +0000 @@ -1,8 +1,10 @@ -From da4d923557050aa51b91a3731f3872cdfe43e283 Mon Sep 17 00:00:00 2001 +From 76f259196183e6f320683410c67ffb0916c9dfb6 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Tue, 4 Dec 2018 15:52:02 +0200 Subject: [PATCH] app/testpmd: fix MPLSoGRE encapsulation +[ upstream commit da4d923557050aa51b91a3731f3872cdfe43e283 ] + In function cmd_set_mplsogre_encap_parsed(), MPLS label value was set in mplsogre_encap_conf struct without the required offset. As a result the value was copied incorrectly into @@ -13,7 +15,6 @@ rte_flow_item_mpls struct. Fixes: 3e77031be855 ("app/testpmd: add MPLSoGRE encapsulation") -Cc: stable@dpdk.org Signed-off-by: Dekel Peled Acked-by: Ori Kam