Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/entry: Avoid interrupt flag save and restore

Thanks to all the work that was done by Andy Lutomirski and others,
enter_from_user_mode() and prepare_exit_to_usermode() are now called only with
interrupts disabled. Let's provide them a version of user_enter()/user_exit()
that skips saving and restoring the interrupt flag.

On an AMD-based machine I tested this patch on, with force-enabled
context tracking, the speed-up in system calls was 90 clock cycles or 6%,
measured with the following simple benchmark:

#include <sys/signal.h>
#include <time.h>
#include <unistd.h>
#include <stdio.h>

unsigned long rdtsc()
{
unsigned long result;
asm volatile("rdtsc; shl $32, %%rdx; mov %%eax, %%eax\n"
"or %%rdx, %%rax" : "=a" (result) : : "rdx");
return result;
}

int main()
{
unsigned long tsc1, tsc2;
int pid = getpid();
int i;

tsc1 = rdtsc();
for (i = 0; i < 100000000; i++)
kill(pid, SIGWINCH);
tsc2 = rdtsc();

printf("%ld\n", tsc2 - tsc1);
}

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Rik van Riel <riel@redhat.com>
Reviewed-by: Andy Lutomirski <luto@kernel.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: kvm@vger.kernel.org
Link: http://lkml.kernel.org/r/1466434712-31440-2-git-send-email-pbonzini@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Paolo Bonzini and committed by
Ingo Molnar
2e9d1e15 52e31f89

+17 -2
+2 -2
arch/x86/entry/common.c
··· 43 43 __visible void enter_from_user_mode(void) 44 44 { 45 45 CT_WARN_ON(ct_state() != CONTEXT_USER); 46 - user_exit(); 46 + user_exit_irqoff(); 47 47 } 48 48 #else 49 49 static inline void enter_from_user_mode(void) {} ··· 274 274 ti->status &= ~TS_COMPAT; 275 275 #endif 276 276 277 - user_enter(); 277 + user_enter_irqoff(); 278 278 } 279 279 280 280 #define SYSCALL_EXIT_WORK_FLAGS \
+15
include/linux/context_tracking.h
··· 31 31 context_tracking_exit(CONTEXT_USER); 32 32 } 33 33 34 + /* Called with interrupts disabled. */ 35 + static inline void user_enter_irqoff(void) 36 + { 37 + if (context_tracking_is_enabled()) 38 + __context_tracking_enter(CONTEXT_USER); 39 + 40 + } 41 + static inline void user_exit_irqoff(void) 42 + { 43 + if (context_tracking_is_enabled()) 44 + __context_tracking_exit(CONTEXT_USER); 45 + } 46 + 34 47 static inline enum ctx_state exception_enter(void) 35 48 { 36 49 enum ctx_state prev_ctx; ··· 82 69 #else 83 70 static inline void user_enter(void) { } 84 71 static inline void user_exit(void) { } 72 + static inline void user_enter_irqoff(void) { } 73 + static inline void user_exit_irqoff(void) { } 85 74 static inline enum ctx_state exception_enter(void) { return 0; } 86 75 static inline void exception_exit(enum ctx_state prev_ctx) { } 87 76 static inline enum ctx_state ct_state(void) { return CONTEXT_DISABLED; }