x86/entry for v2.6.33
Subsystems (4)
Linus,
Please pull the latest x86-entry-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-entry-for-linus
This new user-return-facility facility we guest-maintained in the x86 tree hierarchy for the fine KVM folks, who are making use of it in the KVM devel tree. KVM uses it for an optimization to allow fast/lazy context switches to kernel-mode-only tasks without having to switch expensive user state.
out-of-topic modifications in x86-entry-for-linus:
--------------------------------------------------arch/Kconfig # 7c68af6: core, x86: Add user return notifi
include/linux/user-return-notifier.h# 8e7cac7: core: Fix user return notifier on
# 7c68af6: core, x86: Add user return notifi
kernel/Makefile # 7a04109: x86: Fix user return notifier buikernel/user-return-notifier.c # 1786bf0: core: Clean up user return notife
# 3c912b6: x86: Fix user return notifier put # 7c68af6: core, x86: Add user return notifi
Thanks,
Ingo
------------------>
Avi Kivity (4):
core, x86: Add user return notifiers
x86: Fix user return notifier build
core: Fix user return notifier on fork()
core: Clean up user return notifers use of per_cpu
Stephen Rothwell (1):
x86: Fix user return notifier put_cpu_var() invocation
arch/Kconfig | 10 +++++++ arch/x86/Kconfig | 1 + arch/x86/include/asm/thread_info.h | 7 +++- arch/x86/kernel/process.c | 2 + arch/x86/kernel/signal.c | 3 ++ include/linux/user-return-notifier.h | 49 ++++++++++++++++++++++++++++++++++ kernel/Makefile | 1 + kernel/fork.c | 2 + kernel/user-return-notifier.c | 44 ++++++++++++++++++++++++++++++ 9 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 include/linux/user-return-notifier.h create mode 100644 kernel/user-return-notifier.c
arch/Kconfig +10 -0
@@ -83,6 +83,13 @@ config KRETPROBES def_bool y depends on KPROBES && HAVE_KRETPROBES +config USER_RETURN_NOTIFIER + bool + depends on HAVE_USER_RETURN_NOTIFIER + help + Provide a kernel-internal notification when a cpu is about to + switch to user mode. + config HAVE_IOREMAP_PROT bool
@@ -126,4 +133,7 @@ config HAVE_DMA_API_DEBUG config HAVE_DEFAULT_NO_SPIN_MUTEXES bool +config HAVE_USER_RETURN_NOTIFIER + bool + source "kernel/gcov/Kconfig"
arch/x86/Kconfig +1 -0
@@ -50,6 +50,7 @@ config X86 select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_LZMA select HAVE_ARCH_KMEMCHECK + select HAVE_USER_RETURN_NOTIFIER config OUTPUT_FORMAT string
arch/x86/include/asm/thread_info.h +5 -2
@@ -83,6 +83,7 @@ struct thread_info {#define TIF_SYSCALL_AUDIT 7/* syscall auditing active */ #define TIF_SECCOMP 8/* secure computing */ #define TIF_MCE_NOTIFY 10/* notify userspace of an MCE */ +#define TIF_USER_RETURN_NOTIFY 11/* notify kernel of userspace return */ #define TIF_NOTSC 16/* TSC is not accessible in userland */ #define TIF_IA32 17/* 32bit process */ #define TIF_FORK 18/* ret_from_fork */
@@ -107,6 +108,7 @@ struct thread_info {#define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)#define _TIF_SECCOMP (1 << TIF_SECCOMP)#define _TIF_MCE_NOTIFY (1 << TIF_MCE_NOTIFY) +#define _TIF_USER_RETURN_NOTIFY (1 << TIF_USER_RETURN_NOTIFY)#define _TIF_NOTSC (1 << TIF_NOTSC)#define _TIF_IA32 (1 << TIF_IA32)#define _TIF_FORK (1 << TIF_FORK)
@@ -142,13 +144,14 @@ struct thread_info {/* Only used for 64 bit */ #define _TIF_DO_NOTIFY_MASK \ - (_TIF_SIGPENDING|_TIF_MCE_NOTIFY|_TIF_NOTIFY_RESUME) + (_TIF_SIGPENDING | _TIF_MCE_NOTIFY | _TIF_NOTIFY_RESUME | \ + _TIF_USER_RETURN_NOTIFY)/* flags to check in __switch_to() */ #define _TIF_WORK_CTXSW \ (_TIF_IO_BITMAP|_TIF_DEBUGCTLMSR|_TIF_DS_AREA_MSR|_TIF_NOTSC) -#define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW +#define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG)#define PREEMPT_ACTIVE 0x10000000
arch/x86/kernel/process.c +2 -0
@@ -9,6 +9,7 @@#include <linux/pm.h> #include <linux/clockchips.h> #include <linux/random.h> +#include <linux/user-return-notifier.h> #include <trace/events/power.h> #include <asm/system.h> #include <asm/apic.h>
@@ -224,6 +225,7 @@ void __switch_to_xtra(struct task_struct *prev_p, struct task_struct *next_p,*/ memset (tss->io_bitmap,0xff , prev->io_bitmap_max); } +propagate_user_return_notify (prev_p, next_p); }int sys_fork (struct pt_regs *regs)
arch/x86/kernel/signal.c +3 -0
@@ -19,6 +19,7 @@#include <linux/stddef.h> #include <linux/personality.h> #include <linux/uaccess.h> +#include <linux/user-return-notifier.h> #include <asm/processor.h> #include <asm/ucontext.h>
@@ -872,6 +873,8 @@ do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)if (current->replacement_session_keyring)key_replace_session_keyring (); } +if (thread_info_flags & _TIF_USER_RETURN_NOTIFY) +fire_user_return_notifiers ();#ifdef CONFIG_X86_32 clear_thread_flag (TIF_IRET );
include/linux/user-return-notifier.h new file +49 -0
49 lines not on this page · raw message
kernel/Makefile +1 -0
@@ -95,6 +95,7 @@ obj-$(CONFIG_RING_BUFFER) += trace/ obj-$(CONFIG_SMP) += sched_cpupri.o obj-$(CONFIG_SLOW_WORK) += slow-work.o obj-$(CONFIG_PERF_EVENTS) += perf_event.o +obj-$(CONFIG_USER_RETURN_NOTIFIER) += user-return-notifier.o ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y) # According to Alan Modra <[email protected]>, the -fno-omit-frame-pointer is
kernel/fork.c +2 -0
@@ -64,6 +64,7 @@#include <linux/magic.h> #include <linux/perf_event.h> #include <linux/posix-timers.h> +#include <linux/user-return-notifier.h> #include <asm/pgtable.h> #include <asm/pgalloc.h>
@@ -249,6 +250,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) goto out;setup_thread_stack (tsk, orig); +clear_user_return_notifier (tsk); stackend =end_of_stack (tsk); *stackend =STACK_END_MAGIC ;/* for overflow detection */
kernel/user-return-notifier.c new file +44 -0
44 lines not on this page · raw message