Skip to contentSkip to conversation

x86/asm/entry/64: Minor cleanup of conditional compilation

PATCH NAK Nikolay Borisov 2 participants 2 messages Sep 5, 2015 – Sep 6, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 x86/asm/entry/64: Minor cleanup of conditional compilation

The entry_SYSCALL_64_fastpath was checking the value of __SYSCALL_MASK, which in turn was being set in arch/x86/include/asm/unistd.h depending on whether CONFIG_X86_X32_ABI was set or not. This made the intention a bit cryptic.

Juggle the code around so that the conditional compilation depends on the value of CONFIG_X86_X32_ABI

---

Sending v2 as I had forgotten to add my signed-off-by line.

 arch/x86/entry/entry_64.S | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/entry/entry_64.S +3 -3
index 8cb3e43..b0177f9 100644
@@ -175,11 +175,11 @@ GLOBAL(entry_SYSCALL_64_after_swapgs)
 	testl	$_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
 	jnz	tracesys
 entry_SYSCALL_64_fastpath:
-#if __SYSCALL_MASK == ~0
-	cmpq	$__NR_syscall_max, %rax
-#else
+#ifdef CONFIG_X86_X32_ABI
 	andl	$__SYSCALL_MASK, %eax
 	cmpl	$__NR_syscall_max, %eax
+#else
+	cmpq	$__NR_syscall_max, %rax
 #endif
 	ja	1f				/* return -ENOSYS (already in pt_regs->ax) */
 	movq	%r10, %rcx
Signature · 1 line
2.1.4
reviewer Nacked-by on v2 1/1 NAK
#1 lore raw
Quoted 4 lines · Nikolay Borisov

The entry_SYSCALL_64_fastpath was checking the value of __SYSCALL_MASK, which in turn was being set in arch/x86/include/asm/unistd.h depending on whether CONFIG_X86_X32_ABI was set or not. This made the intention a bit cryptic.

On the contrary: that instruction can be omitted if and only if the value of the mask is all 1's; it doesn't matter how the mask is set. So you just turned a local constraint into a global constraint. This is both unnecessarily confusing and opens the risk for bugs later.

If you feel the need, you could submit a patch to add a comment, but this version is: