From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 12A1EA0613 for ; Tue, 27 Aug 2019 11:30:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0BC661BFE1; Tue, 27 Aug 2019 11:30:55 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 194361BFE1 for ; Tue, 27 Aug 2019 11:30:54 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8A18E308212A; Tue, 27 Aug 2019 09:30:53 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 96E695C1B2; Tue, 27 Aug 2019 09:30:51 +0000 (UTC) From: Kevin Traynor To: Saleh Alsouqi Cc: Ferruh Yigit , dpdk stable Date: Tue, 27 Aug 2019 10:29:45 +0100 Message-Id: <20190827093032.20423-8-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 27 Aug 2019 09:30:53 +0000 (UTC) Subject: [dpdk-stable] patch 'app/testpmd: fix MPLS IPv4 encapsulation fields' has been queued to LTS release 18.11.3 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/03/19. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/308460c9a7c018c2eb242b6199224895f3a5f8cb Thanks. Kevin Traynor --- >From 308460c9a7c018c2eb242b6199224895f3a5f8cb Mon Sep 17 00:00:00 2001 From: Saleh Alsouqi Date: Thu, 4 Jul 2019 07:33:22 +0000 Subject: [PATCH] app/testpmd: fix MPLS IPv4 encapsulation fields [ upstream commit a97ec9ba45d4357c172df71be3fcf601dfdb8147 ] Having version and ihl set to 0 would result in a corrupted/incorrect encapsulating packet for MPLS, this commit sets these fields to 4 and 5 respectively as defined in librte_net/rte_ip.h. Fixes: 3e77031be855 ("app/testpmd: add MPLSoGRE encapsulation") Fixes: a1191d39cb57 ("app/testpmd: add MPLSoUDP encapsulation") Signed-off-by: Saleh Alsouqi Reviewed-by: Ferruh Yigit --- app/test-pmd/cmdline_flow.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index d202566b2..fe5bda9dc 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -3747,4 +3747,6 @@ parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token, .dst_addr = mplsogre_encap_conf.ipv4_dst, .next_proto_id = IPPROTO_GRE, + .version_ihl = IPV4_VHL_DEF, + .time_to_live = IPDEFTTL, }, }; @@ -3848,4 +3850,5 @@ parse_vc_action_mplsogre_decap(struct context *ctx, const struct token *token, .hdr = { .proto = IPPROTO_GRE, + .hop_limits = IPDEFTTL, }, }; @@ -3935,4 +3938,6 @@ parse_vc_action_mplsoudp_encap(struct context *ctx, const struct token *token, .dst_addr = mplsoudp_encap_conf.ipv4_dst, .next_proto_id = IPPROTO_UDP, + .version_ihl = IPV4_VHL_DEF, + .time_to_live = IPDEFTTL, }, }; @@ -4039,4 +4044,5 @@ parse_vc_action_mplsoudp_decap(struct context *ctx, const struct token *token, .hdr = { .proto = IPPROTO_UDP, + .hop_limits = IPDEFTTL, }, }; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:11.342002157 +0100 +++ 0008-app-testpmd-fix-MPLS-IPv4-encapsulation-fields.patch 2019-08-27 09:40:10.854145990 +0100 @@ -1 +1 @@ -From a97ec9ba45d4357c172df71be3fcf601dfdb8147 Mon Sep 17 00:00:00 2001 +From 308460c9a7c018c2eb242b6199224895f3a5f8cb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a97ec9ba45d4357c172df71be3fcf601dfdb8147 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index e644efa4f..4e5fa7a2d 100644 +index d202566b2..fe5bda9dc 100644 @@ -25 +26 @@ -@@ -3879,4 +3879,6 @@ parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token, +@@ -3747,4 +3747,6 @@ parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token, @@ -28 +29 @@ -+ .version_ihl = RTE_IPV4_VHL_DEF, ++ .version_ihl = IPV4_VHL_DEF, @@ -32 +33 @@ -@@ -3884,4 +3886,5 @@ parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token, +@@ -3848,4 +3850,5 @@ parse_vc_action_mplsogre_decap(struct context *ctx, const struct token *token, @@ -38 +39 @@ -@@ -4067,4 +4070,6 @@ parse_vc_action_mplsoudp_encap(struct context *ctx, const struct token *token, +@@ -3935,4 +3938,6 @@ parse_vc_action_mplsoudp_encap(struct context *ctx, const struct token *token, @@ -41 +42 @@ -+ .version_ihl = RTE_IPV4_VHL_DEF, ++ .version_ihl = IPV4_VHL_DEF, @@ -45 +46 @@ -@@ -4072,4 +4077,5 @@ parse_vc_action_mplsoudp_encap(struct context *ctx, const struct token *token, +@@ -4039,4 +4044,5 @@ parse_vc_action_mplsoudp_decap(struct context *ctx, const struct token *token,