sched/mmcid: Protect transition on weakly ordered systems

Shrikanth reported a hard lockup which he observed once. The stack trace
shows the following CID related participants:

  watchdog: CPU 23 self-detected hard LOCKUP @ mm_get_cid+0xe8/0x188
  NIP: mm_get_cid+0xe8/0x188
  LR:  mm_get_cid+0x108/0x188
   mm_cid_switch_to+0x3c4/0x52c
   __schedule+0x47c/0x700
   schedule_idle+0x3c/0x64
   do_idle+0x160/0x1b0
   cpu_startup_entry+0x48/0x50
   start_secondary+0x284/0x288
   start_secondary_prolog+0x10/0x14

  watchdog: CPU 11 self-detected hard LOCKUP @ plpar_hcall_norets_notrace+0x18/0x2c
  NIP: plpar_hcall_norets_notrace+0x18/0x2c
  LR:  queued_spin_lock_slowpath+0xd88/0x15d0
   _raw_spin_lock+0x80/0xa0
   raw_spin_rq_lock_nested+0x3c/0xf8
   mm_cid_fixup_cpus_to_tasks+0xc8/0x28c
   sched_mm_cid_exit+0x108/0x22c
   do_exit+0xf4/0x5d0
   make_task_dead+0x0/0x178
   system_call_exception+0x128/0x390
   system_call_vectored_common+0x15c/0x2ec

The task on CPU11 is running the CID ownership mode change fixup function
and is stuck on a runqueue lock. The task on CPU23 is trying to get a CID
from the pool with the same runqueue lock held, but the pool is empty.

After decoding a similar issue in the opposite direction switching from per
task to per CPU mode the tool which models the possible scenarios failed to
come up with a similar loop hole.

This showed up only once, was not reproducible and according to tooling not
related to a overlooked scheduling scenario permutation. But the fact that
it was observed on a PowerPC system gave the right hint: PowerPC is a
weakly ordered architecture.

The transition mechanism does:

    WRITE_ONCE(mm->mm_cid.transit, MM_CID_TRANSIT);
    WRITE_ONCE(mm->mm_cid.percpu, new_mode);

    fixup()

    WRITE_ONCE(mm->mm_cid.transit, 0);

mm_cid_schedin() does:

    if (!READ_ONCE(mm->mm_cid.percpu))
       ...
       cid |= READ_ONCE(mm->mm_cid.transit);

so weakly ordered systems can observe percpu == false and transit == 0 even
if the fixup function has not yet completed. As a consequence the task will
not drop the CID when scheduling out before the fixup is completed, which
means the CID space can be exhausted and the next task scheduling in will
loop in mm_get_cid() and the fixup thread can livelock on the held runqueue
lock as above.

This could obviously be solved by using:
     smp_store_release(&mm->mm_cid.percpu, true);
and
     smp_load_acquire(&mm->mm_cid.percpu);

but that brings a memory barrier back into the scheduler hotpath, which was
just designed out by the CID rewrite.

That can be completely avoided by combining the per CPU mode and the
transit storage into a single mm_cid::mode member and ordering the stores
against the fixup functions to prevent the CPU from reordering them.

That makes the update of both states atomic and a concurrent read observes
always consistent state.

The price is an additional AND operation in mm_cid_schedin() to evaluate
the per CPU or the per task path, but that's in the noise even on strongly
ordered architectures as the actual load can be significantly more
expensive and the conditional branch evaluation is there anyway.

Fixes: fbd0e71dc370 ("sched/mmcid: Provide CID ownership mode fixup functions")
Closes: https://lore.kernel.org/bdfea828-4585-40e8-8835-247c6a8a76b0@linux.ibm.com
Reported-by: Shrikanth Hegde <sshegde@linux.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Link: https://patch.msgid.link/20260201192834.965217106@kernel.org

