Commit c907cd44 authored by Waiman Long's avatar Waiman Long Committed by Peter Zijlstra
Browse files

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: default avatarWaiman Long <longman@redhat.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20241030175253.125248-5-longman@redhat.com
parent 6010d245

kernel/sched/core.c

+6 −6
Original line number Diff line number Diff line
@@ -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);

kernel/sched/fair.c

+3 −2
Original line number Diff line number Diff line
@@ -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)

{