forked from Minki/linux
86d18a55dd
I don't have a z10 to test this anymore, so I have no idea if the code works at all or even crashes. I can try to emulate, but it is just guess work. Nor do we know if the z10 special handling is performance wise still better than the generic handling. There have been a lot of changes to the scheduler. Therefore let's play safe and remove the special handling. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
477 lines
11 KiB
C
477 lines
11 KiB
C
/*
|
|
* Copyright IBM Corp. 2007, 2011
|
|
* Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
|
|
*/
|
|
|
|
#define KMSG_COMPONENT "cpu"
|
|
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
|
|
|
|
#include <linux/workqueue.h>
|
|
#include <linux/cpuset.h>
|
|
#include <linux/device.h>
|
|
#include <linux/export.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/init.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/cpu.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/nodemask.h>
|
|
#include <linux/node.h>
|
|
#include <asm/sysinfo.h>
|
|
#include <asm/numa.h>
|
|
|
|
#define PTF_HORIZONTAL (0UL)
|
|
#define PTF_VERTICAL (1UL)
|
|
#define PTF_CHECK (2UL)
|
|
|
|
struct mask_info {
|
|
struct mask_info *next;
|
|
unsigned char id;
|
|
cpumask_t mask;
|
|
};
|
|
|
|
static void set_topology_timer(void);
|
|
static void topology_work_fn(struct work_struct *work);
|
|
static struct sysinfo_15_1_x *tl_info;
|
|
|
|
static bool topology_enabled = true;
|
|
static DECLARE_WORK(topology_work, topology_work_fn);
|
|
|
|
/*
|
|
* Socket/Book linked lists and per_cpu(cpu_topology) updates are
|
|
* protected by "sched_domains_mutex".
|
|
*/
|
|
static struct mask_info socket_info;
|
|
static struct mask_info book_info;
|
|
static struct mask_info drawer_info;
|
|
|
|
DEFINE_PER_CPU(struct cpu_topology_s390, cpu_topology);
|
|
EXPORT_PER_CPU_SYMBOL_GPL(cpu_topology);
|
|
|
|
static cpumask_t cpu_group_map(struct mask_info *info, unsigned int cpu)
|
|
{
|
|
cpumask_t mask;
|
|
|
|
cpumask_copy(&mask, cpumask_of(cpu));
|
|
if (!topology_enabled || !MACHINE_HAS_TOPOLOGY)
|
|
return mask;
|
|
for (; info; info = info->next) {
|
|
if (cpumask_test_cpu(cpu, &info->mask))
|
|
return info->mask;
|
|
}
|
|
return mask;
|
|
}
|
|
|
|
static cpumask_t cpu_thread_map(unsigned int cpu)
|
|
{
|
|
cpumask_t mask;
|
|
int i;
|
|
|
|
cpumask_copy(&mask, cpumask_of(cpu));
|
|
if (!topology_enabled || !MACHINE_HAS_TOPOLOGY)
|
|
return mask;
|
|
cpu -= cpu % (smp_cpu_mtid + 1);
|
|
for (i = 0; i <= smp_cpu_mtid; i++)
|
|
if (cpu_present(cpu + i))
|
|
cpumask_set_cpu(cpu + i, &mask);
|
|
return mask;
|
|
}
|
|
|
|
static void add_cpus_to_mask(struct topology_core *tl_core,
|
|
struct mask_info *drawer,
|
|
struct mask_info *book,
|
|
struct mask_info *socket)
|
|
{
|
|
struct cpu_topology_s390 *topo;
|
|
unsigned int core;
|
|
|
|
for_each_set_bit(core, &tl_core->mask[0], TOPOLOGY_CORE_BITS) {
|
|
unsigned int rcore;
|
|
int lcpu, i;
|
|
|
|
rcore = TOPOLOGY_CORE_BITS - 1 - core + tl_core->origin;
|
|
lcpu = smp_find_processor_id(rcore << smp_cpu_mt_shift);
|
|
if (lcpu < 0)
|
|
continue;
|
|
for (i = 0; i <= smp_cpu_mtid; i++) {
|
|
topo = &per_cpu(cpu_topology, lcpu + i);
|
|
topo->drawer_id = drawer->id;
|
|
topo->book_id = book->id;
|
|
topo->socket_id = socket->id;
|
|
topo->core_id = rcore;
|
|
topo->thread_id = lcpu + i;
|
|
cpumask_set_cpu(lcpu + i, &drawer->mask);
|
|
cpumask_set_cpu(lcpu + i, &book->mask);
|
|
cpumask_set_cpu(lcpu + i, &socket->mask);
|
|
smp_cpu_set_polarization(lcpu + i, tl_core->pp);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void clear_masks(void)
|
|
{
|
|
struct mask_info *info;
|
|
|
|
info = &socket_info;
|
|
while (info) {
|
|
cpumask_clear(&info->mask);
|
|
info = info->next;
|
|
}
|
|
info = &book_info;
|
|
while (info) {
|
|
cpumask_clear(&info->mask);
|
|
info = info->next;
|
|
}
|
|
info = &drawer_info;
|
|
while (info) {
|
|
cpumask_clear(&info->mask);
|
|
info = info->next;
|
|
}
|
|
}
|
|
|
|
static union topology_entry *next_tle(union topology_entry *tle)
|
|
{
|
|
if (!tle->nl)
|
|
return (union topology_entry *)((struct topology_core *)tle + 1);
|
|
return (union topology_entry *)((struct topology_container *)tle + 1);
|
|
}
|
|
|
|
static void tl_to_masks(struct sysinfo_15_1_x *info)
|
|
{
|
|
struct mask_info *socket = &socket_info;
|
|
struct mask_info *book = &book_info;
|
|
struct mask_info *drawer = &drawer_info;
|
|
union topology_entry *tle, *end;
|
|
|
|
clear_masks();
|
|
tle = info->tle;
|
|
end = (union topology_entry *)((unsigned long)info + info->length);
|
|
while (tle < end) {
|
|
switch (tle->nl) {
|
|
case 3:
|
|
drawer = drawer->next;
|
|
drawer->id = tle->container.id;
|
|
break;
|
|
case 2:
|
|
book = book->next;
|
|
book->id = tle->container.id;
|
|
break;
|
|
case 1:
|
|
socket = socket->next;
|
|
socket->id = tle->container.id;
|
|
break;
|
|
case 0:
|
|
add_cpus_to_mask(&tle->cpu, drawer, book, socket);
|
|
break;
|
|
default:
|
|
clear_masks();
|
|
return;
|
|
}
|
|
tle = next_tle(tle);
|
|
}
|
|
}
|
|
|
|
static void topology_update_polarization_simple(void)
|
|
{
|
|
int cpu;
|
|
|
|
mutex_lock(&smp_cpu_state_mutex);
|
|
for_each_possible_cpu(cpu)
|
|
smp_cpu_set_polarization(cpu, POLARIZATION_HRZ);
|
|
mutex_unlock(&smp_cpu_state_mutex);
|
|
}
|
|
|
|
static int ptf(unsigned long fc)
|
|
{
|
|
int rc;
|
|
|
|
asm volatile(
|
|
" .insn rre,0xb9a20000,%1,%1\n"
|
|
" ipm %0\n"
|
|
" srl %0,28\n"
|
|
: "=d" (rc)
|
|
: "d" (fc) : "cc");
|
|
return rc;
|
|
}
|
|
|
|
int topology_set_cpu_management(int fc)
|
|
{
|
|
int cpu, rc;
|
|
|
|
if (!MACHINE_HAS_TOPOLOGY)
|
|
return -EOPNOTSUPP;
|
|
if (fc)
|
|
rc = ptf(PTF_VERTICAL);
|
|
else
|
|
rc = ptf(PTF_HORIZONTAL);
|
|
if (rc)
|
|
return -EBUSY;
|
|
for_each_possible_cpu(cpu)
|
|
smp_cpu_set_polarization(cpu, POLARIZATION_UNKNOWN);
|
|
return rc;
|
|
}
|
|
|
|
static void update_cpu_masks(void)
|
|
{
|
|
struct cpu_topology_s390 *topo;
|
|
int cpu;
|
|
|
|
for_each_possible_cpu(cpu) {
|
|
topo = &per_cpu(cpu_topology, cpu);
|
|
topo->thread_mask = cpu_thread_map(cpu);
|
|
topo->core_mask = cpu_group_map(&socket_info, cpu);
|
|
topo->book_mask = cpu_group_map(&book_info, cpu);
|
|
topo->drawer_mask = cpu_group_map(&drawer_info, cpu);
|
|
if (!MACHINE_HAS_TOPOLOGY) {
|
|
topo->thread_id = cpu;
|
|
topo->core_id = cpu;
|
|
topo->socket_id = cpu;
|
|
topo->book_id = cpu;
|
|
topo->drawer_id = cpu;
|
|
}
|
|
}
|
|
numa_update_cpu_topology();
|
|
}
|
|
|
|
void store_topology(struct sysinfo_15_1_x *info)
|
|
{
|
|
stsi(info, 15, 1, min(topology_max_mnest, 4));
|
|
}
|
|
|
|
int arch_update_cpu_topology(void)
|
|
{
|
|
struct sysinfo_15_1_x *info = tl_info;
|
|
struct device *dev;
|
|
int cpu, rc = 0;
|
|
|
|
if (MACHINE_HAS_TOPOLOGY) {
|
|
rc = 1;
|
|
store_topology(info);
|
|
tl_to_masks(info);
|
|
}
|
|
update_cpu_masks();
|
|
if (!MACHINE_HAS_TOPOLOGY)
|
|
topology_update_polarization_simple();
|
|
for_each_online_cpu(cpu) {
|
|
dev = get_cpu_device(cpu);
|
|
kobject_uevent(&dev->kobj, KOBJ_CHANGE);
|
|
}
|
|
return rc;
|
|
}
|
|
|
|
static void topology_work_fn(struct work_struct *work)
|
|
{
|
|
rebuild_sched_domains();
|
|
}
|
|
|
|
void topology_schedule_update(void)
|
|
{
|
|
schedule_work(&topology_work);
|
|
}
|
|
|
|
static void topology_timer_fn(unsigned long ignored)
|
|
{
|
|
if (ptf(PTF_CHECK))
|
|
topology_schedule_update();
|
|
set_topology_timer();
|
|
}
|
|
|
|
static struct timer_list topology_timer =
|
|
TIMER_DEFERRED_INITIALIZER(topology_timer_fn, 0, 0);
|
|
|
|
static atomic_t topology_poll = ATOMIC_INIT(0);
|
|
|
|
static void set_topology_timer(void)
|
|
{
|
|
if (atomic_add_unless(&topology_poll, -1, 0))
|
|
mod_timer(&topology_timer, jiffies + HZ / 10);
|
|
else
|
|
mod_timer(&topology_timer, jiffies + HZ * 60);
|
|
}
|
|
|
|
void topology_expect_change(void)
|
|
{
|
|
if (!MACHINE_HAS_TOPOLOGY)
|
|
return;
|
|
/* This is racy, but it doesn't matter since it is just a heuristic.
|
|
* Worst case is that we poll in a higher frequency for a bit longer.
|
|
*/
|
|
if (atomic_read(&topology_poll) > 60)
|
|
return;
|
|
atomic_add(60, &topology_poll);
|
|
set_topology_timer();
|
|
}
|
|
|
|
static int cpu_management;
|
|
|
|
static ssize_t dispatching_show(struct device *dev,
|
|
struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
ssize_t count;
|
|
|
|
mutex_lock(&smp_cpu_state_mutex);
|
|
count = sprintf(buf, "%d\n", cpu_management);
|
|
mutex_unlock(&smp_cpu_state_mutex);
|
|
return count;
|
|
}
|
|
|
|
static ssize_t dispatching_store(struct device *dev,
|
|
struct device_attribute *attr,
|
|
const char *buf,
|
|
size_t count)
|
|
{
|
|
int val, rc;
|
|
char delim;
|
|
|
|
if (sscanf(buf, "%d %c", &val, &delim) != 1)
|
|
return -EINVAL;
|
|
if (val != 0 && val != 1)
|
|
return -EINVAL;
|
|
rc = 0;
|
|
get_online_cpus();
|
|
mutex_lock(&smp_cpu_state_mutex);
|
|
if (cpu_management == val)
|
|
goto out;
|
|
rc = topology_set_cpu_management(val);
|
|
if (rc)
|
|
goto out;
|
|
cpu_management = val;
|
|
topology_expect_change();
|
|
out:
|
|
mutex_unlock(&smp_cpu_state_mutex);
|
|
put_online_cpus();
|
|
return rc ? rc : count;
|
|
}
|
|
static DEVICE_ATTR(dispatching, 0644, dispatching_show,
|
|
dispatching_store);
|
|
|
|
static ssize_t cpu_polarization_show(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
int cpu = dev->id;
|
|
ssize_t count;
|
|
|
|
mutex_lock(&smp_cpu_state_mutex);
|
|
switch (smp_cpu_get_polarization(cpu)) {
|
|
case POLARIZATION_HRZ:
|
|
count = sprintf(buf, "horizontal\n");
|
|
break;
|
|
case POLARIZATION_VL:
|
|
count = sprintf(buf, "vertical:low\n");
|
|
break;
|
|
case POLARIZATION_VM:
|
|
count = sprintf(buf, "vertical:medium\n");
|
|
break;
|
|
case POLARIZATION_VH:
|
|
count = sprintf(buf, "vertical:high\n");
|
|
break;
|
|
default:
|
|
count = sprintf(buf, "unknown\n");
|
|
break;
|
|
}
|
|
mutex_unlock(&smp_cpu_state_mutex);
|
|
return count;
|
|
}
|
|
static DEVICE_ATTR(polarization, 0444, cpu_polarization_show, NULL);
|
|
|
|
static struct attribute *topology_cpu_attrs[] = {
|
|
&dev_attr_polarization.attr,
|
|
NULL,
|
|
};
|
|
|
|
static struct attribute_group topology_cpu_attr_group = {
|
|
.attrs = topology_cpu_attrs,
|
|
};
|
|
|
|
int topology_cpu_init(struct cpu *cpu)
|
|
{
|
|
return sysfs_create_group(&cpu->dev.kobj, &topology_cpu_attr_group);
|
|
}
|
|
|
|
static const struct cpumask *cpu_thread_mask(int cpu)
|
|
{
|
|
return &per_cpu(cpu_topology, cpu).thread_mask;
|
|
}
|
|
|
|
|
|
const struct cpumask *cpu_coregroup_mask(int cpu)
|
|
{
|
|
return &per_cpu(cpu_topology, cpu).core_mask;
|
|
}
|
|
|
|
static const struct cpumask *cpu_book_mask(int cpu)
|
|
{
|
|
return &per_cpu(cpu_topology, cpu).book_mask;
|
|
}
|
|
|
|
static const struct cpumask *cpu_drawer_mask(int cpu)
|
|
{
|
|
return &per_cpu(cpu_topology, cpu).drawer_mask;
|
|
}
|
|
|
|
static int __init early_parse_topology(char *p)
|
|
{
|
|
return kstrtobool(p, &topology_enabled);
|
|
}
|
|
early_param("topology", early_parse_topology);
|
|
|
|
static struct sched_domain_topology_level s390_topology[] = {
|
|
{ cpu_thread_mask, cpu_smt_flags, SD_INIT_NAME(SMT) },
|
|
{ cpu_coregroup_mask, cpu_core_flags, SD_INIT_NAME(MC) },
|
|
{ cpu_book_mask, SD_INIT_NAME(BOOK) },
|
|
{ cpu_drawer_mask, SD_INIT_NAME(DRAWER) },
|
|
{ cpu_cpu_mask, SD_INIT_NAME(DIE) },
|
|
{ NULL, },
|
|
};
|
|
|
|
static void __init alloc_masks(struct sysinfo_15_1_x *info,
|
|
struct mask_info *mask, int offset)
|
|
{
|
|
int i, nr_masks;
|
|
|
|
nr_masks = info->mag[TOPOLOGY_NR_MAG - offset];
|
|
for (i = 0; i < info->mnest - offset; i++)
|
|
nr_masks *= info->mag[TOPOLOGY_NR_MAG - offset - 1 - i];
|
|
nr_masks = max(nr_masks, 1);
|
|
for (i = 0; i < nr_masks; i++) {
|
|
mask->next = kzalloc(sizeof(*mask->next), GFP_KERNEL);
|
|
mask = mask->next;
|
|
}
|
|
}
|
|
|
|
static int __init s390_topology_init(void)
|
|
{
|
|
struct sysinfo_15_1_x *info;
|
|
int i;
|
|
|
|
if (!MACHINE_HAS_TOPOLOGY)
|
|
return 0;
|
|
tl_info = (struct sysinfo_15_1_x *)__get_free_page(GFP_KERNEL);
|
|
info = tl_info;
|
|
store_topology(info);
|
|
pr_info("The CPU configuration topology of the machine is:");
|
|
for (i = 0; i < TOPOLOGY_NR_MAG; i++)
|
|
printk(KERN_CONT " %d", info->mag[i]);
|
|
printk(KERN_CONT " / %d\n", info->mnest);
|
|
alloc_masks(info, &socket_info, 1);
|
|
alloc_masks(info, &book_info, 2);
|
|
alloc_masks(info, &drawer_info, 3);
|
|
set_sched_topology(s390_topology);
|
|
return 0;
|
|
}
|
|
early_initcall(s390_topology_init);
|
|
|
|
static int __init topology_init(void)
|
|
{
|
|
if (MACHINE_HAS_TOPOLOGY)
|
|
set_topology_timer();
|
|
else
|
|
topology_update_polarization_simple();
|
|
return device_create_file(cpu_subsys.dev_root, &dev_attr_dispatching);
|
|
}
|
|
device_initcall(topology_init);
|