69dcc99199
The patch implements cpu topology exportation by sysfs. Items (attributes) are similar to /proc/cpuinfo. 1) /sys/devices/system/cpu/cpuX/topology/physical_package_id: represent the physical package id of cpu X; 2) /sys/devices/system/cpu/cpuX/topology/core_id: represent the cpu core id to cpu X; 3) /sys/devices/system/cpu/cpuX/topology/thread_siblings: represent the thread siblings to cpu X in the same core; 4) /sys/devices/system/cpu/cpuX/topology/core_siblings: represent the thread siblings to cpu X in the same physical package; To implement it in an architecture-neutral way, a new source file, driver/base/topology.c, is to export the 5 attributes. If one architecture wants to support this feature, it just needs to implement 4 defines, typically in file include/asm-XXX/topology.h. The 4 defines are: #define topology_physical_package_id(cpu) #define topology_core_id(cpu) #define topology_thread_siblings(cpu) #define topology_core_siblings(cpu) The type of **_id is int. The type of siblings is cpumask_t. To be consistent on all architectures, the 4 attributes should have deafult values if their values are unavailable. Below is the rule. 1) physical_package_id: If cpu has no physical package id, -1 is the default value. 2) core_id: If cpu doesn't support multi-core, its core id is 0. 3) thread_siblings: Just include itself, if the cpu doesn't support HT/multi-thread. 4) core_siblings: Just include itself, if the cpu doesn't support multi-core and HT/Multi-thread. So be careful when declaring the 4 defines in include/asm-XXX/topology.h. If an attribute isn't defined on an architecture, it won't be exported. Thank Nathan, Greg, Andi, Paul and Venki. The patch provides defines for i386/x86_64/ia64. Signed-off-by: Zhang, Yanmin <yanmin.zhang@intel.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Nick Piggin <nickpiggin@yahoo.com.au> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
104 lines
2.2 KiB
C
104 lines
2.2 KiB
C
/*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* This file contains NUMA specific variables and functions which can
|
|
* be split away from DISCONTIGMEM and are used on NUMA machines with
|
|
* contiguous memory.
|
|
* 2002/08/07 Erich Focht <efocht@ess.nec.de>
|
|
* Populate cpu entries in sysfs for non-numa systems as well
|
|
* Intel Corporation - Ashok Raj
|
|
*/
|
|
|
|
#include <linux/config.h>
|
|
#include <linux/cpu.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/node.h>
|
|
#include <linux/init.h>
|
|
#include <linux/bootmem.h>
|
|
#include <linux/nodemask.h>
|
|
#include <asm/mmzone.h>
|
|
#include <asm/numa.h>
|
|
#include <asm/cpu.h>
|
|
|
|
#ifdef CONFIG_NUMA
|
|
static struct node *sysfs_nodes;
|
|
#endif
|
|
static struct ia64_cpu *sysfs_cpus;
|
|
|
|
int arch_register_cpu(int num)
|
|
{
|
|
struct node *parent = NULL;
|
|
|
|
#ifdef CONFIG_NUMA
|
|
parent = &sysfs_nodes[cpu_to_node(num)];
|
|
#endif /* CONFIG_NUMA */
|
|
|
|
#ifdef CONFIG_ACPI
|
|
/*
|
|
* If CPEI cannot be re-targetted, and this is
|
|
* CPEI target, then dont create the control file
|
|
*/
|
|
if (!can_cpei_retarget() && is_cpu_cpei_target(num))
|
|
sysfs_cpus[num].cpu.no_control = 1;
|
|
#endif
|
|
|
|
return register_cpu(&sysfs_cpus[num].cpu, num, parent);
|
|
}
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
void arch_unregister_cpu(int num)
|
|
{
|
|
struct node *parent = NULL;
|
|
|
|
#ifdef CONFIG_NUMA
|
|
int node = cpu_to_node(num);
|
|
parent = &sysfs_nodes[node];
|
|
#endif /* CONFIG_NUMA */
|
|
|
|
return unregister_cpu(&sysfs_cpus[num].cpu, parent);
|
|
}
|
|
EXPORT_SYMBOL(arch_register_cpu);
|
|
EXPORT_SYMBOL(arch_unregister_cpu);
|
|
#endif /*CONFIG_HOTPLUG_CPU*/
|
|
|
|
|
|
static int __init topology_init(void)
|
|
{
|
|
int i, err = 0;
|
|
|
|
#ifdef CONFIG_NUMA
|
|
sysfs_nodes = kzalloc(sizeof(struct node) * MAX_NUMNODES, GFP_KERNEL);
|
|
if (!sysfs_nodes) {
|
|
err = -ENOMEM;
|
|
goto out;
|
|
}
|
|
|
|
/*
|
|
* MCD - Do we want to register all ONLINE nodes, or all POSSIBLE nodes?
|
|
*/
|
|
for_each_online_node(i) {
|
|
if ((err = register_node(&sysfs_nodes[i], i, 0)))
|
|
goto out;
|
|
}
|
|
#endif
|
|
|
|
sysfs_cpus = kzalloc(sizeof(struct ia64_cpu) * NR_CPUS, GFP_KERNEL);
|
|
if (!sysfs_cpus) {
|
|
err = -ENOMEM;
|
|
goto out;
|
|
}
|
|
|
|
for_each_present_cpu(i) {
|
|
if((err = arch_register_cpu(i)))
|
|
goto out;
|
|
}
|
|
out:
|
|
return err;
|
|
}
|
|
|
|
subsys_initcall(topology_init);
|