Commit 414aaef1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RISC-V fixes from Palmer Dabbelt:

 - Three fixes for unnecessary spew: an ACPI CPPC boot-time debug
   message, the link-time warnings for R_RISCV_NONE in binaries, and
   some compile-time warnings in __put_user_nocheck

 - A fix for a race during text patching

 - Interrupts are no longer disabled during exception handling

 - A fix for a missing sign extension in the misaligned load handler

 - A fix to avoid static ftrace being selected in Kconfig, as we have
   moved to dynamic ftrace

* tag 'riscv-for-linus-6.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: uaccess: Fix -Wuninitialized and -Wshadow in __put_user_nocheck
  riscv: Stop supporting static ftrace
  riscv: traps_misaligned: properly sign extend value in misaligned load handler
  riscv: Enable interrupt during exception handling
  riscv: ftrace: Properly acquire text_mutex to fix a race condition
  ACPI: RISC-V: Remove unnecessary CPPC debug message
  riscv: Stop considering R_RISCV_NONE as bad relocations
parents c7de79e6 b65ca218

arch/riscv/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ config RISCV 
	select CLONE_BACKWARDS

	select COMMON_CLK

	select CPU_PM if CPU_IDLE || HIBERNATION || SUSPEND

	select DYNAMIC_FTRACE if FUNCTION_TRACER

	select EDAC_SUPPORT

	select FRAME_POINTER if PERF_EVENTS || (FUNCTION_TRACER && !DYNAMIC_FTRACE)

	select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY if DYNAMIC_FTRACE
@@ -162,7 +163,7 @@ config RISCV 
	select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL

	select HAVE_FUNCTION_GRAPH_TRACER if HAVE_DYNAMIC_FTRACE_WITH_ARGS

	select HAVE_FUNCTION_GRAPH_FREGS

	select HAVE_FUNCTION_TRACER if !XIP_KERNEL

	select HAVE_FUNCTION_TRACER if !XIP_KERNEL && HAVE_DYNAMIC_FTRACE

	select HAVE_EBPF_JIT if MMU

	select HAVE_GUP_FAST if MMU

	select HAVE_FUNCTION_ARG_ACCESS_API

arch/riscv/include/asm/uaccess.h

+2 −2
Original line number Diff line number Diff line
@@ -311,8 +311,8 @@ 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;			\

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

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

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

			goto label;				\

		break;						\

	}							\

arch/riscv/kernel/ftrace.c

+14 −4
Original line number Diff line number Diff line
@@ -14,6 +14,18 @@ 
#include <asm/text-patching.h>



#ifdef CONFIG_DYNAMIC_FTRACE

void ftrace_arch_code_modify_prepare(void)

	__acquires(&text_mutex)

{

	mutex_lock(&text_mutex);

}



void ftrace_arch_code_modify_post_process(void)

	__releases(&text_mutex)

{

	mutex_unlock(&text_mutex);

}



unsigned long ftrace_call_adjust(unsigned long addr)

{

	if (IS_ENABLED(CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS))
@@ -29,10 +41,8 @@ unsigned long arch_ftrace_get_symaddr(unsigned long fentry_ip) 


void arch_ftrace_update_code(int command)

{

	mutex_lock(&text_mutex);

	command |= FTRACE_MAY_SLEEP;

	ftrace_modify_all_code(command);

	mutex_unlock(&text_mutex);

	flush_icache_all();

}
@@ -149,6 +159,8 @@ int ftrace_init_nop(struct module *mod, struct dyn_ftrace *rec) 
	unsigned int nops[2], offset;

	int ret;



	guard(mutex)(&text_mutex);



	ret = ftrace_rec_set_nop_ops(rec);

	if (ret)

		return ret;
@@ -157,9 +169,7 @@ int ftrace_init_nop(struct module *mod, struct dyn_ftrace *rec) 
	nops[0] = to_auipc_t0(offset);

	nops[1] = RISCV_INSN_NOP4;



	mutex_lock(&text_mutex);

	ret = patch_insn_write((void *)pc, nops, 2 * MCOUNT_INSN_SIZE);

	mutex_unlock(&text_mutex);



	return ret;

}

arch/riscv/kernel/traps.c

+6 −4
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/cpu.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/irqflags.h>

#include <linux/randomize_kstack.h>

#include <linux/sched.h>

#include <linux/sched/debug.h>
@@ -151,7 +152,9 @@ asmlinkage __visible __trap_section void name(struct pt_regs *regs) \ 
{										\

	if (user_mode(regs)) {							\

		irqentry_enter_from_user_mode(regs);				\

		local_irq_enable();						\

		do_trap_error(regs, signo, code, regs->epc, "Oops - " str);	\

		local_irq_disable();						\

		irqentry_exit_to_user_mode(regs);				\

	} else {								\

		irqentry_state_t state = irqentry_nmi_enter(regs);		\
@@ -173,17 +176,14 @@ asmlinkage __visible __trap_section void do_trap_insn_illegal(struct pt_regs *re 


	if (user_mode(regs)) {

		irqentry_enter_from_user_mode(regs);



		local_irq_enable();



		handled = riscv_v_first_use_handler(regs);



		local_irq_disable();



		if (!handled)

			do_trap_error(regs, SIGILL, ILL_ILLOPC, regs->epc,

				      "Oops - illegal instruction");



		local_irq_disable();

		irqentry_exit_to_user_mode(regs);

	} else {

		irqentry_state_t state = irqentry_nmi_enter(regs);
@@ -308,9 +308,11 @@ asmlinkage __visible __trap_section void do_trap_break(struct pt_regs *regs) 
{

	if (user_mode(regs)) {

		irqentry_enter_from_user_mode(regs);

		local_irq_enable();



		handle_break(regs);



		local_irq_disable();

		irqentry_exit_to_user_mode(regs);

	} else {

		irqentry_state_t state = irqentry_nmi_enter(regs);

arch/riscv/kernel/traps_misaligned.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static int handle_scalar_misaligned_load(struct pt_regs *regs) 
	}



	if (!fp)

		SET_RD(insn, regs, val.data_ulong << shift >> shift);

		SET_RD(insn, regs, (long)(val.data_ulong << shift) >> shift);

	else if (len == 8)

		set_f64_rd(insn, regs, val.data_u64);

	else