|
@@ -2703,6 +2703,12 @@ static struct rq *finish_task_switch(struct task_struct *prev)
|
|
finish_arch_post_lock_switch();
|
|
finish_arch_post_lock_switch();
|
|
|
|
|
|
fire_sched_in_preempt_notifiers(current);
|
|
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)
|
|
if (mm)
|
|
mmdrop(mm);
|
|
mmdrop(mm);
|
|
if (unlikely(prev_state == TASK_DEAD)) {
|
|
if (unlikely(prev_state == TASK_DEAD)) {
|
|
@@ -2808,6 +2814,13 @@ context_switch(struct rq *rq, struct task_struct *prev,
|
|
*/
|
|
*/
|
|
arch_start_context_switch(prev);
|
|
arch_start_context_switch(prev);
|
|
|
|
|
|
|
|
+ /*
|
|
|
|
+ * If mm is non-NULL, we pass through switch_mm(). If mm is
|
|
|
|
+ * NULL, we will pass through mmdrop() in finish_task_switch().
|
|
|
|
+ * Both of these contain the full memory barrier required by
|
|
|
|
+ * membarrier after storing to rq->curr, before returning to
|
|
|
|
+ * user-space.
|
|
|
|
+ */
|
|
if (!mm) {
|
|
if (!mm) {
|
|
next->active_mm = oldmm;
|
|
next->active_mm = oldmm;
|
|
mmgrab(oldmm);
|
|
mmgrab(oldmm);
|
|
@@ -3344,6 +3357,9 @@ static void __sched notrace __schedule(bool preempt)
|
|
* Make sure that signal_pending_state()->signal_pending() below
|
|
* Make sure that signal_pending_state()->signal_pending() below
|
|
* can't be reordered with __set_current_state(TASK_INTERRUPTIBLE)
|
|
* can't be reordered with __set_current_state(TASK_INTERRUPTIBLE)
|
|
* done by the caller to avoid the race with signal_wake_up().
|
|
* 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);
|
|
rq_lock(rq, &rf);
|
|
smp_mb__after_spinlock();
|
|
smp_mb__after_spinlock();
|
|
@@ -3391,17 +3407,16 @@ static void __sched notrace __schedule(bool preempt)
|
|
/*
|
|
/*
|
|
* The membarrier system call requires each architecture
|
|
* The membarrier system call requires each architecture
|
|
* to have a full memory barrier after updating
|
|
* to have a full memory barrier after updating
|
|
- * rq->curr, before returning to user-space. For TSO
|
|
|
|
- * (e.g. x86), the architecture must provide its own
|
|
|
|
- * barrier in switch_mm(). For weakly ordered machines
|
|
|
|
- * for which spin_unlock() acts as a full memory
|
|
|
|
- * barrier, finish_lock_switch() in common code takes
|
|
|
|
- * care of this barrier. For weakly ordered machines for
|
|
|
|
- * which spin_unlock() acts as a RELEASE barrier (only
|
|
|
|
- * arm64 and PowerPC), arm64 has a full barrier in
|
|
|
|
- * switch_to(), and PowerPC has
|
|
|
|
- * smp_mb__after_unlock_lock() before
|
|
|
|
- * finish_lock_switch().
|
|
|
|
|
|
+ * rq->curr, before returning to user-space.
|
|
|
|
+ *
|
|
|
|
+ * Here are the schemes providing that barrier on the
|
|
|
|
+ * various architectures:
|
|
|
|
+ * - mm ? switch_mm() : mmdrop() for x86, s390, sparc, PowerPC.
|
|
|
|
+ * switch_mm() rely on membarrier_arch_switch_mm() on PowerPC.
|
|
|
|
+ * - finish_lock_switch() for weakly-ordered
|
|
|
|
+ * architectures where spin_unlock is a full barrier,
|
|
|
|
+ * - switch_to() for arm64 (weakly-ordered, spin_unlock
|
|
|
|
+ * is a RELEASE barrier),
|
|
*/
|
|
*/
|
|
++*switch_count;
|
|
++*switch_count;
|
|
|
|
|