Commit b82fbd8f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RISC-V fixes from Palmer Dabbelt:

 - A handful of build fixes

 - A fix to avoid mixing up user/kernel-mode breakpoints, which can
   manifest as a hang when mixing k/uprobes with other breakpoint
   sources

 - A fix to avoid double-allocting crash kernel memory

 - A fix for tracefs syscall name mangling, which was causing syscalls
   not to show up in tracefs

 - A fix to the perf driver to enable the hw events when selected, which
   can trigger a BUG on some userspace access patterns

* tag 'riscv-for-linus-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  drivers: perf: Fix panic in riscv SBI mmap support
  riscv: Fix ftrace syscall handling which are now prefixed with __riscv_
  RISC-V: Fix wrong use of CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK
  riscv: kdump: fix crashkernel reserving problem on RISC-V
  riscv: Remove duplicate objcopy flag
  riscv: signal: fix sigaltstack frame size checking
  riscv: errata: andes: Makefile: Fix randconfig build issue
  riscv: Only consider swbp/ss handlers for correct privileged mode
  riscv: kselftests: Fix mm build by removing testcases subdirectory
parents 17325a21 3fec3233

arch/riscv/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
# for more details.

#



OBJCOPYFLAGS    := -O binary

LDFLAGS_vmlinux := -z norelro

ifeq ($(CONFIG_RELOCATABLE),y)

	LDFLAGS_vmlinux += -shared -Bsymbolic -z notext --emit-relocs

arch/riscv/errata/andes/Makefile

+4 −0
Original line number Diff line number Diff line 
ifdef CONFIG_RISCV_ALTERNATIVE_EARLY

CFLAGS_errata.o := -mcmodel=medany

endif



obj-y += errata.o

arch/riscv/include/asm/ftrace.h

+21 −0
Original line number Diff line number Diff line
@@ -31,6 +31,27 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) 
	return addr;

}



/*

 * Let's do like x86/arm64 and ignore the compat syscalls.

 */

#define ARCH_TRACE_IGNORE_COMPAT_SYSCALLS

static inline bool arch_trace_is_compat_syscall(struct pt_regs *regs)

{

	return is_compat_task();

}



#define ARCH_HAS_SYSCALL_MATCH_SYM_NAME

static inline bool arch_syscall_match_sym_name(const char *sym,

					       const char *name)

{

	/*

	 * Since all syscall functions have __riscv_ prefix, we must skip it.

	 * However, as we described above, we decided to ignore compat

	 * syscalls, so we don't care about __riscv_compat_ prefix here.

	 */

	return !strcmp(sym + 8, name);

}



struct dyn_arch_ftrace {

};

#endif

arch/riscv/include/asm/kprobes.h

+10 −1
Original line number Diff line number Diff line
@@ -40,6 +40,15 @@ void arch_remove_kprobe(struct kprobe *p); 
int kprobe_fault_handler(struct pt_regs *regs, unsigned int trapnr);

bool kprobe_breakpoint_handler(struct pt_regs *regs);

bool kprobe_single_step_handler(struct pt_regs *regs);



#else

static inline bool kprobe_breakpoint_handler(struct pt_regs *regs)

{

	return false;

}



static inline bool kprobe_single_step_handler(struct pt_regs *regs)

{

	return false;

}

#endif /* CONFIG_KPROBES */

#endif /* _ASM_RISCV_KPROBES_H */

arch/riscv/include/asm/uprobes.h

+12 −1
Original line number Diff line number Diff line
@@ -34,7 +34,18 @@ struct arch_uprobe { 
	bool simulate;

};



#ifdef CONFIG_UPROBES

bool uprobe_breakpoint_handler(struct pt_regs *regs);

bool uprobe_single_step_handler(struct pt_regs *regs);



#else

static inline bool uprobe_breakpoint_handler(struct pt_regs *regs)

{

	return false;

}



static inline bool uprobe_single_step_handler(struct pt_regs *regs)

{

	return false;

}

#endif /* CONFIG_UPROBES */

#endif /* _ASM_RISCV_UPROBES_H */