23ca4bba3e
* Introduce a new PER_CPU macro called "EARLY_PER_CPU". This is used by some per_cpu variables that are initialized and accessed before there are per_cpu areas allocated. ["Early" in respect to per_cpu variables is "earlier than the per_cpu areas have been setup".] This patchset adds these new macros: DEFINE_EARLY_PER_CPU(_type, _name, _initvalue) EXPORT_EARLY_PER_CPU_SYMBOL(_name) DECLARE_EARLY_PER_CPU(_type, _name) early_per_cpu_ptr(_name) early_per_cpu_map(_name, _idx) early_per_cpu(_name, _cpu) The DEFINE macro defines the per_cpu variable as well as the early map and pointer. It also initializes the per_cpu variable and map elements to "_initvalue". The early_* macros provide access to the initial map (usually setup during system init) and the early pointer. This pointer is initialized to point to the early map but is then NULL'ed when the actual per_cpu areas are setup. After that the per_cpu variable is the correct access to the variable. The early_per_cpu() macro is not very efficient but does show how to access the variable if you have a function that can be called both "early" and "late". It tests the early ptr to be NULL, and if not then it's still valid. Otherwise, the per_cpu variable is used instead: #define early_per_cpu(_name, _cpu) \ (early_per_cpu_ptr(_name) ? \ early_per_cpu_ptr(_name)[_cpu] : \ per_cpu(_name, _cpu)) A better method is to actually check the pointer manually. In the case below, numa_set_node can be called both "early" and "late": void __cpuinit numa_set_node(int cpu, int node) { int *cpu_to_node_map = early_per_cpu_ptr(x86_cpu_to_node_map); if (cpu_to_node_map) cpu_to_node_map[cpu] = node; else per_cpu(x86_cpu_to_node_map, cpu) = node; } * Add a flag "arch_provides_topology_pointers" that indicates pointers to topology cpumask_t maps are available. Otherwise, use the function returning the cpumask_t value. This is useful if cpumask_t set size is very large to avoid copying data on to/off of the stack. * The coverage of CONFIG_DEBUG_PER_CPU_MAPS has been increased while the non-debug case has been optimized a bit. * Remove an unreferenced compiler warning in drivers/base/topology.c * Clean up #ifdef in setup.c For inclusion into sched-devel/latest tree. Based on: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git + sched-devel/latest .../mingo/linux-2.6-sched-devel.git Signed-off-by: Mike Travis <travis@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
197 lines
5.1 KiB
C
197 lines
5.1 KiB
C
/*
|
|
* driver/base/topology.c - Populate sysfs with cpu topology information
|
|
*
|
|
* Written by: Zhang Yanmin, Intel Corporation
|
|
*
|
|
* Copyright (C) 2006, Intel Corp.
|
|
*
|
|
* 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.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
|
|
* NON INFRINGEMENT. See the GNU General Public License for more
|
|
* details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*
|
|
*/
|
|
#include <linux/sysdev.h>
|
|
#include <linux/init.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/cpu.h>
|
|
#include <linux/module.h>
|
|
#include <linux/topology.h>
|
|
|
|
#define define_one_ro(_name) \
|
|
static SYSDEV_ATTR(_name, 0444, show_##_name, NULL)
|
|
|
|
#define define_id_show_func(name) \
|
|
static ssize_t show_##name(struct sys_device *dev, char *buf) \
|
|
{ \
|
|
unsigned int cpu = dev->id; \
|
|
return sprintf(buf, "%d\n", topology_##name(cpu)); \
|
|
}
|
|
|
|
#if defined(topology_thread_siblings) || defined(topology_core_siblings)
|
|
static ssize_t show_cpumap(int type, cpumask_t *mask, char *buf)
|
|
{
|
|
ptrdiff_t len = PTR_ALIGN(buf + PAGE_SIZE - 1, PAGE_SIZE) - buf;
|
|
int n = 0;
|
|
|
|
if (len > 1) {
|
|
n = type?
|
|
cpulist_scnprintf(buf, len-2, *mask):
|
|
cpumask_scnprintf(buf, len-2, *mask);
|
|
buf[n++] = '\n';
|
|
buf[n] = '\0';
|
|
}
|
|
return n;
|
|
}
|
|
#endif
|
|
|
|
#ifdef arch_provides_topology_pointers
|
|
#define define_siblings_show_map(name) \
|
|
static ssize_t show_##name(struct sys_device *dev, char *buf) \
|
|
{ \
|
|
unsigned int cpu = dev->id; \
|
|
return show_cpumap(0, &(topology_##name(cpu)), buf); \
|
|
}
|
|
|
|
#define define_siblings_show_list(name) \
|
|
static ssize_t show_##name##_list(struct sys_device *dev, char *buf) \
|
|
{ \
|
|
unsigned int cpu = dev->id; \
|
|
return show_cpumap(1, &(topology_##name(cpu)), buf); \
|
|
}
|
|
|
|
#else
|
|
#define define_siblings_show_map(name) \
|
|
static ssize_t show_##name(struct sys_device *dev, char *buf) \
|
|
{ \
|
|
unsigned int cpu = dev->id; \
|
|
cpumask_t mask = topology_##name(cpu); \
|
|
return show_cpumap(0, &mask, buf); \
|
|
}
|
|
|
|
#define define_siblings_show_list(name) \
|
|
static ssize_t show_##name##_list(struct sys_device *dev, char *buf) \
|
|
{ \
|
|
unsigned int cpu = dev->id; \
|
|
cpumask_t mask = topology_##name(cpu); \
|
|
return show_cpumap(1, &mask, buf); \
|
|
}
|
|
#endif
|
|
|
|
#define define_siblings_show_func(name) \
|
|
define_siblings_show_map(name); define_siblings_show_list(name)
|
|
|
|
#ifdef topology_physical_package_id
|
|
define_id_show_func(physical_package_id);
|
|
define_one_ro(physical_package_id);
|
|
#define ref_physical_package_id_attr &attr_physical_package_id.attr,
|
|
#else
|
|
#define ref_physical_package_id_attr
|
|
#endif
|
|
|
|
#ifdef topology_core_id
|
|
define_id_show_func(core_id);
|
|
define_one_ro(core_id);
|
|
#define ref_core_id_attr &attr_core_id.attr,
|
|
#else
|
|
#define ref_core_id_attr
|
|
#endif
|
|
|
|
#ifdef topology_thread_siblings
|
|
define_siblings_show_func(thread_siblings);
|
|
define_one_ro(thread_siblings);
|
|
define_one_ro(thread_siblings_list);
|
|
#define ref_thread_siblings_attr \
|
|
&attr_thread_siblings.attr, &attr_thread_siblings_list.attr,
|
|
#else
|
|
#define ref_thread_siblings_attr
|
|
#endif
|
|
|
|
#ifdef topology_core_siblings
|
|
define_siblings_show_func(core_siblings);
|
|
define_one_ro(core_siblings);
|
|
define_one_ro(core_siblings_list);
|
|
#define ref_core_siblings_attr \
|
|
&attr_core_siblings.attr, &attr_core_siblings_list.attr,
|
|
#else
|
|
#define ref_core_siblings_attr
|
|
#endif
|
|
|
|
static struct attribute *default_attrs[] = {
|
|
ref_physical_package_id_attr
|
|
ref_core_id_attr
|
|
ref_thread_siblings_attr
|
|
ref_core_siblings_attr
|
|
NULL
|
|
};
|
|
|
|
static struct attribute_group topology_attr_group = {
|
|
.attrs = default_attrs,
|
|
.name = "topology"
|
|
};
|
|
|
|
/* Add/Remove cpu_topology interface for CPU device */
|
|
static int __cpuinit topology_add_dev(unsigned int cpu)
|
|
{
|
|
struct sys_device *sys_dev = get_cpu_sysdev(cpu);
|
|
|
|
return sysfs_create_group(&sys_dev->kobj, &topology_attr_group);
|
|
}
|
|
|
|
static void __cpuinit topology_remove_dev(unsigned int cpu)
|
|
{
|
|
struct sys_device *sys_dev = get_cpu_sysdev(cpu);
|
|
|
|
sysfs_remove_group(&sys_dev->kobj, &topology_attr_group);
|
|
}
|
|
|
|
static int __cpuinit topology_cpu_callback(struct notifier_block *nfb,
|
|
unsigned long action, void *hcpu)
|
|
{
|
|
unsigned int cpu = (unsigned long)hcpu;
|
|
int rc = 0;
|
|
|
|
switch (action) {
|
|
case CPU_UP_PREPARE:
|
|
case CPU_UP_PREPARE_FROZEN:
|
|
rc = topology_add_dev(cpu);
|
|
break;
|
|
case CPU_UP_CANCELED:
|
|
case CPU_UP_CANCELED_FROZEN:
|
|
case CPU_DEAD:
|
|
case CPU_DEAD_FROZEN:
|
|
topology_remove_dev(cpu);
|
|
break;
|
|
}
|
|
return rc ? NOTIFY_BAD : NOTIFY_OK;
|
|
}
|
|
|
|
static int __cpuinit topology_sysfs_init(void)
|
|
{
|
|
int cpu;
|
|
int rc;
|
|
|
|
for_each_online_cpu(cpu) {
|
|
rc = topology_add_dev(cpu);
|
|
if (rc)
|
|
return rc;
|
|
}
|
|
hotcpu_notifier(topology_cpu_callback, 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
device_initcall(topology_sysfs_init);
|