diff --git a/include/linux/rseq_types.h b/include/linux/rseq_types.h
index 332dc14b81c9770d87a416ae99cedfa48225eb96..ef0811379c5401cd3f53ed71219db984c4fe1dfa 100644 (file)
--- a/include/linux/rseq_types.h
+++ b/include/linux/rseq_types.h
@@ -121,8 +121,7 @@ struct mm_cid_pcpu {
 /**
  * struct mm_mm_cid - Storage for per MM CID data
  * @pcpu:              Per CPU storage for CIDs associated to a CPU
- * @percpu:            Set, when CIDs are in per CPU mode
- * @transit:           Set to MM_CID_TRANSIT during a mode change transition phase
+ * @mode:              Indicates per CPU and transition mode
  * @max_cids:          The exclusive maximum CID value for allocation and convergence
  * @irq_work:          irq_work to handle the affinity mode change case
  * @work:              Regular work to handle the affinity mode change case
@@ -139,8 +138,7 @@ struct mm_cid_pcpu {
 struct mm_mm_cid {
        /* Hotpath read mostly members */
        struct mm_cid_pcpu      __percpu *pcpu;
-       unsigned int            percpu;
-       unsigned int            transit;
+       unsigned int            mode;
        unsigned int            max_cids;
 
        /* Rarely used. Moves @lock and @mutex into the second cacheline */

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 1e790f25f709a87269f147fb5d98fa1d9374aeb2..858028300c5f96b3c11338d42c2883cb43b58dd8 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -10297,16 +10297,25 @@ void call_trace_sched_update_nr_running(struct rq *rq, int count)
  *
  * Mode switching:
  *
+ * The ownership mode is per process and stored in mm:mm_cid::mode with the
+ * following possible states:
+ *
+ *     0:                              Per task ownership
+ *     0 | MM_CID_TRANSIT:             Transition from per CPU to per task
+ *     MM_CID_ONCPU:                   Per CPU ownership
+ *     MM_CID_ONCPU | MM_CID_TRANSIT:  Transition from per task to per CPU
+ *
  * All transitions of ownership mode happen in two phases:
  *
- *  1) mm:mm_cid.transit contains MM_CID_TRANSIT. This is OR'ed on the CIDs
- *     and denotes that the CID is only temporarily owned by a task. When
- *     the task schedules out it drops the CID back into the pool if this
- *     bit is set.
+ *  1) mm:mm_cid::mode has the MM_CID_TRANSIT bit set. This is OR'ed on the
+ *     CIDs and denotes that the CID is only temporarily owned by a
+ *     task. When the task schedules out it drops the CID back into the
+ *     pool if this bit is set.
  *
  *  2) The initiating context walks the per CPU space or the tasks to fixup
- *     or drop the CIDs and after completion it clears mm:mm_cid.transit.
- *     After that point the CIDs are strictly task or CPU owned again.
+ *     or drop the CIDs and after completion it clears MM_CID_TRANSIT in
+ *     mm:mm_cid::mode. After that point the CIDs are strictly task or CPU
+ *     owned again.
  *
  * This two phase transition is required to prevent CID space exhaustion
  * during the transition as a direct transfer of ownership would fail:
