Unverified Commit 2f956db8 authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

Revert "RISC-V: vDSO: Wire up getrandom() vDSO implementation" 

This has been on -next for a bit, but it's broken and there's already a
v2.  So I'm reverting it to avoid more rebasing.

This reverts commit 89079520.

Link: https://lore.kernel.org/r/20250602173315.20228-1-palmer@dabbelt.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@dabbelt.com>
parent 1a3f6980

arch/riscv/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ config RISCV 
	select THREAD_INFO_IN_TASK

	select TRACE_IRQFLAGS_SUPPORT

	select UACCESS_MEMCPY if !MMU

	select VDSO_GETRANDOM if HAVE_GENERIC_VDSO

	select USER_STACKTRACE_SUPPORT

	select ZONE_DMA32 if 64BIT

arch/riscv/include/asm/vdso/getrandom.h

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2025 Xi Ruoyao <xry111@xry111.site>. All Rights Reserved.

 */

#ifndef __ASM_VDSO_GETRANDOM_H

#define __ASM_VDSO_GETRANDOM_H



#ifndef __ASSEMBLY__



#include <asm/unistd.h>



static __always_inline ssize_t getrandom_syscall(void *_buffer, size_t _len, unsigned int _flags)

{

	register long ret asm("a0");

	register long nr asm("a7") = __NR_getrandom;

	register void *buffer asm("a0") = _buffer;

	register size_t len asm("a1") = _len;

	register unsigned int flags asm("a2") = _flags;



	asm volatile ("ecall\n"

		      : "+r" (ret)

		      : "r" (nr), "r" (buffer), "r" (len), "r" (flags)

		      : "memory");



	return ret;

}



#endif /* !__ASSEMBLY__ */



#endif /* __ASM_VDSO_GETRANDOM_H */

arch/riscv/kernel/vdso/Makefile

+0 −12
Original line number Diff line number Diff line
@@ -13,17 +13,9 @@ vdso-syms += flush_icache 
vdso-syms += hwprobe

vdso-syms += sys_hwprobe



ifdef CONFIG_VDSO_GETRANDOM

vdso-syms += getrandom

endif



# Files to link into the vdso

obj-vdso = $(patsubst %, %.o, $(vdso-syms)) note.o



ifdef CONFIG_VDSO_GETRANDOM

obj-vdso += vgetrandom-chacha.o

endif



ccflags-y := -fno-stack-protector

ccflags-y += -DDISABLE_BRANCH_PROFILING

ccflags-y += -fno-builtin
@@ -32,10 +24,6 @@ ifneq ($(c-gettimeofday-y),) 
  CFLAGS_vgettimeofday.o += -fPIC -include $(c-gettimeofday-y)

endif



ifneq ($(c-getrandom-y),)

  CFLAGS_getrandom.o += -fPIC -include $(c-getrandom-y)

endif



CFLAGS_hwprobe.o += -fPIC



# Build rules

arch/riscv/kernel/vdso/getrandom.c

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (C) 2025 Xi Ruoyao <xry111@xry111.site>. All Rights Reserved.

 */

#include <linux/types.h>



ssize_t __vdso_getrandom(void *buffer, size_t len, unsigned int flags, void *opaque_state, size_t opaque_len)

{

	return __cvdso_getrandom(buffer, len, flags, opaque_state, opaque_len);

}

arch/riscv/kernel/vdso/vdso.lds.S

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ VERSION 
#ifndef COMPAT_VDSO

		__vdso_riscv_hwprobe;

#endif

		__vdso_getrandom;

	local: *;

	};

}