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

Merge tag 'objtool-urgent-2021-06-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull objtool fixes from Ingo Molnar:
 "Address a number of objtool warnings that got reported.

  No change in behavior intended, but code generation might be impacted
  by commit 1f008d46 ("x86: Always inline task_size_max()")"

* tag 'objtool-urgent-2021-06-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/lockdep: Improve noinstr vs errors
  x86: Always inline task_size_max()
  x86/xen: Fix noinstr fail in exc_xen_unknown_trap()
  x86/xen: Fix noinstr fail in xen_pv_evtchn_do_upcall()
  x86/entry: Fix noinstr fail in __do_fast_syscall_32()
  objtool/x86: Ignore __x86_indirect_alt_* symbols
parents 7426cedc 49faa777

arch/x86/entry/common.c

+3 −2
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ static noinstr bool __do_fast_syscall_32(struct pt_regs *regs) 
		/* User code screwed up. */

		regs->ax = -EFAULT;



		instrumentation_end();

		local_irq_disable();

		instrumentation_end();

		irqentry_exit_to_user_mode(regs);

		return false;

	}
@@ -269,15 +269,16 @@ __visible noinstr void xen_pv_evtchn_do_upcall(struct pt_regs *regs) 
	irqentry_state_t state = irqentry_enter(regs);

	bool inhcall;



	instrumentation_begin();

	run_sysvec_on_irqstack_cond(__xen_pv_evtchn_do_upcall, regs);



	inhcall = get_and_clear_inhcall();

	if (inhcall && !WARN_ON_ONCE(state.exit_rcu)) {

		instrumentation_begin();

		irqentry_exit_cond_resched();

		instrumentation_end();

		restore_inhcall(inhcall);

	} else {

		instrumentation_end();

		irqentry_exit(regs, state);

	}

}

arch/x86/include/asm/page_64.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ void copy_page(void *to, void *from); 
 *

 * With page table isolation enabled, we map the LDT in ... [stay tuned]

 */

static inline unsigned long task_size_max(void)

static __always_inline unsigned long task_size_max(void)

{

	unsigned long ret;

arch/x86/lib/retpoline.S

+4 −0
Original line number Diff line number Diff line
@@ -58,12 +58,16 @@ SYM_FUNC_START_NOALIGN(__x86_indirect_alt_call_\reg) 
2:	.skip	5-(2b-1b), 0x90

SYM_FUNC_END(__x86_indirect_alt_call_\reg)



STACK_FRAME_NON_STANDARD(__x86_indirect_alt_call_\reg)



SYM_FUNC_START_NOALIGN(__x86_indirect_alt_jmp_\reg)

	ANNOTATE_RETPOLINE_SAFE

1:	jmp	*%\reg

2:	.skip	5-(2b-1b), 0x90

SYM_FUNC_END(__x86_indirect_alt_jmp_\reg)



STACK_FRAME_NON_STANDARD(__x86_indirect_alt_jmp_\reg)



.endm



/*

arch/x86/xen/enlighten_pv.c

+2 −0
Original line number Diff line number Diff line
@@ -592,8 +592,10 @@ DEFINE_IDTENTRY_RAW(xenpv_exc_debug) 
DEFINE_IDTENTRY_RAW(exc_xen_unknown_trap)

{

	/* This should never happen and there is no way to handle it. */

	instrumentation_begin();

	pr_err("Unknown trap in Xen PV mode.");

	BUG();

	instrumentation_end();

}



#ifdef CONFIG_X86_MCE

include/linux/debug_locks.h

+2 −0
Original line number Diff line number Diff line
@@ -27,8 +27,10 @@ extern int debug_locks_off(void); 
	int __ret = 0;							\

									\

	if (!oops_in_progress && unlikely(c)) {				\

		instrumentation_begin();				\

		if (debug_locks_off() && !debug_locks_silent)		\

			WARN(1, "DEBUG_LOCKS_WARN_ON(%s)", #c);		\

		instrumentation_end();					\

		__ret = 1;						\

	}								\

	__ret;								\