mirror of
https://github.com/torvalds/linux.git
synced 2024-12-25 12:21:37 +00:00
467a9e1633
The purpose of this single series of commits from Srivatsa S Bhat (with a small piece from Gautham R Shenoy) touching multiple subsystems that use CPU hotplug notifiers is to provide a way to register them that will not lead to deadlocks with CPU online/offline operations as described in the changelog of commit93ae4f978c
(CPU hotplug: Provide lockless versions of callback registration functions). The first three commits in the series introduce the API and document it and the rest simply goes through the users of CPU hotplug notifiers and converts them to using the new method. / -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJTQow2AAoJEILEb/54YlRxW4QQAJlYRDUzwFJzJzYhltQYuVR+ 4D74XMtvXgoJfg3cwdSWvMKKpJZnA9BVN0f7Hcx9wYmgdexYUuHeZJmMNyc3S2+g KjKBIsugvgmZhHbbLd6TJ6GBbhGT5JLt9VmSfL9zIkveInU1YHFUUqL/mxdHm4J0 BSGKjk2rN3waRJgmY+xfliFLtQjDKFwJpMuvrgtoUyfas3f4sIV43UNbqdvA/weJ rzedxXOlKH/id4b56lj/4iIzcoL3mwvJJ7r6n0CEMsKv87z09kqR0O+69Tsq/cgs j17CsvoJOmZGk3QTeKVMQWBsvk6aPoDu3zK83gLbQMt+qjOpSTbJLz/3HZw4/TrW ss4nuZne1DLMGS+6hoxYbTP+6Ni//Kn+l/LrHc5jb7m1X3lMO4W2aV3IROtIE1rv lEP1IG01NU4u9YwkVj1dyhrkSp8tLPul4SrUK8W+oNweOC5crjJV7vJbIPJgmYiM IZN55wln0yVRtR4TX+rmvN0PixsInE8MeaVCmReApyF9pdzul/StxlBze5BKLSJD cqo1kNPpsmdxoDucqUpQ/gSvy+IOl2qnlisB5PpV93sk7De6TFDYrGHxjYIW7jMf StXwdCDDQhzd2Q8Kfpp895A1dbIl8rKtwA6bTU2eX+BfMVFzuMdT44cvosx1+UdQ sWl//rg76nb13dFjvF+q =SW7Q -----END PGP SIGNATURE----- Merge tag 'cpu-hotplug-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm Pull CPU hotplug notifiers registration fixes from Rafael Wysocki: "The purpose of this single series of commits from Srivatsa S Bhat (with a small piece from Gautham R Shenoy) touching multiple subsystems that use CPU hotplug notifiers is to provide a way to register them that will not lead to deadlocks with CPU online/offline operations as described in the changelog of commit93ae4f978c
("CPU hotplug: Provide lockless versions of callback registration functions"). The first three commits in the series introduce the API and document it and the rest simply goes through the users of CPU hotplug notifiers and converts them to using the new method" * tag 'cpu-hotplug-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (52 commits) net/iucv/iucv.c: Fix CPU hotplug callback registration net/core/flow.c: Fix CPU hotplug callback registration mm, zswap: Fix CPU hotplug callback registration mm, vmstat: Fix CPU hotplug callback registration profile: Fix CPU hotplug callback registration trace, ring-buffer: Fix CPU hotplug callback registration xen, balloon: Fix CPU hotplug callback registration hwmon, via-cputemp: Fix CPU hotplug callback registration hwmon, coretemp: Fix CPU hotplug callback registration thermal, x86-pkg-temp: Fix CPU hotplug callback registration octeon, watchdog: Fix CPU hotplug callback registration oprofile, nmi-timer: Fix CPU hotplug callback registration intel-idle: Fix CPU hotplug callback registration clocksource, dummy-timer: Fix CPU hotplug callback registration drivers/base/topology.c: Fix CPU hotplug callback registration acpi-cpufreq: Fix CPU hotplug callback registration zsmalloc: Fix CPU hotplug callback registration scsi, fcoe: Fix CPU hotplug callback registration scsi, bnx2fc: Fix CPU hotplug callback registration scsi, bnx2i: Fix CPU hotplug callback registration ...
180 lines
4.7 KiB
C
180 lines
4.7 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/mm.h>
|
|
#include <linux/cpu.h>
|
|
#include <linux/module.h>
|
|
#include <linux/hardirq.h>
|
|
#include <linux/topology.h>
|
|
|
|
#define define_one_ro_named(_name, _func) \
|
|
static DEVICE_ATTR(_name, 0444, _func, NULL)
|
|
|
|
#define define_one_ro(_name) \
|
|
static DEVICE_ATTR(_name, 0444, show_##_name, NULL)
|
|
|
|
#define define_id_show_func(name) \
|
|
static ssize_t show_##name(struct device *dev, \
|
|
struct device_attribute *attr, char *buf) \
|
|
{ \
|
|
unsigned int cpu = dev->id; \
|
|
return sprintf(buf, "%d\n", topology_##name(cpu)); \
|
|
}
|
|
|
|
#if defined(topology_thread_cpumask) || defined(topology_core_cpumask) || \
|
|
defined(topology_book_cpumask)
|
|
static ssize_t show_cpumap(int type, const struct cpumask *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
|
|
|
|
#define define_siblings_show_map(name) \
|
|
static ssize_t show_##name(struct device *dev, \
|
|
struct device_attribute *attr, char *buf) \
|
|
{ \
|
|
return show_cpumap(0, topology_##name(dev->id), buf); \
|
|
}
|
|
|
|
#define define_siblings_show_list(name) \
|
|
static ssize_t show_##name##_list(struct device *dev, \
|
|
struct device_attribute *attr, \
|
|
char *buf) \
|
|
{ \
|
|
return show_cpumap(1, topology_##name(dev->id), buf); \
|
|
}
|
|
|
|
#define define_siblings_show_func(name) \
|
|
define_siblings_show_map(name); define_siblings_show_list(name)
|
|
|
|
define_id_show_func(physical_package_id);
|
|
define_one_ro(physical_package_id);
|
|
|
|
define_id_show_func(core_id);
|
|
define_one_ro(core_id);
|
|
|
|
define_siblings_show_func(thread_cpumask);
|
|
define_one_ro_named(thread_siblings, show_thread_cpumask);
|
|
define_one_ro_named(thread_siblings_list, show_thread_cpumask_list);
|
|
|
|
define_siblings_show_func(core_cpumask);
|
|
define_one_ro_named(core_siblings, show_core_cpumask);
|
|
define_one_ro_named(core_siblings_list, show_core_cpumask_list);
|
|
|
|
#ifdef CONFIG_SCHED_BOOK
|
|
define_id_show_func(book_id);
|
|
define_one_ro(book_id);
|
|
define_siblings_show_func(book_cpumask);
|
|
define_one_ro_named(book_siblings, show_book_cpumask);
|
|
define_one_ro_named(book_siblings_list, show_book_cpumask_list);
|
|
#endif
|
|
|
|
static struct attribute *default_attrs[] = {
|
|
&dev_attr_physical_package_id.attr,
|
|
&dev_attr_core_id.attr,
|
|
&dev_attr_thread_siblings.attr,
|
|
&dev_attr_thread_siblings_list.attr,
|
|
&dev_attr_core_siblings.attr,
|
|
&dev_attr_core_siblings_list.attr,
|
|
#ifdef CONFIG_SCHED_BOOK
|
|
&dev_attr_book_id.attr,
|
|
&dev_attr_book_siblings.attr,
|
|
&dev_attr_book_siblings_list.attr,
|
|
#endif
|
|
NULL
|
|
};
|
|
|
|
static struct attribute_group topology_attr_group = {
|
|
.attrs = default_attrs,
|
|
.name = "topology"
|
|
};
|
|
|
|
/* Add/Remove cpu_topology interface for CPU device */
|
|
static int topology_add_dev(unsigned int cpu)
|
|
{
|
|
struct device *dev = get_cpu_device(cpu);
|
|
|
|
return sysfs_create_group(&dev->kobj, &topology_attr_group);
|
|
}
|
|
|
|
static void topology_remove_dev(unsigned int cpu)
|
|
{
|
|
struct device *dev = get_cpu_device(cpu);
|
|
|
|
sysfs_remove_group(&dev->kobj, &topology_attr_group);
|
|
}
|
|
|
|
static int 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 notifier_from_errno(rc);
|
|
}
|
|
|
|
static int topology_sysfs_init(void)
|
|
{
|
|
int cpu;
|
|
int rc = 0;
|
|
|
|
cpu_notifier_register_begin();
|
|
|
|
for_each_online_cpu(cpu) {
|
|
rc = topology_add_dev(cpu);
|
|
if (rc)
|
|
goto out;
|
|
}
|
|
__hotcpu_notifier(topology_cpu_callback, 0);
|
|
|
|
out:
|
|
cpu_notifier_register_done();
|
|
return rc;
|
|
}
|
|
|
|
device_initcall(topology_sysfs_init);
|