Commit a377ac1c authored by Thomas Gleixner's avatar Thomas Gleixner

x86/entry: Move user return notifier out of loop

Guests and user space share certain MSRs. KVM sets these MSRs to guest
values once and does not set them back to user space values on every VM
exit to spare the costly MSR operations.

User return notifiers ensure that these MSRs are set back to the correct
values before returning to user space in exit_to_usermode_loop().

There is no reason to evaluate the TIF flag indicating that user return
notifiers need to be invoked in the loop. The important point is that they
are invoked before returning to user space.

Move the invocation out of the loop into the section which does the last
preperatory steps before returning to user space. That section is not
preemptible and runs with interrupts disabled until the actual return.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20200722220520.159112003@linutronix.de
parent 0b085e68
...@@ -208,7 +208,7 @@ static long syscall_trace_enter(struct pt_regs *regs) ...@@ -208,7 +208,7 @@ static long syscall_trace_enter(struct pt_regs *regs)
#define EXIT_TO_USERMODE_LOOP_FLAGS \ #define EXIT_TO_USERMODE_LOOP_FLAGS \
(_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_UPROBE | \ (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
_TIF_NEED_RESCHED | _TIF_USER_RETURN_NOTIFY | _TIF_PATCH_PENDING) _TIF_NEED_RESCHED | _TIF_PATCH_PENDING)
static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags) static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)
{ {
...@@ -242,9 +242,6 @@ static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags) ...@@ -242,9 +242,6 @@ static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)
rseq_handle_notify_resume(NULL, regs); rseq_handle_notify_resume(NULL, regs);
} }
if (cached_flags & _TIF_USER_RETURN_NOTIFY)
fire_user_return_notifiers();
/* Disable IRQs and retry */ /* Disable IRQs and retry */
local_irq_disable(); local_irq_disable();
...@@ -273,6 +270,9 @@ static void __prepare_exit_to_usermode(struct pt_regs *regs) ...@@ -273,6 +270,9 @@ static void __prepare_exit_to_usermode(struct pt_regs *regs)
/* Reload ti->flags; we may have rescheduled above. */ /* Reload ti->flags; we may have rescheduled above. */
cached_flags = READ_ONCE(ti->flags); cached_flags = READ_ONCE(ti->flags);
if (cached_flags & _TIF_USER_RETURN_NOTIFY)
fire_user_return_notifiers();
if (unlikely(cached_flags & _TIF_IO_BITMAP)) if (unlikely(cached_flags & _TIF_IO_BITMAP))
tss_update_io_bitmap(); tss_update_io_bitmap();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment