linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] membarrier: Document scheduler barrier requirements
@ 2017-08-19  4:39 Mathieu Desnoyers
  2017-08-20  5:05 ` Paul E. McKenney
  2017-08-21  8:42 ` Peter Zijlstra
  0 siblings, 2 replies; 7+ messages in thread
From: Mathieu Desnoyers @ 2017-08-19  4:39 UTC (permalink / raw)
  To: Paul E . McKenney
  Cc: linux-kernel, Mathieu Desnoyers, Peter Zijlstra, Boqun Feng,
	Andrew Hunter, Maged Michael, gromer, Avi Kivity,
	Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
	Dave Watson

Document the membarrier requirement on having a full memory barrier in
__schedule() after coming from user-space, before storing to rq->curr.
It is provided by smp_mb__before_spinlock() in __schedule().

Document that membarrier requires a full barrier on transition from
kernel thread to userspace thread, which skips the call to switch_mm(). We
currently have an implicit barrier from atomic_dec_and_test() in mmdrop() that
ensures this.

The x86 switch_mm_irqs_off() full barrier is currently provided by many cpumask
update operations as well as load_cr3(). Document that load_cr3() is providing
this barrier.

[ Rebased on top of linux-rcu for-mingo branch.
  Applies on top of "membarrier: Provide expedited private command". ]

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
CC: Peter Zijlstra <peterz@infradead.org>
CC: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
CC: Boqun Feng <boqun.feng@gmail.com>
CC: Andrew Hunter <ahh@google.com>
CC: Maged Michael <maged.michael@gmail.com>
CC: gromer@google.com
CC: Avi Kivity <avi@scylladb.com>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Paul Mackerras <paulus@samba.org>
CC: Michael Ellerman <mpe@ellerman.id.au>
CC: Dave Watson <davejwatson@fb.com>
---
 arch/x86/mm/tlb.c        | 3 +++
 include/linux/sched/mm.h | 4 ++++
 kernel/sched/core.c      | 9 +++++++++
 3 files changed, 16 insertions(+)

diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index 014d07a..cd815b6 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -133,6 +133,9 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
 	 * and neither LOCK nor MFENCE orders them.
 	 * Fortunately, load_cr3() is serializing and gives the
 	 * ordering guarantee we need.
+	 *
+	 * This full barrier is also required by the membarrier
+	 * system call.
 	 */
 	load_cr3(next->pgd);
 
diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h
index 2b24a69..fe29d06 100644
--- a/include/linux/sched/mm.h
+++ b/include/linux/sched/mm.h
@@ -38,6 +38,10 @@ static inline void mmgrab(struct mm_struct *mm)
 extern void __mmdrop(struct mm_struct *);
 static inline void mmdrop(struct mm_struct *mm)
 {
+	/*
+	 * The implicit full barrier implied by atomic_dec_and_test is
+	 * required by the membarrier system call.
+	 */
 	if (unlikely(atomic_dec_and_test(&mm->mm_count)))
 		__mmdrop(mm);
 }
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 3f29c6a..b0f199f 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2654,6 +2654,12 @@ static struct rq *finish_task_switch(struct task_struct *prev)
 	finish_arch_post_lock_switch();
 
 	fire_sched_in_preempt_notifiers(current);
+	/*
+	 * When transitioning from a kernel thread to a userspace
+	 * thread, mmdrop()'s implicit full barrier is required by the
+	 * membarrier system call, because the current active_mm can
+	 * become the current mm without going through switch_mm().
+	 */
 	if (mm)
 		mmdrop(mm);
 	if (unlikely(prev_state == TASK_DEAD)) {
@@ -3295,6 +3301,9 @@ static void __sched notrace __schedule(bool preempt)
 	 * Make sure that signal_pending_state()->signal_pending() below
 	 * can't be reordered with __set_current_state(TASK_INTERRUPTIBLE)
 	 * done by the caller to avoid the race with signal_wake_up().
+	 *
+	 * The membarrier system call requires a full memory barrier
+	 * after coming from user-space, before storing to rq->curr.
 	 */
 	smp_mb__before_spinlock();
 	rq_lock(rq, &rf);
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH v2] membarrier: Document scheduler barrier requirements
  2017-08-19  4:39 Mathieu Desnoyers
