Commit 2e4c54da authored by Len Brown's avatar Len Brown Committed by Thomas Gleixner
Browse files

topology: Create core_cpus and die_cpus sysfs attributes 



Create CPU topology sysfs attributes: "core_cpus" and "core_cpus_list"

These attributes represent all of the logical CPUs that share the
same core.

These attriutes is synonymous with the existing "thread_siblings" and
"thread_siblings_list" attribute, which will be deprecated.

Create CPU topology sysfs attributes: "die_cpus" and "die_cpus_list".
These attributes represent all of the logical CPUs that share the
same die.

Suggested-by: default avatarBrice Goglin <Brice.Goglin@inria.fr>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/071c23a298cd27ede6ed0b6460cae190d193364f.1557769318.git.len.brown@intel.com
parent b73ed8dc

Documentation/cputopology.txt

+15 −6
Original line number Diff line number Diff line
@@ -36,15 +36,15 @@ drawer_id: 
	identifier (rather than the kernel's).	The actual value is

	architecture and platform dependent.



thread_siblings:

core_cpus:



	internal kernel map of cpuX's hardware threads within the same

	core as cpuX.

	internal kernel map of CPUs within the same core.

	(deprecated name: "thread_siblings")



thread_siblings_list:

core_cpus_list:



	human-readable list of cpuX's hardware threads within the same

	core as cpuX.

	human-readable list of CPUs within the same core.

	(deprecated name: "thread_siblings_list");



package_cpus:
@@ -56,6 +56,14 @@ package_cpus_list: 
	human-readable list of CPUs sharing the same physical_package_id.

	(deprecated name: "core_siblings_list")



die_cpus:



	internal kernel map of CPUs within the same die.



die_cpus_list:



	human-readable list of CPUs within the same die.



book_siblings:



	internal kernel map of cpuX's hardware threads within the same
@@ -93,6 +101,7 @@ these macros in include/asm-XXX/topology.h:: 
	#define topology_drawer_id(cpu)

	#define topology_sibling_cpumask(cpu)

	#define topology_core_cpumask(cpu)

	#define topology_die_cpumask(cpu)

	#define topology_book_cpumask(cpu)

	#define topology_drawer_cpumask(cpu)

arch/x86/include/asm/smp.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ extern unsigned int num_processors; 


DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_sibling_map);

DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);

DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_die_map);

/* cpus sharing the last level cache: */

DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);

DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);

arch/x86/include/asm/topology.h

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ extern const struct cpumask *cpu_coregroup_mask(int cpu); 
#define topology_core_id(cpu)			(cpu_data(cpu).cpu_core_id)



#ifdef CONFIG_SMP

#define topology_die_cpumask(cpu)		(per_cpu(cpu_die_map, cpu))

#define topology_core_cpumask(cpu)		(per_cpu(cpu_core_map, cpu))

#define topology_sibling_cpumask(cpu)		(per_cpu(cpu_sibling_map, cpu))

arch/x86/kernel/smpboot.c

+22 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ EXPORT_PER_CPU_SYMBOL(cpu_sibling_map); 
DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);

EXPORT_PER_CPU_SYMBOL(cpu_core_map);



/* representing HT, core, and die siblings of each logical CPU */

DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_die_map);

EXPORT_PER_CPU_SYMBOL(cpu_die_map);



DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);



/* Per CPU bogomips and other parameters */
@@ -509,6 +513,15 @@ static bool match_pkg(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o) 
	return false;

}



static bool match_die(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)

{

	if ((c->phys_proc_id == o->phys_proc_id) &&

		(c->cpu_die_id == o->cpu_die_id))

		return true;

	return false;

}





#if defined(CONFIG_SCHED_SMT) || defined(CONFIG_SCHED_MC)

static inline int x86_sched_itmt_flags(void)

{
@@ -571,6 +584,7 @@ void set_cpu_sibling_map(int cpu) 
		cpumask_set_cpu(cpu, topology_sibling_cpumask(cpu));

		cpumask_set_cpu(cpu, cpu_llc_shared_mask(cpu));

		cpumask_set_cpu(cpu, topology_core_cpumask(cpu));

		cpumask_set_cpu(cpu, topology_die_cpumask(cpu));

		c->booted_cores = 1;

		return;

	}
@@ -619,6 +633,9 @@ void set_cpu_sibling_map(int cpu) 
		}

		if (match_pkg(c, o) && !topology_same_node(c, o))

			x86_has_numa_in_package = true;



		if ((i == cpu) || (has_mp && match_die(c, o)))

			link_mask(topology_die_cpumask, cpu, i);

	}



	threads = cpumask_weight(topology_sibling_cpumask(cpu));
@@ -1223,6 +1240,7 @@ static __init void disable_smp(void) 
		physid_set_mask_of_physid(0, &phys_cpu_present_map);

	cpumask_set_cpu(0, topology_sibling_cpumask(0));

	cpumask_set_cpu(0, topology_core_cpumask(0));

	cpumask_set_cpu(0, topology_die_cpumask(0));

}



/*
@@ -1318,6 +1336,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) 
	for_each_possible_cpu(i) {

		zalloc_cpumask_var(&per_cpu(cpu_sibling_map, i), GFP_KERNEL);

		zalloc_cpumask_var(&per_cpu(cpu_core_map, i), GFP_KERNEL);

		zalloc_cpumask_var(&per_cpu(cpu_die_map, i), GFP_KERNEL);

		zalloc_cpumask_var(&per_cpu(cpu_llc_shared_map, i), GFP_KERNEL);

	}
@@ -1538,6 +1557,8 @@ static void remove_siblinginfo(int cpu) 
			cpu_data(sibling).booted_cores--;

	}



	for_each_cpu(sibling, topology_die_cpumask(cpu))

		cpumask_clear_cpu(cpu, topology_die_cpumask(sibling));

	for_each_cpu(sibling, topology_sibling_cpumask(cpu))

		cpumask_clear_cpu(cpu, topology_sibling_cpumask(sibling));

	for_each_cpu(sibling, cpu_llc_shared_mask(cpu))
@@ -1545,6 +1566,7 @@ static void remove_siblinginfo(int cpu) 
	cpumask_clear(cpu_llc_shared_mask(cpu));

	cpumask_clear(topology_sibling_cpumask(cpu));

	cpumask_clear(topology_core_cpumask(cpu));

	cpumask_clear(topology_die_cpumask(cpu));

	c->cpu_core_id = 0;

	c->booted_cores = 0;

	cpumask_clear_cpu(cpu, cpu_sibling_setup_mask);

arch/x86/xen/smp_pv.c

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ static void __init xen_pv_smp_prepare_cpus(unsigned int max_cpus) 
	for_each_possible_cpu(i) {

		zalloc_cpumask_var(&per_cpu(cpu_sibling_map, i), GFP_KERNEL);

		zalloc_cpumask_var(&per_cpu(cpu_core_map, i), GFP_KERNEL);

		zalloc_cpumask_var(&per_cpu(cpu_die_map, i), GFP_KERNEL);

		zalloc_cpumask_var(&per_cpu(cpu_llc_shared_map, i), GFP_KERNEL);

	}

	set_cpu_sibling_map(0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE