public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Several RISC-V fixes for v6.17-rc5:

Browse source 
- An LTO fix for clang when building with CONFIG_CMODEL_MEDLOW
 
 - A fix for ACPI CPPC CSR read/write return values
 
 - Several fixes for incorrect access widths in thread_info.cpu reads
 
 - A fix for an issue in __put_user_nocheck() that was causing the glibc
   tst-socket-timestamp test to fail
 
 - A fix to initialize struct kexec_buf records in several kexec-related
   functions, which were generating UBSAN warnings
 
 - Two fixes for sparse warnings
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEElRDoIDdEz9/svf2Kx4+xDQu9KksFAmi7X/YACgkQx4+xDQu9
 KkvvqRAAnZwgWgOJYPSrlpoxZ/uk/J8tU5ULsdkEs/l79Yl1geCk/Jh7xGJo4ROI
 HvSZPC4s4D7MPtXkV7VFwqAVl1betNAvTB13eIkmLrMHuDoh9EqBbG3CBvPeKY+l
 I0eRp5uSGGIccdLFaTqmO+IHp6SiCj6xTshUme8TT5+UuDdDiducucDtNUSveYNI
 ehRyuNR6Kw7vATnQHOqwnbHgAxA8mtzFjJVvd/C89C79B6D965+urN+tPhGoYBe0
 R9zEhxKPdtsnE0KZfE2sNt7q9V59O7Nsl9Q2YjXY3q3t7xPeEyhDMnYrK7XJ3cRj
 VRy0UkF233WKbmD8jne6p/BVw1nC/ktK8a/j6ZiXK61WhuJviv52LZIbhswq4/R/
 ssI55ne0WkDS2VtmiNibGRP8tBuiajqmjMiE83o620Q5zHt4fA0fQN2SbBj5P441
 CprhRCCxOLdczQIZWnZx8aYJuPYKbFaoVz+YCGZD9hN1TzKKO1K3eshVym/Jr6K4
 Ez2CMJXVCycy5vlwOeQqIEEVsnZ43tvXS+O0wc9bFVP27JVXNmN0geU79S0acw8z
 3XOP8LtlY37Uxz0O2cakygVL859WpDbTJe5ECi2L+m57XXXFOVqa1yIF8+/kG8+B
 lB3dOwWjCiR1hwNHRxon8CWvCmUBaHRwYmCTmMpSRs53mHhyRpE=
 =o1+b
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2025-09-07 08:15:56 -07:00
commit 00e6982822
9 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/riscv/Kconfig
View file

@ -65,7 +65,7 @@ config RISCV
select ARCH_SUPPORTS_HUGE_PFNMAP if TRANSPARENT_HUGEPAGE select ARCH_SUPPORTS_HUGE_PFNMAP if TRANSPARENT_HUGEPAGE
select ARCH_SUPPORTS_HUGETLBFS if MMU select ARCH_SUPPORTS_HUGETLBFS if MMU
# LLD >= 14: https://github.com/llvm/llvm-project/issues/50505 # 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_LTO_CLANG_THIN if LLD_VERSION >= 140000
select ARCH_SUPPORTS_MSEAL_SYSTEM_MAPPINGS if 64BIT && MMU select ARCH_SUPPORTS_MSEAL_SYSTEM_MAPPINGS if 64BIT && MMU
select ARCH_SUPPORTS_PAGE_TABLE_CHECK if MMU select ARCH_SUPPORTS_PAGE_TABLE_CHECK if MMU

2
arch/riscv/include/asm/asm.h
View file

@ -91,7 +91,7 @@
#endif #endif
.macro asm_per_cpu dst sym tmp .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 slli \tmp, \tmp, PER_CPU_OFFSET_SHIFT
la \dst, __per_cpu_offset la \dst, __per_cpu_offset
add \dst, \dst, \tmp add \dst, \dst, \tmp

8
arch/riscv/include/asm/uaccess.h
View file