@ 2017-08-20  5:05 ` Paul E. McKenney
  2017-08-21  8:42 ` Peter Zijlstra
  1 sibling, 0 replies; 7+ messages in thread
From: Paul E. McKenney @ 2017-08-20  5:05 UTC (permalink / raw)
  To: Mathieu Desnoyers
  Cc: linux-kernel, Peter Zijlstra, Boqun Feng, Andrew Hunter,
	Maged Michael, gromer, Avi Kivity, Benjamin Herrenschmidt,
	Paul Mackerras, Michael Ellerman, Dave Watson

On Fri, Aug 18, 2017 at 09:39:16PM -0700, Mathieu Desnoyers wrote:
> Document the membarrier requirement on having a full memory barrier in
> __schedule() after coming from user-space, before storing to rq->curr.
> It is provided by smp_mb__before_spinlock() in __schedule().
> 
> Document that membarrier requires a full barrier on transition from
> kernel thread to userspace thread, which skips the call to switch_mm(). We
> currently have an implicit barrier from atomic_dec_and_test() in mmdrop() that
> ensures this.
> 
> The x86 switch_mm_irqs_off() full barrier is currently provided by many cpumask
> update operations as well as load_cr3(). Document that load_cr3() is providing
> this barrier.
> 
> [ Rebased on top of linux-rcu for-mingo branch.
>   Applies on top of "membarrier: Provide expedited private command". ]

I have queued this for review and testing, thank you!

							Thanx, Paul

> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
> CC: Peter Zijlstra <peterz@infradead.org>
> CC: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> CC: Boqun Feng <boqun.feng@gmail.com>
> CC: Andrew Hunter <ahh@google.com>
> CC: Maged Michael <maged.michael@gmail.com>
> CC: gromer@google.com
> CC: Avi Kivity <avi@scylladb.com>
> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> CC: Paul Mackerras <paulus@samba.org>
> CC: Michael Ellerman <mpe@ellerman.id.au>
> CC: Dave Watson <davejwatson@fb.com>
> ---
>  arch/x86/mm/tlb.c        | 3 +++
>  include/linux/sched/mm.h | 4 ++++
>  kernel/sched/core.c      | 9 +++++++++
>  3 files changed, 16 insertions(+)
> 
> diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
> index 014d07a..cd815b6 100644
> --- a/arch/x86/mm/tlb.c
> +++ b/arch/x86/mm/tlb.c
> @@ -133,6 +133,9 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
>  	 * and neither LOCK nor MFENCE orders them.
>  	 * Fortunately, load_cr3() is serializing and gives the
>  	 * ordering guarantee we need.
> +	 *
> +	 * This full barrier is also required by the membarrier
> +	 * system call.
>  	 */
>  	load_cr3(next->pgd);
> 
> diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h
> index 2b24a69..fe29d06 100644
> --- a/include/linux/sched/mm.h
> +++ b/include/linux/sched/mm.h
> @@ -38,6 +38,10 @@ static inline void mmgrab(struct mm_struct *mm)
>  extern void __mmdrop(struct mm_struct *);
>  static inline void mmdrop(struct mm_struct *mm)
>  {
> +	/*
> +	 * The implicit full barrier implied by atomic_dec_and_test is
> +	 * required by the membarrier system call.
> +	 */
>  	if (unlikely(atomic_dec_and_test(&mm->mm_count)))
>  		__mmdrop(mm);
>  }
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index 3f29c6a..b0f199f 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -2654,6 +2654,12 @@ static struct rq *finish_task_switch(struct task_struct *prev)
>  	finish_arch_post_lock_switch();
> 
>  	fire_sched_in_preempt_notifiers(current);
> +	/*
> +	 * When transitioning from a kernel thread to a userspace
> +	 * thread, mmdrop()'s implicit full barrier is required by the
> +	 * membarrier system call, because the current active_mm can
> +	 * become the current mm without going through switch_mm().
> +	 */
>  	if (mm)
>  		mmdrop(mm);
>  	if (unlikely(prev_state == TASK_DEAD)) {
> @@ -3295,6 +3301,9 @@ static void __sched notrace __schedule(bool preempt)
>  	 * Make sure that signal_pending_state()->signal_pending() below
>  	 * can't be reordered with __set_current_state(TASK_INTERRUPTIBLE)
>  	 * done by the caller to avoid the race with signal_wake_up().
> +	 *
> +	 * The membarrier system call requires a full memory barrier
> +	 * after coming from user-space, before storing to rq->curr.
>  	 */
>  	smp_mb__before_spinlock();
>  	rq_lock(rq, &rf);
> -- 
> 1.9.1
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2] membarrier: Document scheduler barrier requirements
  2017-08-19  4:39 Mathieu Desnoyers
  2017-08-20  5:05 ` Paul E. McKenney
@ 2017-08-21  8:42 ` Peter Zijlstra
  2017-08-22  6:20   ` Paul E. McKenney
  1 sibling, 1 reply; 7+ messages in thread
From: Peter Zijlstra @ 2017-08-21  8:42 UTC (permalink / raw)
  To: Mathieu Desnoyers
  Cc: Paul E . McKenney, linux-kernel, Boqun Feng, Andrew Hunter,
	Maged Michael, gromer, Avi Kivity, Benjamin Herrenschmidt,
	Paul Mackerras, Michael Ellerman, Dave Watson

On Fri, Aug 18, 2017 at 09:39:16PM -0700, Mathieu Desnoyers wrote:
> @@ -3295,6 +3301,9 @@ static void __sched notrace __schedule(bool preempt)
>  	 * Make sure that signal_pending_state()->signal_pending() below
>  	 * can't be reordered with __set_current_state(TASK_INTERRUPTIBLE)
>  	 * done by the caller to avoid the race with signal_wake_up().
> +	 *
> +	 * The membarrier system call requires a full memory barrier
> +	 * after coming from user-space, before storing to rq->curr.
>  	 */
>  	smp_mb__before_spinlock();
>  	rq_lock(rq, &rf);


Merge conflict here, current tip is over to smp_mb__after_spinlock().

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2] membarrier: Document scheduler barrier requirements
  2017-08-21  8:42 ` Peter Zijlstra
@ 2017-08-22  6:20   ` Paul E. McKenney
  0 siblings, 0 replies; 7+ messages in thread
From: Paul E. McKenney @ 2017-08-22  6:20 UTC (permalink / raw)
  To: Peter Zijlstra
  Cc: Mathieu Desnoyers, linux-kernel, Boqun Feng, Andrew Hunter,
	Maged Michael, gromer, Avi Kivity, Benjamin Herrenschmidt,
	Paul Mackerras, Michael Ellerman, Dave Watson

On Mon, Aug 21, 2017 at 10:42:36AM +0200, Peter Zijlstra wrote:
> On Fri, Aug 18, 2017 at 09:39:16PM -0700, Mathieu Desnoyers wrote:
> > @@ -3295,6 +3301,9 @@ static void __sched notrace __schedule(bool preempt)
> >  	 * Make sure that signal_pending_state()->signal_pending() below
> >  	 * can't be reordered with __set_current_state(TASK_INTERRUPTIBLE)
> >  	 * done by the caller to avoid the race with signal_wake_up().
> > +	 *
> > +	 * The membarrier system call requires a full memory barrier
> > +	 * after coming from user-space, before storing to rq->curr.
> >  	 */
> >  	smp_mb__before_spinlock();
> >  	rq_lock(rq, &rf);
> 
> Merge conflict here, current tip is over to smp_mb__after_spinlock().

Would some tree other than -rcu be better for that commit?

							Thanx, Paul

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v2] membarrier: Document scheduler barrier requirements
@ 2017-09-19 19:56 Mathieu Desnoyers
  2017-09-19 21:47 ` Andrea Parri
  0 siblings, 1 reply; 7+ messages in thread
