x86/entry: Fix instrumentation annotation

commit 15f720aabe71a5662c4198b22532d95bbeec80ef upstream.

Embracing a callout into instrumentation_begin() / instrumentation_begin()
does not really make sense. Make the latter instrumentation_end().

Fixes: 2f6474e4636b ("x86/entry: Switch XEN/PV hypercall entry to IDTENTRY")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Kees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210210002512.106502464@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index 0904f5676e4d8880562ad9d00532c12d2fb79b8c..f89ae8ada64fe347049e3bb5eda85b5357c65829 100644 (file)
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -270,7 +270,7 @@ __visible noinstr void xen_pv_evtchn_do_upcall(struct pt_regs *regs)
 
        instrumentation_begin();
        run_on_irqstack_cond(__xen_pv_evtchn_do_upcall, regs);
-       instrumentation_begin();
+       instrumentation_end();
 
        set_irq_regs(old_regs);