@@ -10411,6 +10420,7 @@ static inline unsigned int mm_cid_calc_pcpu_thrs(struct mm_mm_cid *mc)
 static bool mm_update_max_cids(struct mm_struct *mm)
 {
        struct mm_mm_cid *mc = &mm->mm_cid;
+       bool percpu = cid_on_cpu(mc->mode);
 
        lockdep_assert_held(&mm->mm_cid.lock);
 
@@ -10419,7 +10429,7 @@ static bool mm_update_max_cids(struct mm_struct *mm)
        __mm_update_max_cids(mc);
 
        /* Check whether owner mode must be changed */
-       if (!mc->percpu) {
+       if (!percpu) {
                /* Enable per CPU mode when the number of users is above max_cids */
                if (mc->users > mc->max_cids)
                        mc->pcpu_thrs = mm_cid_calc_pcpu_thrs(mc);
@@ -10430,12 +10440,17 @@ static bool mm_update_max_cids(struct mm_struct *mm)
        }
 
        /* Mode change required? */
-       if (!!mc->percpu == !!mc->pcpu_thrs)
+       if (percpu == !!mc->pcpu_thrs)
                return false;
 
-       /* Set the transition flag to bridge the transfer */
-       WRITE_ONCE(mc->transit, MM_CID_TRANSIT);
-       WRITE_ONCE(mc->percpu, !!mc->pcpu_thrs);
+       /* Flip the mode and set the transition flag to bridge the transfer */
+       WRITE_ONCE(mc->mode, mc->mode ^ (MM_CID_TRANSIT | MM_CID_ONCPU));
+       /*
+        * Order the store against the subsequent fixups so that
+        * acquire(rq::lock) cannot be reordered by the CPU before the
+        * store.
+        */
+       smp_mb();
        return true;
 }
 
@@ -10460,7 +10475,7 @@ static inline void mm_update_cpus_allowed(struct mm_struct *mm, const struct cpu
 
        WRITE_ONCE(mc->nr_cpus_allowed, weight);
        __mm_update_max_cids(mc);
-       if (!mc->percpu)
+       if (!cid_on_cpu(mc->mode))
                return;
 
        /* Adjust the threshold to the wider set */
@@ -10478,6 +10493,16 @@ static inline void mm_update_cpus_allowed(struct mm_struct *mm, const struct cpu
        irq_work_queue(&mc->irq_work);
 }
 
+static inline void mm_cid_complete_transit(struct mm_struct *mm, unsigned int mode)
+{
+       /*
+        * Ensure that the store removing the TRANSIT bit cannot be
+        * reordered by the CPU before the fixups have been completed.
+        */
+       smp_mb();
+       WRITE_ONCE(mm->mm_cid.mode, mode);
+}
+
 static inline void mm_cid_transit_to_task(struct task_struct *t, struct mm_cid_pcpu *pcp)
 {
        if (cid_on_cpu(t->mm_cid.cid)) {
@@ -10521,8 +10546,7 @@ static void mm_cid_fixup_cpus_to_tasks(struct mm_struct *mm)
                        }
                }
        }
-       /* Clear the transition bit */
-       WRITE_ONCE(mm->mm_cid.transit, 0);
+       mm_cid_complete_transit(mm, 0);
 }
 
 static inline void mm_cid_transit_to_cpu(struct task_struct *t, struct mm_cid_pcpu *pcp)
@@ -10594,8 +10618,7 @@ static void mm_cid_fixup_tasks_to_cpus(void)
        struct mm_struct *mm = current->mm;
 
        mm_cid_do_fixup_tasks_to_cpus(mm);
-       /* Clear the transition bit */
-       WRITE_ONCE(mm->mm_cid.transit, 0);
+       mm_cid_complete_transit(mm, MM_CID_ONCPU);
 }
 
 static bool sched_mm_cid_add_user(struct task_struct *t, struct mm_struct *mm)
@@ -10626,13 +10649,13 @@ void sched_mm_cid_fork(struct task_struct *t)
                }
 
                if (!sched_mm_cid_add_user(t, mm)) {
-                       if (!mm->mm_cid.percpu)
+                       if (!cid_on_cpu(mm->mm_cid.mode))
                                t->mm_cid.cid = mm_get_cid(mm);
                        return;
                }
 
                /* Handle the mode change and transfer current's CID */
-               percpu = !!mm->mm_cid.percpu;
+               percpu = cid_on_cpu(mm->mm_cid.mode);
                if (!percpu)
                        mm_cid_transit_to_task(current, pcp);
                else
@@ -10671,7 +10694,7 @@ static bool __sched_mm_cid_exit(struct task_struct *t)
         * affinity change increased the number of allowed CPUs and the
         * deferred fixup did not run yet.
         */
-       if (WARN_ON_ONCE(mm->mm_cid.percpu))
+       if (WARN_ON_ONCE(cid_on_cpu(mm->mm_cid.mode)))
                return false;
        /*
         * A failed fork(2) cleanup never gets here, so @current must have
@@ -10762,7 +10785,7 @@ static void mm_cid_work_fn(struct work_struct *work)
                if (!mm_update_max_cids(mm))
                        return;
                /* Affinity changes can only switch back to task mode */
