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 68654A04B1 for ; Thu, 5 Nov 2020 13:41:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 626ADC31B; Thu, 5 Nov 2020 13:41:06 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 35DD4C7F2 for ; Thu, 5 Nov 2020 13:41:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2286V/6UmsvZ2xdM60ujjA2BKb5KbatRHGQtaZ/MxkM=; b=OIgbin16nNiuq2YsY7hT7KMyw4oqOnn743UrywCIrv1sP6hHkWYClvbkHIEz8vvLxr9dqF pHHhplX66uA37J66U+uEOgjN217k+AjSkF8kHJSmS35LDhTifQNp0pvBE/mMzUmyn6b5j0 OQBqcl1TvCNLqzvqD4H1EgLYxijTsrY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-576-lBLDv_4wM7eAdcquMXNMFw-1; Thu, 05 Nov 2020 07:40:58 -0500 X-MC-Unique: lBLDv_4wM7eAdcquMXNMFw-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2E3BF1074646; Thu, 5 Nov 2020 12:40:57 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D3A55C3E1; Thu, 5 Nov 2020 12:40:55 +0000 (UTC) From: Kevin Traynor To: Yi Yang Cc: Jiayu Hu , dpdk stable Date: Thu, 5 Nov 2020 12:39:23 +0000 Message-Id: <20201105124015.306404-16-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'gso: fix payload unit size for UDP' has been queued to LTS release 18.11.11 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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/20. 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/0b1b80325e9cc6c7ddd1b2bba0001d2c351c5c8b Thanks. Kevin. --- >From 0b1b80325e9cc6c7ddd1b2bba0001d2c351c5c8b Mon Sep 17 00:00:00 2001 From: Yi Yang Date: Thu, 17 Sep 2020 10:12:49 +0800 Subject: [PATCH] gso: fix payload unit size for UDP [ upstream commit b9b75d9b5c9dbc71ee12f77e9abe089492708aae ] Fragment offset of IPv4 header is measured in units of 8 bytes. Fragment offset of UDP fragments will be wrong after GSO if pyld_unit_size isn't multiple of 8. Say pyld_unit_size is 1500, fragment offset of the second UDP fragment will be 187 (i.e. 1500 / 8), which means 1496, and it will result in 4-byte data loss (1500 - 1496 = 4). So UDP GRO will reassemble out a wrong packet. Fixes: b166d4f30b66 ("gso: support UDP/IPv4 fragmentation") Signed-off-by: Yi Yang Acked-by: Jiayu Hu --- lib/librte_gso/gso_udp4.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/librte_gso/gso_udp4.c b/lib/librte_gso/gso_udp4.c index 927dee1213..a33b1f1c54 100644 --- a/lib/librte_gso/gso_udp4.c +++ b/lib/librte_gso/gso_udp4.c @@ -70,5 +70,8 @@ gso_udp4_segment(struct rte_mbuf *pkt, } - pyld_unit_size = gso_size - hdr_offset; + /* pyld_unit_size must be a multiple of 8 because frag_off + * uses 8 bytes as unit. + */ + pyld_unit_size = (gso_size - hdr_offset) & ~7U; /* Segment the payload */ -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.566865691 +0000 +++ 0016-gso-fix-payload-unit-size-for-UDP.patch 2020-11-05 12:38:54.179895972 +0000 @@ -1 +1 @@ -From b9b75d9b5c9dbc71ee12f77e9abe089492708aae Mon Sep 17 00:00:00 2001 +From 0b1b80325e9cc6c7ddd1b2bba0001d2c351c5c8b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b9b75d9b5c9dbc71ee12f77e9abe089492708aae ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 21fea09273..6fa68f243a 100644 +index 927dee1213..a33b1f1c54 100644