Skip to content

Commit 84e6006

Browse files
Peter ZijlstraIngo Molnar
authored andcommitted
x86/xen: Fix noinstr fail in xen_pv_evtchn_do_upcall()
Fix: vmlinux.o: warning: objtool: xen_pv_evtchn_do_upcall()+0x23: call to irq_enter_rcu() leaves .noinstr.text section Fixes: 359f01d ("x86/entry: Use run_sysvec_on_irqstack_cond() for XEN upcall") Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 240001d commit 84e6006

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/x86/entry/common.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,15 +269,16 @@ __visible noinstr void xen_pv_evtchn_do_upcall(struct pt_regs *regs)
269269
irqentry_state_t state = irqentry_enter(regs);
270270
bool inhcall;
271271

272+
instrumentation_begin();
272273
run_sysvec_on_irqstack_cond(__xen_pv_evtchn_do_upcall, regs);
273274

274275
inhcall = get_and_clear_inhcall();
275276
if (inhcall && !WARN_ON_ONCE(state.exit_rcu)) {
276-
instrumentation_begin();
277277
irqentry_exit_cond_resched();
278278
instrumentation_end();
279279
restore_inhcall(inhcall);
280280
} else {
281+
instrumentation_end();
281282
irqentry_exit(regs, state);
282283
}
283284
}

0 commit comments

Comments
 (0)