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

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull core fixes from Thomas Gleixner:

 - A collection of objtool fixes which address recent fallout partially
   exposed by newer toolchains, clang, BPF and general code changes.

 - Force USER_DS for user stack traces

[ Note: the "objtool fixes" are not all to objtool itself, but for
  kernel code that triggers objtool warnings.

  Things like missing function size annotations, or code that confuses
  the unwinder etc.   - Linus]

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)
  objtool: Support conditional retpolines
  objtool: Convert insn type to enum
  objtool: Fix seg fault on bad switch table entry
  objtool: Support repeated uses of the same C jump table
  objtool: Refactor jump table code
  objtool: Refactor sibling call detection logic
  objtool: Do frame pointer check before dead end check
  objtool: Change dead_end_function() to return boolean
  objtool: Warn on zero-length functions
  objtool: Refactor function alias logic
  objtool: Track original function across branches
  objtool: Add mcsafe_handle_tail() to the uaccess safe list
  bpf: Disable GCC -fgcse optimization for ___bpf_prog_run()
  x86/uaccess: Remove redundant CLACs in getuser/putuser error paths
  x86/uaccess: Don't leak AC flag into fentry from mcsafe_handle_tail()
  x86/uaccess: Remove ELF function annotation from copy_user_handle_tail()
  x86/head/64: Annotate start_cpu0() as non-callable
  x86/entry: Fix thunk function ELF sizes
  x86/kvm: Don't call kvm_spurious_fault() from .fixup
  x86/kvm: Replace vmx_vmenter()'s call to kvm_spurious_fault() with UD2
  ...
parents 4b01f5a4 b68b9907

arch/x86/entry/thunk_64.S

+2 −3
Original line number Diff line number Diff line
@@ -12,9 +12,7 @@ 


	/* rdi:	arg1 ... normal C conventions. rax is saved/restored. */

	.macro THUNK name, func, put_ret_addr_in_rdi=0

	.globl \name

	.type \name, @function

\name:

	ENTRY(\name)

	pushq %rbp

	movq %rsp, %rbp
@@ -35,6 +33,7 @@ 


	call \func

	jmp  .L_restore

	ENDPROC(\name)

	_ASM_NOKPROBE(\name)

	.endm

arch/x86/include/asm/kvm_host.h

+19 −15
Original line number Diff line number Diff line
@@ -1496,25 +1496,29 @@ enum { 
#define kvm_arch_vcpu_memslots_id(vcpu) ((vcpu)->arch.hflags & HF_SMM_MASK ? 1 : 0)

#define kvm_memslots_for_spte_role(kvm, role) __kvm_memslots(kvm, (role).smm)



asmlinkage void __noreturn kvm_spurious_fault(void);



/*

 * Hardware virtualization extension instructions may fault if a

 * reboot turns off virtualization while processes are running.

 * Trap the fault and ignore the instruction if that happens.

 * Usually after catching the fault we just panic; during reboot

 * instead the instruction is ignored.

 */

asmlinkage void kvm_spurious_fault(void);



#define ____kvm_handle_fault_on_reboot(insn, cleanup_insn)		\

	"666: " insn "\n\t" \

	"668: \n\t"                           \

	".pushsection .fixup, \"ax\" \n" \

	"666: \n\t"							\

	insn "\n\t"							\

	"jmp	668f \n\t"						\

	"667: \n\t"							\

	"call	kvm_spurious_fault \n\t"				\

	"668: \n\t"							\

	".pushsection .fixup, \"ax\" \n\t"				\

	"700: \n\t"							\

	cleanup_insn "\n\t"						\

	"cmpb	$0, kvm_rebooting\n\t"					\

	"jne 668b \n\t"      		      \

	__ASM_SIZE(push) " $666b \n\t"	      \

	"jmp kvm_spurious_fault \n\t"	      \

	"je	667b \n\t"						\

	"jmp	668b \n\t"						\

	".popsection \n\t"						\

	_ASM_EXTABLE(666b, 667b)

	_ASM_EXTABLE(666b, 700b)



#define __kvm_handle_fault_on_reboot(insn)		\

	____kvm_handle_fault_on_reboot(insn, "")

arch/x86/include/asm/paravirt.h

+1 −0
Original line number Diff line number Diff line
@@ -746,6 +746,7 @@ bool __raw_callee_save___native_vcpu_is_preempted(long cpu); 
	    PV_RESTORE_ALL_CALLER_REGS					\

	    FRAME_END							\

	    "ret;"							\

	    ".size " PV_THUNK_NAME(func) ", .-" PV_THUNK_NAME(func) ";"	\

	    ".popsection")



/* Get a reference to a callee-save function */

arch/x86/kernel/head_64.S

+2 −2
Original line number Diff line number Diff line
@@ -253,10 +253,10 @@ END(secondary_startup_64) 
 * start_secondary() via .Ljump_to_C_code.

 */

ENTRY(start_cpu0)

	movq	initial_stack(%rip), %rsp

	UNWIND_HINT_EMPTY

	movq	initial_stack(%rip), %rsp

	jmp	.Ljump_to_C_code

ENDPROC(start_cpu0)

END(start_cpu0)

#endif



	/* Both SMP bootup and ACPI suspend change these variables */

arch/x86/kernel/kvm.c

+1 −0
Original line number Diff line number Diff line
@@ -838,6 +838,7 @@ asm( 
"cmpb	$0, " __stringify(KVM_STEAL_TIME_preempted) "+steal_time(%rax);"

"setne	%al;"

"ret;"

".size __raw_callee_save___kvm_vcpu_is_preempted, .-__raw_callee_save___kvm_vcpu_is_preempted;"

".popsection");



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE