From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Apr 2023 21:02:54 +0000 (-0700)
Subject: Merge tag 'objtool-core-2023-04-27' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.6-pxa1908~1342
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=2aff7c706c7483f4895ca250c92c1d71e45b6e82;p=linux.git

Merge tag 'objtool-core-2023-04-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull objtool updates from Ingo Molnar:

 - Mark arch_cpu_idle_dead() __noreturn, make all architectures &
   drivers that did this inconsistently follow this new, common
   convention, and fix all the fallout that objtool can now detect
   statically

 - Fix/improve the ORC unwinder becoming unreliable due to
   UNWIND_HINT_EMPTY ambiguity, split it into UNWIND_HINT_END_OF_STACK
   and UNWIND_HINT_UNDEFINED to resolve it

 - Fix noinstr violations in the KCSAN code and the lkdtm/stackleak code

 - Generate ORC data for __pfx code

 - Add more __noreturn annotations to various kernel startup/shutdown
   and panic functions

 - Misc improvements & fixes

* tag 'objtool-core-2023-04-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (52 commits)
  x86/hyperv: Mark hv_ghcb_terminate() as noreturn
  scsi: message: fusion: Mark mpt_halt_firmware() __noreturn
  x86/cpu: Mark {hlt,resume}_play_dead() __noreturn
  btrfs: Mark btrfs_assertfail() __noreturn
  objtool: Include weak functions in global_noreturns check
  cpu: Mark nmi_panic_self_stop() __noreturn
  cpu: Mark panic_smp_self_stop() __noreturn
  arm64/cpu: Mark cpu_park_loop() and friends __noreturn
  x86/head: Mark *_start_kernel() __noreturn
  init: Mark start_kernel() __noreturn
  init: Mark [arch_call_]rest_init() __noreturn
  objtool: Generate ORC data for __pfx code
  x86/linkage: Fix padding for typed functions
  objtool: Separate prefix code from stack validation code
  objtool: Remove superfluous dead_end_function() check
  objtool: Add symbol iteration helpers
  objtool: Add WARN_INSN()
  scripts/objdump-func: Support multiple functions
  context_tracking: Fix KCSAN noinstr violation
  objtool: Add stackleak instrumentation to uaccess safe list
  ...
---

2aff7c706c7483f4895ca250c92c1d71e45b6e82
diff --cc arch/x86/include/asm/mshyperv.h
index b445e252aa83,09c26e658bcc..49bb4f2bd300
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@@ -228,8 -212,7 +228,8 @@@ int hv_unmap_ioapic_interrupt(int ioapi
  void hv_ghcb_msr_write(u64 msr, u64 value);
  void hv_ghcb_msr_read(u64 msr, u64 *value);
  bool hv_ghcb_negotiate_protocol(void);
- void hv_ghcb_terminate(unsigned int set, unsigned int reason);
+ void __noreturn hv_ghcb_terminate(unsigned int set, unsigned int reason);
 +void hv_vtom_init(void);
  #else
  static inline void hv_ghcb_msr_write(u64 msr, u64 value) {}
  static inline void hv_ghcb_msr_read(u64 msr, u64 *value) {}
diff --cc arch/x86/kernel/head_64.S
index 6a8238702eab,8d8d25c64827..a5df3e994f04
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@@ -230,27 -238,9 +230,27 @@@ SYM_INNER_LABEL(secondary_startup_64_no
  	ANNOTATE_RETPOLINE_SAFE
  	jmp	*%rax
  1:
- 	UNWIND_HINT_EMPTY
+ 	UNWIND_HINT_END_OF_STACK
  	ANNOTATE_NOENDBR // above
  
 +#ifdef CONFIG_SMP
 +	movl	smpboot_control(%rip), %ecx
 +
 +	/* Get the per cpu offset for the given CPU# which is in ECX */
 +	movq	__per_cpu_offset(,%rcx,8), %rdx
 +#else
 +	xorl	%edx, %edx /* zero-extended to clear all of RDX */
 +#endif /* CONFIG_SMP */
 +
 +	/*
 +	 * Setup a boot time stack - Any secondary CPU will have lost its stack
 +	 * by now because the cr3-switch above unmaps the real-mode stack.
 +	 *
 +	 * RDX contains the per-cpu offset
 +	 */
 +	movq	pcpu_hot + X86_current_task(%rdx), %rax
 +	movq	TASK_threadsp(%rax), %rsp
 +
  	/*
  	 * We must switch to a new descriptor in kernel space for the GDT
  	 * because soon the kernel won't have access anymore to the userspace
@@@ -383,12 -371,8 +383,12 @@@ SYM_CODE_END(secondary_startup_64
   */
  SYM_CODE_START(start_cpu0)
  	ANNOTATE_NOENDBR
- 	UNWIND_HINT_EMPTY
+ 	UNWIND_HINT_END_OF_STACK
 -	movq	initial_stack(%rip), %rsp
 +
 +	/* Find the idle task stack */
 +	movq	PER_CPU_VAR(pcpu_hot) + X86_current_task, %rcx
 +	movq	TASK_threadsp(%rcx), %rsp
 +
  	jmp	.Ljump_to_C_code
  SYM_CODE_END(start_cpu0)
  #endif
diff --cc include/linux/context_tracking.h
index 3a7909ed5498,5ae3abd767b4..d3cbb6c16bab
--- a/include/linux/context_tracking.h
+++ b/include/linux/context_tracking.h
@@@ -96,9 -96,8 +96,9 @@@ static inline void user_exit_irqoff(voi
  static inline int exception_enter(void) { return 0; }
  static inline void exception_exit(enum ctx_state prev_ctx) { }
  static inline int ct_state(void) { return -1; }
 +static inline int __ct_state(void) { return -1; }
  static __always_inline bool context_tracking_guest_enter(void) { return false; }
- static inline void context_tracking_guest_exit(void) { }
+ static __always_inline void context_tracking_guest_exit(void) { }
  #define CT_WARN_ON(cond) do { } while (0)
  #endif /* !CONFIG_CONTEXT_TRACKING_USER */