From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 9 Feb 2021 23:40:42 +0000 (+0100)
Subject: x86/entry: Fix instrumentation annotation
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=15f720aabe71a5662c4198b22532d95bbeec80ef;p=linux.git

x86/entry: Fix instrumentation annotation

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
---

diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index 18d8f17f755c4..c4efffbe24dac 100644
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -266,7 +266,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);