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

Merge tag 'core-urgent-2025-12-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull misc core fixes from Ingo Molnar:

 - Improve bug reporting

 - Suppress W=1 format warning

 - Improve rseq scalability on Clang builds

* tag 'core-urgent-2025-12-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  rseq: Always inline rseq_debug_syscall_return()
  bug: Hush suggest-attribute=format for __warn_printf()
  bug: Let report_bug_entry() provide the correct bugaddr
parents 9d9c1cfe bdae29d6

include/linux/rseq_entry.h

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ static __always_inline void rseq_exit_to_user_mode_legacy(void) 


void __rseq_debug_syscall_return(struct pt_regs *regs);



static inline void rseq_debug_syscall_return(struct pt_regs *regs)

static __always_inline void rseq_debug_syscall_return(struct pt_regs *regs)

{

	if (static_branch_unlikely(&rseq_debug_enabled))

		__rseq_debug_syscall_return(regs);

lib/bug.c

+5 −1
Original line number Diff line number Diff line
@@ -173,6 +173,9 @@ struct bug_entry *find_bug(unsigned long bugaddr) 
	return module_find_bug(bugaddr);

}



__diag_push();

__diag_ignore(GCC, all, "-Wsuggest-attribute=format",

	      "Not a valid __printf() conversion candidate.");

static void __warn_printf(const char *fmt, struct pt_regs *regs)

{

	if (!fmt)
@@ -192,6 +195,7 @@ static void __warn_printf(const char *fmt, struct pt_regs *regs) 


	printk("%s", fmt);

}

__diag_pop();



static enum bug_trap_type __report_bug(struct bug_entry *bug, unsigned long bugaddr, struct pt_regs *regs)

{
@@ -262,7 +266,7 @@ enum bug_trap_type report_bug_entry(struct bug_entry *bug, struct pt_regs *regs) 
	bool rcu = false;



	rcu = warn_rcu_enter();

	ret = __report_bug(bug, 0, regs);

	ret = __report_bug(bug, bug_addr(bug), regs);

	warn_rcu_exit(rcu);



	return ret;