Commit 00e69828 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-6.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux 

Pull RISC-V fixes from Paul Walmsley:

 - LTO fix for clang when building with CONFIG_CMODEL_MEDLOW

 - Fix for ACPI CPPC CSR read/write return values

 - Several fixes for incorrect access widths in thread_info.cpu reads

 - Fix an issue in __put_user_nocheck() that was causing the glibc
   tst-socket-timestamp test to fail

 - Initialize struct kexec_buf records in several kexec-related
   functions, which were generating UBSAN warnings

 - Two fixes for sparse warnings

* tag 'riscv-for-linus-6.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: Fix sparse warning about different address spaces
  riscv: Fix sparse warning in __get_user_error()
  riscv: kexec: Initialize kexec_buf struct
  riscv: use lw when reading int cpu in asm_per_cpu
  riscv, bpf: use lw when reading int cpu in bpf_get_smp_processor_id
  riscv, bpf: use lw when reading int cpu in BPF_MOV64_PERCPU_REG
  riscv: uaccess: fix __put_user_nocheck for unaligned accesses
  riscv: use lw when reading int cpu in new_vmalloc_check
  ACPI: RISC-V: Fix FFH_CPPC_CSR error handling
  riscv: Only allow LTO with CMODEL_MEDANY
parents b2369207 a03ee11b

arch/riscv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ config RISCV 
	select ARCH_SUPPORTS_HUGE_PFNMAP if TRANSPARENT_HUGEPAGE

	select ARCH_SUPPORTS_HUGETLBFS if MMU

	# LLD >= 14: https://github.com/llvm/llvm-project/issues/50505

	select ARCH_SUPPORTS_LTO_CLANG if LLD_VERSION >= 140000

	select ARCH_SUPPORTS_LTO_CLANG if LLD_VERSION >= 140000 && CMODEL_MEDANY

	select ARCH_SUPPORTS_LTO_CLANG_THIN if LLD_VERSION >= 140000

	select ARCH_SUPPORTS_MSEAL_SYSTEM_MAPPINGS if 64BIT && MMU

	select ARCH_SUPPORTS_PAGE_TABLE_CHECK if MMU

arch/riscv/include/asm/asm.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 
#endif



.macro asm_per_cpu dst sym tmp

	REG_L \tmp, TASK_TI_CPU_NUM(tp)

	lw    \tmp, TASK_TI_CPU_NUM(tp)

	slli  \tmp, \tmp, PER_CPU_OFFSET_SHIFT

	la    \dst, __per_cpu_offset

	add   \dst, \dst, \tmp

arch/riscv/include/asm/uaccess.h

+4 −4
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ do { \ 
		err = 0;						\

		break;							\

__gu_failed:								\

		x = 0;							\

		x = (__typeof__(x))0;					\

		err = -EFAULT;						\

} while (0)
@@ -311,7 +311,7 @@ do { \ 
do {								\

	if (!IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) &&	\

	    !IS_ALIGNED((uintptr_t)__gu_ptr, sizeof(*__gu_ptr))) {	\

		__inttype(x) ___val = (__inttype(x))x;			\

		__typeof__(*(__gu_ptr)) ___val = (x);		\

		if (__asm_copy_to_user_sum_enabled(__gu_ptr, &(___val), sizeof(*__gu_ptr))) \

			goto label;				\

		break;						\
@@ -438,10 +438,10 @@ unsigned long __must_check clear_user(void __user *to, unsigned long n) 
}



#define __get_kernel_nofault(dst, src, type, err_label)			\

	__get_user_nocheck(*((type *)(dst)), (type *)(src), err_label)

	__get_user_nocheck(*((type *)(dst)), (__force __user type *)(src), err_label)



#define __put_kernel_nofault(dst, src, type, err_label)			\

	__put_user_nocheck(*((type *)(src)), (type *)(dst), err_label)

	__put_user_nocheck(*((type *)(src)), (__force __user type *)(dst), err_label)



static __must_check __always_inline bool user_access_begin(const void __user *ptr, size_t len)

{

arch/riscv/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
	 * a0 = &new_vmalloc[BIT_WORD(cpu)]

	 * a1 = BIT_MASK(cpu)

	 */

	REG_L 	a2, TASK_TI_CPU(tp)

	lw	a2, TASK_TI_CPU(tp)

	/*

	 * Compute the new_vmalloc element position:

	 * (cpu / 64) * 8 = (cpu >> 6) << 3

arch/riscv/kernel/kexec_elf.c

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static int riscv_kexec_elf_load(struct kimage *image, struct elfhdr *ehdr, 
	int i;

	int ret = 0;

	size_t size;

	struct kexec_buf kbuf;

	struct kexec_buf kbuf = {};

	const struct elf_phdr *phdr;



	kbuf.image = image;
@@ -66,7 +66,7 @@ static int elf_find_pbase(struct kimage *image, unsigned long kernel_len, 
{

	int i;

	int ret;

	struct kexec_buf kbuf;

	struct kexec_buf kbuf = {};

	const struct elf_phdr *phdr;

	unsigned long lowest_paddr = ULONG_MAX;

	unsigned long lowest_vaddr = ULONG_MAX;