From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id E7EC1A0544
for <public@inbox.dpdk.org>; Wed, 22 Jun 2022 15:54:45 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id DBAFC427F3;
Wed, 22 Jun 2022 15:54:45 +0200 (CEST)
Received: from smartserver.smartsharesystems.com
(smartserver.smartsharesystems.com [77.243.40.215])
by mails.dpdk.org (Postfix) with ESMTP id BAE054069F;
Wed, 22 Jun 2022 15:54:43 +0200 (CEST)
Received: from dkrd2.smartsharesys.local ([192.168.4.12]) by
smartserver.smartsharesystems.com with Microsoft SMTPSVC(6.0.3790.4675);
Wed, 22 Jun 2022 15:54:43 +0200
From: =?UTF-8?q?Morten=20Br=C3=B8rup?= <mb@smartsharesystems.com>
To: emil.berg@ericsson.com,
bruce.richardson@intel.com,
dev@dpdk.org
Cc: stephen@networkplumber.org, stable@dpdk.org, bugzilla@dpdk.org,
hofors@lysator.liu.se, olivier.matz@6wind.com,
=?UTF-8?q?Morten=20Br=C3=B8rup?= <mb@smartsharesystems.com>
Subject: [PATCH v3] net: fix checksum with unaligned buffer
Date: Wed, 22 Jun 2022 15:54:41 +0200
Message-Id: <20220622135441.20281-1-mb@smartsharesystems.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <98CBD80474FA8B44BF855DF32C47DC35D87139@smartserver.smartshare.dk>
References: <98CBD80474FA8B44BF855DF32C47DC35D87139@smartserver.smartshare.dk>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-OriginalArrivalTime: 22 Jun 2022 13:54:43.0233 (UTC)
FILETIME=[9FF82110:01D8863F]
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
With this patch, the checksum can be calculated on an unligned buffer.
I.e. the buf parameter is no longer required to be 16 bit aligned.
The checksum is still calculated using a 16 bit aligned pointer, so the
compiler can auto-vectorize the function's inner loop.
When the buffer is unaligned, the first byte of the buffer is handled
separately. Furthermore, the calculated checksum of the buffer is byte
shifted before being added to the initial checksum, to compensate for the
checksum having been calculated on the buffer shifted by one byte.
v3:
* Remove braces from single statement block.
* Fix typo in commit message.
v2:
* Do not assume that the buffer is part of an aligned packet buffer.
Bugzilla ID: 1035
Cc: stable@dpdk.org
Signed-off-by: Morten Brørup <mb@smartsharesystems.com>
---
lib/net/rte_ip.h | 30 +++++++++++++++++++++++++-----
1 file changed, 25 insertions(+), 5 deletions(-)
diff --git a/lib/net/rte_ip.h b/lib/net/rte_ip.h
index b502481670..3fad448085 100644
--- a/lib/net/rte_ip.h
+++ b/lib/net/rte_ip.h
@@ -162,20 +162,40 @@ __rte_raw_cksum(const void *buf, size_t len, uint32_t sum)
{
/* extend strict-aliasing rules */
typedef uint16_t __attribute__((__may_alias__)) u16_p;
- const u16_p *u16_buf = (const u16_p *)buf;
- const u16_p *end = u16_buf + len / sizeof(*u16_buf);
+ const u16_p *u16_buf;
+ const u16_p *end;
+ uint32_t bsum = 0;
+ const bool unaligned = (uintptr_t)buf & 1;
+
+ /* if buffer is unaligned, keeping it byte order independent */
+ if (unlikely(unaligned)) {
+ uint16_t first = 0;
+ if (unlikely(len == 0))
+ return 0;
+ ((unsigned char *)&first)[1] = *(const unsigned char *)buf;
+ bsum += first;
+ buf = (const void *)((uintptr_t)buf + 1);
+ len--;
+ }
+ /* aligned access for compiler auto-vectorization */
+ u16_buf = (const u16_p *)buf;
+ end = u16_buf + len / sizeof(*u16_buf);
for (; u16_buf != end; ++u16_buf)
- sum += *u16_buf;
+ bsum += *u16_buf;
/* if length is odd, keeping it byte order independent */
if (unlikely(len % 2)) {
uint16_t left = 0;
*(unsigned char *)&left = *(const unsigned char *)end;
- sum += left;
+ bsum += left;
}
- return sum;
+ /* if buffer is unaligned, swap the checksum bytes */
+ if (unlikely(unaligned))
+ bsum = (bsum & 0xFF00FF00) >> 8 | (bsum & 0x00FF00FF) << 8;
+
+ return sum + bsum;
}
/**
--
2.17.1