diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2021-06-21 13:12:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-06-22 13:56:42 +0200 |
| commit | 84e60065df9ef03759115a7e48c04bbc0d292165 (patch) | |
| tree | cd95ee4a9c76577a954d5317742d092da0a66f86 | |
| parent | x86/entry: Fix noinstr fail in __do_fast_syscall_32() (diff) | |
| download | linux-84e60065df9ef03759115a7e48c04bbc0d292165.tar.xz linux-84e60065df9ef03759115a7e48c04bbc0d292165.zip | |
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
| -rw-r--r-- | arch/x86/entry/common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c index a6bf516257ec..04bce95bc7e3 100644 --- a/arch/x86/entry/common.c +++ b/arch/x86/entry/common.c @@ -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); } } |