Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0430499c authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

x86: Use the new schedule_user API on userspace preemption 



This way we can exit the RCU extended quiescent state before
we schedule a new task from irq/exception exit.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Alessio Igor Bogani <abogani@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Avi Kivity <avi@redhat.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Geoff Levand <geoff@infradead.org>
Cc: Gilad Ben Yossef <gilad@benyossef.com>
Cc: Hakan Akkan <hakanakkan@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Max Krasnyansky <maxk@qualcomm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Sven-Thorsten Dietrich <thebigcorporation@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent 20ab65e3

arch/x86/include/asm/rcu.h

+12 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_RCU_H

#define _ASM_X86_RCU_H



#ifndef __ASSEMBLY__



#include <linux/rcupdate.h>

#include <asm/ptrace.h>
@@ -17,4 +19,14 @@ static inline void exception_exit(struct pt_regs *regs) 
#endif

}



#else /* __ASSEMBLY__ */



#ifdef CONFIG_RCU_USER_QS

# define SCHEDULE_USER call schedule_user

#else

# define SCHEDULE_USER call schedule

#endif



#endif /* !__ASSEMBLY__ */



#endif

arch/x86/kernel/entry_64.S

+5 −4
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include <asm/ftrace.h>

#include <asm/percpu.h>

#include <asm/asm.h>

#include <asm/rcu.h>

#include <linux/err.h>



/* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */
@@ -565,7 +566,7 @@ sysret_careful: 
	TRACE_IRQS_ON

	ENABLE_INTERRUPTS(CLBR_NONE)

	pushq_cfi %rdi

	call schedule

	SCHEDULE_USER

	popq_cfi %rdi

	jmp sysret_check
@@ -678,7 +679,7 @@ int_careful: 
	TRACE_IRQS_ON

	ENABLE_INTERRUPTS(CLBR_NONE)

	pushq_cfi %rdi

	call schedule

	SCHEDULE_USER

	popq_cfi %rdi

	DISABLE_INTERRUPTS(CLBR_NONE)

	TRACE_IRQS_OFF
@@ -974,7 +975,7 @@ retint_careful: 
	TRACE_IRQS_ON

	ENABLE_INTERRUPTS(CLBR_NONE)

	pushq_cfi %rdi

	call  schedule

	SCHEDULE_USER

	popq_cfi %rdi

	GET_THREAD_INFO(%rcx)

	DISABLE_INTERRUPTS(CLBR_NONE)
@@ -1449,7 +1450,7 @@ paranoid_userspace: 
paranoid_schedule:

	TRACE_IRQS_ON

	ENABLE_INTERRUPTS(CLBR_ANY)

	call schedule

	SCHEDULE_USER

	DISABLE_INTERRUPTS(CLBR_ANY)

	TRACE_IRQS_OFF

	jmp paranoid_userspace