To associate the SD flags with some metadata, we need some more structure in the way they are declared.
Rather than shove that in a free-standing macro list, move the declaration in a separate file that can be re-imported with different SD_FLAG definitions, inspired by what we do with syscalls and unistd.h. No change in functionality. Signed-off-by: Valentin Schneider <[email protected]> --- include/linux/sched/sd_flags.h | 33 +++++++++++++++++++++++++++++++++ include/linux/sched/topology.h | 18 ++++-------------- 2 files changed, 37 insertions(+), 14 deletions(-) create mode 100644 include/linux/sched/sd_flags.h diff --git a/include/linux/sched/sd_flags.h b/include/linux/sched/sd_flags.h new file mode 100644 index 000000000000..685bbe736945 --- /dev/null +++ b/include/linux/sched/sd_flags.h @@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * sched-domains (multiprocessor balancing) flag declarations. + */ + +/* Balance when about to become idle */ +SD_FLAG(SD_BALANCE_NEWIDLE, 0) +/* Balance on exec */ +SD_FLAG(SD_BALANCE_EXEC, 1) +/* Balance on fork, clone */ +SD_FLAG(SD_BALANCE_FORK, 2) +/* Balance on wakeup */ +SD_FLAG(SD_BALANCE_WAKE, 3) +/* Wake task to waking CPU */ +SD_FLAG(SD_WAKE_AFFINE, 4) +/* Domain members have different CPU capacities */ +SD_FLAG(SD_ASYM_CPUCAPACITY, 5) +/* Domain members share CPU capacity */ +SD_FLAG(SD_SHARE_CPUCAPACITY, 6) +/* Domain members share power domain */ +SD_FLAG(SD_SHARE_POWERDOMAIN, 7) +/* Domain members share CPU pkg resources */ +SD_FLAG(SD_SHARE_PKG_RESOURCES, 8) +/* Only a single load balancing instance */ +SD_FLAG(SD_SERIALIZE, 9) +/* Place busy groups earlier in the domain */ +SD_FLAG(SD_ASYM_PACKING, 10) +/* Prefer to place tasks in a sibling domain */ +SD_FLAG(SD_PREFER_SIBLING, 11) +/* sched_domains of this level overlap */ +SD_FLAG(SD_OVERLAP, 12) +/* cross-node balancing */ +SD_FLAG(SD_NUMA, 13) diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h index fb11091129b3..f274eca282de 100644 --- a/include/linux/sched/topology.h +++ b/include/linux/sched/topology.h @@ -11,20 +11,10 @@ */ #ifdef CONFIG_SMP -#define SD_BALANCE_NEWIDLE 0x0001 /* Balance when about to become idle */ -#define SD_BALANCE_EXEC 0x0002 /* Balance on exec */ -#define SD_BALANCE_FORK 0x0004 /* Balance on fork, clone */ -#define SD_BALANCE_WAKE 0x0008 /* Balance on wakeup */ -#define SD_WAKE_AFFINE 0x0010 /* Wake task to waking CPU */ -#define SD_ASYM_CPUCAPACITY 0x0020 /* Domain members have different CPU capacities */ -#define SD_SHARE_CPUCAPACITY 0x0040 /* Domain members share CPU capacity */ -#define SD_SHARE_POWERDOMAIN 0x0080 /* Domain members share power domain */ -#define SD_SHARE_PKG_RESOURCES 0x0100 /* Domain members share CPU pkg resources */ -#define SD_SERIALIZE 0x0200 /* Only a single load balancing instance */ -#define SD_ASYM_PACKING 0x0400 /* Place busy groups earlier in the domain */ -#define SD_PREFER_SIBLING 0x0800 /* Prefer to place tasks in a sibling domain */ -#define SD_OVERLAP 0x1000 /* sched_domains of this level overlap */ -#define SD_NUMA 0x2000 /* cross-node balancing */ +/* Generate SD_FOO = VALUE */ +#define SD_FLAG(name, idx) static const unsigned int name = BIT(idx); +#include <linux/sched/sd_flags.h> +#undef SD_FLAG #ifdef CONFIG_SCHED_SMT static inline int cpu_smt_flags(void) -- 2.27.0
