Re: [PATCH v5 06/24] sched/core: allow only preferred CPUs in is_cpu_allowed

[Shrikanth Hegde <sshegde@linux.ibm.com>]

Hi Yury.

On 6/26/26 6:55 PM, Shrikanth Hegde wrote:
> Hi Yury. Thanks for going through the patches.
> 

[...]

>> So, you've got 3 options to declare the status: self-explaining enum,
>> self-explaining #defines, and this random numbers explained in
>> comment. The latter option is the worst to me.
> 
> ok. I will define the enums.
> 
>>
>> And you didn't provide any benchmark advocating this caching
>> optimization.


I did below to see. Made interval as 100ms.
Ran ./hackbench 30 process 30000 loops in both the VM at the same time.
Values are average of 5 runs.

With optimization:
13.6 seconds

Without optimization:
13.8 seconds

>>
>> Sorry, but NAK.
>>
> 
> If we move to local variable then this won;t be necessary,
> just enum's would be enough (I think). Let me go stare at it.

I have made it use the local variable instead. There maybe better names
for variable, put something quickly to check the idea.
Effectively this PATCH 6 becomes:

Does this seems better?
Please let me know your comments.

---

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 9e16946c9d62..fafedd52611f 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2498,8 +2498,10 @@ static inline bool rq_has_pinned_tasks(struct rq *rq)
   * Per-CPU kthreads are allowed to run on !active && online CPUs, see
   * __set_cpus_allowed_ptr() and select_fallback_rq().
   */
-static inline bool is_cpu_allowed(struct task_struct *p, int cpu)
+static inline bool is_cpu_allowed(struct task_struct *p, int cpu, int cached)
  {
+       bool task_check_preferred_cpu;
+
         /* When not in the task's cpumask, no point in looking further. */
         if (!task_allowed_on_cpu(p, cpu))
                 return false;
@@ -2508,9 +2510,24 @@ static inline bool is_cpu_allowed(struct task_struct *p, int cpu)
         if (is_migration_disabled(p))
                 return cpu_online(cpu);
  
+       /*
+        * This is essential to maintain user affinities when preferred
+        * CPUs change. A task pinned on non-preferred CPU should continue
+        * to run there, since this is non-user triggered.
+        *
+        * If CPU is non-preferred and task can run on other CPUs which are
+        * currently preferred, then choose those other CPUs instead.
+        * Overhead is minimal when CPU is preferred.
+        */
+       task_check_preferred_cpu = !cpu_preferred(cpu) &&
+                                  task_has_preferred_cpus(p, cached);
+
         /* Non kernel threads are not allowed during either online or offline. */
-       if (!(p->flags & PF_KTHREAD))
+       if (!(p->flags & PF_KTHREAD)) {
+               if (task_check_preferred_cpu)
+                       return false;
                 return cpu_active(cpu);
+       }
  
         /* KTHREAD_IS_PER_CPU is always allowed. */
         if (kthread_is_per_cpu(p))
@@ -2520,6 +2537,10 @@ static inline bool is_cpu_allowed(struct task_struct *p, int cpu)
         if (cpu_dying(cpu))
                 return false;
  
+       /* Try on preferred CPU first if possible*/
+       if (task_check_preferred_cpu)
+               return false;
+
         /* But are allowed during online. */
         return cpu_online(cpu);
  }
@@ -2595,7 +2616,7 @@ static struct rq *__migrate_task(struct rq *rq, struct rq_flags *rf,
         __must_hold(__rq_lockp(rq))
  {
         /* Affinity changed (again). */
-       if (!is_cpu_allowed(p, dest_cpu))
+       if (!is_cpu_allowed(p, dest_cpu, NO_CACHED_VAL))
                 return rq;
  
         rq = move_queued_task(rq, rf, p, dest_cpu);
@@ -3547,7 +3568,15 @@ static int select_fallback_rq(int cpu, struct task_struct *p)
         int nid = cpu_to_node(cpu);
         const struct cpumask *nodemask = NULL;
         enum { cpuset, possible, fail } state = cpuset;
-       int dest_cpu;
+       int dest_cpu, has_preferred_cpu;
+
+       /*
+        * Cache the value whether task's affinity spans preferred CPUs.
+        * This helps to avoid repeating the same for each CPU
+        * later in the loop.
+        */
+       has_preferred_cpu = task_has_preferred_cpus(p, NO_CACHED_VAL) ?
+                           TASK_HAS_PREFERRED_CPUS : TASK_NO_PREFERRED_CPUS;
  
         /*
          * If the node that the CPU is on has been offlined, cpu_to_node()
@@ -3559,7 +3588,7 @@ static int select_fallback_rq(int cpu, struct task_struct *p)
  
                 /* Look for allowed, online CPU in same node. */
                 for_each_cpu(dest_cpu, nodemask) {
-                       if (is_cpu_allowed(p, dest_cpu))
+                       if (is_cpu_allowed(p, dest_cpu, has_preferred_cpu))
                                 return dest_cpu;
                 }
         }
@@ -3567,7 +3596,7 @@ static int select_fallback_rq(int cpu, struct task_struct *p)
         for (;;) {
                 /* Any allowed, online CPU? */
                 for_each_cpu(dest_cpu, p->cpus_ptr) {
-                       if (!is_cpu_allowed(p, dest_cpu))
+                       if (!is_cpu_allowed(p, dest_cpu, has_preferred_cpu))
                                 continue;
  
                         goto out;
@@ -3632,7 +3661,7 @@ int select_task_rq(struct task_struct *p, int cpu, int *wake_flags)
          * [ this allows ->select_task() to simply return task_cpu(p) and
          *   not worry about this generic constraint ]
          */
-       if (unlikely(!is_cpu_allowed(p, cpu)))
+       if (unlikely(!is_cpu_allowed(p, cpu, NO_CACHED_VAL)))
                 cpu = select_fallback_rq(task_cpu(p), p);
  
         return cpu;
@@ -6467,7 +6496,7 @@ static bool try_steal_cookie(int this, int that)
                 if (p == src->core_pick || p == src->curr)
                         goto next;
  
-               if (!is_cpu_allowed(p, this))
+               if (!is_cpu_allowed(p, this, NO_CACHED_VAL))
                         goto next;
  
                 if (p->core_occupation > dst->idle->core_occupation)
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index c7c2dea65edd..949c044702c1 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -4213,4 +4213,32 @@ DEFINE_CLASS_IS_UNCONDITIONAL(sched_change)
  
  #include "ext.h"
  
+enum task_preferred_cached {
+       TASK_NO_PREFERRED_CPUS = -1,
+       NO_CACHED_VAL,
+       TASK_HAS_PREFERRED_CPUS,
+};
+
+/*
+ * Value is cached when called via select_fallback_rq().
+ *
+ * TASK_NO_PREFERRED_CPUS : Cached and preferred CPUs exists in task's
+ *                          affinity.
+ * NO_CACHED_VAL:           Not cached and need to evaluate.
+ * TASK_HAS_PREFERRED_CPUS: Cached and preferred CPU doesn't exits
+ *                          task's affinity
+ *
+ * Only affects FAIR task.
+ */
+static inline bool task_has_preferred_cpus(struct task_struct *p, int cached)
+{
+       /* Only FAIR tasks honor preferred CPU state */
+       if (unlikely(p->sched_class != &fair_sched_class))
+               return false;
+
+       if (cached)
+               return cached > 0;
+       else
+               return cpumask_intersects(p->cpus_ptr, cpu_preferred_mask);
+}
  #endif /* _KERNEL_SCHED_SCHED_H */