tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: 359f01d1816f ("x86/entry: Use run_sysvec_on_irqstack_cond() for XEN upcall")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210621120120.532960208@infradead.org

authored by

Peter Zijlstra and committed by
Ingo Molnar 84e60065 240001d4

+2 -1
+2 -1
arch/x86/entry/common.c
··· 269 269 irqentry_state_t state = irqentry_enter(regs); 270 270 bool inhcall; 271 271 272 + instrumentation_begin(); 272 273 run_sysvec_on_irqstack_cond(__xen_pv_evtchn_do_upcall, regs); 273 274 274 275 inhcall = get_and_clear_inhcall(); 275 276 if (inhcall && !WARN_ON_ONCE(state.exit_rcu)) { 276 - instrumentation_begin(); 277 277 irqentry_exit_cond_resched(); 278 278 instrumentation_end(); 279 279 restore_inhcall(inhcall); 280 280 } else { 281 + instrumentation_end(); 281 282 irqentry_exit(regs, state); 282 283 } 283 284 }