From: Mathieu Desnoyers @ 2017-09-19 19:56 UTC (permalink / raw)
  To: Paul E . McKenney
  Cc: linux-kernel, Mathieu Desnoyers, Peter Zijlstra, Boqun Feng,
	Andrew Hunter, Maged Michael, gromer, Avi Kivity,
	Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
	Dave Watson

Document the membarrier requirement on having a full memory barrier in
__schedule() after coming from user-space, before storing to rq->curr.
It is provided by smp_mb__before_spinlock() in __schedule().

Document that membarrier requires a full barrier on transition from
kernel thread to userspace thread. We currently have an implicit barrier
from atomic_dec_and_test() in mmdrop() that ensures this.

The x86 switch_mm_irqs_off() full barrier is currently provided by many
cpumask update operations as well as write_cr3(). Document that
write_cr3() provides this barrier.

Changes since v1:
- Update comments to match reality for code paths which are after
  storing to rq->curr, before returning to user-space.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
CC: Peter Zijlstra <peterz@infradead.org>
CC: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
CC: Boqun Feng <boqun.feng@gmail.com>
CC: Andrew Hunter <ahh@google.com>
CC: Maged Michael <maged.michael@gmail.com>
CC: gromer@google.com
CC: Avi Kivity <avi@scylladb.com>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Paul Mackerras <paulus@samba.org>
CC: Michael Ellerman <mpe@ellerman.id.au>
CC: Dave Watson <davejwatson@fb.com>
---
 arch/x86/mm/tlb.c        | 5 +++++
 include/linux/sched/mm.h | 5 +++++
 kernel/sched/core.c      | 9 +++++++++
 3 files changed, 19 insertions(+)

diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index 1ab3821f9e26..74f94fe4aded 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -144,6 +144,11 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
 	}
 #endif
 
