From: Charlie Jenkins <charlie@rivosinc.com>
To: Charlie Jenkins <charlie@rivosinc.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Conor Dooley <conor@kernel.org>,
Samuel Holland <samuel.holland@sifive.com>,
David Laight <David.Laight@aculab.com>,
linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: Paul Walmsley <paul.walmsley@sifive.com>,
Albert Ou <aou@eecs.berkeley.edu>
Subject: [PATCH v4 4/5] riscv: Vector checksum library
Date: Mon, 11 Sep 2023 15:57:14 -0700 [thread overview]
Message-ID: <20230911-optimize_checksum-v4-4-77cc2ad9e9d7@rivosinc.com> (raw)
In-Reply-To: <20230911-optimize_checksum-v4-0-77cc2ad9e9d7@rivosinc.com>
This patch is not ready for merge as vector support in the kernel is
limited. However, the code has been tested in QEMU so the algorithms
do work. This code requires the kernel to be compiled with C vector
support, but that is not yet possible. It is written in assembly
rather than using the GCC vector instrinsics because they did not
provide optimal code.
Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
---
arch/riscv/lib/csum.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 92 insertions(+)
diff --git a/arch/riscv/lib/csum.c b/arch/riscv/lib/csum.c
index 47d98c51bab2..eb4596fc7f5b 100644
--- a/arch/riscv/lib/csum.c
+++ b/arch/riscv/lib/csum.c
@@ -12,6 +12,10 @@
#include <net/checksum.h>
+#ifdef CONFIG_RISCV_ISA_V
+#include <riscv_vector.h>
+#endif
+
/* Default version is sufficient for 32 bit */
#ifndef CONFIG_32BIT
__sum16 csum_ipv6_magic(const struct in6_addr *saddr,
@@ -115,6 +119,94 @@ unsigned int __no_sanitize_address do_csum(const unsigned char *buff, int len)
offset = (csum_t)buff & OFFSET_MASK;
kasan_check_read(buff, len);
ptr = (const csum_t *)(buff - offset);
+#ifdef CONFIG_RISCV_ISA_V
+ if (!has_vector())
+ goto no_vector;
+
+ len += offset;
+
+ vuint64m1_t prev_buffer;
+ vuint32m1_t curr_buffer;
+ unsigned int shift, cl, tail_seg;
+ csum_t vl, csum;
+ const csum_t *ptr;
+
+#ifdef CONFIG_32BIT
+ csum_t high_result, low_result;
+#else
+ csum_t result;
+#endif
+
+ // Read the tail segment
+ tail_seg = len % 4;
+ csum = 0;
+ if (tail_seg) {
+ shift = (4 - tail_seg) * 8;
+ csum = *(unsigned int *)((const unsigned char *)ptr + len - tail_seg);
+ csum = ((unsigned int)csum << shift) >> shift;
+ len -= tail_seg;
+ }
+
+ unsigned int start_mask = (unsigned int)(~(~0U << offset));
+
+ kernel_vector_begin();
+ asm(".option push \n\
+ .option arch, +v \n\
+ vsetvli %[vl], %[len], e8, m1, ta, ma \n\
+ # clear out mask and vector registers since we switch up sizes \n\
+ vmclr.m v0 \n\
+ vmclr.m %[prev_buffer] \n\
+ vmclr.m %[curr_buffer] \n\
+ # Mask out the leading bits of a misaligned address \n\
+ vsetivli x0, 1, e64, m1, ta, ma \n\
+ vmv.s.x %[prev_buffer], %[csum] \n\
+ vmv.s.x v0, %[start_mask] \n\
+ vsetvli %[vl], %[len], e8, m1, ta, ma \n\
+ vmnot.m v0, v0 \n\
+ vle8.v %[curr_buffer], (%[buff]), v0.t \n\
+ j 2f \n\
+ # Iterate through the buff and sum all words \n\
+ 1: \n\
+ vsetvli %[vl], %[len], e8, m1, ta, ma \n\
+ vle8.v %[curr_buffer], (%[buff]) \n\
+ 2: \n\
+ vsetvli x0, x0, e32, m1, ta, ma \n\
+ vwredsumu.vs %[prev_buffer], %[curr_buffer], %[prev_buffer] \n\t"
+#ifdef CONFIG_32BIT
+ "sub %[len], %[len], %[vl] \n\
+ slli %[vl], %[vl], 2 \n\
+ add %[buff], %[vl], %[buff] \n\
+ bnez %[len], 1b \n\
+ vsetvli x0, x0, e64, m1, ta, ma \n\
+ vmv.x.s %[result], %[prev_buffer] \n\
+ addi %[vl], x0, 32 \n\
+ vsrl.vx %[prev_buffer], %[prev_buffer], %[vl] \n\
+ vmv.x.s %[high_result], %[prev_buffer] \n\
+ .option pop"
+ : [vl] "=&r"(vl), [prev_buffer] "=&vd"(prev_buffer),
+ [curr_buffer] "=&vd"(curr_buffer),
+ [high_result] "=&r"(high_result), [low_result] "=&r"(low_result)
+ : [buff] "r"(ptr), [len] "r"(len), [start_mask] "r"(start_mask),
+ [csum] "r"(csum));
+
+ high_result += low_result;
+ high_result += high_result < low_result;
+#else // !CONFIG_32BIT
+ "subw %[len], %[len], %[vl] \n\
+ slli %[vl], %[vl], 2 \n\
+ addw %[buff], %[vl], %[buff] \n\
+ bnez %[len], 1b \n\
+ vsetvli x0, x0, e64, m1, ta, ma \n\
+ vmv.x.s %[result], %[prev_buffer] \n\
+ .option pop"
+ : [vl] "=&r"(vl), [prev_buffer] "=&vd"(prev_buffer),
+ [curr_buffer] "=&vd"(curr_buffer), [result] "=&r"(result)
+ : [buff] "r"(ptr), [len] "r"(len), [start_mask] "r"(start_mask),
+ [csum] "r"(csum));
+#endif // !CONFIG_32BIT
+ kernel_vector_end();
+no_vector:
+#endif // CONFIG_RISCV_ISA_V
len = len + offset - sizeof(csum_t);
/*
--
2.42.0
next prev parent reply other threads:[~2023-09-12 2:18 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-11 22:57 [PATCH v4 0/5] riscv: Add fine-tuned checksum functions Charlie Jenkins
2023-09-11 22:57 ` [PATCH v4 1/5] riscv: Checksum header Charlie Jenkins
2023-09-12 10:24 ` Emil Renner Berthing
2023-09-13 2:38 ` Charlie Jenkins
2023-09-13 9:19 ` Emil Renner Berthing
2023-09-11 22:57 ` [PATCH v4 2/5] riscv: Add checksum library Charlie Jenkins
2023-09-12 8:45 ` David Laight
2023-09-13 3:09 ` Charlie Jenkins
2023-09-13 8:47 ` David Laight
2023-09-13 23:18 ` Charlie Jenkins
2023-09-14 0:41 ` Charlie Jenkins
2023-09-14 12:25 ` Conor Dooley
2023-09-14 17:58 ` Charlie Jenkins
2023-09-14 18:02 ` Conor Dooley
2023-09-14 23:30 ` Charlie Jenkins
2023-09-11 22:57 ` [PATCH v4 3/5] riscv: Vector checksum header Charlie Jenkins
2023-09-11 22:57 ` Charlie Jenkins [this message]
2023-09-14 12:46 ` [PATCH v4 4/5] riscv: Vector checksum library Conor Dooley
2023-09-14 16:14 ` Charlie Jenkins
2023-09-14 16:29 ` Conor Dooley
2023-09-14 17:29 ` Charlie Jenkins
2023-09-14 17:36 ` Conor Dooley
2023-09-14 20:59 ` Charlie Jenkins
2023-09-11 22:57 ` [PATCH v4 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=20230911-optimize_checksum-v4-4-77cc2ad9e9d7@rivosinc.com \
--to=charlie@rivosinc.com \
--cc=David.Laight@aculab.com \
--cc=aou@eecs.berkeley.edu \
--cc=conor@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=samuel.holland@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®