lkml.org 
[lkml]   [2020]   [Dec]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subjectx86/entry: Annotate noinstr escape in __do_fast_syscall_32()
Date
The recent change to unbreak the 32bit fast syscall introduced a new
noinstr escape. While harmless because state is already established at
this point it makes objtool complain.

Add the missing annotation and fix the 'case' typo in the comment while
at it.

Fixes: 4facb95b7ada ("x86/entry: Unbreak 32bit fast syscall")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/entry/common.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -130,8 +130,10 @@ static noinstr bool __do_fast_syscall_32
return false;
}

- /* The case truncates any ptrace induced syscall nr > 2^32 -1 */
+ instrumentation_begin();
+ /* The cast truncates any ptrace induced syscall nr > 2^32 -1 */
nr = (unsigned int)syscall_enter_from_user_mode_work(regs, nr);
+ instrumentation_end();

/* Now this is just like a normal syscall. */
do_syscall_32_irqs_on(regs, nr);
\
 
 \ /
  Last update: 2020-12-17 21:30    [W:0.036 / U:0.012 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site