+	/*
+	 * The membarrier system call requires a full memory barrier
+	 * before returning to user-space, after storing to rq->curr.
+	 * Writing to CR3 provides that full memory barrier.
+	 */
 	if (real_prev == next) {
 		VM_BUG_ON(this_cpu_read(cpu_tlbstate.ctxs[prev_asid].ctx_id) !=
 			  next->context.ctx_id);
diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h
index 3a19c253bdb1..766cc47c4d7c 100644
--- a/include/linux/sched/mm.h
+++ b/include/linux/sched/mm.h
@@ -38,6 +38,11 @@ static inline void mmgrab(struct mm_struct *mm)
 extern void __mmdrop(struct mm_struct *);
 static inline void mmdrop(struct mm_struct *mm)
 {
+	/*
+	 * The implicit full barrier implied by atomic_dec_and_test is
+	 * required by the membarrier system call before returning to
+	 * user-space, after storing to rq->curr.
+	 */
 	if (unlikely(atomic_dec_and_test(&mm->mm_count)))
 		__mmdrop(mm);
 }
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 18a6966567da..7977b25acf54 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2658,6 +2658,12 @@ static struct rq *finish_task_switch(struct task_struct *prev)
 	finish_arch_post_lock_switch();
 
 	fire_sched_in_preempt_notifiers(current);
+	/*
+	 * When transitioning from a kernel thread to a userspace
+	 * thread, mmdrop()'s implicit full barrier is required by the
+	 * membarrier system call, because the current active_mm can
+	 * become the current mm without going through switch_mm().
+	 */
 	if (mm)
 		mmdrop(mm);
 	if (unlikely(prev_state == TASK_DEAD)) {
@@ -3299,6 +3305,9 @@ static void __sched notrace __schedule(bool preempt)
 	 * Make sure that signal_pending_state()->signal_pending() below
 	 * can't be reordered with __set_current_state(TASK_INTERRUPTIBLE)
 	 * done by the caller to avoid the race with signal_wake_up().
+	 *
+	 * The membarrier system call requires a full memory barrier
+	 * after coming from user-space, before storing to rq->curr.
 	 */
 	rq_lock(rq, &rf);
 	smp_mb__after_spinlock();
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH v2] membarrier: Document scheduler barrier requirements
  2017-09-19 19:56 [PATCH v2] membarrier: Document scheduler barrier requirements Mathieu Desnoyers
@ 2017-09-19 21:47 ` Andrea Parri
  2017-09-19 22:02   ` Mathieu Desnoyers
  0 siblings, 1 reply; 7+ messages in thread
From: Andrea Parri @ 2017-09-19 21:47 UTC (permalink / raw)
  To: Mathieu Desnoyers
  Cc: Paul E . McKenney, linux-kernel, Peter Zijlstra, Boqun Feng,
	Andrew Hunter, Maged Michael, gromer, Avi Kivity,
	Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
	Dave Watson

On Tue, Sep 19, 2017 at 03:56:31PM -0400, Mathieu Desnoyers wrote:
> Document the membarrier requirement on having a full memory barrier in
> __schedule() after coming from user-space, before storing to rq->curr.
> It is provided by smp_mb__before_spinlock() in __schedule().

It is smp_mb__after_spinlock(). (Yes: I missed it in my previous email.)

  Andrea


> 
> Document that membarrier requires a full barrier on transition from
> kernel thread to userspace thread. We currently have an implicit barrier
> from atomic_dec_and_test() in mmdrop() that ensures this.
> 
> The x86 switch_mm_irqs_off() full barrier is currently provided by many
> cpumask update operations as well as write_cr3(). Document that
> write_cr3() provides this barrier.
> 
> Changes since v1:
> - Update comments to match reality for code paths which are after
>   storing to rq->curr, before returning to user-space.
> 
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
> CC: Peter Zijlstra <peterz@infradead.org>
> CC: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> CC: Boqun Feng <boqun.feng@gmail.com>
> CC: Andrew Hunter <ahh@google.com>
> CC: Maged Michael <maged.michael@gmail.com>
> CC: gromer@google.com
> CC: Avi Kivity <avi@scylladb.com>
> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> CC: Paul Mackerras <paulus@samba.org>
> CC: Michael Ellerman <mpe@ellerman.id.au>
> CC: Dave Watson <davejwatson@fb.com>
> ---
>  arch/x86/mm/tlb.c        | 5 +++++
>  include/linux/sched/mm.h | 5 +++++
>  kernel/sched/core.c      | 9 +++++++++
>  3 files changed, 19 insertions(+)
> 
> diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
> index 1ab3821f9e26..74f94fe4aded 100644
> --- a/arch/x86/mm/tlb.c
> +++ b/arch/x86/mm/tlb.c
> @@ -144,6 +144,11 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
>  	}
>  #endif
>  
> +	/*
> +	 * The membarrier system call requires a full memory barrier
> +	 * before returning to user-space, after storing to rq->curr.
> +	 * Writing to CR3 provides that full memory barrier.
> +	 */
>  	if (real_prev == next) {
>  		VM_BUG_ON(this_cpu_read(cpu_tlbstate.ctxs[prev_asid].ctx_id) !=
>  			  next->context.ctx_id);
> diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h
> index 3a19c253bdb1..766cc47c4d7c 100644
> --- a/include/linux/sched/mm.h
> +++ b/include/linux/sched/mm.h
> @@ -38,6 +38,11 @@ static inline void mmgrab(struct mm_struct *mm)
>  extern void __mmdrop(struct mm_struct *);
>  static inline void mmdrop(struct mm_struct *mm)
>  {
> +	/*
> +	 * The implicit full barrier implied by atomic_dec_and_test is
> +	 * required by the membarrier system call before returning to
> +	 * user-space, after storing to rq->curr.
> +	 */
>  	if (unlikely(atomic_dec_and_test(&mm->mm_count)))
>  		__mmdrop(mm);
>  }
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index 18a6966567da..7977b25acf54 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -2658,6 +2658,12 @@ static struct rq *finish_task_switch(struct task_struct *prev)
>  	finish_arch_post_lock_switch();
>  
>  	fire_sched_in_preempt_notifiers(current);
> +	/*
> +	 * When transitioning from a kernel thread to a userspace
> +	 * thread, mmdrop()'s implicit full barrier is required by the
> +	 * membarrier system call, because the current active_mm can
> +	 * become the current mm without going through switch_mm().
> +	 */
>  	if (mm)
>  		mmdrop(mm);
>  	if (unlikely(prev_state == TASK_DEAD)) {
> @@ -3299,6 +3305,9 @@ static void __sched notrace __schedule(bool preempt)
>  	 * Make sure that signal_pending_state()->signal_pending() below
>  	 * can't be reordered with __set_current_state(TASK_INTERRUPTIBLE)
>  	 * done by the caller to avoid the race with signal_wake_up().
> +	 *
> +	 * The membarrier system call requires a full memory barrier
> +	 * after coming from user-space, before storing to rq->curr.
>  	 */
>  	rq_lock(rq, &rf);
>  	smp_mb__after_spinlock();
> -- 
> 2.11.0
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2] membarrier: Document scheduler barrier requirements
  2017-09-19 21:47 ` Andrea Parri
@ 2017-09-19 22:02   ` Mathieu Desnoyers
  0 siblings, 0 replies; 7+ messages in thread
From: Mathieu Desnoyers @ 2017-09-19 22:02 UTC (permalink / raw)
  To: Andrea Parri
  Cc: Paul E. McKenney, linux-kernel, Peter Zijlstra, Boqun Feng,
	Andrew Hunter, maged michael, gromer, Avi Kivity,
	Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
	Dave Watson

----- On Sep 19, 2017, at 5:47 PM, Andrea Parri parri.andrea@gmail.com wrote:

> On Tue, Sep 19, 2017 at 03:56:31PM -0400, Mathieu Desnoyers wrote:
>> Document the membarrier requirement on having a full memory barrier in
>> __schedule() after coming from user-space, before storing to rq->curr.
>> It is provided by smp_mb__before_spinlock() in __schedule().
> 
> It is smp_mb__after_spinlock(). (Yes: I missed it in my previous email.)

OK. Will send a v3 fixing the changelog.

Thanks,

Mathieu

> 
>  Andrea
> 
> 
>> 
>> Document that membarrier requires a full barrier on transition from
>> kernel thread to userspace thread. We currently have an implicit barrier
>> from atomic_dec_and_test() in mmdrop() that ensures this.
>> 
>> The x86 switch_mm_irqs_off() full barrier is currently provided by many
>> cpumask update operations as well as write_cr3(). Document that
>> write_cr3() provides this barrier.
>> 
>> Changes since v1:
>> - Update comments to match reality for code paths which are after
>>   storing to rq->curr, before returning to user-space.
>> 
>> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
>> CC: Peter Zijlstra <peterz@infradead.org>
>> CC: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
>> CC: Boqun Feng <boqun.feng@gmail.com>
>> CC: Andrew Hunter <ahh@google.com>
>> CC: Maged Michael <maged.michael@gmail.com>
>> CC: gromer@google.com
>> CC: Avi Kivity <avi@scylladb.com>
>> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
>> CC: Paul Mackerras <paulus@samba.org>
>> CC: Michael Ellerman <mpe@ellerman.id.au>
>> CC: Dave Watson <davejwatson@fb.com>
>> ---
>>  arch/x86/mm/tlb.c        | 5 +++++
>>  include/linux/sched/mm.h | 5 +++++
>>  kernel/sched/core.c      | 9 +++++++++
>>  3 files changed, 19 insertions(+)
>> 
>> diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
>> index 1ab3821f9e26..74f94fe4aded 100644
>> --- a/arch/x86/mm/tlb.c
>> +++ b/arch/x86/mm/tlb.c
>> @@ -144,6 +144,11 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct
>> mm_struct *next,
>>  	}
>>  #endif
>>  
>> +	/*
>> +	 * The membarrier system call requires a full memory barrier
>> +	 * before returning to user-space, after storing to rq->curr.
>> +	 * Writing to CR3 provides that full memory barrier.
>> +	 */
>>  	if (real_prev == next) {
>>  		VM_BUG_ON(this_cpu_read(cpu_tlbstate.ctxs[prev_asid].ctx_id) !=
>>  			  next->context.ctx_id);
>> diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h
>> index 3a19c253bdb1..766cc47c4d7c 100644
>> --- a/include/linux/sched/mm.h
>> +++ b/include/linux/sched/mm.h
>> @@ -38,6 +38,11 @@ static inline void mmgrab(struct mm_struct *mm)
>>  extern void __mmdrop(struct mm_struct *);
>>  static inline void mmdrop(struct mm_struct *mm)
>>  {
>> +	/*
>> +	 * The implicit full barrier implied by atomic_dec_and_test is
>> +	 * required by the membarrier system call before returning to
>> +	 * user-space, after storing to rq->curr.
>> +	 */
>>  	if (unlikely(atomic_dec_and_test(&mm->mm_count)))
>>  		__mmdrop(mm);
>>  }
>> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
>> index 18a6966567da..7977b25acf54 100644
>> --- a/kernel/sched/core.c
>> +++ b/kernel/sched/core.c
>> @@ -2658,6 +2658,12 @@ static struct rq *finish_task_switch(struct task_struct
>> *prev)
>>  	finish_arch_post_lock_switch();
>>  
>>  	fire_sched_in_preempt_notifiers(current);
>> +	/*
>> +	 * When transitioning from a kernel thread to a userspace
>> +	 * thread, mmdrop()'s implicit full barrier is required by the
>> +	 * membarrier system call, because the current active_mm can
>> +	 * become the current mm without going through switch_mm().
>> +	 */
>>  	if (mm)
>>  		mmdrop(mm);
>>  	if (unlikely(prev_state == TASK_DEAD)) {
>> @@ -3299,6 +3305,9 @@ static void __sched notrace __schedule(bool preempt)
>>  	 * Make sure that signal_pending_state()->signal_pending() below
>>  	 * can't be reordered with __set_current_state(TASK_INTERRUPTIBLE)
>>  	 * done by the caller to avoid the race with signal_wake_up().
>> +	 *
>> +	 * The membarrier system call requires a full memory barrier
>> +	 * after coming from user-space, before storing to rq->curr.
>>  	 */
>>  	rq_lock(rq, &rf);
>>  	smp_mb__after_spinlock();
>> --
>> 2.11.0

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2017-09-19 22:01 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-19 19:56 [PATCH v2] membarrier: Document scheduler barrier requirements Mathieu Desnoyers
2017-09-19 21:47 ` Andrea Parri
2017-09-19 22:02   ` Mathieu Desnoyers
  -- strict thread matches above, loose matches on Subject: below --
2017-08-19  4:39 Mathieu Desnoyers
2017-08-20  5:05 ` Paul E. McKenney
2017-08-21  8:42 ` Peter Zijlstra
2017-08-22  6:20   ` Paul E. McKenney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).