s390/vdso: getrandom() vdso implementation
Subsystems (5)
Heiko Carstens
maintainercover s390/vdso: getrandom() vdso implementation
Hi Jason,
quite late but finally the s390 vdso getrandom implementation which applies on top of your random git tree.
As a prerequisite this requires some changes to s390 core code to allow alternatives in vdso code. It is fine when all of this gets routed via your tree.
Please note that the first patch of this series is already in linux-next [1], but given that it is so small it seems to be the easiest to apply it also on your tree; but I'm sure somebody will complain :)
Thanks,
Heiko
[1] 0147addc4fb7 ("s390/facility: Disable compile time optimization for decompressor code")
Heiko Carstens (7):
s390/facility: Disable compile time optimization for decompressor code s390/alternatives: Remove ALT_FACILITY_EARLY s390/facility: Let test_facility() generate static branch if possible s390/module: Provide find_section() helper
s390/vdso: Allow alternatives in vdso code
s390/vdso: Move vdso symbol handling to separate header file s390/vdso: Wire up getrandom() vdso implementation
arch/s390/Kconfig | 1 + arch/s390/include/asm/alternative.h | 6 +- arch/s390/include/asm/facility.h | 37 +++- arch/s390/include/asm/fpu-insn-asm.h | 22 +++ arch/s390/include/asm/module.h | 14 ++ arch/s390/include/asm/vdso-symbols.h | 17 ++ arch/s390/include/asm/vdso.h | 12 -- arch/s390/include/asm/vdso/getrandom.h | 40 +++++ arch/s390/include/asm/vdso/vsyscall.h | 15 ++ arch/s390/kernel/compat_signal.c | 2 +- arch/s390/kernel/entry.S | 2 +- arch/s390/kernel/signal.c | 2 +- arch/s390/kernel/vdso.c | 26 ++- arch/s390/kernel/vdso64/Makefile | 9 +- arch/s390/kernel/vdso64/vdso.h | 1 + arch/s390/kernel/vdso64/vdso64.lds.S | 7 + arch/s390/kernel/vdso64/vgetrandom-chacha.S | 184 ++++++++++++++++++++ arch/s390/kernel/vdso64/vgetrandom.c | 14 ++ tools/arch/s390/vdso | 1 + tools/testing/selftests/vDSO/Makefile | 2 +- 20 files changed, 378 insertions(+), 36 deletions(-) create mode 100644 arch/s390/include/asm/vdso-symbols.h create mode 100644 arch/s390/include/asm/vdso/getrandom.h create mode 100644 arch/s390/kernel/vdso64/vgetrandom-chacha.S create mode 100644 arch/s390/kernel/vdso64/vgetrandom.c create mode 120000 tools/arch/s390/vdso
Signature · 1 line
2.43.0
Heiko Carstens
maintainerPATCH 1/7 s390/facility: Disable compile time optimization for decompressor code
Disable compile time optimizations of test_facility() for the decompressor. The decompressor should not contain any optimized code depending on the architecture level set the kernel image is compiled for to avoid unexpected operation exceptions.
Add a __DECOMPRESSOR check to test_facility() to enforce that facilities are always checked during runtime for the decompressor.
--- arch/s390/include/asm/facility.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/s390/include/asm/facility.h +4 -2
@@ -59,8 +59,10 @@ static inline int test_facility(unsigned long nr)unsigned long facilities_als[] = {FACILITIES_ALS };if (__builtin_constant_p (nr) && nr <sizeof (facilities_als) *8 ) { -if (__test_facility (nr, &facilities_als)) -return 1 ; +if (__test_facility (nr, &facilities_als)) { +if (!__is_defined (__DECOMPRESSOR)) +return 1 ; + } }return __test_facility (nr, &stfle_fac_list); }
Signature · 1 line
2.43.0
Heiko Carstens
maintainerPATCH 2/7 s390/alternatives: Remove ALT_FACILITY_EARLY
In reply to Heiko CarstensPatch all alternatives which depend on facilities from the decompressor. There is no technical reason which enforces to split patching of such alternatives to the decompressor and the kernel.
This simplifies alternative handling a bit, since one alternative type is removed.
--- arch/s390/include/asm/alternative.h | 6 +----- arch/s390/kernel/entry.S | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-)
arch/s390/include/asm/alternative.h +1 -5
@@ -39,11 +39,7 @@#define ALT_TYPE_SHIFT 20#define ALT_CTX_SHIFT 28 -#define ALT_FACILITY_EARLY (facility) (ALT_CTX_EARLY << ALT_CTX_SHIFT | \ - ALT_TYPE_FACILITY << ALT_TYPE_SHIFT | \ - (facility) << ALT_DATA_SHIFT) - -#define ALT_FACILITY (facility) (ALT_CTX_LATE << ALT_CTX_SHIFT | \ +#define ALT_FACILITY (facility) (ALT_CTX_EARLY << ALT_CTX_SHIFT | \ ALT_TYPE_FACILITY << ALT_TYPE_SHIFT | \ (facility) << ALT_DATA_SHIFT)
arch/s390/kernel/entry.S +1 -1
@@ -42,7 +42,7 @@ _LPP_OFFSET = __LC_LPP .macro LPSWEY address, lpswe ALTERNATIVE_2 "b \lpswe;nopr", \ - ".insn siy,0xeb0000000071,\address,0", ALT_FACILITY_EARLY(193), \ + ".insn siy,0xeb0000000071,\address,0", ALT_FACILITY(193), \ __stringify(.insn siy,0xeb0000000071,LOWCORE_ALT_ADDRESS+\address,0), \ ALT_LOWCORE .endm
Signature · 1 line
2.43.0
Heiko Carstens
maintainerPATCH 3/7 s390/facility: Let test_facility() generate static branch if possible
In reply to Heiko CarstensLet test_facility() generate a branch instruction if the tested facility is a constant, and where the result cannot be evaluated during compile time. The branch instruction defaults to "false" and is patched to nop (branch not taken) if the tested facility is available.
This avoids runtime checks and is similar to x86's static_cpu_has() and arm64's alternative_has_cap_likely().
--- arch/s390/include/asm/facility.h | 37 +++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 8 deletions(-)
arch/s390/include/asm/facility.h +29 -8
@@ -14,7 +14,7 @@#include <linux/string.h> #include <linux/types.h> #include <linux/preempt.h> - +#include <asm/alternative.h> #include <asm/lowcore.h> #define MAX_FACILITY_BIT (sizeof(stfle_fac_list) * 8)
@@ -39,30 +39,51 @@ static inline void __clear_facility(unsigned long nr, void *facilities) ptr[nr >>3 ] &= ~(0x80 >> (nr &7 )); } -static inline int __test_facility (unsigned long nr,void *facilities) +static __always_inline bool __test_facility(unsigned long nr, void *facilities) {unsigned char *ptr;if (nr >=MAX_FACILITY_BIT ) -return 0 ; +return false; ptr = (unsigned char *) facilities + (nr >>3 );return (*ptr & (0x80 >> (nr &7 ))) !=0 ; } +/* +* __test_facility_constant() generates a single instruction branch. If the +* tested facility is available (likely) the branch is patched into a nop. +* +* Do not use this function unless you know what you are doing. All users are +* supposed to use test_facility() which will do the right thing. +*/ +static __always_inline bool __test_facility_constant(unsigned long nr) +{ + asm goto( + ALTERNATIVE("brcl 15,%l[l_no]", "brcl 0,0", ALT_FACILITY(%[nr])) + : + : [nr] "i" (nr) + : + : l_no); +return true; +l_no: +return false; +} +/* * The test_facility function uses the bit ordering where the MSB is bit 0. * That makes it easier to query facility bits with the bit number as * documented in the Principles of Operation. */ -static inline int test_facility (unsigned long nr) +static __always_inline bool test_facility(unsigned long nr) {unsigned long facilities_als[] = {FACILITIES_ALS }; -if (__builtin_constant_p (nr) && nr <sizeof (facilities_als) *8 ) { -if (__test_facility (nr, &facilities_als)) { -if (!__is_defined (__DECOMPRESSOR)) -return 1 ; +if (!__is_defined (__DECOMPRESSOR) &&__builtin_constant_p (nr)) { +if (nr <sizeof (facilities_als) *8 ) { +if (__test_facility (nr, &facilities_als)) +return true; } +return __test_facility_constant (nr); }return __test_facility (nr, &stfle_fac_list); }
Signature · 1 line
2.43.0
Heiko Carstens
maintainerPATCH 4/7 s390/module: Provide find_section() helper
In reply to Heiko CarstensProvide find_section() helper function which can be used to find a section by name, similar to other architectures.
--- arch/s390/include/asm/module.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/s390/include/asm/module.h +14 -0
@@ -38,4 +38,18 @@ struct mod_arch_specific { #endif /* CONFIG_FUNCTION_TRACER */ }; +static inline const Elf_Shdr *find_section (const Elf_Ehdr *hdr, +const Elf_Shdr *sechdrs, +const char *name) +{ +const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset; +const Elf_Shdr *s, *se; + +for (s = sechdrs, se = sechdrs + hdr->e_shnum; s < se; s++) { +if (strcmp (name, secstrs + s->sh_name) ==0 ) +return s; + } +return NULL ; +} +#endif /* _ASM_S390_MODULE_H */
Signature · 1 line
2.43.0
Heiko Carstens
maintainerPATCH 5/7 s390/vdso: Allow alternatives in vdso code
In reply to Heiko CarstensImplement the infrastructure required to allow alternatives in vdso code.
--- arch/s390/kernel/vdso.c | 19 +++++++++++++++++++ arch/s390/kernel/vdso64/vdso64.lds.S | 4 ++++ 2 files changed, 23 insertions(+)
arch/s390/kernel/vdso.c +19 -0
@@ -12,12 +12,14 @@#include <linux/errno.h> #include <linux/init.h> #include <linux/kernel.h> +#include <linux/module.h> #include <linux/mm.h> #include <linux/slab.h> #include <linux/smp.h> #include <linux/time_namespace.h> #include <linux/random.h> #include <vdso/datapage.h> +#include <asm/alternative.h> #include <asm/vdso.h> extern char vdso64_start[], vdso64_end[];
@@ -250,8 +252,25 @@ static struct page ** __init vdso_setup_pages(void *start, void *end)return pagelist; } +static void vdso_apply_alternatives (void ) +{ +const struct elf64_shdr *alt, *shdr; +struct alt_instr *start, *end; +const struct elf64_hdr *hdr; + + hdr = (struct elf64_hdr *)vdso64_start; + shdr = (void *)hdr + hdr->e_shoff; + alt =find_section (hdr, shdr,".altinstructions" ); +if (!alt) +return ; + start = (void *)hdr + alt->sh_offset; + end = (void *)hdr + alt->sh_offset + alt->sh_size; +apply_alternatives (start, end); +} +static int __init vdso_init (void ) { +vdso_apply_alternatives (); vdso64_mapping.pages =vdso_setup_pages (vdso64_start, vdso64_end);if (IS_ENABLED (CONFIG_COMPAT )) vdso32_mapping.pages =vdso_setup_pages (vdso32_start, vdso32_end);
arch/s390/kernel/vdso64/vdso64.lds.S +4 -0
@@ -42,6 +42,10 @@ SECTIONS .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) } .rodata1 : { *(.rodata1) } + . = ALIGN(8); + .altinstructions : { *(.altinstructions) } + .altinstr_replacement : { *(.altinstr_replacement) } + .dynamic : { *(.dynamic) } :text :dynamic .eh_frame_hdr : { *(.eh_frame_hdr) } :text :eh_frame_hdr
Signature · 1 line
2.43.0
Heiko Carstens
maintainerPATCH 6/7 s390/vdso: Move vdso symbol handling to separate header file
In reply to Heiko CarstensThe vdso.h header file, which is included at many places, includes generated header files. This can easily lead to recursive header file inclusions if the vdso code is changed.
Therefore move the vdso symbol code, which requires the generated header files, to a separate header file, and include it at the two locations which require it.
--- arch/s390/include/asm/vdso-symbols.h | 17 +++++++++++++++++ arch/s390/include/asm/vdso.h | 12 ------------ arch/s390/kernel/compat_signal.c | 2 +- arch/s390/kernel/signal.c | 2 +- 4 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 arch/s390/include/asm/vdso-symbols.h
arch/s390/include/asm/vdso-symbols.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __S390_VDSO_SYMBOLS_H__ +#define __S390_VDSO_SYMBOLS_H__ + +#include <generated/vdso64-offsets.h> +#ifdef CONFIG_COMPAT +#include <generated/vdso32-offsets.h> +#endif + +#define VDSO64_SYMBOL (tsk, name) ((tsk)->mm->context.vdso_base + (vdso64_offset_##name)) +#ifdef CONFIG_COMPAT +#define VDSO32_SYMBOL (tsk, name) ((tsk)->mm->context.vdso_base + (vdso32_offset_##name)) +#else +#define VDSO32_SYMBOL (tsk, name) (-1UL) +#endif + +#endif /* __S390_VDSO_SYMBOLS_H__ */
arch/s390/include/asm/vdso.h +0 -12
@@ -6,18 +6,6 @@#ifndef __ASSEMBLY__ -#include <generated/vdso64-offsets.h> -#ifdef CONFIG_COMPAT -#include <generated/vdso32-offsets.h> -#endif - -#define VDSO64_SYMBOL (tsk, name) ((tsk)->mm->context.vdso_base + (vdso64_offset_##name)) -#ifdef CONFIG_COMPAT -#define VDSO32_SYMBOL (tsk, name) ((tsk)->mm->context.vdso_base + (vdso32_offset_##name)) -#else -#define VDSO32_SYMBOL (tsk, name) (-1UL) -#endif -extern struct vdso_data *vdso_data;int vdso_getcpu_init (void );
arch/s390/kernel/compat_signal.c +1 -1
@@ -24,11 +24,11 @@#include <linux/tty.h> #include <linux/personality.h> #include <linux/binfmts.h> +#include <asm/vdso-symbols.h> #include <asm/access-regs.h> #include <asm/ucontext.h> #include <linux/uaccess.h> #include <asm/lowcore.h> -#include <asm/vdso.h> #include <asm/fpu.h> #include "compat_linux.h" #include "compat_ptrace.h"
arch/s390/kernel/signal.c +1 -1
@@ -30,9 +30,9 @@#include <linux/compat.h> #include <asm/ucontext.h> #include <linux/uaccess.h> +#include <asm/vdso-symbols.h> #include <asm/access-regs.h> #include <asm/lowcore.h> -#include <asm/vdso.h> #include "entry.h" /*
Signature · 1 line
2.43.0
Heiko Carstens
maintainerPATCH 7/7 s390/vdso: Wire up getrandom() vdso implementation
In reply to Heiko CarstensProvide the s390 specific vdso getrandom() architecture backend.
_vdso_rng_data required data is placed within the _vdso_data vvar page, by using a hardcoded offset larger than vdso_data.
As required the chacha20 implementation does not write to the stack.
The implementation follows more or less the arm64 implementations and makes use of vector instructions. It has a fallback to the getrandom() system call for machines where the vector facility is not installed.
The check if the vector facility is installed, as well as an optimization for machines with the vector-enhancements facility 2, is implemented with alternatives, avoiding runtime checks.
Note that __kernel_getrandom() is implemented without the vdso user wrapper which would setup a stack frame for odd cases (aka very old glibc variants) where the caller has not done that. All callers of __kernel_getrandom() are required to setup a stack frame, like the C ABI requires it.
The vdso testcases vdso_test_getrandom and vdso_test_chacha pass.
--- arch/s390/Kconfig | 1 + arch/s390/include/asm/fpu-insn-asm.h | 22 +++ arch/s390/include/asm/vdso/getrandom.h | 40 +++++ arch/s390/include/asm/vdso/vsyscall.h | 15 ++ arch/s390/kernel/vdso.c | 7 +- arch/s390/kernel/vdso64/Makefile | 9 +- arch/s390/kernel/vdso64/vdso.h | 1 + arch/s390/kernel/vdso64/vdso64.lds.S | 3 + arch/s390/kernel/vdso64/vgetrandom-chacha.S | 184 ++++++++++++++++++++ arch/s390/kernel/vdso64/vgetrandom.c | 14 ++ tools/arch/s390/vdso | 1 + tools/testing/selftests/vDSO/Makefile | 2 +- 12 files changed, 290 insertions(+), 9 deletions(-) create mode 100644 arch/s390/include/asm/vdso/getrandom.h create mode 100644 arch/s390/kernel/vdso64/vgetrandom-chacha.S create mode 100644 arch/s390/kernel/vdso64/vgetrandom.c create mode 120000 tools/arch/s390/vdso
arch/s390/Kconfig +1 -0
@@ -243,6 +243,7 @@ config S390 select TRACE_IRQFLAGS_SUPPORT select TTY select USER_STACKTRACE_SUPPORT + select VDSO_GETRANDOM select VIRT_CPU_ACCOUNTING select ZONE_DMA # Note: keep the above list sorted alphabetically
arch/s390/include/asm/fpu-insn-asm.h +22 -0
@@ -407,6 +407,28 @@ MRXBOPC 0, 0x0E, v1 .endm +/* VECTOR STORE BYTE REVERSED ELEMENTS */ + .macro VSTBR vr1, disp, index="%r0", base, m + VX_NUM v1, \vr1 + GR_NUM x2, \index + GR_NUM b2, \base + .word 0xE600 | ((v1&15) << 4) | (x2&15) + .word (b2 << 12) | (\disp) + MRXBOPC \m, 0x0E, v1 +.endm +.macro VSTBRH vr1, disp, index="%r0", base + VSTBR \vr1, \disp, \index, \base, 1 +.endm +.macro VSTBRF vr1, disp, index="%r0", base + VSTBR \vr1, \disp, \index, \base, 2 +.endm +.macro VSTBRG vr1, disp, index="%r0", base + VSTBR \vr1, \disp, \index, \base, 3 +.endm +.macro VSTBRQ vr1, disp, index="%r0", base + VSTBR \vr1, \disp, \index, \base, 4 +.endm + /* VECTOR STORE MULTIPLE */ .macro VSTM vfrom, vto, disp, base, hint=3 VX_NUM v1, \vfrom
arch/s390/include/asm/vdso/getrandom.h new file +40 -0
@@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASM_VDSO_GETRANDOM_H +#define __ASM_VDSO_GETRANDOM_H + +#ifndef __ASSEMBLY__ + +#include <vdso/datapage.h> +#include <asm/vdso/vsyscall.h> +#include <asm/syscall.h> +#include <asm/unistd.h> +#include <asm/page.h> + +/** +* getrandom_syscall - Invoke the getrandom() syscall. +* @buffer: Destination buffer to fill with random bytes. +* @len: Size of @buffer in bytes. +* @flags: Zero or more GRND_* flags. +* Returns: The number of random bytes written to @buffer, or a negative value indicating an error. +*/ +static __always_inline ssize_t getrandom_syscall(void *buffer, size_t len, unsigned int flags) +{ +return syscall3 (__NR_getrandom, (long )buffer, (long )len, (long )flags); +} + +static __always_inline const struct vdso_rng_data *__arch_get_vdso_rng_data(void) +{ +/* +* The RNG data is in the real VVAR data page, but if a task belongs to a time namespace +* then VVAR_DATA_PAGE_OFFSET points to the namespace-specific VVAR page and VVAR_TIMENS_ +* PAGE_OFFSET points to the real VVAR page. +*/ +if (IS_ENABLED (CONFIG_TIME_NS ) && _vdso_data->clock_mode ==VDSO_CLOCKMODE_TIMENS ) +return (void *)&_vdso_rng_data +VVAR_TIMENS_PAGE_OFFSET *PAGE_SIZE ; +return &_vdso_rng_data; +} + +#endif /* !__ASSEMBLY__ */ + +#endif /* __ASM_VDSO_GETRANDOM_H */
arch/s390/include/asm/vdso/vsyscall.h +15 -0
@@ -2,12 +2,21 @@#ifndef __ASM_VDSO_VSYSCALL_H#define __ASM_VDSO_VSYSCALL_H +#define __VDSO_RND_DATA_OFFSET 768 +#ifndef __ASSEMBLY__#include <linux/hrtimer.h> #include <linux/timekeeper_internal.h> #include <vdso/datapage.h> #include <asm/vdso.h> + +enum vvar_pages { +VVAR_DATA_PAGE_OFFSET , +VVAR_TIMENS_PAGE_OFFSET , +VVAR_NR_PAGES +}; +/* * Update the vDSO data page to keep in sync with kernel timekeeping. */
@@ -18,6 +27,12 @@ static __always_inline struct vdso_data *__s390_get_k_vdso_data(void) }#define __arch_get_k_vdso_data __s390_get_k_vdso_data +static __always_inline struct vdso_rng_data *__s390_get_k_vdso_rnd_data(void) +{ +return (void *)vdso_data + __VDSO_RND_DATA_OFFSET; +} +#define __arch_get_k_vdso_rng_data __s390_get_k_vdso_rnd_data +/* The asm-generic header needs to be included after the definitions above */ #include <asm-generic/vdso/vsyscall.h>
arch/s390/kernel/vdso.c +1 -6
@@ -19,6 +19,7 @@#include <linux/time_namespace.h> #include <linux/random.h> #include <vdso/datapage.h> +#include <asm/vdso/vsyscall.h> #include <asm/alternative.h> #include <asm/vdso.h>
@@ -31,12 +32,6 @@ static union vdso_data_store vdso_data_store __page_aligned_data;struct vdso_data *vdso_data = vdso_data_store.data; -enum vvar_pages { -VVAR_DATA_PAGE_OFFSET , -VVAR_TIMENS_PAGE_OFFSET , -VVAR_NR_PAGES , -}; -#ifdef CONFIG_TIME_NS struct vdso_data *arch_get_vdso_data (void *vvar_page) {
arch/s390/kernel/vdso64/Makefile +7 -2
@@ -3,12 +3,17 @@ # Include the generic Makefile to check the built vdso. include $(srctree)/lib/vdso/Makefile -obj-vdso64 = vdso_user_wrapper.o note.o -obj-cvdso64 = vdso64_generic.o getcpu.o +obj-vdso64 = vdso_user_wrapper.o note.o vgetrandom-chacha.o +obj-cvdso64 = vdso64_generic.o getcpu.o vgetrandom.o VDSO_CFLAGS_REMOVE := -pg $(CC_FLAGS_FTRACE) $(CC_FLAGS_EXPOLINE) $(CC_FLAGS_CHECK_STACK) CFLAGS_REMOVE_getcpu.o = $(VDSO_CFLAGS_REMOVE) +CFLAGS_REMOVE_vgetrandom.o = $(VDSO_CFLAGS_REMOVE) CFLAGS_REMOVE_vdso64_generic.o = $(VDSO_CFLAGS_REMOVE) +ifneq ($(c-getrandom-y),) + CFLAGS_vgetrandom.o += -include $(c-getrandom-y) +endif + # Build rules targets := $(obj-vdso64) $(obj-cvdso64) vdso64.so vdso64.so.dbg
arch/s390/kernel/vdso64/vdso.h +1 -0
@@ -10,5 +10,6 @@ int __s390_vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unuseint __s390_vdso_gettimeofday (struct __kernel_old_timeval *tv,struct timezone *tz);int __s390_vdso_clock_gettime (clockid_t clock,struct __kernel_timespec *ts);int __s390_vdso_clock_getres (clockid_t clock,struct __kernel_timespec *ts); +ssize_t __kernel_getrandom (void *buffer,size_t len,unsigned int flags,void *opaque_state,size_t opaque_len);#endif /* __ARCH_S390_KERNEL_VDSO64_VDSO_H */
arch/s390/kernel/vdso64/vdso64.lds.S +3 -0
@@ -4,6 +4,7 @@ * library */ +#include <asm/vdso/vsyscall.h> #include <asm/page.h> #include <asm/vdso.h>
@@ -13,6 +14,7 @@ OUTPUT_ARCH(s390:64-bit) SECTIONS { PROVIDE(_vdso_data = . - __VVAR_PAGES * PAGE_SIZE); + PROVIDE(_vdso_rng_data = _vdso_data + __VDSO_RND_DATA_OFFSET); #ifdef CONFIG_TIME_NS PROVIDE(_timens_data = _vdso_data + PAGE_SIZE); #endif
@@ -144,6 +146,7 @@ VERSION __kernel_restart_syscall; __kernel_rt_sigreturn; __kernel_sigreturn; + __kernel_getrandom; local: *; }; }
arch/s390/kernel/vdso64/vgetrandom-chacha.S new file +184 -0
184 lines not on this page · raw message
arch/s390/kernel/vdso64/vgetrandom.c new file +14 -0
@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <asm/facility.h> +#include <uapi/asm-generic/errno.h> +#include "vdso.h" + +ssize_t __kernel_getrandom (void *buffer,size_t len,unsigned int flags,void *opaque_state,size_t opaque_len) +{ +if (test_facility (129 )) +return __cvdso_getrandom (buffer, len, flags, opaque_state, opaque_len); +if (unlikely (opaque_len == ~0UL && !buffer && !len && !flags)) +return -ENOSYS ; +return getrandom_syscall (buffer, len, flags); +}
tools/arch/s390/vdso new file +1 -0
@@ -0,0 +1 @@ +../../../arch/s390/kernel/vdso64
tools/testing/selftests/vDSO/Makefile +1 -1
@@ -9,7 +9,7 @@ ifeq ($(ARCH),$(filter $(ARCH),x86 x86_64)) TEST_GEN_PROGS += vdso_standalone_test_x86 endif TEST_GEN_PROGS += vdso_test_correctness -ifeq ($(ARCH)$(CONFIG_X86_32),$(filter $(ARCH)$(CONFIG_X86_32),x86 x86_64 loongarch arm64 powerpc)) +ifeq ($(ARCH)$(CONFIG_X86_32),$(filter $(ARCH)$(CONFIG_X86_32),x86 x86_64 loongarch arm64 powerpc s390)) TEST_GEN_PROGS += vdso_test_getrandom TEST_GEN_PROGS += vdso_test_chacha endif
Signature · 1 line
2.43.0
Jason A. Donenfeld
maintainerRe: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation
Quoted 15 lines · Heiko Carstens
Provide the s390 specific vdso
getrandom()architecture backend.
_vdso_rng_datarequired data is placed within the_vdso_datavvar page, by using a hardcoded offset larger thanvdso_data.As required the chacha20 implementation does not write to the stack.
The implementation follows more or less the arm64 implementations and makes use of vector instructions. It has a fallback to the
getrandom()system call for machines where the vector facility is not installed.
The check if the vector facility is installed, as well as an optimization for machines with the vector-enhancements facility 2, is implemented with alternatives, avoiding runtime checks.
Quoted 6 lines
Note that
__kernel_getrandom()is implemented without the vdso user wrapper which would setup a stack frame for odd cases (aka very old glibc variants) where the caller has not done that. All callers of__kernel_getrandom()are required to setup a stack frame, like the C ABI requires it.The vdso testcases
vdso_test_getrandomandvdso_test_chachapass.
I'd be curious to see the results of ./vdso_test_getrandom bench-single and such.
Jason
Heiko Carstens
maintainerRe: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation
Quoted 5 lines · Jason A. Donenfeld
Quoted 1 line · Heiko Carstens
The vdso testcases
vdso_test_getrandomandvdso_test_chachapass.I'd be curious to see the results of ./vdso_test_getrandom bench-single and such.
It looks like this with two layers of hypervisors in between, but that shouldn't matter too much for this type of workload:
$ ./vdso_test_getrandom bench-single vdso: 25000000 times in 0.493703559 seconds libc: 25000000 times in 6.371764073 seconds syscall: 25000000 times in 6.584025337 seconds
Jason A. Donenfeld
maintainerRe: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation
Quoted 7 lines · Heiko Carstens
Quoted 5 lines · Jason A. Donenfeld
Quoted 1 line · Heiko Carstens
The vdso testcases
vdso_test_getrandomandvdso_test_chachapass.I'd be curious to see the results of ./vdso_test_getrandom bench-single and such.
Quoted 7 lines
It looks like this with two layers of hypervisors in between, but that shouldn't matter too much for this type of workload:
$ ./vdso_test_getrandom bench-single vdso: 25000000 times in 0.493703559 seconds libc: 25000000 times in 6.371764073 seconds syscall: 25000000 times in 6.584025337 seconds
Cool. I'll amend that to the commit message, perhaps, so we have some historical snapshot of what it does. What cpu generation/model is this?
Jason
Heiko Carstens
maintainerRe: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation
Quoted 11 lines · Jason A. Donenfeld
Quoted 10 lines · Heiko Carstens
Quoted 5 lines · Jason A. Donenfeld
Quoted 1 line · Heiko Carstens
The vdso testcases
vdso_test_getrandomandvdso_test_chachapass.I'd be curious to see the results of ./vdso_test_getrandom bench-single and such.
It looks like this with two layers of hypervisors in between, but that shouldn't matter too much for this type of workload:
Quoted 7 lines
Quoted 4 lines
$ ./vdso_test_getrandom bench-single vdso: 25000000 times in 0.493703559 seconds libc: 25000000 times in 6.371764073 seconds syscall: 25000000 times in 6.584025337 secondsCool. I'll amend that to the commit message, perhaps, so we have some historical snapshot of what it does. What cpu generation/model is this?
That was on a z16 machine.
Re: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation
In reply to Heiko CarstensQuoted 520 lines · Heiko Carstens
Provide the s390 specific vdso
getrandom()architecture backend.
_vdso_rng_datarequired data is placed within the_vdso_datavvar page, by using a hardcoded offset larger thanvdso_data.As required the chacha20 implementation does not write to the stack.
The implementation follows more or less the arm64 implementations and makes use of vector instructions. It has a fallback to the
getrandom()system call for machines where the vector facility is not installed.
The check if the vector facility is installed, as well as an optimization for machines with the vector-enhancements facility 2, is implemented with alternatives, avoiding runtime checks.Note that
__kernel_getrandom()is implemented without the vdso user wrapper which would setup a stack frame for odd cases (aka very old glibc variants) where the caller has not done that. All callers of__kernel_getrandom()are required to setup a stack frame, like the C ABI requires it.The vdso testcases
vdso_test_getrandomandvdso_test_chachapass.Signed-off-by Heiko Carstens <[email protected]>--- arch/s390/Kconfig | 1 + arch/s390/include/asm/fpu-insn-asm.h | 22 +++ arch/s390/include/asm/vdso/getrandom.h | 40 +++++ arch/s390/include/asm/vdso/vsyscall.h | 15 ++ arch/s390/kernel/vdso.c | 7 +- arch/s390/kernel/vdso64/Makefile | 9 +- arch/s390/kernel/vdso64/vdso.h | 1 + arch/s390/kernel/vdso64/vdso64.lds.S | 3 + arch/s390/kernel/vdso64/vgetrandom-chacha.S | 184 ++++++++++++++++++++ arch/s390/kernel/vdso64/vgetrandom.c | 14 ++ tools/arch/s390/vdso | 1 + tools/testing/selftests/vDSO/Makefile | 2 +- 12 files changed, 290 insertions(+), 9 deletions(-) create mode 100644 arch/s390/include/asm/vdso/getrandom.h create mode 100644 arch/s390/kernel/vdso64/vgetrandom-chacha.S create mode 100644 arch/s390/kernel/vdso64/vgetrandom.c create mode 120000 tools/arch/s390/vdsoarch/s390/Kconfig +1
-0@@ -243,6 +243,7 @@ config S390 select TRACE_IRQFLAGS_SUPPORT select TTY select USER_STACKTRACE_SUPPORT + select VDSO_GETRANDOM select VIRT_CPU_ACCOUNTING select ZONE_DMA # Note: keep the above list sorted alphabeticallyarch/s390/include/asm/fpu-insn-asm.h +22
-0@@ -407,6 +407,28 @@ MRXBOPC 0, 0x0E, v1 .endm +/* VECTOR STORE BYTE REVERSED ELEMENTS */ + .macro VSTBR vr1, disp, index="%r0", base, m + VX_NUM v1, \vr1 + GR_NUM x2, \index + GR_NUM b2, \base + .word 0xE600 | ((v1&15) << 4) | (x2&15) + .word (b2 << 12) | (\disp) + MRXBOPC \m, 0x0E, v1 +.endm +.macro VSTBRH vr1, disp, index="%r0", base + VSTBR \vr1, \disp, \index, \base, 1 +.endm +.macro VSTBRF vr1, disp, index="%r0", base + VSTBR \vr1, \disp, \index, \base, 2 +.endm +.macro VSTBRG vr1, disp, index="%r0", base + VSTBR \vr1, \disp, \index, \base, 3 +.endm +.macro VSTBRQ vr1, disp, index="%r0", base + VSTBR \vr1, \disp, \index, \base, 4 +.endm + /* VECTOR STORE MULTIPLE */ .macro VSTM vfrom, vto, disp, base, hint=3 VX_NUM v1, \vfromarch/s390/include/asm/vdso/getrandom.h new file +19
-0@@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASM_VDSO_GETRANDOM_H +#define __ASM_VDSO_GETRANDOM_H + +#ifndef __ASSEMBLY__ + +#include <vdso/datapage.h> +#include <asm/vdso/vsyscall.h> +#include <asm/syscall.h> +#include <asm/unistd.h> +#include <asm/page.h> + +/** +* getrandom_syscall - Invoke the getrandom() syscall. +* @buffer: Destination buffer to fill with random bytes. +* @len: Size of @buffer in bytes. +* @flags: Zero or more GRND_* flags. +* Returns: The number of random bytes written to @buffer, or a negative value indicating an error.
+ */
+static__always_inlinessize_tgetrandom_syscall(void *buffer, size_t len, unsigned int flags)arch/s390/include/asm/vdso/getrandom.h new file +2
-0+{ + return syscall3(__NR_getrandom, (long)buffer, (long)len,(long)flags);
arch/s390/include/asm/vdso/getrandom.h new file +3
-0+} + +static __always_inline const struct vdso_rng_data
*__arch_get_vdso_rng_data(void)arch/s390/include/asm/vdso/getrandom.h new file +3
-0+{ +/* +* The RNG data is in the real VVAR data page, but if a task belongs to a time namespace
arch/s390/include/asm/vdso/getrandom.h new file +1
-0+* then VVAR_DATA_PAGE_OFFSET points to the namespace-specific VVAR page and
VVAR_TIMENS_arch/s390/include/asm/vdso/getrandom.h new file +3
-0+* PAGE_OFFSET points to the real VVAR page. +*/ + if (IS_ENABLED(CONFIG_TIME_NS) && _vdso_data->clock_mode ==
VDSO_CLOCKMODE_TIMENS)arch/s390/include/asm/vdso/getrandom.h new file +1
-0+ return (void *)&_vdso_rng_data + VVAR_TIMENS_PAGE_OFFSET *
PAGE_SIZE;arch/s390/include/asm/vdso/getrandom.h new file +6
-0+return &_vdso_rng_data; +} + +#endif /* !__ASSEMBLY__ */ + +#endif /* __ASM_VDSO_GETRANDOM_H */ arch/s390/include/asm/vdso/vsyscall.h +15
-0@@ -2,12 +2,21 @@#ifndef __ASM_VDSO_VSYSCALL_H#define __ASM_VDSO_VSYSCALL_H +#define __VDSO_RND_DATA_OFFSET 768 +#ifndef __ASSEMBLY__#include <linux/hrtimer.h> #include <linux/timekeeper_internal.h> #include <vdso/datapage.h> #include <asm/vdso.h> + +enum vvar_pages { +VVAR_DATA_PAGE_OFFSET , +VVAR_TIMENS_PAGE_OFFSET , +VVAR_NR_PAGES +}; +/* * Update the vDSO data page to keep in sync with kernel timekeeping. */ @@ -18,6 +27,12 @@ static __always_inline struct vdso_data *__s390_get_k_vdso_data(void) }#define __arch_get_k_vdso_data __s390_get_k_vdso_data +static __always_inline struct vdso_rng_data *__s390_get_k_vdso_rnd_data (void ) +{ +return (void *)vdso_data + __VDSO_RND_DATA_OFFSET; +} +#define __arch_get_k_vdso_rng_data __s390_get_k_vdso_rnd_data +/* The asm-generic header needs to be included after the definitions above */
#include <asm-generic/vdso/vsyscall.h>arch/s390/kernel/vdso.c +1
-6@@ -19,6 +19,7 @@#include <linux/time_namespace.h> #include <linux/random.h> #include <vdso/datapage.h> +#include <asm/vdso/vsyscall.h> #include <asm/alternative.h> #include <asm/vdso.h> @@ -31,12 +32,6 @@ static union vdso_data_store vdso_data_store __page_aligned_data;struct vdso_data *vdso_data = vdso_data_store.data; -enum vvar_pages { -VVAR_DATA_PAGE_OFFSET , -VVAR_TIMENS_PAGE_OFFSET , -VVAR_NR_PAGES , -}; -#ifdef CONFIG_TIME_NS struct vdso_data *arch_get_vdso_data (void *vvar_page){
arch/s390/kernel/vdso64/Makefile +7
-2@@ -3,12 +3,17 @@ # Include the generic Makefile to check the built vdso. include $(srctree)/lib/vdso/Makefile -obj-vdso64 = vdso_user_wrapper.o note.o -obj-cvdso64 = vdso64_generic.o getcpu.o +obj-vdso64 = vdso_user_wrapper.o note.o vgetrandom-chacha.o +obj-cvdso64 = vdso64_generic.o getcpu.o vgetrandom.o VDSO_CFLAGS_REMOVE := -pg $(CC_FLAGS_FTRACE) $(CC_FLAGS_EXPOLINE) $(CC_FLAGS_CHECK_STACK) CFLAGS_REMOVE_getcpu.o = $(VDSO_CFLAGS_REMOVE) +CFLAGS_REMOVE_vgetrandom.o = $(VDSO_CFLAGS_REMOVE) CFLAGS_REMOVE_vdso64_generic.o = $(VDSO_CFLAGS_REMOVE) +ifneq ($(c-getrandom-y),) + CFLAGS_vgetrandom.o += -include $(c-getrandom-y) +endif + # Build rulestargets := $(obj-vdso64) $(obj-cvdso64) vdso64.so vdso64.so.dbg
arch/s390/kernel/vdso64/vdso.h +0
-0@@ -10,5 +10,6 @@ int __s390_vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unuseint __s390_vdso_gettimeofday (struct __kernel_old_timeval *tv,struct timezone *tz);int __s390_vdso_clock_gettime (clockid_t clock,struct __kernel_timespec *ts); int __s390_vdso_clock_getres(clockid_t clock, struct __kernel_timespec*ts);
+ssize_t__kernel_getrandom(void *buffer, size_t len, unsigned int flags, void *opaque_state, size_t opaque_len);#endif /*
__ARCH_S390_KERNEL_VDSO64_VDSO_H*/arch/s390/kernel/vdso64/vdso64.lds.S +3
-0@@ -4,6 +4,7 @@ * library */ +#include <asm/vdso/vsyscall.h> #include <asm/page.h> #include <asm/vdso.h>@@ -13,6 +14,7 @@ OUTPUT_ARCH(s390:64-bit) SECTIONS { PROVIDE(_vdso_data = . - __VVAR_PAGES * PAGE_SIZE); + PROVIDE(_vdso_rng_data = _vdso_data + __VDSO_RND_DATA_OFFSET); #ifdef CONFIG_TIME_NS PROVIDE(_timens_data = _vdso_data + PAGE_SIZE); #endif@@ -144,6 +146,7 @@ VERSION __kernel_restart_syscall; __kernel_rt_sigreturn; __kernel_sigreturn; + __kernel_getrandom; local: *; }; }arch/s390/kernel/vdso64/vgetrandom-chacha.S new file +36
-0@@ -0,0 +1,184 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include <linux/linkage.h> +#include <asm/alternative.h> +#include <asm/fpu-insn.h> + +#define STATE0 %v0 +#define STATE1 %v1 +#define STATE2 %v2 +#define STATE3 %v3 +#define COPY0 %v4 +#define COPY1 %v5 +#define COPY2 %v6 +#define COPY3 %v7 +#define PERM4 %v16 +#define PERM8 %v17 +#define PERM12 %v18 +#define BEPERM %v19 +#define TMP0 %v20 +#define TMP1 %v21 +#define TMP2 %v22 +#define TMP3 %v23 + + .section .rodata + + .balign 128 +.Lconstants: + .long 0x61707865,0x3320646e,0x79622d32,0x6b206574 # endian-neutral + .long 0x04050607,0x08090a0b,0x0c0d0e0f,0x00010203 # rotl 4 bytes + .long 0x08090a0b,0x0c0d0e0f,0x00010203,0x04050607 # rotl 8 bytes + .long 0x0c0d0e0f,0x00010203,0x04050607,0x08090a0b # rotl 12 bytes + .long 0x03020100,0x07060504,0x0b0a0908,0x0f0e0d0c # byte swap + + .text +/* + * s390 ChaCha20 implementation meant for vDSO. Produces a givenpositive
+ * number of blocks of output with nonce 0, taking an input key and 8-bytes
+ * counter. Does not spill to the stack.
+ *
+ * void __arch_chacha20_blocks_nostack(uint8_t*dst_bytes,+ * const uint8_t *key, + * uint32_t *counter, + * size_t nblocks)+ */
arch/s390/kernel/vdso64/vgetrandom-chacha.S new file +140
-0+SYM_FUNC_START(__arch_chacha20_blocks_nostack) + larl %r1,.Lconstants + + /* COPY0 = "expand 32-byte k" */ + VL COPY0,0,,%r1 + + /* PERM4-PERM12,BEPERM = byte selectors for VPERM */ + VLM PERM4,BEPERM,16,%r1 + + /* COPY1,COPY2 = key */ + VLM COPY1,COPY2,0,%r3 + + /* COPY3 = counter || zero nonce */ + lg %r3,0(%r4) + VZERO COPY3 + VLVGG COPY3,%r3,0 + + lghi %r1,0 +.Lblock: + VLR STATE0,COPY0 + VLR STATE1,COPY1 + VLR STATE2,COPY2 + VLR STATE3,COPY3 + + lghi %r0,10 +.Ldoubleround: + /* STATE0 += STATE1, STATE3 = rotl32(STATE3 ^ STATE0, 16) */ + VAF STATE0,STATE0,STATE1 + VX STATE3,STATE3,STATE0 + VERLLF STATE3,STATE3,16 + + /* STATE2 += STATE3, STATE1 = rotl32(STATE1 ^ STATE2, 12) */ + VAF STATE2,STATE2,STATE3 + VX STATE1,STATE1,STATE2 + VERLLF STATE1,STATE1,12 + + /* STATE0 += STATE1, STATE3 = rotl32(STATE3 ^ STATE0, 8) */ + VAF STATE0,STATE0,STATE1 + VX STATE3,STATE3,STATE0 + VERLLF STATE3,STATE3,8 + + /* STATE2 += STATE3, STATE1 = rotl32(STATE1 ^ STATE2, 7) */ + VAF STATE2,STATE2,STATE3 + VX STATE1,STATE1,STATE2 + VERLLF STATE1,STATE1,7 + + /* STATE1[0,1,2,3] = STATE1[1,2,3,0] */ + VPERM STATE1,STATE1,STATE1,PERM4 + /* STATE2[0,1,2,3] = STATE2[2,3,0,1] */ + VPERM STATE2,STATE2,STATE2,PERM8 + /* STATE3[0,1,2,3] = STATE3[3,0,1,2] */ + VPERM STATE3,STATE3,STATE3,PERM12 + + /* STATE0 += STATE1, STATE3 = rotl32(STATE3 ^ STATE0, 16) */ + VAF STATE0,STATE0,STATE1 + VX STATE3,STATE3,STATE0 + VERLLF STATE3,STATE3,16 + + /* STATE2 += STATE3, STATE1 = rotl32(STATE1 ^ STATE2, 12) */ + VAF STATE2,STATE2,STATE3 + VX STATE1,STATE1,STATE2 + VERLLF STATE1,STATE1,12 + + /* STATE0 += STATE1, STATE3 = rotl32(STATE3 ^ STATE0, 8) */ + VAF STATE0,STATE0,STATE1 + VX STATE3,STATE3,STATE0 + VERLLF STATE3,STATE3,8 + + /* STATE2 += STATE3, STATE1 = rotl32(STATE1 ^ STATE2, 7) */ + VAF STATE2,STATE2,STATE3 + VX STATE1,STATE1,STATE2 + VERLLF STATE1,STATE1,7 + + /* STATE1[0,1,2,3] = STATE1[3,0,1,2] */ + VPERM STATE1,STATE1,STATE1,PERM12 + /* STATE2[0,1,2,3] = STATE2[2,3,0,1] */ + VPERM STATE2,STATE2,STATE2,PERM8 + /* STATE3[0,1,2,3] = STATE3[1,2,3,0] */ + VPERM STATE3,STATE3,STATE3,PERM4 + brctg %r0,.Ldoubleround + + /* OUTPUT0 = STATE0 + STATE0 */ + VAF STATE0,STATE0,COPY0 + /* OUTPUT1 = STATE1 + STATE1 */ + VAF STATE1,STATE1,COPY1 + /* OUTPUT2 = STATE2 + STATE2 */ + VAF STATE2,STATE2,COPY2 + /* OUTPUT2 = STATE3 + STATE3 */ + VAF STATE3,STATE3,COPY3 + + /* + * 32 bit wise little endian store to OUTPUT. If the vector + * enhancement facility 2 is not installed use the slow path. + */ + ALTERNATIVE "brc 0xf,.Lstoreslow", "nop", ALT_FACILITY(148) + VSTBRF STATE0,0,,%r2 + VSTBRF STATE1,16,,%r2 + VSTBRF STATE2,32,,%r2 + VSTBRF STATE3,48,,%r2 +.Lstoredone: + + /* ++COPY3.COUNTER */ + alsih %r3,1 + alcr %r3,%r1 + VLVGG COPY3,%r3,0 + + /* OUTPUT += 64, --NBLOCKS */ + aghi %r2,64 + brctg %r5,.Lblock + + /* COUNTER = COPY3.COUNTER */ + stg %r3,0(%r4) + + /* Zero out potentially sensitive regs */ + VZERO STATE0 + VZERO STATE1 + VZERO STATE2 + VZERO STATE3 + VZERO COPY1 + VZERO COPY2 + + /* Early exit if TMP0-TMP3 have not been used */ + ALTERNATIVE "nopr", "br %r14", ALT_FACILITY(148) + + VZERO TMP0 + VZERO TMP1 + VZERO TMP2 + VZERO TMP3 + + br %r14 + +.Lstoreslow: + /* Convert STATE to little endian format and store to OUTPUT */ + VPERM TMP0,STATE0,STATE0,BEPERM + VPERM TMP1,STATE1,STATE1,BEPERM + VPERM TMP2,STATE2,STATE2,BEPERM + VPERM TMP3,STATE3,STATE3,BEPERM + VSTM TMP0,TMP3,0,%r2 + j .Lstoredone +SYM_FUNC_END(__arch_chacha20_blocks_nostack)arch/s390/kernel/vdso64/vgetrandom.c new file +7
-0@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <asm/facility.h> +#include <uapi/asm-generic/errno.h> +#include "vdso.h" + +ssize_t __kernel_getrandom(void *buffer, size_t len, unsigned intflags, void
*opaque_state,size_topaque_len)arch/s390/kernel/vdso64/vgetrandom.c new file +3
-0+{ +if (test_facility (129 )) + return __cvdso_getrandom(buffer, len, flags, opaque_state,
opaque_len);arch/s390/kernel/vdso64/vgetrandom.c new file +4
-0+if (unlikely (opaque_len == ~0UL && !buffer && !len && !flags)) +return -ENOSYS ; +return getrandom_syscall (buffer, len, flags); +}tools/arch/s390/vdso new file +1
-0@@ -0,0 +1 @@ +../../../arch/s390/kernel/vdso64tools/testing/selftests/vDSO/Makefile +1
-1@@ -9,7 +9,7 @@ ifeq ($(ARCH),$(filter $(ARCH),x86 x86_64)) TEST_GEN_PROGS += vdso_standalone_test_x86 endif TEST_GEN_PROGS += vdso_test_correctness -ifeq ($(ARCH)$(CONFIG_X86_32),$(filter $(ARCH)$(CONFIG_X86_32),x86 x86_64 loongarch arm64 powerpc)) +ifeq ($(ARCH)$(CONFIG_X86_32),$(filter $(ARCH)$(CONFIG_X86_32),x86 x86_64 loongarch arm64 powerpc s390)) TEST_GEN_PROGS += vdso_test_getrandom
Quoted 2 lines
TEST_GEN_PROGS+=vdso_test_chacha
endif
Looks absolutely nice. Thanks Heiko
Jason A. Donenfeld
maintainerRe: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation
In reply to Heiko CarstensQuoted 1 line · Heiko Carstens
The vdso testcases
vdso_test_getrandomandvdso_test_chachapass.
I'm trying to cross compile this but I'm getting:
CC vdso_test_chacha/home/zx2c4/Projects/random-linux/tools/testing/selftests/../../../tools/arch/s390/vdso/vgetrandom-chacha.S: Assembler messages:/home/zx2c4/Projects/random-linux/tools/testing/selftests/../../../tools/arch/s390/vdso/vgetrandom-chacha.S:147: Error: Unrecognized opcode: `alsih'
Any idea what's up?
Jason
Jason A. Donenfeld
maintainerRe: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation
Quoted 10 lines · Jason A. Donenfeld
Quoted 1 line · Heiko Carstens
The vdso testcases
vdso_test_getrandomandvdso_test_chachapass.I'm trying to cross compile this but I'm getting:
CC
vdso_test_chacha/home/zx2c4/Projects/random-linux/tools/testing/selftests/../../../tools/arch/s390/vdso/vgetrandom-chacha.S: Assembler messages:/home/zx2c4/Projects/random-linux/tools/testing/selftests/../../../tools/arch/s390/vdso/vgetrandom-chacha.S:147: Error: Unrecognized opcode: `alsih'Any idea what's up?
Looks like I needed -march=arch9. I can potentially rebuild my toolchains to do this by default, though, if that's a normal thing to have and this is just my toolchain being crappy. Or, if it's not a normal thing to have, do we need to add it to the selftests Makefile?
Jason A. Donenfeld
maintainerRe: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation
Quoted 10 lines · Jason A. Donenfeld
Quoted 9 lines · Jason A. Donenfeld
Quoted 1 line · Heiko Carstens
The vdso testcases
vdso_test_getrandomandvdso_test_chachapass.I'm trying to cross compile this but I'm getting:
CC
vdso_test_chacha/home/zx2c4/Projects/random-linux/tools/testing/selftests/../../../tools/arch/s390/vdso/vgetrandom-chacha.S: Assembler messages:/home/zx2c4/Projects/random-linux/tools/testing/selftests/../../../tools/arch/s390/vdso/vgetrandom-chacha.S:147: Error: Unrecognized opcode: `alsih'
Quoted 6 lines
Quoted 1 line
Any idea what's up?
Looks like I needed
-march=arch9. I can potentially rebuild my toolchains to do this by default, though, if that's a normal thing to have and this is just my toolchain being crappy. Or, if it's not a normal thing to have, do we need to add it to the selftestsMakefile?
I can squash this into the commit, for example:
tools/testing/selftests/vDSO/Makefile +3 -0
@@ -43,3 +43,6 @@ $(OUTPUT)/vdso_test_chacha: CFLAGS += -idirafter $(top_srcdir)/tools/include \ -idirafter $(top_srcdir)/arch/$(SRCARCH)/include \ -idirafter $(top_srcdir)/include \ -D__ASSEMBLY__ -Wa,--noexecstack +ifeq ($(ARCH),s390) +$(OUTPUT)/vdso_test_chacha: CFLAGS += -march=arch9 +endif
Heiko Carstens
maintainerRe: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation
In reply to Jason A. DonenfeldQuoted 10 lines · Jason A. Donenfeld
Quoted 9 lines · Jason A. Donenfeld
Quoted 1 line · Heiko Carstens
The vdso testcases
vdso_test_getrandomandvdso_test_chachapass.I'm trying to cross compile this but I'm getting:
CC
vdso_test_chacha/home/zx2c4/Projects/random-linux/tools/testing/selftests/../../../tools/arch/s390/vdso/vgetrandom-chacha.S: Assembler messages:/home/zx2c4/Projects/random-linux/tools/testing/selftests/../../../tools/arch/s390/vdso/vgetrandom-chacha.S:147: Error: Unrecognized opcode: `alsih'
Quoted 6 lines
Quoted 1 line
Any idea what's up?
Looks like I needed
-march=arch9. I can potentially rebuild my toolchains to do this by default, though, if that's a normal thing to have and this is just my toolchain being crappy. Or, if it's not a normal thing to have, do we need to add it to the selftestsMakefile?
That needs to be fixed differently, since the kernel build would also fail when building for z10. Could you squash the below fix into this patch, please?
That way the compiler will still generate the correct code even if compiled with a lower march flag. There is already a guard in place (test_facility()), which prevents that this code will be executed if the machine does not know the instruction.
So for the kernel itself including the vdso code, everything is correct now. But similar checks are missing within vdso_test_chacha.c. I'll provide something for that, so that the test case will be skipped if the required instructions are missing, but not today.
arch/s390/kernel/vdso64/vgetrandom-chacha.S +2 -1
@@ -144,7 +144,8 @@ SYM_FUNC_START(__arch_chacha20_blocks_nostack) .Lstoredone: /* ++COPY3.COUNTER */ - alsih %r3,1 + /* alsih %r3,1 */ + .insn rilu,0xcc0a00000000,%r3,1 alcr %r3,%r1 VLVGG COPY3,%r3,0
Jason A. Donenfeld
maintainerRe: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation
Quoted 13 lines · Heiko Carstens
Quoted 12 lines · Jason A. Donenfeld
Quoted 10 lines · Jason A. Donenfeld
Quoted 1 line · Heiko Carstens
The vdso testcases
vdso_test_getrandomandvdso_test_chachapass.I'm trying to cross compile this but I'm getting:
CC
vdso_test_chacha/home/zx2c4/Projects/random-linux/tools/testing/selftests/../../../tools/arch/s390/vdso/vgetrandom-chacha.S: Assembler messages:/home/zx2c4/Projects/random-linux/tools/testing/selftests/../../../tools/arch/s390/vdso/vgetrandom-chacha.S:147: Error: Unrecognized opcode: `alsih'Any idea what's up?
Quoted 8 lines
Quoted 4 lines
Looks like I needed
-march=arch9. I can potentially rebuild my toolchains to do this by default, though, if that's a normal thing to have and this is just my toolchain being crappy. Or, if it's not a normal thing to have, do we need to add it to the selftestsMakefile?That needs to be fixed differently, since the kernel build would also fail when building for z10. Could you squash the below fix into this patch, please?
Done.
Quoted 4 lines
So for the kernel itself including the vdso code, everything is correct now. But similar checks are missing within
vdso_test_chacha.c. I'll provide something for that, so that the test case will be skipped if the required instructions are missing, but not today.
Okay. I would assume no rush there, because it's unlikely there are those machines part of kselftest fleets anyway?
Jason
Heiko Carstens
maintainerRe: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation
Quoted 17 lines · Jason A. Donenfeld
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
CC
vdso_test_chacha/home/zx2c4/Projects/random-linux/tools/testing/selftests/../../../tools/arch/s390/vdso/vgetrandom-chacha.S: Assembler messages:/home/zx2c4/Projects/random-linux/tools/testing/selftests/../../../tools/arch/s390/vdso/vgetrandom-chacha.S:147: Error: Unrecognized opcode: `alsih'Any idea what's up?
Quoted 8 lines
Quoted 4 lines
Looks like I needed
-march=arch9. I can potentially rebuild my toolchains to do this by default, though, if that's a normal thing to have and this is just my toolchain being crappy. Or, if it's not a normal thing to have, do we need to add it to the selftestsMakefile?That needs to be fixed differently, since the kernel build would also fail when building for z10. Could you squash the below fix into this patch, please?
Done.
Quoted 7 lines
Quoted 4 lines
So for the kernel itself including the vdso code, everything is correct now. But similar checks are missing within
vdso_test_chacha.c. I'll provide something for that, so that the test case will be skipped if the required instructions are missing, but not today.Okay. I would assume no rush there, because it's unlikely there are those machines part of kselftest fleets anyway?
There was another surprise waiting for me: the ALTERNATIVE macro within the tools header file is defined in a way that it omits everything. So I was just lucky that the s390 chacha assembler code worked, since even without the alternatives the code is working, but executes code for newer CPU generations, which it shouldn't.
So below is a diff which fixes both:
- Add an s390 specific ALTERNATIVE macro that emits code that is supposed to work on older CPU generations, instead of no code
- Add a hwcap check to make sure that all CPU capabilities required to run the assembler code are present
It probably makes sense to squash this also into "s390/vdso: Wire up getrandom() vdso implementation".
Please feel free to change the code in whatever way you like. If you prefer separate patches, I will provide them.
tools/include/asm/alternative.h +10 -0
@@ -2,8 +2,18 @@#ifndef _TOOLS_ASM_ALTERNATIVE_ASM_H#define _TOOLS_ASM_ALTERNATIVE_ASM_H +#if defined(__s390x__) +#ifdef __ASSEMBLY__ +.macro ALTERNATIVE oldinstr, newinstr, feature + \oldinstr +.endm +#endif +#else +/* Just disable it so we can build arch/x86/lib/memcpy_64.S for perf bench: */ #define ALTERNATIVE ##endif + +#endif
tools/testing/selftests/vDSO/vdso_test_chacha.c +25 -0
@@ -5,11 +5,34 @@#include <tools/le_byteshift.h> #include <sys/random.h> +#include <sys/auxv.h> #include <string.h> #include <stdint.h> #include <stdbool.h> #include "../kselftest.h" +#if defined(__s390x__) + +#ifndef HWCAP_S390_VX +#define HWCAP_S390_VX 2048 +#endif + +static bool cpu_has_capabilities (void ) +{ +if (getauxval (AT_HWCAP ) &HWCAP_S390_VX ) +return true; +return false; +} + +#else + +static bool cpu_has_capabilities (void ) +{ +return true; +} + +#endif +static uint32_t rol32 (uint32_t word,unsigned int shift) {return (word << (shift &31 )) | (word >> ((-shift) &31 ));
@@ -67,6 +90,8 @@ int main(int argc, char *argv[])uint8_t output1[BLOCK_SIZE *BLOCKS ], output2[BLOCK_SIZE *BLOCKS ];ksft_print_header (); +if (!cpu_has_capabilities ()) +ksft_exit_skip ("Required CPU capabilities missing\n" );ksft_set_plan (1 );for (unsigned int trial =0 ; trial <TRIALS ; ++trial) {
Jason A. Donenfeld
maintainerPATCH 1/1 selftests: vDSO: check cpu caps before running chacha test
Some archs -- arm64 and s390x -- implemented chacha using instructions that are available most places, but aren't always available. The kernel handles this just fine, but the selftest does not. Check the hwcaps before running, and skip the test if the cpu doesn't support it. As well, on s390x, always emit the fallback instructions of an alternative block, to ensure maximum compatibility.
--- tools/include/asm/alternative.h | 10 ++++++++++ .../testing/selftests/vDSO/vdso_test_chacha.c | 20 +++++++++++++++++++ 2 files changed, 30 insertions(+)
tools/include/asm/alternative.h +10 -0
@@ -2,8 +2,18 @@#ifndef _TOOLS_ASM_ALTERNATIVE_ASM_H#define _TOOLS_ASM_ALTERNATIVE_ASM_H +#if defined(__s390x__) +#ifdef __ASSEMBLY__ +.macro ALTERNATIVE oldinstr, newinstr, feature + \oldinstr +.endm +#endif +#else +/* Just disable it so we can build arch/x86/lib/memcpy_64.S for perf bench: */ #define ALTERNATIVE ##endif + +#endif
tools/testing/selftests/vDSO/vdso_test_chacha.c +20 -0
@@ -5,11 +5,29 @@#include <tools/le_byteshift.h> #include <sys/random.h> +#include <sys/auxv.h> #include <string.h> #include <stdint.h> #include <stdbool.h> #include "../kselftest.h" +#if defined(__aarch64__) +static bool cpu_has_capabilities (void ) +{ +return getauxval (AT_HWCAP ) &HWCAP_ASIMD ; +} +#elif defined(__s390x__) +static bool cpu_has_capabilities (void ) +{ +return getauxval (AT_HWCAP ) &HWCAP_S390_VXRS ; +} +#else +static bool cpu_has_capabilities (void ) +{ +return true; +} +#endif +static uint32_t rol32 (uint32_t word,unsigned int shift) {return (word << (shift &31 )) | (word >> ((-shift) &31 ));
@@ -67,6 +85,8 @@ int main(int argc, char *argv[])uint8_t output1[BLOCK_SIZE *BLOCKS ], output2[BLOCK_SIZE *BLOCKS ];ksft_print_header (); +if (!cpu_has_capabilities ()) +ksft_exit_skip ("Required CPU capabilities missing\n" );ksft_set_plan (1 );for (unsigned int trial =0 ; trial <TRIALS ; ++trial) {
Signature · 1 line
2.46.0
Jason A. Donenfeld
maintainerRe: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation
In reply to Heiko CarstensHi Heiko,
Quoted 2 lines · Heiko Carstens
Please feel free to change the code in whatever way you like. If you prefer separate patches, I will provide them.
Just wanted to make sure you saw https://lore.kernel.org/all/[email protected]/
Jason
Heiko Carstens
maintainerRe: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation
Hi Jason,
Quoted 5 lines · Heiko Carstens
Quoted 2 lines
Please feel free to change the code in whatever way you like. If you prefer separate patches, I will provide them.
Just wanted to make sure you saw https://lore.kernel.org/all/[email protected]/
Yes, looks good to me. I just gave it also a quick test.
FWIW, I think the tags for the commit message should be
However, if you keep it as it is, that's also fine.
Thanks a lot!
Heiko
Jason A. Donenfeld
maintainerRe: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation
Quoted 6 lines · Heiko Carstens
Hi Jason,
Quoted 4 lines · Heiko Carstens
Quoted 2 lines
Please feel free to change the code in whatever way you like. If you prefer separate patches, I will provide them.
Quoted 8 lines
Quoted 1 line
Just wanted to make sure you saw https://lore.kernel.org/all/[email protected]/
Yes, looks good to me. I just gave it also a quick test.
FWIW, I think the tags for the commit message should be
Co-developed-by Heiko Carstens <[email protected]>Signed-off-by Heiko Carstens <[email protected]>
Thanks, fixed.
kernel test robot
build botRe: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation
In reply to Heiko Carstenskernel test robot noticed the following build errors:
Hi Heiko,
kernel test robot noticed the following build errors:
[auto build test ERROR on crng-random/master]
[cannot apply to s390/features shuah-kselftest/next shuah-kselftest/fixes linus/master v6.11-rc7 next-20240913] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Heiko-Carstens/s390-facility-Disable-compile-time-optimization-for-decompressor-code/20240913-210923 base: https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git master patch link: https://lore.kernel.org/r/20240913130544.2398678-8-hca%40linux.ibm.com patch subject: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation config: s390-randconfig-r063-20240914 (https://download.01.org/0day-ci/archive/20240914/[email protected]/config) compiler: s390-linux-gcc (GCC) 14.1.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240914/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
arch/s390/kernel/vdso64/vgetrandom-chacha.S: Assembler messages:
>> arch/s390/kernel/vdso64/vgetrandom-chacha.S:147: Error: Unrecognized opcode: `alsih'
make[3]: *** [arch/s390/kernel/vdso64/Makefile:62: arch/s390/kernel/vdso64/vgetrandom-chacha.o] Error 1 make[3]: Target 'include/generated/vdso64-offsets.h' not remade because of errors. make[2]: *** [arch/s390/Makefile:157: vdso_prepare] Error 2
make[2]: Target 'prepare' not remade because of errors.
make[1]: *** [Makefile:224: __sub-make] Error 2
make[1]: Target 'prepare' not remade because of errors.
make: *** [Makefile:224: __sub-make] Error 2
make: Target 'prepare' not remade because of errors.
vim +147 arch/s390/kernel/vdso64/vgetrandom-chacha.S
145
146 /* ++COPY3.COUNTER */
> 147 alsih %r3,1
148 alcr %r3,%r1
149 VLVGG COPY3,%r3,0
150
151 /* OUTPUT += 64, --NBLOCKS */
152 aghi %r2,64
153 brctg %r5,.Lblock
154
155 /* COUNTER = COPY3.COUNTER */
156 stg %r3,0(%r4)
157
158 /* Zero out potentially sensitive regs */
159 VZERO STATE0
160 VZERO STATE1
161 VZERO STATE2
162 VZERO STATE3
163 VZERO COPY1
164 VZERO COPY2
165
166 /* Early exit if TMP0-TMP3 have not been used */
167 ALTERNATIVE "nopr", "br %r14", ALT_FACILITY(148)
168
169 VZERO TMP0
170 VZERO TMP1
171 VZERO TMP2
172 VZERO TMP3
173
174 br %r14
175
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation
In reply to Heiko Carstenskernel test robot noticed the following build errors:
Hi Heiko,
kernel test robot noticed the following build errors:
[auto build test ERROR on crng-random/master]
[cannot apply to s390/features shuah-kselftest/next shuah-kselftest/fixes linus/master v6.11 next-20240913] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Heiko-Carstens/s390-facility-Disable-compile-time-optimization-for-decompressor-code/20240913-210923 base: https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git master patch link: https://lore.kernel.org/r/20240913130544.2398678-8-hca%40linux.ibm.com patch subject: [PATCH 7/7] s390/vdso: Wire up getrandom() vdso implementation config: s390-randconfig-r054-20240915 (https://download.01.org/0day-ci/archive/20240916/[email protected]/config) compiler: clang version 20.0.0git (https://github.com/llvm/llvm-project bf684034844c660b778f0eba103582f582b710c9) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240916/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
In file included from arch/s390/kernel/asm-offsets.c:11:
In file included from include/linux/kvm_host.h:16:
In file included from include/linux/mm.h:2230:
include/linux/vmstat.h:503:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
503 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
504 | item];
| ~~~~
include/linux/vmstat.h:510:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
510 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
511 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
include/linux/vmstat.h:517:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
517 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
include/linux/vmstat.h:523:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
523 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
524 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
In file included from arch/s390/kernel/asm-offsets.c:11:
In file included from include/linux/kvm_host.h:19:
In file included from include/linux/msi.h:24:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:14:
In file included from arch/s390/include/asm/io.h:93:
include/asm-generic/io.h:548:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
548 | val = __raw_readb(PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:561:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
561 | val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/big_endian.h:37:59: note: expanded from macro '__le16_to_cpu'
37 | #define __le16_to_cpu(x) __swab16((__force __u16)(__le16)(x))
| ^
include/uapi/linux/swab.h:102:54: note: expanded from macro '__swab16'
102 | #define __swab16(x) (__u16)__builtin_bswap16((__u16)(x))
| ^
In file included from arch/s390/kernel/asm-offsets.c:11:
In file included from include/linux/kvm_host.h:19:
In file included from include/linux/msi.h:24:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:14:
In file included from arch/s390/include/asm/io.h:93:
include/asm-generic/io.h:574:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
574 | val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/big_endian.h:35:59: note: expanded from macro '__le32_to_cpu'
35 | #define __le32_to_cpu(x) __swab32((__force __u32)(__le32)(x))
| ^
include/uapi/linux/swab.h:115:54: note: expanded from macro '__swab32'
115 | #define __swab32(x) (__u32)__builtin_bswap32((__u32)(x))
| ^
In file included from arch/s390/kernel/asm-offsets.c:11:
In file included from include/linux/kvm_host.h:19:
In file included from include/linux/msi.h:24:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:14:
In file included from arch/s390/include/asm/io.h:93:
include/asm-generic/io.h:585:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
585 | __raw_writeb(value, PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:595:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
595 | __raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:605:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
605 | __raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:693:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
693 | readsb(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:701:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
701 | readsw(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:709:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
709 | readsl(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:718:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
718 | writesb(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:727:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
727 | writesw(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:736:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
736 | writesl(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
16 warnings generated.
>> arch/s390/kernel/vdso64/vgetrandom-chacha.S:147:2: error: instruction requires: high-word
alsih %r3,1
^
make[3]: *** [arch/s390/kernel/vdso64/Makefile:62: arch/s390/kernel/vdso64/vgetrandom-chacha.o] Error 1
In file included from <built-in>:4:
In file included from lib/vdso/getrandom.c:11:
In file included from arch/s390/include/asm/vdso/getrandom.h:9:
In file included from arch/s390/include/asm/vdso/vsyscall.h:10:
In file included from include/linux/timekeeper_internal.h:10:
In file included from include/linux/clocksource.h:22:
In file included from arch/s390/include/asm/io.h:93:
include/asm-generic/io.h:548:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
548 | val = __raw_readb(PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:561:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
561 | val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/big_endian.h:37:59: note: expanded from macro '__le16_to_cpu'
37 | #define __le16_to_cpu(x) __swab16((__force __u16)(__le16)(x))
| ^
include/uapi/linux/swab.h:102:54: note: expanded from macro '__swab16'
102 | #define __swab16(x) (__u16)__builtin_bswap16((__u16)(x))
| ^
In file included from <built-in>:4:
In file included from lib/vdso/getrandom.c:11:
In file included from arch/s390/include/asm/vdso/getrandom.h:9:
In file included from arch/s390/include/asm/vdso/vsyscall.h:10:
In file included from include/linux/timekeeper_internal.h:10:
In file included from include/linux/clocksource.h:22:
In file included from arch/s390/include/asm/io.h:93:
include/asm-generic/io.h:574:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
574 | val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/big_endian.h:35:59: note: expanded from macro '__le32_to_cpu'
35 | #define __le32_to_cpu(x) __swab32((__force __u32)(__le32)(x))
| ^
include/uapi/linux/swab.h:115:54: note: expanded from macro '__swab32'
115 | #define __swab32(x) (__u32)__builtin_bswap32((__u32)(x))
| ^
In file included from <built-in>:4:
In file included from lib/vdso/getrandom.c:11:
In file included from arch/s390/include/asm/vdso/getrandom.h:9:
In file included from arch/s390/include/asm/vdso/vsyscall.h:10:
In file included from include/linux/timekeeper_internal.h:10:
In file included from include/linux/clocksource.h:22:
In file included from arch/s390/include/asm/io.h:93:
include/asm-generic/io.h:585:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
585 | __raw_writeb(value, PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:595:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
595 | __raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:605:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
605 | __raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:693:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
693 | readsb(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:701:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
701 | readsw(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:709:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
709 | readsl(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:718:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
718 | writesb(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:727:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
727 | writesw(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:736:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
736 | writesl(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^ 12 warnings generated.
make[3]: Target 'include/generated/vdso64-offsets.h' not remade because of errors. make[2]: *** [arch/s390/Makefile:157: vdso_prepare] Error 2
make[2]: Target 'prepare' not remade because of errors.
make[1]: *** [Makefile:224: __sub-make] Error 2
make[1]: Target 'prepare' not remade because of errors.
make: *** [Makefile:224: __sub-make] Error 2
make: Target 'prepare' not remade because of errors.
vim +147 arch/s390/kernel/vdso64/vgetrandom-chacha.S
145
146 /* ++COPY3.COUNTER */
> 147 alsih %r3,1
148 alcr %r3,%r1
149 VLVGG COPY3,%r3,0
150
151 /* OUTPUT += 64, --NBLOCKS */
152 aghi %r2,64
153 brctg %r5,.Lblock
154
155 /* COUNTER = COPY3.COUNTER */
156 stg %r3,0(%r4)
157
158 /* Zero out potentially sensitive regs */
159 VZERO STATE0
160 VZERO STATE1
161 VZERO STATE2
162 VZERO STATE3
163 VZERO COPY1
164 VZERO COPY2
165
166 /* Early exit if TMP0-TMP3 have not been used */
167 ALTERNATIVE "nopr", "br %r14", ALT_FACILITY(148)
168
169 VZERO TMP0
170 VZERO TMP1
171 VZERO TMP2
172 VZERO TMP3
173
174 br %r14
175
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Jason A. Donenfeld
maintainerHey Heiko,
Quoted 8 lines · Heiko Carstens
Hi Jason,
quite late but finally the s390 vdso getrandom implementation which applies on top of your random git tree.
As a prerequisite this requires some changes to s390 core code to allow alternatives in vdso code. It is fine when all of this gets routed via your tree.
On first glance, this series looks perfect. I can't comment too much on the s390 parts, but first pass of the crypto/vdso/api parts looks spot on. Nice going.
Were you thinking you'd like me to take these via the random.git tree for 6.12 next week, or were you thinking of delaying it a release and taking it into the arch tree for 6.13?
Jason
Jason A. Donenfeld
maintainerQuoted 12 lines · Jason A. Donenfeld
Hey Heiko,
Quoted 8 lines · Heiko Carstens
Hi Jason,
quite late but finally the s390 vdso getrandom implementation which applies on top of your random git tree.
As a prerequisite this requires some changes to s390 core code to allow alternatives in vdso code. It is fine when all of this gets routed via your tree.
Quoted 7 lines
On first glance, this series looks perfect. I can't comment too much on the s390 parts, but first pass of the
crypto/vdso/apiparts looks spot on. Nice going.Were you thinking you'd like me to take these via the random.git tree for 6.12 next week, or were you thinking of delaying it a release and taking it into the arch tree for 6.13?
If you did want it to be in 6.12, assuming this series continues to look good, I think we'd still want it to be in -next for at least a week, so maybe that'd take the form of me sending an additional late pull during the merge window for this. Either way, I'll defer to your judgement here, as most of these changes are fiddly s390 things more than anything else.
Jason
Heiko Carstens
maintainerHi Jason,
Quoted 8 lines
Quoted 7 lines
On first glance, this series looks perfect. I can't comment too much on the s390 parts, but first pass of the
crypto/vdso/apiparts looks spot on. Nice going.Were you thinking you'd like me to take these via the random.git tree for 6.12 next week, or were you thinking of delaying it a release and taking it into the arch tree for 6.13?
Quoted 6 lines
If you did want it to be in 6.12, assuming this series continues to look good, I think we'd still want it to be in -next for at least a week, so maybe that'd take the form of me sending an additional late pull during the merge window for this. Either way, I'll defer to your judgement here, as most of these changes are fiddly s390 things more than anything else.
This series is intended to go into 6.12. I don't see a reason to delay this for a full release cycle. If something breaks we'll fix it, as usual.
So a late pull request would be perfectly fine. Alternatively we can take this via s390 also for a second pull request; whatever you prefer and is less work for you.
Jason A. Donenfeld
maintainerQuoted 17 lines · Heiko Carstens
Hi Jason,
Quoted 8 lines
Quoted 7 lines
On first glance, this series looks perfect. I can't comment too much on the s390 parts, but first pass of the
crypto/vdso/apiparts looks spot on. Nice going.Were you thinking you'd like me to take these via the random.git tree for 6.12 next week, or were you thinking of delaying it a release and taking it into the arch tree for 6.13?
Quoted 6 lines
If you did want it to be in 6.12, assuming this series continues to look good, I think we'd still want it to be in -next for at least a week, so maybe that'd take the form of me sending an additional late pull during the merge window for this. Either way, I'll defer to your judgement here, as most of these changes are fiddly s390 things more than anything else.
Quoted 6 lines
This series is intended to go into 6.12. I don't see a reason to delay this for a full release cycle. If something breaks we'll fix it, as usual.
So a late pull request would be perfectly fine. Alternatively we can take this via s390 also for a second pull request; whatever you prefer and is less work for you.
Okay, great. I'll queue it up then in random.git.
Jason