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 2E766A046B for ; Fri, 23 Aug 2019 11:44:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 20B011BF9B; Fri, 23 Aug 2019 11:44:13 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 181371BFA3 for ; Fri, 23 Aug 2019 11:44:12 +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 89AC13058E0A; Fri, 23 Aug 2019 09:44:11 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id CCFDA5C226; Fri, 23 Aug 2019 09:44:10 +0000 (UTC) From: Kevin Traynor To: Konstantin Ananyev Cc: dpdk stable Date: Fri, 23 Aug 2019 10:42:57 +0100 Message-Id: <20190823094336.12078-7-ktraynor@redhat.com> In-Reply-To: <20190823094336.12078-1-ktraynor@redhat.com> References: <20190823094336.12078-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.47]); Fri, 23 Aug 2019 09:44:11 +0000 (UTC) Subject: [dpdk-stable] patch 'ip_frag: fix IPv6 fragment size calculation' 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 08/28/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/7ba4bc38778196ab636539672e370dc6044b11f6 Thanks. Kevin Traynor --- >From 7ba4bc38778196ab636539672e370dc6044b11f6 Mon Sep 17 00:00:00 2001 From: Konstantin Ananyev Date: Thu, 6 Jun 2019 12:33:28 +0100 Subject: [PATCH] ip_frag: fix IPv6 fragment size calculation [ upstream commit 4b06b0771f321bd4301075eaff64452261a45a4d ] Take into account IPv6 fragment extension header when calculating data size for each fragment. Fixes: 7a838c8798a9 ("ip_frag: fix IPv6 when MTU sizes not aligned to 8 bytes") Fixes: 0aa31d7a5929 ("ip_frag: add IPv6 fragmentation support") Signed-off-by: Konstantin Ananyev --- lib/librte_ip_frag/rte_ipv6_fragmentation.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/librte_ip_frag/rte_ipv6_fragmentation.c b/lib/librte_ip_frag/rte_ipv6_fragmentation.c index b9437eb11..e5759a783 100644 --- a/lib/librte_ip_frag/rte_ipv6_fragmentation.c +++ b/lib/librte_ip_frag/rte_ipv6_fragmentation.c @@ -84,6 +84,8 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in, * the last fragment) are a multiple of 8 bytes per RFC2460. */ - frag_size = RTE_ALIGN_FLOOR(mtu_size - sizeof(struct ipv6_hdr), - RTE_IPV6_EHDR_FO_ALIGN); + + frag_size = mtu_size - sizeof(struct ipv6_hdr) - + sizeof(struct ipv6_extension_fragment); + frag_size = RTE_ALIGN_FLOOR(frag_size, RTE_IPV6_EHDR_FO_ALIGN); /* Check that pkts_out is big enough to hold all fragments */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-22 19:38:20.943656152 +0100 +++ 0007-ip_frag-fix-IPv6-fragment-size-calculation.patch 2019-08-22 19:38:20.398027809 +0100 @@ -1 +1 @@ -From 4b06b0771f321bd4301075eaff64452261a45a4d Mon Sep 17 00:00:00 2001 +From 7ba4bc38778196ab636539672e370dc6044b11f6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4b06b0771f321bd4301075eaff64452261a45a4d ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index bfe44d435..43449970e 100644 +index b9437eb11..e5759a783 100644 @@ -25 +26 @@ -- frag_size = RTE_ALIGN_FLOOR(mtu_size - sizeof(struct rte_ipv6_hdr), +- frag_size = RTE_ALIGN_FLOOR(mtu_size - sizeof(struct ipv6_hdr), @@ -28 +29 @@ -+ frag_size = mtu_size - sizeof(struct rte_ipv6_hdr) - ++ frag_size = mtu_size - sizeof(struct ipv6_hdr) -