@ -209,7 +209,7 @@ do { \
err = 0; \ err = 0; \
break; \ break; \
__gu_failed: \ __gu_failed: \
x = 0; \ x = (__typeof__(x))0; \
err = -EFAULT; \ err = -EFAULT; \
} while (0) } while (0)
@ -311,7 +311,7 @@ do { \
do { \ do { \
if (!IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && \ if (!IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && \
!IS_ALIGNED((uintptr_t)__gu_ptr, sizeof(*__gu_ptr))) { \ !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))) \ if (__asm_copy_to_user_sum_enabled(__gu_ptr, &(___val), sizeof(*__gu_ptr))) \
goto label; \ goto label; \
break; \ 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) \ #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) \ #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) static __must_check __always_inline bool user_access_begin(const void __user *ptr, size_t len)
{ {

2
arch/riscv/kernel/entry.S
View file

@ -46,7 +46,7 @@
* a0 = &new_vmalloc[BIT_WORD(cpu)] * a0 = &new_vmalloc[BIT_WORD(cpu)]
* a1 = BIT_MASK(cpu) * a1 = BIT_MASK(cpu)
*/ */
REG_L a2, TASK_TI_CPU(tp) lw a2, TASK_TI_CPU(tp)
/* /*
* Compute the new_vmalloc element position: * Compute the new_vmalloc element position:
* (cpu / 64) * 8 = (cpu >> 6) << 3 * (cpu / 64) * 8 = (cpu >> 6) << 3

4
arch/riscv/kernel/kexec_elf.c
View file

@ -28,7 +28,7 @@ static int riscv_kexec_elf_load(struct kimage *image, struct elfhdr *ehdr,
int i; int i;
int ret = 0; int ret = 0;
size_t size; size_t size;
struct kexec_buf kbuf; struct kexec_buf kbuf = {};
const struct elf_phdr *phdr; const struct elf_phdr *phdr;
kbuf.image = image; kbuf.image = image;
@ -66,7 +66,7 @@ static int elf_find_pbase(struct kimage *image, unsigned long kernel_len,
{ {
int i; int i;
int ret; int ret;
struct kexec_buf kbuf; struct kexec_buf kbuf = {};
const struct elf_phdr *phdr; const struct elf_phdr *phdr;
unsigned long lowest_paddr = ULONG_MAX; unsigned long lowest_paddr = ULONG_MAX;
unsigned long lowest_vaddr = ULONG_MAX; unsigned long lowest_vaddr = ULONG_MAX;

2
arch/riscv/kernel/kexec_image.c
View file

@ -41,7 +41,7 @@ static void *image_load(struct kimage *image,
struct riscv_image_header *h; struct riscv_image_header *h;
u64 flags; u64 flags;
bool be_image, be_kernel; bool be_image, be_kernel;
struct kexec_buf kbuf; struct kexec_buf kbuf = {};
int ret; int ret;
/* Check Image header */ /* Check Image header */

2
arch/riscv/kernel/machine_kexec_file.c
View file

@ -261,7 +261,7 @@ int load_extra_segments(struct kimage *image, unsigned long kernel_start,
int ret; int ret;
void *fdt; void *fdt;
unsigned long initrd_pbase = 0UL; unsigned long initrd_pbase = 0UL;
struct kexec_buf kbuf; struct kexec_buf kbuf = {};
char *modified_cmdline = NULL; char *modified_cmdline = NULL;
kbuf.image = image; kbuf.image = image;

4
arch/riscv/net/bpf_jit_comp64.c
View file

@ -1356,7 +1356,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
emit_mv(rd, rs, ctx); emit_mv(rd, rs, ctx);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
/* Load current CPU number in T1 */ /* Load current CPU number in T1 */
emit_ld(RV_REG_T1, offsetof(struct thread_info, cpu), emit_lw(RV_REG_T1, offsetof(struct thread_info, cpu),
RV_REG_TP, ctx); RV_REG_TP, ctx);
/* Load address of __per_cpu_offset array in T2 */ /* Load address of __per_cpu_offset array in T2 */
emit_addr(RV_REG_T2, (u64)&__per_cpu_offset, extra_pass, ctx); emit_addr(RV_REG_T2, (u64)&__per_cpu_offset, extra_pass, ctx);
@ -1763,7 +1763,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
*/ */
if (insn->src_reg == 0 && insn->imm == BPF_FUNC_get_smp_processor_id) { if (insn->src_reg == 0 && insn->imm == BPF_FUNC_get_smp_processor_id) {
/* Load current CPU number in R0 */ /* Load current CPU number in R0 */
emit_ld(bpf_to_rv_reg(BPF_REG_0, ctx), offsetof(struct thread_info, cpu), emit_lw(bpf_to_rv_reg(BPF_REG_0, ctx), offsetof(struct thread_info, cpu),
RV_REG_TP, ctx); RV_REG_TP, ctx);
break; break;
} }

4
drivers/acpi/riscv/cppc.c
View file

@ -119,7 +119,7 @@ int cpc_read_ffh(int cpu, struct cpc_reg *reg, u64 *val)
*val = data.ret.value; *val = data.ret.value;
return (data.ret.error) ? sbi_err_map_linux_errno(data.ret.error) : 0; return data.ret.error;
} }
return -EINVAL; return -EINVAL;
@ -148,7 +148,7 @@ int cpc_write_ffh(int cpu, struct cpc_reg *reg, u64 val)
smp_call_function_single(cpu, cppc_ffh_csr_write, &data, 1); smp_call_function_single(cpu, cppc_ffh_csr_write, &data, 1);
return (data.ret.error) ? sbi_err_map_linux_errno(data.ret.error) : 0; return data.ret.error;
} }
return -EINVAL; return -EINVAL;