Commit 04d4e665 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Peter Zijlstra
Browse files

sched/isolation: Use single feature type while referring to housekeeping cpumask 



Refer to housekeeping APIs using single feature types instead of flags.
This prevents from passing multiple isolation features at once to
housekeeping interfaces, which soon won't be possible anymore as each
isolation features will have their own cpumask.

Signed-off-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarJuri Lelli <juri.lelli@redhat.com>
Reviewed-by: default avatarPhil Auld <pauld@redhat.com>
Link: https://lore.kernel.org/r/20220207155910.527133-5-frederic@kernel.org
parent c8fb9f22

arch/x86/kernel/cpu/aperfmperf.c

+3 −3
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ unsigned int aperfmperf_get_khz(int cpu) 
	if (!boot_cpu_has(X86_FEATURE_APERFMPERF))

		return 0;



	if (!housekeeping_cpu(cpu, HK_FLAG_MISC))

	if (!housekeeping_cpu(cpu, HK_TYPE_MISC))

		return 0;



	if (rcu_is_idle_cpu(cpu))
@@ -114,7 +114,7 @@ void arch_freq_prepare_all(void) 
		return;



	for_each_online_cpu(cpu) {

		if (!housekeeping_cpu(cpu, HK_FLAG_MISC))

		if (!housekeeping_cpu(cpu, HK_TYPE_MISC))

			continue;

		if (rcu_is_idle_cpu(cpu))

			continue; /* Idle CPUs are completely uninteresting. */
@@ -136,7 +136,7 @@ unsigned int arch_freq_get_on_cpu(int cpu) 
	if (!boot_cpu_has(X86_FEATURE_APERFMPERF))

		return 0;



	if (!housekeeping_cpu(cpu, HK_FLAG_MISC))

	if (!housekeeping_cpu(cpu, HK_TYPE_MISC))

		return 0;



	if (aperfmperf_snapshot_cpu(cpu, ktime_get(), true))

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -8769,7 +8769,7 @@ int kvm_arch_init(void *opaque) 
	}



	if (pi_inject_timer == -1)

		pi_inject_timer = housekeeping_enabled(HK_FLAG_TIMER);

		pi_inject_timer = housekeeping_enabled(HK_TYPE_TIMER);

#ifdef CONFIG_X86_64

	pvclock_gtod_register_notifier(&pvclock_gtod_notifier);

drivers/base/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static ssize_t print_cpus_isolated(struct device *dev, 
		return -ENOMEM;



	cpumask_andnot(isolated, cpu_possible_mask,

		       housekeeping_cpumask(HK_FLAG_DOMAIN));

		       housekeeping_cpumask(HK_TYPE_DOMAIN));

	len = sysfs_emit(buf, "%*pbl\n", cpumask_pr_args(isolated));



	free_cpumask_var(isolated);

drivers/pci/pci-driver.c

+2 −2
Original line number Diff line number Diff line
@@ -377,8 +377,8 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, 
			goto out;

		}

		cpumask_and(wq_domain_mask,

			    housekeeping_cpumask(HK_FLAG_WQ),

			    housekeeping_cpumask(HK_FLAG_DOMAIN));

			    housekeeping_cpumask(HK_TYPE_WQ),

			    housekeeping_cpumask(HK_TYPE_DOMAIN));



		cpu = cpumask_any_and(cpumask_of_node(node),

				      wq_domain_mask);

include/linux/sched/isolation.h

+22 −21
Original line number Diff line number Diff line
@@ -5,54 +5,55 @@ 
#include <linux/init.h>

#include <linux/tick.h>



enum hk_flags {

	HK_FLAG_TIMER		= 1,

	HK_FLAG_RCU		= (1 << 1),

	HK_FLAG_MISC		= (1 << 2),

	HK_FLAG_SCHED		= (1 << 3),

	HK_FLAG_TICK		= (1 << 4),

	HK_FLAG_DOMAIN		= (1 << 5),

	HK_FLAG_WQ		= (1 << 6),

	HK_FLAG_MANAGED_IRQ	= (1 << 7),

	HK_FLAG_KTHREAD		= (1 << 8),

enum hk_type {

	HK_TYPE_TIMER,

	HK_TYPE_RCU,

	HK_TYPE_MISC,

	HK_TYPE_SCHED,

	HK_TYPE_TICK,

	HK_TYPE_DOMAIN,

	HK_TYPE_WQ,

	HK_TYPE_MANAGED_IRQ,

	HK_TYPE_KTHREAD,

	HK_TYPE_MAX

};



#ifdef CONFIG_CPU_ISOLATION

DECLARE_STATIC_KEY_FALSE(housekeeping_overridden);

extern int housekeeping_any_cpu(enum hk_flags flags);

extern const struct cpumask *housekeeping_cpumask(enum hk_flags flags);

extern bool housekeeping_enabled(enum hk_flags flags);

extern void housekeeping_affine(struct task_struct *t, enum hk_flags flags);

extern bool housekeeping_test_cpu(int cpu, enum hk_flags flags);

extern int housekeeping_any_cpu(enum hk_type type);

extern const struct cpumask *housekeeping_cpumask(enum hk_type type);

extern bool housekeeping_enabled(enum hk_type type);

extern void housekeeping_affine(struct task_struct *t, enum hk_type type);

extern bool housekeeping_test_cpu(int cpu, enum hk_type type);

extern void __init housekeeping_init(void);



#else



static inline int housekeeping_any_cpu(enum hk_flags flags)

static inline int housekeeping_any_cpu(enum hk_type type)

{

	return smp_processor_id();

}



static inline const struct cpumask *housekeeping_cpumask(enum hk_flags flags)

static inline const struct cpumask *housekeeping_cpumask(enum hk_type type)

{

	return cpu_possible_mask;

}



static inline bool housekeeping_enabled(enum hk_flags flags)

static inline bool housekeeping_enabled(enum hk_type type)

{

	return false;

}



static inline void housekeeping_affine(struct task_struct *t,

				       enum hk_flags flags) { }

				       enum hk_type type) { }

static inline void housekeeping_init(void) { }

#endif /* CONFIG_CPU_ISOLATION */



static inline bool housekeeping_cpu(int cpu, enum hk_flags flags)

static inline bool housekeeping_cpu(int cpu, enum hk_type type)

{

#ifdef CONFIG_CPU_ISOLATION

	if (static_branch_unlikely(&housekeeping_overridden))

		return housekeeping_test_cpu(cpu, flags);

		return housekeeping_test_cpu(cpu, type);

#endif

	return true;

}