-               if (WARN_ON_ONCE(mm->mm_cid.percpu))
+               if (WARN_ON_ONCE(cid_on_cpu(mm->mm_cid.mode)))
                        return;
        }
        mm_cid_fixup_cpus_to_tasks(mm);
@@ -10783,8 +10806,7 @@ static void mm_cid_irq_work(struct irq_work *work)
 void mm_init_cid(struct mm_struct *mm, struct task_struct *p)
 {
        mm->mm_cid.max_cids = 0;
-       mm->mm_cid.percpu = 0;
-       mm->mm_cid.transit = 0;
+       mm->mm_cid.mode = 0;
        mm->mm_cid.nr_cpus_allowed = p->nr_cpus_allowed;
        mm->mm_cid.users = 0;
        mm->mm_cid.pcpu_thrs = 0;

diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index eff207346e8e1b3f30ae67f600999eaf2c8810c1..f85fd6b81f5ec55e5fc5cb3e125c36e943edc718 100644 (file)
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -3816,7 +3816,8 @@ static __always_inline void mm_cid_update_pcpu_cid(struct mm_struct *mm, unsigne
        __this_cpu_write(mm->mm_cid.pcpu->cid, cid);
 }
 
-static __always_inline void mm_cid_from_cpu(struct task_struct *t, unsigned int cpu_cid)
+static __always_inline void mm_cid_from_cpu(struct task_struct *t, unsigned int cpu_cid,
+                                           unsigned int mode)
 {
        unsigned int max_cids, tcid = t->mm_cid.cid;
        struct mm_struct *mm = t->mm;
@@ -3842,15 +3843,16 @@ static __always_inline void mm_cid_from_cpu(struct task_struct *t, unsigned int
                if (!cid_on_cpu(cpu_cid))
                        cpu_cid = cid_to_cpu_cid(mm_get_cid(mm));
 
-               /* Set the transition mode flag if required */
-               if (READ_ONCE(mm->mm_cid.transit))
+               /* Handle the transition mode flag if required */
+               if (mode & MM_CID_TRANSIT)
                        cpu_cid = cpu_cid_to_cid(cpu_cid) | MM_CID_TRANSIT;
        }
        mm_cid_update_pcpu_cid(mm, cpu_cid);
        mm_cid_update_task_cid(t, cpu_cid);
 }
 
-static __always_inline void mm_cid_from_task(struct task_struct *t, unsigned int cpu_cid)
+static __always_inline void mm_cid_from_task(struct task_struct *t, unsigned int cpu_cid,
+                                            unsigned int mode)
 {
        unsigned int max_cids, tcid = t->mm_cid.cid;
        struct mm_struct *mm = t->mm;
@@ -3876,7 +3878,7 @@ static __always_inline void mm_cid_from_task(struct task_struct *t, unsigned int
                if (!cid_on_task(tcid))
                        tcid = mm_get_cid(mm);
                /* Set the transition mode flag if required */
-               tcid |= READ_ONCE(mm->mm_cid.transit);
+               tcid |= mode & MM_CID_TRANSIT;
        }
        mm_cid_update_pcpu_cid(mm, tcid);
        mm_cid_update_task_cid(t, tcid);
@@ -3885,16 +3887,17 @@ static __always_inline void mm_cid_from_task(struct task_struct *t, unsigned int
 static __always_inline void mm_cid_schedin(struct task_struct *next)
 {
        struct mm_struct *mm = next->mm;
-       unsigned int cpu_cid;
+       unsigned int cpu_cid, mode;
 
        if (!next->mm_cid.active)
                return;
 
        cpu_cid = __this_cpu_read(mm->mm_cid.pcpu->cid);
-       if (likely(!READ_ONCE(mm->mm_cid.percpu)))
-               mm_cid_from_task(next, cpu_cid);
+       mode = READ_ONCE(mm->mm_cid.mode);
+       if (likely(!cid_on_cpu(mode)))
+               mm_cid_from_task(next, cpu_cid, mode);
        else
-               mm_cid_from_cpu(next, cpu_cid);
+               mm_cid_from_cpu(next, cpu_cid, mode);
 }
 
 static __always_inline void mm_cid_schedout(struct task_struct *prev)