From: Charlie Jenkins <charlie@rivosinc.com>
To: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>,
Charlie Jenkins <charlie@rivosinc.com>
Subject: [PATCH 2/5] riscv: Add checksum library
Date: Sat, 26 Aug 2023 18:26:07 -0700 [thread overview]
Message-ID: <20230826-optimize_checksum-v1-2-937501b4522a@rivosinc.com> (raw)
In-Reply-To: <20230826-optimize_checksum-v1-0-937501b4522a@rivosinc.com>
Provide a 32 and 64 bit version of do_csum. When compiled for 32-bit
will load from the buffer in groups of 32 bits, and when compiled for
64-bit will load in groups of 64 bits.
Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
---
arch/riscv/include/asm/checksum.h | 2 -
arch/riscv/lib/Makefile | 1 +
arch/riscv/lib/csum.c | 118 ++++++++++++++++++++++++++++++++++++++
3 files changed, 119 insertions(+), 2 deletions(-)
diff --git a/arch/riscv/include/asm/checksum.h b/arch/riscv/include/asm/checksum.h
index cd98f8cde888..af49b3409576 100644
--- a/arch/riscv/include/asm/checksum.h
+++ b/arch/riscv/include/asm/checksum.h
@@ -76,10 +76,8 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
#endif
#define ip_fast_csum ip_fast_csum
-#ifdef CONFIG_64BIT
extern unsigned int do_csum(const unsigned char *buff, int len);
#define do_csum do_csum
-#endif
#include <asm-generic/checksum.h>
diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile
index 26cb2502ecf8..2aa1a4ad361f 100644
--- a/arch/riscv/lib/Makefile
+++ b/arch/riscv/lib/Makefile
@@ -6,6 +6,7 @@ lib-y += memmove.o
lib-y += strcmp.o
lib-y += strlen.o
lib-y += strncmp.o
+lib-y += csum.o
lib-$(CONFIG_MMU) += uaccess.o
lib-$(CONFIG_64BIT) += tishift.o
lib-$(CONFIG_RISCV_ISA_ZICBOZ) += clear_page.o
diff --git a/arch/riscv/lib/csum.c b/arch/riscv/lib/csum.c
new file mode 100644
index 000000000000..2037041ce8a0
--- /dev/null
+++ b/arch/riscv/lib/csum.c
@@ -0,0 +1,118 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * IP checksum library
+ *
+ * Influenced by arch/arm64/lib/csum.c
+ * Copyright (C) 2023 Rivos Inc.
+ */
+#include <linux/bitops.h>
+#include <linux/compiler.h>
+#include <linux/kasan-checks.h>
+#include <linux/kernel.h>
+
+#include <net/checksum.h>
+
+/* Default version is sufficient for 32 bit */
+#ifdef CONFIG_64BIT
+__sum16 csum_ipv6_magic(const struct in6_addr *saddr,
+ const struct in6_addr *daddr,
+ __u32 len, __u8 proto, __wsum csum)
+{
+ unsigned long sum, ulen, uproto;
+
+ uproto = (unsigned long)htonl(proto);
+ ulen = (unsigned long)htonl(len);
+ sum = (unsigned long)csum;
+
+ sum += *(const unsigned long *)saddr->s6_addr;
+ sum += sum < csum;
+
+ sum += *((const unsigned long *)saddr->s6_addr + 1);
+ sum += sum < *((const unsigned long *)saddr->s6_addr + 1);
+
+ sum += *(const unsigned long *)daddr->s6_addr;
+ sum += sum < *(const unsigned long *)daddr->s6_addr;
+
+ sum += *((const unsigned long *)daddr->s6_addr + 1);
+ sum += sum < *((const unsigned long *)daddr->s6_addr + 1);
+
+ sum += ulen;
+ sum += sum < ulen;
+
+ sum += uproto;
+ sum += sum < uproto;
+
+ sum += (sum >> 32) | (sum << 32);
+ sum >>= 32;
+ return csum_fold((__force __wsum)sum);
+}
+EXPORT_SYMBOL(csum_ipv6_magic);
+#endif
+
+#ifdef CONFIG_32BIT
+typedef unsigned int csum_t;
+#define OFFSET_MASK 3
+#else
+typedef unsigned long csum_t;
+#define OFFSET_MASK 7
+#endif
+
+/*
+ * Perform a checksum on an arbitrary memory address.
+ * Algorithm accounts for buff being misaligned.
+ * If not aligned on an 8-byte boundary, will read the whole byte but not use
+ * the bytes that it shouldn't. The same thing will occur on the tail-end of the
+ * read.
+ */
+unsigned int __no_sanitize_address do_csum(const unsigned char *buff, int len)
+{
+ unsigned int offset, shift;
+ csum_t csum, data;
+ const csum_t *ptr;
+
+ if (unlikely(len <= 0))
+ return 0;
+ /*
+ * To align the address, grab the whole first byte in buff.
+ * Since it is inside of a same byte, it will never cross pages or cache
+ * lines.
+ * Directly call KASAN with the alignment we will be using.
+ */
+ offset = (csum_t)buff & OFFSET_MASK;
+ kasan_check_read(buff, len);
+ ptr = (const csum_t *)(buff - offset);
+ len = len + offset - sizeof(csum_t);
+
+ /*
+ * RISC-V is always little endian, so need to clear bits to the right.
+ */
+ shift = offset * 8;
+ data = *ptr;
+ data = (data >> shift) << shift;
+
+ while (len > 0) {
+ csum += data;
+ csum += csum < data;
+ len -= sizeof(csum_t);
+ ptr += 1;
+ data = *ptr;
+ }
+
+ /*
+ * Perform alignment (and over-read) bytes on the tail if any bytes
+ * leftover.
+ */
+ shift = len * -8;
+ data = (data << shift) >> shift;
+ csum += data;
+ csum += csum < data;
+
+#ifdef CONFIG_64BIT
+ csum += (csum >> 32) | (csum << 32);
+ csum >>= 32;
+#endif
+ csum = (unsigned int)csum + (((unsigned int)csum >> 16) | ((unsigned int)csum << 16));
+ if (offset & 1)
+ return (unsigned short)swab32(csum);
+ return csum >> 16;
+}
--
2.41.0
next prev parent reply other threads:[~2023-08-27 1:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-27 1:26 [PATCH 0/5] riscv: Add fine-tuned checksum functions Charlie Jenkins
2023-08-27 1:26 ` [PATCH 1/5] riscv: Checksum header Charlie Jenkins
2023-08-27 1:42 ` Conor Dooley
2023-08-27 2:00 ` Palmer Dabbelt
2023-08-27 10:28 ` Conor Dooley
2023-08-27 12:25 ` Conor Dooley
2023-08-28 16:55 ` Charlie Jenkins
2023-08-28 17:08 ` Conor Dooley
2023-08-28 18:20 ` Charlie Jenkins
2023-08-28 18:56 ` Conor Dooley
2023-08-28 21:39 ` Charlie Jenkins
2023-08-27 1:26 ` Charlie Jenkins [this message]
2023-08-27 1:26 ` [PATCH 3/5] riscv: Vector checksum header Charlie Jenkins
2023-08-28 18:22 ` Samuel Holland
2023-08-27 1:26 ` [PATCH 4/5] riscv: Vector checksum library Charlie Jenkins
2023-08-27 1:26 ` [PATCH 5/5] riscv: Test checksum functions Charlie Jenkins
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230826-optimize_checksum-v1-2-937501b4522a@rivosinc.com \
--to=charlie@rivosinc.com \
--cc=aou@eecs.berkeley.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®