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 2C3F1A2E1B for ; Thu, 5 Sep 2019 12:18:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1EF521EF97; Thu, 5 Sep 2019 12:18:59 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id BD2521E9D9 for ; Thu, 5 Sep 2019 12:18:57 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 23A6D8980EA; Thu, 5 Sep 2019 10:18:57 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 81A2119C6A; Thu, 5 Sep 2019 10:18:55 +0000 (UTC) From: Kevin Traynor To: Hariprasad Govindharajan Cc: Bruce Richardson , Jerin Jacob , David Christensen , Herakliusz Lipiec , dpdk stable Date: Thu, 5 Sep 2019 11:17:25 +0100 Message-Id: <20190905101754.21933-25-ktraynor@redhat.com> In-Reply-To: <20190905101754.21933-1-ktraynor@redhat.com> References: <20190905101754.21933-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Thu, 05 Sep 2019 10:18:57 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/l3fwd: fix unaligned memory access on x86' 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/12/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/14340ceac10347adcd0a0d25871203f7740710b4 Thanks. Kevin Traynor --- >From 14340ceac10347adcd0a0d25871203f7740710b4 Mon Sep 17 00:00:00 2001 From: Hariprasad Govindharajan Date: Tue, 30 Jul 2019 14:26:38 +0100 Subject: [PATCH] examples/l3fwd: fix unaligned memory access on x86 [ upstream commit d7f936190e8d8ad3f2c447c3e59d754501c44884 ] Fix unaligned memory access when reading IPv6 header which leads to segmentation fault by changing aligned memory read to unaligned memory read. Bugzilla ID: 279 Fixes: 64d3955de1de ("examples/l3fwd: fix ARM build") Signed-off-by: Hariprasad Govindharajan Reviewed-by: Bruce Richardson Reviewed-by: Jerin Jacob Reviewed-by: David Christensen Reviewed-by: Herakliusz Lipiec Tested-by: Herakliusz Lipiec --- examples/l3fwd/l3fwd_em.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c index fa8f82be6..76c5f714f 100644 --- a/examples/l3fwd/l3fwd_em.c +++ b/examples/l3fwd/l3fwd_em.c @@ -286,5 +286,9 @@ em_get_ipv6_dst_port(void *ipv6_hdr, uint16_t portid, void *lookup_struct) * and src IP address higher 32 bits. */ +#if defined RTE_ARCH_X86 + key.xmm[1] = _mm_loadu_si128(data1); +#else key.xmm[1] = *(xmm_t *)data1; +#endif /* -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-09-05 10:36:49.046343588 +0100 +++ 0025-examples-l3fwd-fix-unaligned-memory-access-on-x86.patch 2019-09-05 10:36:47.520700283 +0100 @@ -1 +1 @@ -From d7f936190e8d8ad3f2c447c3e59d754501c44884 Mon Sep 17 00:00:00 2001 +From 14340ceac10347adcd0a0d25871203f7740710b4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d7f936190e8d8ad3f2c447c3e59d754501c44884 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 5f499e005..74a7c8fa4 100644 +index fa8f82be6..76c5f714f 100644 @@ -28 +29 @@ -@@ -288,5 +288,9 @@ em_get_ipv6_dst_port(void *ipv6_hdr, uint16_t portid, void *lookup_struct) +@@ -286,5 +286,9 @@ em_get_ipv6_dst_port(void *ipv6_hdr, uint16_t portid, void *lookup_struct)