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 0A7E1A04AF for ; Thu, 20 Aug 2020 17:34:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 018931C0B4; Thu, 20 Aug 2020 17:34:39 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 6D1DF1E2B for ; Thu, 20 Aug 2020 17:34:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597937677; 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=5z5LCDkRC6UtwROY95L3kTqCoMnTZk+5pXhUz+UufBs=; b=O2+DBDHcKpKSkpp+EJsJQBB1Jdq4wGuOuoj0s1ZXlwZ4ignSmIBC2IoOM+s22ogeN0yg2T PMweoblgnFEkX8V4NB3mkMqNS6WZSEd2pXEohyYhmDjjdB4WjgjJG6igWbF2Bo4Uw8SFIU 7iCFzL6Q/yBH+NyhxxRMCbIHzlP8boQ= 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-83-CTx-QfmpPl-5yhlx4hqU6g-1; Thu, 20 Aug 2020 11:34:33 -0400 X-MC-Unique: CTx-QfmpPl-5yhlx4hqU6g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D13971885D8E; Thu, 20 Aug 2020 15:34:31 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 92A5D10098A5; Thu, 20 Aug 2020 15:34:30 +0000 (UTC) From: Kevin Traynor To: Hongzhi Guo Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Olivier Matz , dpdk stable Date: Thu, 20 Aug 2020 16:33:25 +0100 Message-Id: <20200820153341.171927-20-ktraynor@redhat.com> In-Reply-To: <20200820153341.171927-1-ktraynor@redhat.com> References: <20200820153341.171927-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net: fix checksum on big endian CPUs' has been queued to LTS release 18.11.10 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.10 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/25/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/9f6bad9ea2c5df814893c78c97cbe16c3d45b0f4 Thanks. Kevin. --- >From 9f6bad9ea2c5df814893c78c97cbe16c3d45b0f4 Mon Sep 17 00:00:00 2001 From: Hongzhi Guo Date: Fri, 10 Jul 2020 19:43:13 +0800 Subject: [PATCH] net: fix checksum on big endian CPUs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 982bb68cab2b93724f9625d53c309e73fa194e6e ] With current code, the checksum of odd-length buffers is wrong on big endian CPUs: the last byte is not properly summed to the accumulator. Fix this by left-shifting the remaining byte by 8. For instance, if the last byte is 0x42, we should add 0x4200 to the accumulator on big endian CPUs. This change is similar to what is suggested in Errata 3133 of RFC 1071. Fixes: 6006818cfb26("net: new checksum functions") Signed-off-by: Hongzhi Guo Reviewed-by: Morten Brørup Acked-by: Olivier Matz --- lib/librte_net/rte_ip.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h index 728a045b9d..a589a702af 100644 --- a/lib/librte_net/rte_ip.h +++ b/lib/librte_net/rte_ip.h @@ -132,6 +132,9 @@ __rte_raw_cksum(const void *buf, size_t len, uint32_t sum) /* if length is in odd bytes */ - if (len == 1) - sum += *((const uint8_t *)u16_buf); + if (len == 1) { + uint16_t left = 0; + *(uint8_t *)&left = *(const uint8_t *)u16_buf; + sum += left; + } return sum; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-20 16:26:16.588499082 +0100 +++ 0020-net-fix-checksum-on-big-endian-CPUs.patch 2020-08-20 16:26:15.805324152 +0100 @@ -1 +1 @@ -From 982bb68cab2b93724f9625d53c309e73fa194e6e Mon Sep 17 00:00:00 2001 +From 9f6bad9ea2c5df814893c78c97cbe16c3d45b0f4 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 982bb68cab2b93724f9625d53c309e73fa194e6e ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index a9ffc33571..fcd1eb342d 100644 +index 728a045b9d..a589a702af 100644 @@ -34 +35 @@ -@@ -140,6 +140,9 @@ __rte_raw_cksum(const void *buf, size_t len, uint32_t sum) +@@ -132,6 +132,9 @@ __rte_raw_cksum(const void *buf, size_t len, uint32_t sum)