mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
![Paolo Bonzini](/assets/img/avatar_default.png)
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>
144 lines
3.5 KiB
C
144 lines
3.5 KiB
C
#ifndef _LINUX_CONTEXT_TRACKING_H
|
|
#define _LINUX_CONTEXT_TRACKING_H
|
|
|
|
#include <linux/sched.h>
|
|
#include <linux/vtime.h>
|
|
#include <linux/context_tracking_state.h>
|
|
#include <asm/ptrace.h>
|
|
|
|
|
|
#ifdef CONFIG_CONTEXT_TRACKING
|
|
extern void context_tracking_cpu_set(int cpu);
|
|
|
|
/* Called with interrupts disabled. */
|
|
extern void __context_tracking_enter(enum ctx_state state);
|
|
extern void __context_tracking_exit(enum ctx_state state);
|
|
|
|
extern void context_tracking_enter(enum ctx_state state);
|
|
extern void context_tracking_exit(enum ctx_state state);
|
|
extern void context_tracking_user_enter(void);
|
|
extern void context_tracking_user_exit(void);
|
|
|
|
static inline void user_enter(void)
|
|
{
|
|
if (context_tracking_is_enabled())
|
|
context_tracking_enter(CONTEXT_USER);
|
|
|
|
}
|
|
static inline void user_exit(void)
|
|
{
|
|
if (context_tracking_is_enabled())
|
|
context_tracking_exit(CONTEXT_USER);
|
|
}
|
|
|
|
/* Called with interrupts disabled. */
|
|
static inline void user_enter_irqoff(void)
|
|
{
|
|
if (context_tracking_is_enabled())
|
|
__context_tracking_enter(CONTEXT_USER);
|
|
|
|
}
|
|
static inline void user_exit_irqoff(void)
|
|
{
|
|
if (context_tracking_is_enabled())
|
|
__context_tracking_exit(CONTEXT_USER);
|
|
}
|
|
|
|
static inline enum ctx_state exception_enter(void)
|
|
{
|
|
enum ctx_state prev_ctx;
|
|
|
|
if (!context_tracking_is_enabled())
|
|
return 0;
|
|
|
|
prev_ctx = this_cpu_read(context_tracking.state);
|
|
if (prev_ctx != CONTEXT_KERNEL)
|
|
context_tracking_exit(prev_ctx);
|
|
|
|
return prev_ctx;
|
|
}
|
|
|
|
static inline void exception_exit(enum ctx_state prev_ctx)
|
|
{
|
|
if (context_tracking_is_enabled()) {
|
|
if (prev_ctx != CONTEXT_KERNEL)
|
|
context_tracking_enter(prev_ctx);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
* ct_state() - return the current context tracking state if known
|
|
*
|
|
* Returns the current cpu's context tracking state if context tracking
|
|
* is enabled. If context tracking is disabled, returns
|
|
* CONTEXT_DISABLED. This should be used primarily for debugging.
|
|
*/
|
|
static inline enum ctx_state ct_state(void)
|
|
{
|
|
return context_tracking_is_enabled() ?
|
|
this_cpu_read(context_tracking.state) : CONTEXT_DISABLED;
|
|
}
|
|
#else
|
|
static inline void user_enter(void) { }
|
|
static inline void user_exit(void) { }
|
|
static inline void user_enter_irqoff(void) { }
|
|
static inline void user_exit_irqoff(void) { }
|
|
static inline enum ctx_state exception_enter(void) { return 0; }
|
|
static inline void exception_exit(enum ctx_state prev_ctx) { }
|
|
static inline enum ctx_state ct_state(void) { return CONTEXT_DISABLED; }
|
|
#endif /* !CONFIG_CONTEXT_TRACKING */
|
|
|
|
#define CT_WARN_ON(cond) WARN_ON(context_tracking_is_enabled() && (cond))
|
|
|
|
#ifdef CONFIG_CONTEXT_TRACKING_FORCE
|
|
extern void context_tracking_init(void);
|
|
#else
|
|
static inline void context_tracking_init(void) { }
|
|
#endif /* CONFIG_CONTEXT_TRACKING_FORCE */
|
|
|
|
|
|
#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
|
|
static inline void guest_enter(void)
|
|
{
|
|
if (vtime_accounting_cpu_enabled())
|
|
vtime_guest_enter(current);
|
|
else
|
|
current->flags |= PF_VCPU;
|
|
|
|
if (context_tracking_is_enabled())
|
|
__context_tracking_enter(CONTEXT_GUEST);
|
|
}
|
|
|
|
static inline void guest_exit(void)
|
|
{
|
|
if (context_tracking_is_enabled())
|
|
__context_tracking_exit(CONTEXT_GUEST);
|
|
|
|
if (vtime_accounting_cpu_enabled())
|
|
vtime_guest_exit(current);
|
|
else
|
|
current->flags &= ~PF_VCPU;
|
|
}
|
|
|
|
#else
|
|
static inline void guest_enter(void)
|
|
{
|
|
/*
|
|
* This is running in ioctl context so its safe
|
|
* to assume that it's the stime pending cputime
|
|
* to flush.
|
|
*/
|
|
vtime_account_system(current);
|
|
current->flags |= PF_VCPU;
|
|
}
|
|
|
|
static inline void guest_exit(void)
|
|
{
|
|
/* Flush the guest cputime we spent on the guest */
|
|
vtime_account_system(current);
|
|
current->flags &= ~PF_VCPU;
|
|
}
|
|
#endif /* CONFIG_VIRT_CPU_ACCOUNTING_GEN */
|
|
|
|
#endif
|