sched: Unify HK_TYPE_{TIMER|TICK|MISC} to HK_TYPE_KERNEL_NOISE

As all the non-domain and non-managed_irq housekeeping types have been
unified to HK_TYPE_KERNEL_NOISE, replace all these references in the
scheduler to use HK_TYPE_KERNEL_NOISE.

Signed-off-by: Waiman Long <longman@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20241030175253.125248-5-longman@redhat.com

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 1dee3f5ef940dc86d3683dd4cfe33d0c5b0ee5a3..5fbec67d48b2543fe6853f81b1bbc0af5d8c1fdf 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1170,13 +1170,13 @@ int get_nohz_timer_target(void)
        struct sched_domain *sd;
        const struct cpumask *hk_mask;
 
-       if (housekeeping_cpu(cpu, HK_TYPE_TIMER)) {
+       if (housekeeping_cpu(cpu, HK_TYPE_KERNEL_NOISE)) {
                if (!idle_cpu(cpu))
                        return cpu;
                default_cpu = cpu;
        }
 
-       hk_mask = housekeeping_cpumask(HK_TYPE_TIMER);
+       hk_mask = housekeeping_cpumask(HK_TYPE_KERNEL_NOISE);
 
        guard(rcu)();
 
@@ -1191,7 +1191,7 @@ int get_nohz_timer_target(void)
        }
 
        if (default_cpu == -1)
-               default_cpu = housekeeping_any_cpu(HK_TYPE_TIMER);
+               default_cpu = housekeeping_any_cpu(HK_TYPE_KERNEL_NOISE);
 
        return default_cpu;
 }
@@ -5634,7 +5634,7 @@ void sched_tick(void)
        unsigned long hw_pressure;
        u64 resched_latency;
 
-       if (housekeeping_cpu(cpu, HK_TYPE_TICK))
+       if (housekeeping_cpu(cpu, HK_TYPE_KERNEL_NOISE))
                arch_scale_freq_tick();
 
        sched_clock_tick();
@@ -5773,7 +5773,7 @@ static void sched_tick_start(int cpu)
        int os;
        struct tick_work *twork;
 
-       if (housekeeping_cpu(cpu, HK_TYPE_TICK))
+       if (housekeeping_cpu(cpu, HK_TYPE_KERNEL_NOISE))
                return;
 
        WARN_ON_ONCE(!tick_work_cpu);
@@ -5794,7 +5794,7 @@ static void sched_tick_stop(int cpu)
        struct tick_work *twork;
        int os;
 
-       if (housekeeping_cpu(cpu, HK_TYPE_TICK))
+       if (housekeeping_cpu(cpu, HK_TYPE_KERNEL_NOISE))
                return;
 
        WARN_ON_ONCE(!tick_work_cpu);

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index ef302263f5b3d22c520aec20770622d2432d734f..d5127d9beaeab2bc2466208be3121e8b73da1ef4 100644 (file)
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -12203,7 +12203,7 @@ static inline int find_new_ilb(void)
        const struct cpumask *hk_mask;
        int ilb_cpu;
 
-       hk_mask = housekeeping_cpumask(HK_TYPE_MISC);
+       hk_mask = housekeeping_cpumask(HK_TYPE_KERNEL_NOISE);
 
        for_each_cpu_and(ilb_cpu, nohz.idle_cpus_mask, hk_mask) {
 
@@ -12221,7 +12221,8 @@ static inline int find_new_ilb(void)
  * Kick a CPU to do the NOHZ balancing, if it is time for it, via a cross-CPU
  * SMP function call (IPI).
  *
- * We pick the first idle CPU in the HK_TYPE_MISC housekeeping set (if there is one).
+ * We pick the first idle CPU in the HK_TYPE_KERNEL_NOISE housekeeping set
+ * (if there is one).
  */
 static void kick_ilb(unsigned int flags)
 {