]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
riscv: Add runtime constant support
authorCharlie Jenkins <charlie@rivosinc.com>
Wed, 19 Mar 2025 18:35:20 +0000 (11:35 -0700)
committerAlexandre Ghiti <alexghiti@rivosinc.com>
Thu, 20 Mar 2025 09:15:03 +0000 (09:15 +0000)
Implement the runtime constant infrastructure for riscv. Use this
infrastructure to generate constants to be used by the d_hash()
function.

This is the riscv variant of commit 94a2bc0f611c ("arm64: add 'runtime
constant' support") and commit e3c92e81711d ("runtime constants: add
x86 architecture support").

[ alex: Remove trailing whitespace ]

Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Tested-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/20250319-runtime_const_riscv-v10-2-745b31a11d65@rivosinc.com
Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
arch/riscv/Kconfig
arch/riscv/include/asm/asm.h
arch/riscv/include/asm/runtime-const.h [new file with mode: 0644]
arch/riscv/kernel/vmlinux.lds.S

index 7612c52e9b1e35607f1dd4603a596416d3357a71..c123f7c0579c1aca839e3c04bdb662d6856ae765 100644 (file)
@@ -783,6 +783,28 @@ config RISCV_ISA_ZBC
 
           If you don't know what to do here, say Y.
 
+config TOOLCHAIN_HAS_ZBKB
+       bool
+       default y
+       depends on !64BIT || $(cc-option,-mabi=lp64 -march=rv64ima_zbkb)
+       depends on !32BIT || $(cc-option,-mabi=ilp32 -march=rv32ima_zbkb)
+       depends on LLD_VERSION >= 150000 || LD_VERSION >= 23900
+       depends on AS_HAS_OPTION_ARCH
+
+config RISCV_ISA_ZBKB
+       bool "Zbkb extension support for bit manipulation instructions"
+       depends on TOOLCHAIN_HAS_ZBKB
+       depends on RISCV_ALTERNATIVE
+       default y
+       help
+          Adds support to dynamically detect the presence of the ZBKB
+          extension (bit manipulation for cryptography) and enable its usage.
+
+          The Zbkb extension provides instructions to accelerate a number
+          of common cryptography operations (pack, zip, etc).
+
+          If you don't know what to do here, say Y.
+
 config RISCV_ISA_ZICBOM
        bool "Zicbom extension support for non-coherent DMA operation"
        depends on MMU
index 776354895b81e7dc332e58265548aaf7365a6037..a8a2af6dfe9d2406625ca8fc94014fe5180e4fec 100644 (file)
@@ -27,6 +27,7 @@
 #define REG_ASM                __REG_SEL(.dword, .word)
 #define SZREG          __REG_SEL(8, 4)
 #define LGREG          __REG_SEL(3, 2)
+#define SRLI           __REG_SEL(srliw, srli)
 
 #if __SIZEOF_POINTER__ == 8
 #ifdef __ASSEMBLY__
diff --git a/arch/riscv/include/asm/runtime-const.h b/arch/riscv/include/asm/runtime-const.h
new file mode 100644 (file)
index 0000000..ea2e49c
--- /dev/null
@@ -0,0 +1,265 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_RISCV_RUNTIME_CONST_H
+#define _ASM_RISCV_RUNTIME_CONST_H
+
+#include <asm/asm.h>
+#include <asm/alternative.h>
+#include <asm/cacheflush.h>
+#include <asm/insn-def.h>
+#include <linux/memory.h>
+#include <asm/text-patching.h>
+
+#include <linux/uaccess.h>
+
+#ifdef CONFIG_32BIT
+#define runtime_const_ptr(sym)                                 \
+({                                                             \
+       typeof(sym) __ret;                                      \
+       asm_inline(".option push\n\t"                           \
+               ".option norvc\n\t"                             \
+               "1:\t"                                          \
+               "lui    %[__ret],0x89abd\n\t"                   \
+               "addi   %[__ret],%[__ret],-0x211\n\t"           \
+               ".option pop\n\t"                               \
+               ".pushsection runtime_ptr_" #sym ",\"a\"\n\t"   \
+               ".long 1b - .\n\t"                              \
+               ".popsection"                                   \
+               : [__ret] "=r" (__ret));                        \
+       __ret;                                                  \
+})
+#else
+/*
+ * Loading 64-bit constants into a register from immediates is a non-trivial
+ * task on riscv64. To get it somewhat performant, load 32 bits into two
+ * different registers and then combine the results.
+ *
+ * If the processor supports the Zbkb extension, we can combine the final
+ * "slli,slli,srli,add" into the single "pack" instruction. If the processor
+ * doesn't support Zbkb but does support the Zbb extension, we can
+ * combine the final "slli,srli,add" into one instruction "add.uw".
+ */
+#define RISCV_RUNTIME_CONST_64_PREAMBLE                                \
+       ".option push\n\t"                                      \
+       ".option norvc\n\t"                                     \
+       "1:\t"                                                  \
+       "lui    %[__ret],0x89abd\n\t"                           \
+       "lui    %[__tmp],0x1234\n\t"                            \
+       "addiw  %[__ret],%[__ret],-0x211\n\t"                   \
+       "addiw  %[__tmp],%[__tmp],0x567\n\t"                    \
+
+#define RISCV_RUNTIME_CONST_64_BASE                            \
+       "slli   %[__tmp],%[__tmp],32\n\t"                       \
+       "slli   %[__ret],%[__ret],32\n\t"                       \
+       "srli   %[__ret],%[__ret],32\n\t"                       \
+       "add    %[__ret],%[__ret],%[__tmp]\n\t"                 \
+
+#define RISCV_RUNTIME_CONST_64_ZBA                             \
+       ".option push\n\t"                                      \
+       ".option arch,+zba\n\t"                                 \
+       "slli   %[__tmp],%[__tmp],32\n\t"                       \
+       "add.uw %[__ret],%[__ret],%[__tmp]\n\t"                 \
+       "nop\n\t"                                               \
+       "nop\n\t"                                               \
+       ".option pop\n\t"                                       \
+
+#define RISCV_RUNTIME_CONST_64_ZBKB                            \
+       ".option push\n\t"                                      \
+       ".option arch,+zbkb\n\t"                                \
+       "pack   %[__ret],%[__ret],%[__tmp]\n\t"                 \
+       "nop\n\t"                                               \
+       "nop\n\t"                                               \
+       "nop\n\t"                                               \
+       ".option pop\n\t"                                       \
+
+#define RISCV_RUNTIME_CONST_64_POSTAMBLE(sym)                  \
+       ".option pop\n\t"                                       \
+       ".pushsection runtime_ptr_" #sym ",\"a\"\n\t"           \
+       ".long 1b - .\n\t"                                      \
+       ".popsection"                                           \
+
+#if defined(CONFIG_RISCV_ISA_ZBA) && defined(CONFIG_RISCV_ISA_ZBKB)
+#define runtime_const_ptr(sym)                                         \
+({                                                                     \
+       typeof(sym) __ret, __tmp;                                       \
+       asm_inline(RISCV_RUNTIME_CONST_64_PREAMBLE                      \
+               ALTERNATIVE_2(                                          \
+                       RISCV_RUNTIME_CONST_64_BASE,                    \
+                       RISCV_RUNTIME_CONST_64_ZBA,                     \
+                       0, RISCV_ISA_EXT_ZBA, 1,                        \
+                       RISCV_RUNTIME_CONST_64_ZBKB,                    \
+                       0, RISCV_ISA_EXT_ZBKB, 1                        \
+               )                                                       \
+               RISCV_RUNTIME_CONST_64_POSTAMBLE(sym)                   \
+               : [__ret] "=r" (__ret), [__tmp] "=r" (__tmp));          \
+       __ret;                                                          \
+})
+#elif defined(CONFIG_RISCV_ISA_ZBA)
+#define runtime_const_ptr(sym)                                         \
+({                                                                     \
+       typeof(sym) __ret, __tmp;                                       \
+       asm_inline(RISCV_RUNTIME_CONST_64_PREAMBLE                      \
+               ALTERNATIVE(                                            \
+                       RISCV_RUNTIME_CONST_64_BASE,                    \
+                       RISCV_RUNTIME_CONST_64_ZBA,                     \
+                       0, RISCV_ISA_EXT_ZBA, 1                         \
+               )                                                       \
+               RISCV_RUNTIME_CONST_64_POSTAMBLE(sym)                   \
+               : [__ret] "=r" (__ret), [__tmp] "=r" (__tmp));          \
+       __ret;                                                          \
+})
+#elif defined(CONFIG_RISCV_ISA_ZBKB)
+#define runtime_const_ptr(sym)                                         \
+({                                                                     \
+       typeof(sym) __ret, __tmp;                                       \
+       asm_inline(RISCV_RUNTIME_CONST_64_PREAMBLE                      \
+               ALTERNATIVE(                                            \
+                       RISCV_RUNTIME_CONST_64_BASE,                    \
+                       RISCV_RUNTIME_CONST_64_ZBKB,                    \
+                       0, RISCV_ISA_EXT_ZBKB, 1                        \
+               )                                                       \
+               RISCV_RUNTIME_CONST_64_POSTAMBLE(sym)                   \
+               : [__ret] "=r" (__ret), [__tmp] "=r" (__tmp));          \
+       __ret;                                                          \
+})
+#else
+#define runtime_const_ptr(sym)                                         \
+({                                                                     \
+       typeof(sym) __ret, __tmp;                                       \
+       asm_inline(RISCV_RUNTIME_CONST_64_PREAMBLE                      \
+               RISCV_RUNTIME_CONST_64_BASE                             \
+               RISCV_RUNTIME_CONST_64_POSTAMBLE(sym)                   \
+               : [__ret] "=r" (__ret), [__tmp] "=r" (__tmp));          \
+       __ret;                                                          \
+})
+#endif
+#endif
+
+#define runtime_const_shift_right_32(val, sym)                 \
+({                                                             \
+       u32 __ret;                                              \
+       asm_inline(".option push\n\t"                           \
+               ".option norvc\n\t"                             \
+               "1:\t"                                          \
+               SRLI " %[__ret],%[__val],12\n\t"                \
+               ".option pop\n\t"                               \
+               ".pushsection runtime_shift_" #sym ",\"a\"\n\t" \
+               ".long 1b - .\n\t"                              \
+               ".popsection"                                   \
+               : [__ret] "=r" (__ret)                          \
+               : [__val] "r" (val));                           \
+       __ret;                                                  \
+})
+
+#define runtime_const_init(type, sym) do {                     \
+       extern s32 __start_runtime_##type##_##sym[];            \
+       extern s32 __stop_runtime_##type##_##sym[];             \
+                                                               \
+       runtime_const_fixup(__runtime_fixup_##type,             \
+                           (unsigned long)(sym),               \
+                           __start_runtime_##type##_##sym,     \
+                           __stop_runtime_##type##_##sym);     \
+} while (0)
+
+static inline void __runtime_fixup_caches(void *where, unsigned int insns)
+{
+       /* On riscv there are currently only cache-wide flushes so va is ignored. */
+       __always_unused uintptr_t va = (uintptr_t)where;
+
+       flush_icache_range(va, va + 4 * insns);
+}
+
+/*
+ * The 32-bit immediate is stored in a lui+addi pairing.
+ * lui holds the upper 20 bits of the immediate in the first 20 bits of the instruction.
+ * addi holds the lower 12 bits of the immediate in the first 12 bits of the instruction.
+ */
+static inline void __runtime_fixup_32(__le16 *lui_parcel, __le16 *addi_parcel, unsigned int val)
+{
+       unsigned int lower_immediate, upper_immediate;
+       u32 lui_insn, addi_insn, addi_insn_mask;
+       __le32 lui_res, addi_res;
+
+       /* Mask out upper 12 bit of addi */
+       addi_insn_mask = 0x000fffff;
+
+       lui_insn = (u32)le16_to_cpu(lui_parcel[0]) | (u32)le16_to_cpu(lui_parcel[1]) << 16;
+       addi_insn = (u32)le16_to_cpu(addi_parcel[0]) | (u32)le16_to_cpu(addi_parcel[1]) << 16;
+
+       lower_immediate = sign_extend32(val, 11);
+       upper_immediate = (val - lower_immediate);
+
+       if (upper_immediate & 0xfffff000) {
+               /* replace upper 20 bits of lui with upper immediate */
+               lui_insn &= 0x00000fff;
+               lui_insn |= upper_immediate & 0xfffff000;
+       } else {
+               /* replace lui with nop if immediate is small enough to fit in addi */
+               lui_insn = RISCV_INSN_NOP4;
+               /*
+                * lui is being skipped, so do a load instead of an add. A load
+                * is performed by adding with the x0 register. Setting rs to
+                * zero with the following mask will accomplish this goal.
+                */
+               addi_insn_mask &= 0x07fff;
+       }
+
+       if (lower_immediate & 0x00000fff) {
+               /* replace upper 12 bits of addi with lower 12 bits of val */
+               addi_insn &= addi_insn_mask;
+               addi_insn |= (lower_immediate & 0x00000fff) << 20;
+       } else {
+               /* replace addi with nop if lower_immediate is empty */
+               addi_insn = RISCV_INSN_NOP4;
+       }
+
+       addi_res = cpu_to_le32(addi_insn);
+       lui_res = cpu_to_le32(lui_insn);
+       mutex_lock(&text_mutex);
+       patch_insn_write(addi_parcel, &addi_res, sizeof(addi_res));
+       patch_insn_write(lui_parcel, &lui_res, sizeof(lui_res));
+       mutex_unlock(&text_mutex);
+}
+
+static inline void __runtime_fixup_ptr(void *where, unsigned long val)
+{
+#ifdef CONFIG_32BIT
+               __runtime_fixup_32(where, where + 4, val);
+               __runtime_fixup_caches(where, 2);
+#else
+               __runtime_fixup_32(where, where + 8, val);
+               __runtime_fixup_32(where + 4, where + 12, val >> 32);
+               __runtime_fixup_caches(where, 4);
+#endif
+}
+
+/*
+ * Replace the least significant 5 bits of the srli/srliw immediate that is
+ * located at bits 20-24
+ */
+static inline void __runtime_fixup_shift(void *where, unsigned long val)
+{
+       __le16 *parcel = where;
+       __le32 res;
+       u32 insn;
+
+       insn = (u32)le16_to_cpu(parcel[0]) | (u32)le16_to_cpu(parcel[1]) << 16;
+
+       insn &= 0xfe0fffff;
+       insn |= (val & 0b11111) << 20;
+
+       res = cpu_to_le32(insn);
+       mutex_lock(&text_mutex);
+       patch_text_nosync(where, &res, sizeof(insn));
+       mutex_unlock(&text_mutex);
+}
+
+static inline void runtime_const_fixup(void (*fn)(void *, unsigned long),
+                                      unsigned long val, s32 *start, s32 *end)
+{
+       while (start < end) {
+               fn(*start + (void *)start, val);
+               start++;
+       }
+}
+
+#endif /* _ASM_RISCV_RUNTIME_CONST_H */
index 002ca58dd998cb78b662837b5ebac988fb6c77bb..61bd5ba6680a786bf1db7dc37bf1acda0639b5c7 100644 (file)
@@ -97,6 +97,9 @@ SECTIONS
        {
                EXIT_DATA
        }
+
+       RUNTIME_CONST_VARIABLES
+
        PERCPU_SECTION(L1_CACHE_BYTES)
 
        .rel.dyn : {