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>
115 lines
2.9 KiB
C
115 lines
2.9 KiB
C
/*
|
|
* linux/include/asm-ia64/topology.h
|
|
*
|
|
* Copyright (C) 2002, Erich Focht, NEC
|
|
*
|
|
* All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
#ifndef _ASM_IA64_TOPOLOGY_H
|
|
#define _ASM_IA64_TOPOLOGY_H
|
|
|
|
#include <asm/acpi.h>
|
|
#include <asm/numa.h>
|
|
#include <asm/smp.h>
|
|
|
|
#ifdef CONFIG_NUMA
|
|
|
|
/* Nodes w/o CPUs are preferred for memory allocations, see build_zonelists */
|
|
#define PENALTY_FOR_NODE_WITH_CPUS 255
|
|
|
|
/*
|
|
* Returns the number of the node containing CPU 'cpu'
|
|
*/
|
|
#define cpu_to_node(cpu) (int)(cpu_to_node_map[cpu])
|
|
|
|
/*
|
|
* Returns a bitmask of CPUs on Node 'node'.
|
|
*/
|
|
#define node_to_cpumask(node) (node_to_cpu_mask[node])
|
|
|
|
/*
|
|
* Returns the number of the node containing Node 'nid'.
|
|
* Not implemented here. Multi-level hierarchies detected with
|
|
* the help of node_distance().
|
|
*/
|
|
#define parent_node(nid) (nid)
|
|
|
|
/*
|
|
* Returns the number of the first CPU on Node 'node'.
|
|
*/
|
|
#define node_to_first_cpu(node) (first_cpu(node_to_cpumask(node)))
|
|
|
|
/*
|
|
* Determines the node for a given pci bus
|
|
*/
|
|
#define pcibus_to_node(bus) PCI_CONTROLLER(bus)->node
|
|
|
|
void build_cpu_to_node_map(void);
|
|
|
|
#define SD_CPU_INIT (struct sched_domain) { \
|
|
.span = CPU_MASK_NONE, \
|
|
.parent = NULL, \
|
|
.groups = NULL, \
|
|
.min_interval = 1, \
|
|
.max_interval = 4, \
|
|
.busy_factor = 64, \
|
|
.imbalance_pct = 125, \
|
|
.per_cpu_gain = 100, \
|
|
.cache_nice_tries = 2, \
|
|
.busy_idx = 2, \
|
|
.idle_idx = 1, \
|
|
.newidle_idx = 2, \
|
|
.wake_idx = 1, \
|
|
.forkexec_idx = 1, \
|
|
.flags = SD_LOAD_BALANCE \
|
|
| SD_BALANCE_NEWIDLE \
|
|
| SD_BALANCE_EXEC \
|
|
| SD_WAKE_AFFINE, \
|
|
.last_balance = jiffies, \
|
|
.balance_interval = 1, \
|
|
.nr_balance_failed = 0, \
|
|
}
|
|
|
|
/* sched_domains SD_NODE_INIT for IA64 NUMA machines */
|
|
#define SD_NODE_INIT (struct sched_domain) { \
|
|
.span = CPU_MASK_NONE, \
|
|
.parent = NULL, \
|
|
.groups = NULL, \
|
|
.min_interval = 8, \
|
|
.max_interval = 8*(min(num_online_cpus(), 32)), \
|
|
.busy_factor = 64, \
|
|
.imbalance_pct = 125, \
|
|
.cache_nice_tries = 2, \
|
|
.busy_idx = 3, \
|
|
.idle_idx = 2, \
|
|
.newidle_idx = 0, /* unused */ \
|
|
.wake_idx = 1, \
|
|
.forkexec_idx = 1, \
|
|
.per_cpu_gain = 100, \
|
|
.flags = SD_LOAD_BALANCE \
|
|
| SD_BALANCE_EXEC \
|
|
| SD_BALANCE_FORK \
|
|
| SD_WAKE_BALANCE, \
|
|
.last_balance = jiffies, \
|
|
.balance_interval = 64, \
|
|
.nr_balance_failed = 0, \
|
|
}
|
|
|
|
#endif /* CONFIG_NUMA */
|
|
|
|
#ifdef CONFIG_SMP
|
|
#define topology_physical_package_id(cpu) (cpu_data(cpu)->socket_id)
|
|
#define topology_core_id(cpu) (cpu_data(cpu)->core_id)
|
|
#define topology_core_siblings(cpu) (cpu_core_map[cpu])
|
|
#define topology_thread_siblings(cpu) (cpu_sibling_map[cpu])
|
|
#endif
|
|
|
|
#include <asm-generic/topology.h>
|
|
|
|
#endif /* _ASM_IA64_TOPOLOGY_H */
|