From: Peter Zijlstra <peterz@infradead.org>
Date: Mon, 21 Jun 2021 11:12:34 +0000 (+0200)
Subject: x86/entry: Fix noinstr fail in __do_fast_syscall_32()
X-Git-Tag: v5.10.47~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb83c99cf675f3d48a343f8a17d0b953996660cb;p=thirdparty%2Fkernel%2Fstable.git

x86/entry: Fix noinstr fail in __do_fast_syscall_32()

[ Upstream commit 240001d4e3041832e8a2654adc3ccf1683132b92 ]

Fix:

  vmlinux.o: warning: objtool: __do_fast_syscall_32()+0xf5: call to trace_hardirqs_off() leaves .noinstr.text section

Fixes: 5d5675df792f ("x86/entry: Fix entry/exit mismatch on failed fast 32-bit syscalls")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210621120120.467898710@infradead.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index 2e4d91f3feea4..93a3122cd15ff 100644
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -127,8 +127,8 @@ static noinstr bool __do_fast_syscall_32(struct pt_regs *regs)
 		/* User code screwed up. */
 		regs->ax = -EFAULT;
 
-		instrumentation_end();
 		local_irq_disable();
+		instrumentation_end();
 		irqentry_exit_to_user_mode(regs);
 		return false;
 	}