2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* pSeries NUMA support
|
|
|
|
*
|
|
|
|
* Copyright (C) 2002 Anton Blanchard <anton@au.ibm.com>, IBM
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
2014-10-11 00:04:49 +08:00
|
|
|
#define pr_fmt(fmt) "numa: " fmt
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/threads.h>
|
|
|
|
#include <linux/bootmem.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/mmzone.h>
|
2011-07-23 06:24:23 +08:00
|
|
|
#include <linux/export.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/nodemask.h>
|
|
|
|
#include <linux/cpu.h>
|
|
|
|
#include <linux/notifier.h>
|
2010-07-12 12:36:09 +08:00
|
|
|
#include <linux/memblock.h>
|
2008-02-14 08:37:49 +08:00
|
|
|
#include <linux/of.h>
|
powerpc/mm: Fix numa reserve bootmem page selection
Fix the powerpc NUMA reserve bootmem page selection logic.
commit 8f64e1f2d1e09267ac926e15090fd505c1c0cbcb (powerpc: Reserve
in bootmem lmb reserved regions that cross NUMA nodes) changed
the logic for how the powerpc LMB reserved regions were converted
to bootmen reserved regions. As the folowing discussion reports,
the new logic was not correct.
mark_reserved_regions_for_nid() goes through each LMB on the
system that specifies a reserved area. It searches for
active regions that intersect with that LMB and are on the
specified node. It attempts to bootmem-reserve only the area
where the active region and the reserved LMB intersect. We
can not reserve things on other nodes as they may not have
bootmem structures allocated, yet.
We base the size of the bootmem reservation on two possible
things. Normally, we just make the reservation start and
stop exactly at the start and end of the LMB.
However, the LMB reservations are not aware of NUMA nodes and
on occasion a single LMB may cross into several adjacent
active regions. Those may even be on different NUMA nodes
and will require separate calls to the bootmem reserve
functions. So, the bootmem reservation must be trimmed to
fit inside the current active region.
That's all fine and dandy, but we trim the reservation
in a page-aligned fashion. That's bad because we start the
reservation at a non-page-aligned address: physbase.
The reservation may only span 2 bytes, but that those bytes
may span two pfns and cause a reserve_size of 2*PAGE_SIZE.
Take the case where you reserve 0x2 bytes at 0x0fff and
where the active region ends at 0x1000. You'll jump into
that if() statment, but node_ar.end_pfn=0x1 and
start_pfn=0x0. You'll end up with a reserve_size=0x1000,
and then call
reserve_bootmem_node(node, physbase=0xfff, size=0x1000);
0x1000 may not be on the same node as 0xfff. Oops.
In almost all the vm code, end_<anything> is not inclusive.
If you have an end_pfn of 0x1234, page 0x1234 is not
included in the range. Using PFN_UP instead of the
(>> >> PAGE_SHIFT) will make this consistent with the other VM
code.
We also need to do math for the reserved size with physbase
instead of start_pfn. node_ar.end_pfn << PAGE_SHIFT is
*precisely* the end of the node. However,
(start_pfn << PAGE_SHIFT) is *NOT* precisely the beginning
of the reserved area. That is, of course, physbase.
If we don't use physbase here, the reserve_size can be
made too large.
From: Dave Hansen <dave@linux.vnet.ibm.com>
Tested-by: Geoff Levand <geoffrey.levand@am.sony.com> Tested on PS3.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2009-02-12 20:36:04 +08:00
|
|
|
#include <linux/pfn.h>
|
2010-12-01 20:31:15 +08:00
|
|
|
#include <linux/cpuset.h>
|
|
|
|
#include <linux/node.h>
|
2013-04-24 14:02:13 +08:00
|
|
|
#include <linux/stop_machine.h>
|
2013-04-24 14:07:39 +08:00
|
|
|
#include <linux/proc_fs.h>
|
|
|
|
#include <linux/seq_file.h>
|
|
|
|
#include <linux/uaccess.h>
|
2013-04-30 10:14:20 +08:00
|
|
|
#include <linux/slab.h>
|
2013-07-25 09:13:21 +08:00
|
|
|
#include <asm/cputhreads.h>
|
2005-11-11 11:22:35 +08:00
|
|
|
#include <asm/sparsemem.h>
|
2008-02-14 08:56:49 +08:00
|
|
|
#include <asm/prom.h>
|
2005-11-07 10:18:13 +08:00
|
|
|
#include <asm/smp.h>
|
powerpc: Fix the setup of CPU-to-Node mappings during CPU online
On POWER platforms, the hypervisor can notify the guest kernel about dynamic
changes in the cpu-numa associativity (VPHN topology update). Hence the
cpu-to-node mappings that we got from the firmware during boot, may no longer
be valid after such updates. This is handled using the arch_update_cpu_topology()
hook in the scheduler, and the sched-domains are rebuilt according to the new
mappings.
But unfortunately, at the moment, CPU hotplug ignores these updated mappings
and instead queries the firmware for the cpu-to-numa relationships and uses
them during CPU online. So the kernel can end up assigning wrong NUMA nodes
to CPUs during subsequent CPU hotplug online operations (after booting).
Further, a particularly problematic scenario can result from this bug:
On POWER platforms, the SMT mode can be switched between 1, 2, 4 (and even 8)
threads per core. The switch to Single-Threaded (ST) mode is performed by
offlining all except the first CPU thread in each core. Switching back to
SMT mode involves onlining those other threads back, in each core.
Now consider this scenario:
1. During boot, the kernel gets the cpu-to-node mappings from the firmware
and assigns the CPUs to NUMA nodes appropriately, during CPU online.
2. Later on, the hypervisor updates the cpu-to-node mappings dynamically and
communicates this update to the kernel. The kernel in turn updates its
cpu-to-node associations and rebuilds its sched domains. Everything is
fine so far.
3. Now, the user switches the machine from SMT to ST mode (say, by running
ppc64_cpu --smt=1). This involves offlining all except 1 thread in each
core.
4. The user then tries to switch back from ST to SMT mode (say, by running
ppc64_cpu --smt=4), and this involves onlining those threads back. Since
CPU hotplug ignores the new mappings, it queries the firmware and tries to
associate the newly onlined sibling threads to the old NUMA nodes. This
results in sibling threads within the same core getting associated with
different NUMA nodes, which is incorrect.
The scheduler's build-sched-domains code gets thoroughly confused with this
and enters an infinite loop and causes soft-lockups, as explained in detail
in commit 3be7db6ab (powerpc: VPHN topology change updates all siblings).
So to fix this, use the numa_cpu_lookup_table to remember the updated
cpu-to-node mappings, and use them during CPU hotplug online operations.
Further, we also need to ensure that all threads in a core are assigned to a
common NUMA node, irrespective of whether all those threads were online during
the topology update. To achieve this, we take care not to use cpu_sibling_mask()
since it is not hotplug invariant. Instead, we use cpu_first_sibling_thread()
and set up the mappings manually using the 'threads_per_core' value for that
particular platform. This helps us ensure that we don't hit this bug with any
combination of CPU hotplug and SMT mode switching.
Cc: stable@vger.kernel.org
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2013-12-30 19:35:34 +08:00
|
|
|
#include <asm/cputhreads.h>
|
|
|
|
#include <asm/topology.h>
|
2010-12-01 20:31:15 +08:00
|
|
|
#include <asm/firmware.h>
|
|
|
|
#include <asm/paca.h>
|
2010-12-18 06:07:47 +08:00
|
|
|
#include <asm/hvcall.h>
|
2012-03-29 01:30:02 +08:00
|
|
|
#include <asm/setup.h>
|
2013-04-24 14:03:48 +08:00
|
|
|
#include <asm/vdso.h>
|
2017-12-02 00:47:21 +08:00
|
|
|
#include <asm/drmem.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
static int numa_enabled = 1;
|
|
|
|
|
2008-02-01 12:57:31 +08:00
|
|
|
static char *cmdline __initdata;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static int numa_debug;
|
|
|
|
#define dbg(args...) if (numa_debug) { printk(KERN_INFO args); }
|
|
|
|
|
2005-11-11 11:22:35 +08:00
|
|
|
int numa_cpu_lookup_table[NR_CPUS];
|
2010-04-26 23:32:43 +08:00
|
|
|
cpumask_var_t node_to_cpumask_map[MAX_NUMNODES];
|
2005-04-17 06:20:36 +08:00
|
|
|
struct pglist_data *node_data[MAX_NUMNODES];
|
2005-11-11 11:22:35 +08:00
|
|
|
|
|
|
|
EXPORT_SYMBOL(numa_cpu_lookup_table);
|
2010-04-26 23:32:43 +08:00
|
|
|
EXPORT_SYMBOL(node_to_cpumask_map);
|
2005-11-11 11:22:35 +08:00
|
|
|
EXPORT_SYMBOL(node_data);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static int min_common_depth;
|
2005-12-06 04:06:42 +08:00
|
|
|
static int n_mem_addr_cells, n_mem_size_cells;
|
2010-05-17 04:22:31 +08:00
|
|
|
static int form1_affinity;
|
|
|
|
|
|
|
|
#define MAX_DISTANCE_REF_POINTS 4
|
|
|
|
static int distance_ref_points_depth;
|
2013-08-07 00:01:44 +08:00
|
|
|
static const __be32 *distance_ref_points;
|
2010-05-17 04:22:31 +08:00
|
|
|
static int distance_lookup_table[MAX_NUMNODES][MAX_DISTANCE_REF_POINTS];
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-04-26 23:32:43 +08:00
|
|
|
/*
|
|
|
|
* Allocate node_to_cpumask_map based on number of available nodes
|
|
|
|
* Requires node_possible_map to be valid.
|
|
|
|
*
|
2012-01-13 09:20:09 +08:00
|
|
|
* Note: cpumask_of_node() is not valid until after this is done.
|
2010-04-26 23:32:43 +08:00
|
|
|
*/
|
|
|
|
static void __init setup_node_to_cpumask_map(void)
|
|
|
|
{
|
2013-04-30 06:08:03 +08:00
|
|
|
unsigned int node;
|
2010-04-26 23:32:43 +08:00
|
|
|
|
|
|
|
/* setup nr_node_ids if not done yet */
|
2013-04-30 06:08:03 +08:00
|
|
|
if (nr_node_ids == MAX_NUMNODES)
|
|
|
|
setup_nr_node_ids();
|
2010-04-26 23:32:43 +08:00
|
|
|
|
|
|
|
/* allocate the map */
|
2015-11-06 10:46:29 +08:00
|
|
|
for_each_node(node)
|
2010-04-26 23:32:43 +08:00
|
|
|
alloc_bootmem_cpumask_var(&node_to_cpumask_map[node]);
|
|
|
|
|
|
|
|
/* cpumask_of_node() will now work */
|
|
|
|
dbg("Node to cpumask map for %d nodes\n", nr_node_ids);
|
|
|
|
}
|
|
|
|
|
2013-03-26 02:44:44 +08:00
|
|
|
static int __init fake_numa_create_new_node(unsigned long end_pfn,
|
2008-02-01 12:57:31 +08:00
|
|
|
unsigned int *nid)
|
|
|
|
{
|
|
|
|
unsigned long long mem;
|
|
|
|
char *p = cmdline;
|
|
|
|
static unsigned int fake_nid;
|
|
|
|
static unsigned long long curr_boundary;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Modify node id, iff we started creating NUMA nodes
|
|
|
|
* We want to continue from where we left of the last time
|
|
|
|
*/
|
|
|
|
if (fake_nid)
|
|
|
|
*nid = fake_nid;
|
|
|
|
/*
|
|
|
|
* In case there are no more arguments to parse, the
|
|
|
|
* node_id should be the same as the last fake node id
|
|
|
|
* (we've handled this above).
|
|
|
|
*/
|
|
|
|
if (!p)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
mem = memparse(p, &p);
|
|
|
|
if (!mem)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (mem < curr_boundary)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
curr_boundary = mem;
|
|
|
|
|
|
|
|
if ((end_pfn << PAGE_SHIFT) > mem) {
|
|
|
|
/*
|
|
|
|
* Skip commas and spaces
|
|
|
|
*/
|
|
|
|
while (*p == ',' || *p == ' ' || *p == '\t')
|
|
|
|
p++;
|
|
|
|
|
|
|
|
cmdline = p;
|
|
|
|
fake_nid++;
|
|
|
|
*nid = fake_nid;
|
|
|
|
dbg("created new fake_node with id %d\n", fake_nid);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
powerpc: Fix the setup of CPU-to-Node mappings during CPU online
On POWER platforms, the hypervisor can notify the guest kernel about dynamic
changes in the cpu-numa associativity (VPHN topology update). Hence the
cpu-to-node mappings that we got from the firmware during boot, may no longer
be valid after such updates. This is handled using the arch_update_cpu_topology()
hook in the scheduler, and the sched-domains are rebuilt according to the new
mappings.
But unfortunately, at the moment, CPU hotplug ignores these updated mappings
and instead queries the firmware for the cpu-to-numa relationships and uses
them during CPU online. So the kernel can end up assigning wrong NUMA nodes
to CPUs during subsequent CPU hotplug online operations (after booting).
Further, a particularly problematic scenario can result from this bug:
On POWER platforms, the SMT mode can be switched between 1, 2, 4 (and even 8)
threads per core. The switch to Single-Threaded (ST) mode is performed by
offlining all except the first CPU thread in each core. Switching back to
SMT mode involves onlining those other threads back, in each core.
Now consider this scenario:
1. During boot, the kernel gets the cpu-to-node mappings from the firmware
and assigns the CPUs to NUMA nodes appropriately, during CPU online.
2. Later on, the hypervisor updates the cpu-to-node mappings dynamically and
communicates this update to the kernel. The kernel in turn updates its
cpu-to-node associations and rebuilds its sched domains. Everything is
fine so far.
3. Now, the user switches the machine from SMT to ST mode (say, by running
ppc64_cpu --smt=1). This involves offlining all except 1 thread in each
core.
4. The user then tries to switch back from ST to SMT mode (say, by running
ppc64_cpu --smt=4), and this involves onlining those threads back. Since
CPU hotplug ignores the new mappings, it queries the firmware and tries to
associate the newly onlined sibling threads to the old NUMA nodes. This
results in sibling threads within the same core getting associated with
different NUMA nodes, which is incorrect.
The scheduler's build-sched-domains code gets thoroughly confused with this
and enters an infinite loop and causes soft-lockups, as explained in detail
in commit 3be7db6ab (powerpc: VPHN topology change updates all siblings).
So to fix this, use the numa_cpu_lookup_table to remember the updated
cpu-to-node mappings, and use them during CPU hotplug online operations.
Further, we also need to ensure that all threads in a core are assigned to a
common NUMA node, irrespective of whether all those threads were online during
the topology update. To achieve this, we take care not to use cpu_sibling_mask()
since it is not hotplug invariant. Instead, we use cpu_first_sibling_thread()
and set up the mappings manually using the 'threads_per_core' value for that
particular platform. This helps us ensure that we don't hit this bug with any
combination of CPU hotplug and SMT mode switching.
Cc: stable@vger.kernel.org
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2013-12-30 19:35:34 +08:00
|
|
|
static void reset_numa_cpu_lookup_table(void)
|
|
|
|
{
|
|
|
|
unsigned int cpu;
|
|
|
|
|
|
|
|
for_each_possible_cpu(cpu)
|
|
|
|
numa_cpu_lookup_table[cpu] = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void update_numa_cpu_lookup_table(unsigned int cpu, int node)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
numa_cpu_lookup_table[cpu] = node;
|
powerpc: Fix the setup of CPU-to-Node mappings during CPU online
On POWER platforms, the hypervisor can notify the guest kernel about dynamic
changes in the cpu-numa associativity (VPHN topology update). Hence the
cpu-to-node mappings that we got from the firmware during boot, may no longer
be valid after such updates. This is handled using the arch_update_cpu_topology()
hook in the scheduler, and the sched-domains are rebuilt according to the new
mappings.
But unfortunately, at the moment, CPU hotplug ignores these updated mappings
and instead queries the firmware for the cpu-to-numa relationships and uses
them during CPU online. So the kernel can end up assigning wrong NUMA nodes
to CPUs during subsequent CPU hotplug online operations (after booting).
Further, a particularly problematic scenario can result from this bug:
On POWER platforms, the SMT mode can be switched between 1, 2, 4 (and even 8)
threads per core. The switch to Single-Threaded (ST) mode is performed by
offlining all except the first CPU thread in each core. Switching back to
SMT mode involves onlining those other threads back, in each core.
Now consider this scenario:
1. During boot, the kernel gets the cpu-to-node mappings from the firmware
and assigns the CPUs to NUMA nodes appropriately, during CPU online.
2. Later on, the hypervisor updates the cpu-to-node mappings dynamically and
communicates this update to the kernel. The kernel in turn updates its
cpu-to-node associations and rebuilds its sched domains. Everything is
fine so far.
3. Now, the user switches the machine from SMT to ST mode (say, by running
ppc64_cpu --smt=1). This involves offlining all except 1 thread in each
core.
4. The user then tries to switch back from ST to SMT mode (say, by running
ppc64_cpu --smt=4), and this involves onlining those threads back. Since
CPU hotplug ignores the new mappings, it queries the firmware and tries to
associate the newly onlined sibling threads to the old NUMA nodes. This
results in sibling threads within the same core getting associated with
different NUMA nodes, which is incorrect.
The scheduler's build-sched-domains code gets thoroughly confused with this
and enters an infinite loop and causes soft-lockups, as explained in detail
in commit 3be7db6ab (powerpc: VPHN topology change updates all siblings).
So to fix this, use the numa_cpu_lookup_table to remember the updated
cpu-to-node mappings, and use them during CPU hotplug online operations.
Further, we also need to ensure that all threads in a core are assigned to a
common NUMA node, irrespective of whether all those threads were online during
the topology update. To achieve this, we take care not to use cpu_sibling_mask()
since it is not hotplug invariant. Instead, we use cpu_first_sibling_thread()
and set up the mappings manually using the 'threads_per_core' value for that
particular platform. This helps us ensure that we don't hit this bug with any
combination of CPU hotplug and SMT mode switching.
Cc: stable@vger.kernel.org
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2013-12-30 19:35:34 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void map_cpu_to_node(int cpu, int node)
|
|
|
|
{
|
|
|
|
update_numa_cpu_lookup_table(cpu, node);
|
2005-11-11 11:22:35 +08:00
|
|
|
|
2006-03-21 08:34:45 +08:00
|
|
|
dbg("adding cpu %d to node %d\n", cpu, node);
|
|
|
|
|
2010-04-26 23:32:43 +08:00
|
|
|
if (!(cpumask_test_cpu(cpu, node_to_cpumask_map[node])))
|
|
|
|
cpumask_set_cpu(cpu, node_to_cpumask_map[node]);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2010-12-18 06:07:47 +08:00
|
|
|
#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_PPC_SPLPAR)
|
2005-04-17 06:20:36 +08:00
|
|
|
static void unmap_cpu_from_node(unsigned long cpu)
|
|
|
|
{
|
|
|
|
int node = numa_cpu_lookup_table[cpu];
|
|
|
|
|
|
|
|
dbg("removing cpu %lu from node %d\n", cpu, node);
|
|
|
|
|
2010-04-26 23:32:43 +08:00
|
|
|
if (cpumask_test_cpu(cpu, node_to_cpumask_map[node])) {
|
2011-01-29 20:37:16 +08:00
|
|
|
cpumask_clear_cpu(cpu, node_to_cpumask_map[node]);
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
|
|
|
printk(KERN_ERR "WARNING: cpu %lu not found in node %d\n",
|
|
|
|
cpu, node);
|
|
|
|
}
|
|
|
|
}
|
2010-12-18 06:07:47 +08:00
|
|
|
#endif /* CONFIG_HOTPLUG_CPU || CONFIG_PPC_SPLPAR */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* must hold reference to node during call */
|
2013-08-07 00:01:44 +08:00
|
|
|
static const __be32 *of_get_associativity(struct device_node *dev)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-04-03 20:26:41 +08:00
|
|
|
return of_get_property(dev, "ibm,associativity", NULL);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2010-05-17 04:22:31 +08:00
|
|
|
int __node_distance(int a, int b)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int distance = LOCAL_DISTANCE;
|
|
|
|
|
|
|
|
if (!form1_affinity)
|
2013-03-22 13:49:35 +08:00
|
|
|
return ((a == b) ? LOCAL_DISTANCE : REMOTE_DISTANCE);
|
2010-05-17 04:22:31 +08:00
|
|
|
|
|
|
|
for (i = 0; i < distance_ref_points_depth; i++) {
|
|
|
|
if (distance_lookup_table[a][i] == distance_lookup_table[b][i])
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Double the distance for each NUMA level */
|
|
|
|
distance *= 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
return distance;
|
|
|
|
}
|
2014-04-19 06:07:14 +08:00
|
|
|
EXPORT_SYMBOL(__node_distance);
|
2010-05-17 04:22:31 +08:00
|
|
|
|
|
|
|
static void initialize_distance_lookup_table(int nid,
|
2013-08-07 00:01:44 +08:00
|
|
|
const __be32 *associativity)
|
2010-05-17 04:22:31 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!form1_affinity)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (i = 0; i < distance_ref_points_depth; i++) {
|
2013-08-07 00:01:44 +08:00
|
|
|
const __be32 *entry;
|
|
|
|
|
2015-07-02 13:39:01 +08:00
|
|
|
entry = &associativity[be32_to_cpu(distance_ref_points[i]) - 1];
|
2013-08-07 00:01:44 +08:00
|
|
|
distance_lookup_table[nid][i] = of_read_number(entry, 1);
|
2010-05-17 04:22:31 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-21 08:36:45 +08:00
|
|
|
/* Returns nid in the range [0..MAX_NUMNODES-1], or -1 if no useful numa
|
|
|
|
* info is found.
|
|
|
|
*/
|
2013-08-07 00:01:44 +08:00
|
|
|
static int associativity_to_nid(const __be32 *associativity)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-03-21 08:36:45 +08:00
|
|
|
int nid = -1;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (min_common_depth == -1)
|
2006-03-21 08:36:45 +08:00
|
|
|
goto out;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-08-07 00:01:44 +08:00
|
|
|
if (of_read_number(associativity, 1) >= min_common_depth)
|
|
|
|
nid = of_read_number(&associativity[min_common_depth], 1);
|
2006-03-21 08:36:15 +08:00
|
|
|
|
|
|
|
/* POWER4 LPAR uses 0xffff as invalid node */
|
2006-03-21 08:36:45 +08:00
|
|
|
if (nid == 0xffff || nid >= MAX_NUMNODES)
|
|
|
|
nid = -1;
|
2010-05-17 04:22:31 +08:00
|
|
|
|
2013-08-07 00:01:44 +08:00
|
|
|
if (nid > 0 &&
|
2015-07-02 13:39:01 +08:00
|
|
|
of_read_number(associativity, 1) >= distance_ref_points_depth) {
|
|
|
|
/*
|
|
|
|
* Skip the length field and send start of associativity array
|
|
|
|
*/
|
|
|
|
initialize_distance_lookup_table(nid, associativity + 1);
|
|
|
|
}
|
2010-05-17 04:22:31 +08:00
|
|
|
|
2006-03-21 08:36:45 +08:00
|
|
|
out:
|
2006-03-21 08:35:45 +08:00
|
|
|
return nid;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2010-12-01 20:31:15 +08:00
|
|
|
/* Returns the nid associated with the given device tree node,
|
|
|
|
* or -1 if not found.
|
|
|
|
*/
|
|
|
|
static int of_node_to_nid_single(struct device_node *device)
|
|
|
|
{
|
|
|
|
int nid = -1;
|
2013-08-07 00:01:44 +08:00
|
|
|
const __be32 *tmp;
|
2010-12-01 20:31:15 +08:00
|
|
|
|
|
|
|
tmp = of_get_associativity(device);
|
|
|
|
if (tmp)
|
|
|
|
nid = associativity_to_nid(tmp);
|
|
|
|
return nid;
|
|
|
|
}
|
|
|
|
|
2006-05-02 03:16:12 +08:00
|
|
|
/* Walk the device tree upwards, looking for an associativity id */
|
|
|
|
int of_node_to_nid(struct device_node *device)
|
|
|
|
{
|
|
|
|
int nid = -1;
|
|
|
|
|
|
|
|
of_node_get(device);
|
|
|
|
while (device) {
|
|
|
|
nid = of_node_to_nid_single(device);
|
|
|
|
if (nid != -1)
|
|
|
|
break;
|
|
|
|
|
2015-10-12 04:23:27 +08:00
|
|
|
device = of_get_next_parent(device);
|
2006-05-02 03:16:12 +08:00
|
|
|
}
|
|
|
|
of_node_put(device);
|
|
|
|
|
|
|
|
return nid;
|
|
|
|
}
|
2017-02-02 06:52:42 +08:00
|
|
|
EXPORT_SYMBOL(of_node_to_nid);
|
2006-05-02 03:16:12 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static int __init find_min_common_depth(void)
|
|
|
|
{
|
2010-05-17 04:22:31 +08:00
|
|
|
int depth;
|
2011-04-11 04:42:05 +08:00
|
|
|
struct device_node *root;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2011-10-28 12:25:32 +08:00
|
|
|
if (firmware_has_feature(FW_FEATURE_OPAL))
|
|
|
|
root = of_find_node_by_path("/ibm,opal");
|
|
|
|
else
|
|
|
|
root = of_find_node_by_path("/rtas");
|
2011-04-11 04:42:05 +08:00
|
|
|
if (!root)
|
|
|
|
root = of_find_node_by_path("/");
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/*
|
2010-05-17 04:22:31 +08:00
|
|
|
* This property is a set of 32-bit integers, each representing
|
|
|
|
* an index into the ibm,associativity nodes.
|
|
|
|
*
|
|
|
|
* With form 0 affinity the first integer is for an SMP configuration
|
|
|
|
* (should be all 0's) and the second is for a normal NUMA
|
|
|
|
* configuration. We have only one level of NUMA.
|
|
|
|
*
|
|
|
|
* With form 1 affinity the first integer is the most significant
|
|
|
|
* NUMA boundary and the following are progressively less significant
|
|
|
|
* boundaries. There can be more than one level of NUMA.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2011-04-11 04:42:05 +08:00
|
|
|
distance_ref_points = of_get_property(root,
|
2010-05-17 04:22:31 +08:00
|
|
|
"ibm,associativity-reference-points",
|
|
|
|
&distance_ref_points_depth);
|
|
|
|
|
|
|
|
if (!distance_ref_points) {
|
|
|
|
dbg("NUMA: ibm,associativity-reference-points not found.\n");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
distance_ref_points_depth /= sizeof(int);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-04-24 13:58:23 +08:00
|
|
|
if (firmware_has_feature(FW_FEATURE_OPAL) ||
|
|
|
|
firmware_has_feature(FW_FEATURE_TYPE1_AFFINITY)) {
|
|
|
|
dbg("Using form 1 affinity\n");
|
2011-10-28 12:25:32 +08:00
|
|
|
form1_affinity = 1;
|
2010-04-07 23:33:44 +08:00
|
|
|
}
|
|
|
|
|
2010-05-17 04:22:31 +08:00
|
|
|
if (form1_affinity) {
|
2013-08-07 00:01:44 +08:00
|
|
|
depth = of_read_number(distance_ref_points, 1);
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
2010-05-17 04:22:31 +08:00
|
|
|
if (distance_ref_points_depth < 2) {
|
|
|
|
printk(KERN_WARNING "NUMA: "
|
|
|
|
"short ibm,associativity-reference-points\n");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2013-08-07 00:01:44 +08:00
|
|
|
depth = of_read_number(&distance_ref_points[1], 1);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2010-05-17 04:22:31 +08:00
|
|
|
/*
|
|
|
|
* Warn and cap if the hardware supports more than
|
|
|
|
* MAX_DISTANCE_REF_POINTS domains.
|
|
|
|
*/
|
|
|
|
if (distance_ref_points_depth > MAX_DISTANCE_REF_POINTS) {
|
|
|
|
printk(KERN_WARNING "NUMA: distance array capped at "
|
|
|
|
"%d entries\n", MAX_DISTANCE_REF_POINTS);
|
|
|
|
distance_ref_points_depth = MAX_DISTANCE_REF_POINTS;
|
|
|
|
}
|
|
|
|
|
2011-04-11 04:42:05 +08:00
|
|
|
of_node_put(root);
|
2005-04-17 06:20:36 +08:00
|
|
|
return depth;
|
2010-05-17 04:22:31 +08:00
|
|
|
|
|
|
|
err:
|
2011-04-11 04:42:05 +08:00
|
|
|
of_node_put(root);
|
2010-05-17 04:22:31 +08:00
|
|
|
return -1;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2005-12-01 05:47:23 +08:00
|
|
|
static void __init get_n_mem_cells(int *n_addr_cells, int *n_size_cells)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct device_node *memory = NULL;
|
|
|
|
|
|
|
|
memory = of_find_node_by_type(memory, "memory");
|
2005-12-05 12:50:39 +08:00
|
|
|
if (!memory)
|
2005-12-01 05:47:23 +08:00
|
|
|
panic("numa.c: No memory nodes found!");
|
2005-12-05 12:50:39 +08:00
|
|
|
|
2007-04-03 08:56:50 +08:00
|
|
|
*n_addr_cells = of_n_addr_cells(memory);
|
2007-04-03 08:57:48 +08:00
|
|
|
*n_size_cells = of_n_size_cells(memory);
|
2005-12-01 05:47:23 +08:00
|
|
|
of_node_put(memory);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2013-08-07 00:01:44 +08:00
|
|
|
static unsigned long read_n_cells(int n, const __be32 **buf)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
unsigned long result = 0;
|
|
|
|
|
|
|
|
while (n--) {
|
2013-08-07 00:01:44 +08:00
|
|
|
result = (result << 32) | of_read_number(*buf, 1);
|
2005-04-17 06:20:36 +08:00
|
|
|
(*buf)++;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2008-07-03 11:35:54 +08:00
|
|
|
struct assoc_arrays {
|
|
|
|
u32 n_arrays;
|
|
|
|
u32 array_sz;
|
2013-08-07 00:01:44 +08:00
|
|
|
const __be32 *arrays;
|
2008-07-03 11:35:54 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
2011-03-31 09:57:33 +08:00
|
|
|
* Retrieve and validate the list of associativity arrays for drconf
|
2008-07-03 11:35:54 +08:00
|
|
|
* memory from the ibm,associativity-lookup-arrays property of the
|
|
|
|
* device tree..
|
|
|
|
*
|
|
|
|
* The layout of the ibm,associativity-lookup-arrays property is a number N
|
|
|
|
* indicating the number of associativity arrays, followed by a number M
|
|
|
|
* indicating the size of each associativity array, followed by a list
|
|
|
|
* of N associativity arrays.
|
|
|
|
*/
|
2017-12-02 00:46:35 +08:00
|
|
|
static int of_get_assoc_arrays(struct assoc_arrays *aa)
|
2008-07-03 11:35:54 +08:00
|
|
|
{
|
2017-12-02 00:46:35 +08:00
|
|
|
struct device_node *memory;
|
2013-08-07 00:01:44 +08:00
|
|
|
const __be32 *prop;
|
2008-07-03 11:35:54 +08:00
|
|
|
u32 len;
|
|
|
|
|
2017-12-02 00:46:35 +08:00
|
|
|
memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
|
|
|
|
if (!memory)
|
|
|
|
return -1;
|
|
|
|
|
2008-07-03 11:35:54 +08:00
|
|
|
prop = of_get_property(memory, "ibm,associativity-lookup-arrays", &len);
|
2017-12-02 00:46:35 +08:00
|
|
|
if (!prop || len < 2 * sizeof(unsigned int)) {
|
|
|
|
of_node_put(memory);
|
2008-07-03 11:35:54 +08:00
|
|
|
return -1;
|
2017-12-02 00:46:35 +08:00
|
|
|
}
|
2008-07-03 11:35:54 +08:00
|
|
|
|
2013-08-07 00:01:44 +08:00
|
|
|
aa->n_arrays = of_read_number(prop++, 1);
|
|
|
|
aa->array_sz = of_read_number(prop++, 1);
|
2008-07-03 11:35:54 +08:00
|
|
|
|
2017-12-02 00:46:35 +08:00
|
|
|
of_node_put(memory);
|
|
|
|
|
2011-11-29 12:31:00 +08:00
|
|
|
/* Now that we know the number of arrays and size of each array,
|
2008-07-03 11:35:54 +08:00
|
|
|
* revalidate the size of the property read in.
|
|
|
|
*/
|
|
|
|
if (len < (aa->n_arrays * aa->array_sz + 2) * sizeof(unsigned int))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
aa->arrays = prop;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is like of_node_to_nid_single() for memory represented in the
|
|
|
|
* ibm,dynamic-reconfiguration-memory node.
|
|
|
|
*/
|
2017-12-02 00:47:21 +08:00
|
|
|
static int of_drconf_to_nid_single(struct drmem_lmb *lmb)
|
2008-07-03 11:35:54 +08:00
|
|
|
{
|
2017-12-02 00:46:53 +08:00
|
|
|
struct assoc_arrays aa = { .arrays = NULL };
|
2008-07-03 11:35:54 +08:00
|
|
|
int default_nid = 0;
|
|
|
|
int nid = default_nid;
|
2017-12-02 00:46:53 +08:00
|
|
|
int rc, index;
|
|
|
|
|
|
|
|
rc = of_get_assoc_arrays(&aa);
|
|
|
|
if (rc)
|
|
|
|
return default_nid;
|
2008-07-03 11:35:54 +08:00
|
|
|
|
2017-12-02 00:46:53 +08:00
|
|
|
if (min_common_depth > 0 && min_common_depth <= aa.array_sz &&
|
2017-12-02 00:47:21 +08:00
|
|
|
!(lmb->flags & DRCONF_MEM_AI_INVALID) &&
|
|
|
|
lmb->aa_index < aa.n_arrays) {
|
|
|
|
index = lmb->aa_index * aa.array_sz + min_common_depth - 1;
|
2017-12-02 00:46:53 +08:00
|
|
|
nid = of_read_number(&aa.arrays[index], 1);
|
2008-07-03 11:35:54 +08:00
|
|
|
|
|
|
|
if (nid == 0xffff || nid >= MAX_NUMNODES)
|
|
|
|
nid = default_nid;
|
2015-07-02 13:39:01 +08:00
|
|
|
|
|
|
|
if (nid > 0) {
|
2017-12-02 00:47:21 +08:00
|
|
|
index = lmb->aa_index * aa.array_sz;
|
2015-07-02 13:39:01 +08:00
|
|
|
initialize_distance_lookup_table(nid,
|
2017-12-02 00:46:53 +08:00
|
|
|
&aa.arrays[index]);
|
2015-07-02 13:39:01 +08:00
|
|
|
}
|
2008-07-03 11:35:54 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return nid;
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* Figure out to which domain a cpu belongs and stick it there.
|
|
|
|
* Return the id of the domain used.
|
|
|
|
*/
|
2013-06-25 03:30:09 +08:00
|
|
|
static int numa_setup_cpu(unsigned long lcpu)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2014-08-27 17:34:01 +08:00
|
|
|
int nid = -1;
|
powerpc: Fix the setup of CPU-to-Node mappings during CPU online
On POWER platforms, the hypervisor can notify the guest kernel about dynamic
changes in the cpu-numa associativity (VPHN topology update). Hence the
cpu-to-node mappings that we got from the firmware during boot, may no longer
be valid after such updates. This is handled using the arch_update_cpu_topology()
hook in the scheduler, and the sched-domains are rebuilt according to the new
mappings.
But unfortunately, at the moment, CPU hotplug ignores these updated mappings
and instead queries the firmware for the cpu-to-numa relationships and uses
them during CPU online. So the kernel can end up assigning wrong NUMA nodes
to CPUs during subsequent CPU hotplug online operations (after booting).
Further, a particularly problematic scenario can result from this bug:
On POWER platforms, the SMT mode can be switched between 1, 2, 4 (and even 8)
threads per core. The switch to Single-Threaded (ST) mode is performed by
offlining all except the first CPU thread in each core. Switching back to
SMT mode involves onlining those other threads back, in each core.
Now consider this scenario:
1. During boot, the kernel gets the cpu-to-node mappings from the firmware
and assigns the CPUs to NUMA nodes appropriately, during CPU online.
2. Later on, the hypervisor updates the cpu-to-node mappings dynamically and
communicates this update to the kernel. The kernel in turn updates its
cpu-to-node associations and rebuilds its sched domains. Everything is
fine so far.
3. Now, the user switches the machine from SMT to ST mode (say, by running
ppc64_cpu --smt=1). This involves offlining all except 1 thread in each
core.
4. The user then tries to switch back from ST to SMT mode (say, by running
ppc64_cpu --smt=4), and this involves onlining those threads back. Since
CPU hotplug ignores the new mappings, it queries the firmware and tries to
associate the newly onlined sibling threads to the old NUMA nodes. This
results in sibling threads within the same core getting associated with
different NUMA nodes, which is incorrect.
The scheduler's build-sched-domains code gets thoroughly confused with this
and enters an infinite loop and causes soft-lockups, as explained in detail
in commit 3be7db6ab (powerpc: VPHN topology change updates all siblings).
So to fix this, use the numa_cpu_lookup_table to remember the updated
cpu-to-node mappings, and use them during CPU hotplug online operations.
Further, we also need to ensure that all threads in a core are assigned to a
common NUMA node, irrespective of whether all those threads were online during
the topology update. To achieve this, we take care not to use cpu_sibling_mask()
since it is not hotplug invariant. Instead, we use cpu_first_sibling_thread()
and set up the mappings manually using the 'threads_per_core' value for that
particular platform. This helps us ensure that we don't hit this bug with any
combination of CPU hotplug and SMT mode switching.
Cc: stable@vger.kernel.org
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2013-12-30 19:35:34 +08:00
|
|
|
struct device_node *cpu;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If a valid cpu-to-node mapping is already available, use it
|
|
|
|
* directly instead of querying the firmware, since it represents
|
|
|
|
* the most recent mapping notified to us by the platform (eg: VPHN).
|
|
|
|
*/
|
|
|
|
if ((nid = numa_cpu_lookup_table[lcpu]) >= 0) {
|
|
|
|
map_cpu_to_node(lcpu, nid);
|
|
|
|
return nid;
|
|
|
|
}
|
|
|
|
|
|
|
|
cpu = of_get_cpu_node(lcpu, NULL);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (!cpu) {
|
|
|
|
WARN_ON(1);
|
2014-08-27 17:34:01 +08:00
|
|
|
if (cpu_present(lcpu))
|
|
|
|
goto out_present;
|
|
|
|
else
|
|
|
|
goto out;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-05-02 03:16:12 +08:00
|
|
|
nid = of_node_to_nid_single(cpu);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2014-08-27 17:34:01 +08:00
|
|
|
out_present:
|
powerpc/numa: Ensure nodes initialized for hotplug
This patch fixes some problems encountered at runtime with
configurations that support memory-less nodes, or that hot-add CPUs
into nodes that are memoryless during system execution after boot. The
problems of interest include:
* Nodes known to powerpc to be memoryless at boot, but to have CPUs in
them are allowed to be 'possible' and 'online'. Memory allocations
for those nodes are taken from another node that does have memory
until and if memory is hot-added to the node.
* Nodes which have no resources assigned at boot, but which may still
be referenced subsequently by affinity or associativity attributes,
are kept in the list of 'possible' nodes for powerpc. Hot-add of
memory or CPUs to the system can reference these nodes and bring
them online instead of redirecting the references to one of the set
of nodes known to have memory at boot.
Note that this software operates under the context of CPU hotplug. We
are not doing memory hotplug in this code, but rather updating the
kernel's CPU topology (i.e. arch_update_cpu_topology /
numa_update_cpu_topology). We are initializing a node that may be used
by CPUs or memory before it can be referenced as invalid by a CPU
hotplug operation. CPU hotplug operations are protected by a range of
APIs including cpu_maps_update_begin/cpu_maps_update_done,
cpus_read/write_lock / cpus_read/write_unlock, device locks, and more.
Memory hotplug operations, including try_online_node, are protected by
mem_hotplug_begin/mem_hotplug_done, device locks, and more. In the
case of CPUs being hot-added to a previously memoryless node, the
try_online_node operation occurs wholly within the CPU locks with no
overlap. Using HMC hot-add/hot-remove operations, we have been able to
add and remove CPUs to any possible node without failures. HMC
operations involve a degree self-serialization, though.
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-11-29 06:58:40 +08:00
|
|
|
if (nid < 0 || !node_possible(nid))
|
2010-03-06 05:42:43 +08:00
|
|
|
nid = first_online_node;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2014-08-27 17:34:01 +08:00
|
|
|
map_cpu_to_node(lcpu, nid);
|
2005-04-17 06:20:36 +08:00
|
|
|
of_node_put(cpu);
|
2014-08-27 17:34:01 +08:00
|
|
|
out:
|
2006-03-21 08:35:45 +08:00
|
|
|
return nid;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2013-12-30 19:36:04 +08:00
|
|
|
static void verify_cpu_node_mapping(int cpu, int node)
|
|
|
|
{
|
|
|
|
int base, sibling, i;
|
|
|
|
|
|
|
|
/* Verify that all the threads in the core belong to the same node */
|
|
|
|
base = cpu_first_thread_sibling(cpu);
|
|
|
|
|
|
|
|
for (i = 0; i < threads_per_core; i++) {
|
|
|
|
sibling = base + i;
|
|
|
|
|
|
|
|
if (sibling == cpu || cpu_is_offline(sibling))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (cpu_to_node(sibling) != node) {
|
|
|
|
WARN(1, "CPU thread siblings %d and %d don't belong"
|
|
|
|
" to the same node!\n", cpu, sibling);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-18 22:07:28 +08:00
|
|
|
/* Must run before sched domains notifier. */
|
|
|
|
static int ppc_numa_cpu_prepare(unsigned int cpu)
|
|
|
|
{
|
|
|
|
int nid;
|
|
|
|
|
|
|
|
nid = numa_setup_cpu(cpu);
|
|
|
|
verify_cpu_node_mapping(cpu, nid);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ppc_numa_cpu_dead(unsigned int cpu)
|
|
|
|
{
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
2016-07-18 22:07:28 +08:00
|
|
|
unmap_cpu_from_node(cpu);
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif
|
2016-07-18 22:07:28 +08:00
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check and possibly modify a memory region to enforce the memory limit.
|
|
|
|
*
|
|
|
|
* Returns the size the region should have to enforce the memory limit.
|
|
|
|
* This will either be the original value of size, a truncated value,
|
|
|
|
* or zero. If the returned value of size is 0 the region should be
|
2011-03-31 09:57:33 +08:00
|
|
|
* discarded as it lies wholly above the memory limit.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2005-11-11 11:22:35 +08:00
|
|
|
static unsigned long __init numa_enforce_memory_limit(unsigned long start,
|
|
|
|
unsigned long size)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
/*
|
2010-07-12 12:36:09 +08:00
|
|
|
* We use memblock_end_of_DRAM() in here instead of memory_limit because
|
2005-04-17 06:20:36 +08:00
|
|
|
* we've already adjusted it for the limit and it takes care of
|
2008-10-20 23:37:04 +08:00
|
|
|
* having memory holes below the limit. Also, in the case of
|
|
|
|
* iommu_is_off, memory_limit is not set but is implicitly enforced.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
|
2010-07-12 12:36:09 +08:00
|
|
|
if (start + size <= memblock_end_of_DRAM())
|
2005-04-17 06:20:36 +08:00
|
|
|
return size;
|
|
|
|
|
2010-07-12 12:36:09 +08:00
|
|
|
if (start >= memblock_end_of_DRAM())
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
|
2010-07-12 12:36:09 +08:00
|
|
|
return memblock_end_of_DRAM() - start;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
powerpc: Add support for dynamic reconfiguration memory in kexec/kdump kernels
Kdump kernel needs to use only those memory regions that it is allowed
to use (crashkernel, rtas, tce, etc.). Each of these regions have
their own sizes and are currently added under 'linux,usable-memory'
property under each memory@xxx node of the device tree.
The ibm,dynamic-memory property of ibm,dynamic-reconfiguration-memory
node (on POWER6) now stores in it the representation for most of the
logical memory blocks with the size of each memory block being a
constant (lmb_size). If one or more or part of the above mentioned
regions lie under one of the lmb from ibm,dynamic-memory property,
there is a need to identify those regions within the given lmb.
This makes the kernel recognize a new 'linux,drconf-usable-memory'
property added by kexec-tools. Each entry in this property is of the
form of a count followed by that many (base, size) pairs for the above
mentioned regions. The number of cells in the count value is given by
the #size-cells property of the root node.
Signed-off-by: Chandru Siddalingappa <chandru@in.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-08-29 22:28:16 +08:00
|
|
|
/*
|
|
|
|
* Reads the counter for a given entry in
|
|
|
|
* linux,drconf-usable-memory property
|
|
|
|
*/
|
2013-08-07 00:01:44 +08:00
|
|
|
static inline int __init read_usm_ranges(const __be32 **usm)
|
powerpc: Add support for dynamic reconfiguration memory in kexec/kdump kernels
Kdump kernel needs to use only those memory regions that it is allowed
to use (crashkernel, rtas, tce, etc.). Each of these regions have
their own sizes and are currently added under 'linux,usable-memory'
property under each memory@xxx node of the device tree.
The ibm,dynamic-memory property of ibm,dynamic-reconfiguration-memory
node (on POWER6) now stores in it the representation for most of the
logical memory blocks with the size of each memory block being a
constant (lmb_size). If one or more or part of the above mentioned
regions lie under one of the lmb from ibm,dynamic-memory property,
there is a need to identify those regions within the given lmb.
This makes the kernel recognize a new 'linux,drconf-usable-memory'
property added by kexec-tools. Each entry in this property is of the
form of a count followed by that many (base, size) pairs for the above
mentioned regions. The number of cells in the count value is given by
the #size-cells property of the root node.
Signed-off-by: Chandru Siddalingappa <chandru@in.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-08-29 22:28:16 +08:00
|
|
|
{
|
|
|
|
/*
|
2010-07-23 08:35:52 +08:00
|
|
|
* For each lmb in ibm,dynamic-memory a corresponding
|
powerpc: Add support for dynamic reconfiguration memory in kexec/kdump kernels
Kdump kernel needs to use only those memory regions that it is allowed
to use (crashkernel, rtas, tce, etc.). Each of these regions have
their own sizes and are currently added under 'linux,usable-memory'
property under each memory@xxx node of the device tree.
The ibm,dynamic-memory property of ibm,dynamic-reconfiguration-memory
node (on POWER6) now stores in it the representation for most of the
logical memory blocks with the size of each memory block being a
constant (lmb_size). If one or more or part of the above mentioned
regions lie under one of the lmb from ibm,dynamic-memory property,
there is a need to identify those regions within the given lmb.
This makes the kernel recognize a new 'linux,drconf-usable-memory'
property added by kexec-tools. Each entry in this property is of the
form of a count followed by that many (base, size) pairs for the above
mentioned regions. The number of cells in the count value is given by
the #size-cells property of the root node.
Signed-off-by: Chandru Siddalingappa <chandru@in.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-08-29 22:28:16 +08:00
|
|
|
* entry in linux,drconf-usable-memory property contains
|
|
|
|
* a counter followed by that many (base, size) duple.
|
|
|
|
* read the counter from linux,drconf-usable-memory
|
|
|
|
*/
|
|
|
|
return read_n_cells(n_mem_size_cells, usm);
|
|
|
|
}
|
|
|
|
|
[POWERPC] Support ibm,dynamic-reconfiguration-memory nodes
For PAPR partitions with large amounts of memory, the firmware has an
alternative, more compact representation for the information about the
memory in the partition and its NUMA associativity information. This
adds the code to the kernel to parse this alternative representation.
The other part of this patch is telling the firmware that we can
handle the alternative representation. There is however a subtlety
here, because the firmware will invoke a reboot if the memory
representation we request is different from the representation that
firmware is currently using. This is because firmware can't change
the representation on the fly. Further, some firmware versions used
on POWER5+ machines have a bug where this reboot leaves the machine
with an altered value of load-base, which will prevent any kernel
booting until it is reset to the normal value (0x4000). Because of
this bug, we do NOT set fake_elf.rpanote.new_mem_def = 1, and thus we
do not request the new representation on POWER5+ and earlier machines.
We do request the new representation on POWER6, which uses the
ibm,client-architecture-support call.
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-11-29 19:27:42 +08:00
|
|
|
/*
|
|
|
|
* Extract NUMA information from the ibm,dynamic-reconfiguration-memory
|
|
|
|
* node. This assumes n_mem_{addr,size}_cells have been set.
|
|
|
|
*/
|
2017-12-02 00:47:21 +08:00
|
|
|
static void __init numa_setup_drmem_lmb(struct drmem_lmb *lmb,
|
|
|
|
const __be32 **usm)
|
[POWERPC] Support ibm,dynamic-reconfiguration-memory nodes
For PAPR partitions with large amounts of memory, the firmware has an
alternative, more compact representation for the information about the
memory in the partition and its NUMA associativity information. This
adds the code to the kernel to parse this alternative representation.
The other part of this patch is telling the firmware that we can
handle the alternative representation. There is however a subtlety
here, because the firmware will invoke a reboot if the memory
representation we request is different from the representation that
firmware is currently using. This is because firmware can't change
the representation on the fly. Further, some firmware versions used
on POWER5+ machines have a bug where this reboot leaves the machine
with an altered value of load-base, which will prevent any kernel
booting until it is reset to the normal value (0x4000). Because of
this bug, we do NOT set fake_elf.rpanote.new_mem_def = 1, and thus we
do not request the new representation on POWER5+ and earlier machines.
We do request the new representation on POWER6, which uses the
ibm,client-architecture-support call.
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-11-29 19:27:42 +08:00
|
|
|
{
|
2017-12-02 00:47:21 +08:00
|
|
|
unsigned int ranges, is_kexec_kdump = 0;
|
|
|
|
unsigned long base, size, sz;
|
2008-07-03 11:35:54 +08:00
|
|
|
int nid;
|
|
|
|
|
2017-12-02 00:47:21 +08:00
|
|
|
/*
|
|
|
|
* Skip this block if the reserved bit is set in flags (0x80)
|
|
|
|
* or if the block is not assigned to this partition (0x8)
|
|
|
|
*/
|
|
|
|
if ((lmb->flags & DRCONF_MEM_RESERVED)
|
|
|
|
|| !(lmb->flags & DRCONF_MEM_ASSIGNED))
|
2008-07-03 11:35:54 +08:00
|
|
|
return;
|
|
|
|
|
2017-12-02 00:47:21 +08:00
|
|
|
if (*usm)
|
powerpc: Add support for dynamic reconfiguration memory in kexec/kdump kernels
Kdump kernel needs to use only those memory regions that it is allowed
to use (crashkernel, rtas, tce, etc.). Each of these regions have
their own sizes and are currently added under 'linux,usable-memory'
property under each memory@xxx node of the device tree.
The ibm,dynamic-memory property of ibm,dynamic-reconfiguration-memory
node (on POWER6) now stores in it the representation for most of the
logical memory blocks with the size of each memory block being a
constant (lmb_size). If one or more or part of the above mentioned
regions lie under one of the lmb from ibm,dynamic-memory property,
there is a need to identify those regions within the given lmb.
This makes the kernel recognize a new 'linux,drconf-usable-memory'
property added by kexec-tools. Each entry in this property is of the
form of a count followed by that many (base, size) pairs for the above
mentioned regions. The number of cells in the count value is given by
the #size-cells property of the root node.
Signed-off-by: Chandru Siddalingappa <chandru@in.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-08-29 22:28:16 +08:00
|
|
|
is_kexec_kdump = 1;
|
|
|
|
|
2017-12-02 00:47:21 +08:00
|
|
|
base = lmb->base_addr;
|
|
|
|
size = drmem_lmb_size();
|
|
|
|
ranges = 1;
|
2008-07-03 11:35:54 +08:00
|
|
|
|
2017-12-02 00:47:21 +08:00
|
|
|
if (is_kexec_kdump) {
|
|
|
|
ranges = read_usm_ranges(usm);
|
|
|
|
if (!ranges) /* there are no (base, size) duple */
|
|
|
|
return;
|
|
|
|
}
|
2008-07-03 11:35:54 +08:00
|
|
|
|
2017-12-02 00:47:21 +08:00
|
|
|
do {
|
powerpc: Add support for dynamic reconfiguration memory in kexec/kdump kernels
Kdump kernel needs to use only those memory regions that it is allowed
to use (crashkernel, rtas, tce, etc.). Each of these regions have
their own sizes and are currently added under 'linux,usable-memory'
property under each memory@xxx node of the device tree.
The ibm,dynamic-memory property of ibm,dynamic-reconfiguration-memory
node (on POWER6) now stores in it the representation for most of the
logical memory blocks with the size of each memory block being a
constant (lmb_size). If one or more or part of the above mentioned
regions lie under one of the lmb from ibm,dynamic-memory property,
there is a need to identify those regions within the given lmb.
This makes the kernel recognize a new 'linux,drconf-usable-memory'
property added by kexec-tools. Each entry in this property is of the
form of a count followed by that many (base, size) pairs for the above
mentioned regions. The number of cells in the count value is given by
the #size-cells property of the root node.
Signed-off-by: Chandru Siddalingappa <chandru@in.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-08-29 22:28:16 +08:00
|
|
|
if (is_kexec_kdump) {
|
2017-12-02 00:47:21 +08:00
|
|
|
base = read_n_cells(n_mem_addr_cells, usm);
|
|
|
|
size = read_n_cells(n_mem_size_cells, usm);
|
powerpc: Add support for dynamic reconfiguration memory in kexec/kdump kernels
Kdump kernel needs to use only those memory regions that it is allowed
to use (crashkernel, rtas, tce, etc.). Each of these regions have
their own sizes and are currently added under 'linux,usable-memory'
property under each memory@xxx node of the device tree.
The ibm,dynamic-memory property of ibm,dynamic-reconfiguration-memory
node (on POWER6) now stores in it the representation for most of the
logical memory blocks with the size of each memory block being a
constant (lmb_size). If one or more or part of the above mentioned
regions lie under one of the lmb from ibm,dynamic-memory property,
there is a need to identify those regions within the given lmb.
This makes the kernel recognize a new 'linux,drconf-usable-memory'
property added by kexec-tools. Each entry in this property is of the
form of a count followed by that many (base, size) pairs for the above
mentioned regions. The number of cells in the count value is given by
the #size-cells property of the root node.
Signed-off-by: Chandru Siddalingappa <chandru@in.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-08-29 22:28:16 +08:00
|
|
|
}
|
2017-12-02 00:47:21 +08:00
|
|
|
|
|
|
|
nid = of_drconf_to_nid_single(lmb);
|
|
|
|
fake_numa_create_new_node(((base + size) >> PAGE_SHIFT),
|
|
|
|
&nid);
|
|
|
|
node_set_online(nid);
|
|
|
|
sz = numa_enforce_memory_limit(base, size);
|
|
|
|
if (sz)
|
|
|
|
memblock_set_node(base, sz, &memblock.memory, nid);
|
|
|
|
} while (--ranges);
|
[POWERPC] Support ibm,dynamic-reconfiguration-memory nodes
For PAPR partitions with large amounts of memory, the firmware has an
alternative, more compact representation for the information about the
memory in the partition and its NUMA associativity information. This
adds the code to the kernel to parse this alternative representation.
The other part of this patch is telling the firmware that we can
handle the alternative representation. There is however a subtlety
here, because the firmware will invoke a reboot if the memory
representation we request is different from the representation that
firmware is currently using. This is because firmware can't change
the representation on the fly. Further, some firmware versions used
on POWER5+ machines have a bug where this reboot leaves the machine
with an altered value of load-base, which will prevent any kernel
booting until it is reset to the normal value (0x4000). Because of
this bug, we do NOT set fake_elf.rpanote.new_mem_def = 1, and thus we
do not request the new representation on POWER5+ and earlier machines.
We do request the new representation on POWER6, which uses the
ibm,client-architecture-support call.
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-11-29 19:27:42 +08:00
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static int __init parse_numa_properties(void)
|
|
|
|
{
|
2011-08-11 04:44:22 +08:00
|
|
|
struct device_node *memory;
|
2006-03-21 08:36:45 +08:00
|
|
|
int default_nid = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned long i;
|
|
|
|
|
|
|
|
if (numa_enabled == 0) {
|
|
|
|
printk(KERN_WARNING "NUMA disabled by user\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
min_common_depth = find_min_common_depth();
|
|
|
|
|
|
|
|
if (min_common_depth < 0)
|
|
|
|
return min_common_depth;
|
|
|
|
|
2006-03-21 08:34:45 +08:00
|
|
|
dbg("NUMA associativity depth for CPU/Memory: %d\n", min_common_depth);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
2006-03-21 08:36:45 +08:00
|
|
|
* Even though we connect cpus to numa domains later in SMP
|
|
|
|
* init, we need to know the node ids now. This is because
|
|
|
|
* each node to be onlined must have NODE_DATA etc backing it.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2006-03-21 08:36:45 +08:00
|
|
|
for_each_present_cpu(i) {
|
2011-08-11 04:44:23 +08:00
|
|
|
struct device_node *cpu;
|
2006-03-21 08:35:45 +08:00
|
|
|
int nid;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-01-08 10:19:45 +08:00
|
|
|
cpu = of_get_cpu_node(i, NULL);
|
2006-03-21 08:36:45 +08:00
|
|
|
BUG_ON(!cpu);
|
2006-05-02 03:16:12 +08:00
|
|
|
nid = of_node_to_nid_single(cpu);
|
2006-03-21 08:36:45 +08:00
|
|
|
of_node_put(cpu);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-03-21 08:36:45 +08:00
|
|
|
/*
|
|
|
|
* Don't fall back to default_nid yet -- we will plug
|
|
|
|
* cpus into nodes once the memory scan has discovered
|
|
|
|
* the topology.
|
|
|
|
*/
|
|
|
|
if (nid < 0)
|
|
|
|
continue;
|
|
|
|
node_set_online(nid);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2005-12-06 04:06:42 +08:00
|
|
|
get_n_mem_cells(&n_mem_addr_cells, &n_mem_size_cells);
|
2011-08-11 04:44:22 +08:00
|
|
|
|
|
|
|
for_each_node_by_type(memory, "memory") {
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned long start;
|
|
|
|
unsigned long size;
|
2006-03-21 08:35:45 +08:00
|
|
|
int nid;
|
2005-04-17 06:20:36 +08:00
|
|
|
int ranges;
|
2013-08-07 00:01:44 +08:00
|
|
|
const __be32 *memcell_buf;
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned int len;
|
|
|
|
|
2007-04-03 20:26:41 +08:00
|
|
|
memcell_buf = of_get_property(memory,
|
2005-12-04 15:39:55 +08:00
|
|
|
"linux,usable-memory", &len);
|
|
|
|
if (!memcell_buf || len <= 0)
|
2007-04-03 20:26:41 +08:00
|
|
|
memcell_buf = of_get_property(memory, "reg", &len);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!memcell_buf || len <= 0)
|
|
|
|
continue;
|
|
|
|
|
2005-12-13 15:01:21 +08:00
|
|
|
/* ranges in cell */
|
|
|
|
ranges = (len >> 2) / (n_mem_addr_cells + n_mem_size_cells);
|
2005-04-17 06:20:36 +08:00
|
|
|
new_range:
|
|
|
|
/* these are order-sensitive, and modify the buffer pointer */
|
2005-12-06 04:06:42 +08:00
|
|
|
start = read_n_cells(n_mem_addr_cells, &memcell_buf);
|
|
|
|
size = read_n_cells(n_mem_size_cells, &memcell_buf);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-03-21 08:36:45 +08:00
|
|
|
/*
|
|
|
|
* Assumption: either all memory nodes or none will
|
|
|
|
* have associativity properties. If none, then
|
|
|
|
* everything goes to default_nid.
|
|
|
|
*/
|
2006-05-02 03:16:12 +08:00
|
|
|
nid = of_node_to_nid_single(memory);
|
2006-03-21 08:36:45 +08:00
|
|
|
if (nid < 0)
|
|
|
|
nid = default_nid;
|
2008-02-01 12:57:31 +08:00
|
|
|
|
|
|
|
fake_numa_create_new_node(((start + size) >> PAGE_SHIFT), &nid);
|
2006-03-21 08:36:45 +08:00
|
|
|
node_set_online(nid);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2016-10-14 02:45:30 +08:00
|
|
|
size = numa_enforce_memory_limit(start, size);
|
|
|
|
if (size)
|
|
|
|
memblock_set_node(start, size, &memblock.memory, nid);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (--ranges)
|
|
|
|
goto new_range;
|
|
|
|
}
|
|
|
|
|
[POWERPC] Support ibm,dynamic-reconfiguration-memory nodes
For PAPR partitions with large amounts of memory, the firmware has an
alternative, more compact representation for the information about the
memory in the partition and its NUMA associativity information. This
adds the code to the kernel to parse this alternative representation.
The other part of this patch is telling the firmware that we can
handle the alternative representation. There is however a subtlety
here, because the firmware will invoke a reboot if the memory
representation we request is different from the representation that
firmware is currently using. This is because firmware can't change
the representation on the fly. Further, some firmware versions used
on POWER5+ machines have a bug where this reboot leaves the machine
with an altered value of load-base, which will prevent any kernel
booting until it is reset to the normal value (0x4000). Because of
this bug, we do NOT set fake_elf.rpanote.new_mem_def = 1, and thus we
do not request the new representation on POWER5+ and earlier machines.
We do request the new representation on POWER6, which uses the
ibm,client-architecture-support call.
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-11-29 19:27:42 +08:00
|
|
|
/*
|
2011-08-11 04:44:23 +08:00
|
|
|
* Now do the same thing for each MEMBLOCK listed in the
|
|
|
|
* ibm,dynamic-memory property in the
|
|
|
|
* ibm,dynamic-reconfiguration-memory node.
|
[POWERPC] Support ibm,dynamic-reconfiguration-memory nodes
For PAPR partitions with large amounts of memory, the firmware has an
alternative, more compact representation for the information about the
memory in the partition and its NUMA associativity information. This
adds the code to the kernel to parse this alternative representation.
The other part of this patch is telling the firmware that we can
handle the alternative representation. There is however a subtlety
here, because the firmware will invoke a reboot if the memory
representation we request is different from the representation that
firmware is currently using. This is because firmware can't change
the representation on the fly. Further, some firmware versions used
on POWER5+ machines have a bug where this reboot leaves the machine
with an altered value of load-base, which will prevent any kernel
booting until it is reset to the normal value (0x4000). Because of
this bug, we do NOT set fake_elf.rpanote.new_mem_def = 1, and thus we
do not request the new representation on POWER5+ and earlier machines.
We do request the new representation on POWER6, which uses the
ibm,client-architecture-support call.
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-11-29 19:27:42 +08:00
|
|
|
*/
|
|
|
|
memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
|
2017-12-02 00:47:21 +08:00
|
|
|
if (memory) {
|
|
|
|
walk_drmem_lmbs(memory, numa_setup_drmem_lmb);
|
|
|
|
of_node_put(memory);
|
|
|
|
}
|
[POWERPC] Support ibm,dynamic-reconfiguration-memory nodes
For PAPR partitions with large amounts of memory, the firmware has an
alternative, more compact representation for the information about the
memory in the partition and its NUMA associativity information. This
adds the code to the kernel to parse this alternative representation.
The other part of this patch is telling the firmware that we can
handle the alternative representation. There is however a subtlety
here, because the firmware will invoke a reboot if the memory
representation we request is different from the representation that
firmware is currently using. This is because firmware can't change
the representation on the fly. Further, some firmware versions used
on POWER5+ machines have a bug where this reboot leaves the machine
with an altered value of load-base, which will prevent any kernel
booting until it is reset to the normal value (0x4000). Because of
this bug, we do NOT set fake_elf.rpanote.new_mem_def = 1, and thus we
do not request the new representation on POWER5+ and earlier machines.
We do request the new representation on POWER6, which uses the
ibm,client-architecture-support call.
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-11-29 19:27:42 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __init setup_nonnuma(void)
|
|
|
|
{
|
2010-07-12 12:36:09 +08:00
|
|
|
unsigned long top_of_ram = memblock_end_of_DRAM();
|
|
|
|
unsigned long total_ram = memblock_phys_mem_size();
|
2006-09-27 16:49:49 +08:00
|
|
|
unsigned long start_pfn, end_pfn;
|
2010-08-04 11:43:53 +08:00
|
|
|
unsigned int nid = 0;
|
|
|
|
struct memblock_region *reg;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-04-13 04:25:01 +08:00
|
|
|
printk(KERN_DEBUG "Top of RAM: 0x%lx, Total RAM: 0x%lx\n",
|
2005-04-17 06:20:36 +08:00
|
|
|
top_of_ram, total_ram);
|
2006-04-13 04:25:01 +08:00
|
|
|
printk(KERN_DEBUG "Memory hole size: %ldMB\n",
|
2005-04-17 06:20:36 +08:00
|
|
|
(top_of_ram - total_ram) >> 20);
|
|
|
|
|
2010-08-04 11:43:53 +08:00
|
|
|
for_each_memblock(memory, reg) {
|
2010-10-13 05:07:09 +08:00
|
|
|
start_pfn = memblock_region_memory_base_pfn(reg);
|
|
|
|
end_pfn = memblock_region_memory_end_pfn(reg);
|
2008-02-01 12:57:31 +08:00
|
|
|
|
|
|
|
fake_numa_create_new_node(end_pfn, &nid);
|
2011-12-09 02:22:08 +08:00
|
|
|
memblock_set_node(PFN_PHYS(start_pfn),
|
2014-01-22 07:49:26 +08:00
|
|
|
PFN_PHYS(end_pfn - start_pfn),
|
|
|
|
&memblock.memory, nid);
|
2008-02-01 12:57:31 +08:00
|
|
|
node_set_online(nid);
|
2006-09-27 16:49:49 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2005-12-13 03:56:47 +08:00
|
|
|
void __init dump_numa_cpu_topology(void)
|
|
|
|
{
|
|
|
|
unsigned int node;
|
|
|
|
unsigned int cpu, count;
|
|
|
|
|
|
|
|
if (min_common_depth == -1 || !numa_enabled)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for_each_online_node(node) {
|
2016-10-18 16:52:14 +08:00
|
|
|
pr_info("Node %d CPUs:", node);
|
2005-12-13 03:56:47 +08:00
|
|
|
|
|
|
|
count = 0;
|
|
|
|
/*
|
|
|
|
* If we used a CPU iterator here we would miss printing
|
|
|
|
* the holes in the cpumap.
|
|
|
|
*/
|
2010-04-26 23:32:43 +08:00
|
|
|
for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
|
|
|
|
if (cpumask_test_cpu(cpu,
|
|
|
|
node_to_cpumask_map[node])) {
|
2005-12-13 03:56:47 +08:00
|
|
|
if (count == 0)
|
2016-10-18 16:52:14 +08:00
|
|
|
pr_cont(" %u", cpu);
|
2005-12-13 03:56:47 +08:00
|
|
|
++count;
|
|
|
|
} else {
|
|
|
|
if (count > 1)
|
2016-10-18 16:52:14 +08:00
|
|
|
pr_cont("-%u", cpu - 1);
|
2005-12-13 03:56:47 +08:00
|
|
|
count = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (count > 1)
|
2016-10-18 16:52:14 +08:00
|
|
|
pr_cont("-%u", nr_cpu_ids - 1);
|
|
|
|
pr_cont("\n");
|
2005-12-13 03:56:47 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-09-17 20:15:33 +08:00
|
|
|
/* Initialize NODE_DATA for a node on the local memory */
|
|
|
|
static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn)
|
2008-11-24 20:02:35 +08:00
|
|
|
{
|
2014-09-17 20:15:33 +08:00
|
|
|
u64 spanned_pages = end_pfn - start_pfn;
|
|
|
|
const size_t nd_size = roundup(sizeof(pg_data_t), SMP_CACHE_BYTES);
|
|
|
|
u64 nd_pa;
|
|
|
|
void *nd;
|
|
|
|
int tnid;
|
2008-11-24 20:02:35 +08:00
|
|
|
|
2014-09-17 20:15:33 +08:00
|
|
|
nd_pa = memblock_alloc_try_nid(nd_size, SMP_CACHE_BYTES, nid);
|
|
|
|
nd = __va(nd_pa);
|
2008-11-24 20:02:35 +08:00
|
|
|
|
2014-09-17 20:15:33 +08:00
|
|
|
/* report and initialize */
|
|
|
|
pr_info(" NODE_DATA [mem %#010Lx-%#010Lx]\n",
|
|
|
|
nd_pa, nd_pa + nd_size - 1);
|
|
|
|
tnid = early_pfn_to_nid(nd_pa >> PAGE_SHIFT);
|
|
|
|
if (tnid != nid)
|
|
|
|
pr_info(" NODE_DATA(%d) on node %d\n", nid, tnid);
|
2008-11-24 20:02:35 +08:00
|
|
|
|
2014-09-17 20:15:33 +08:00
|
|
|
node_data[nid] = nd;
|
|
|
|
memset(NODE_DATA(nid), 0, sizeof(pg_data_t));
|
|
|
|
NODE_DATA(nid)->node_id = nid;
|
|
|
|
NODE_DATA(nid)->node_start_pfn = start_pfn;
|
|
|
|
NODE_DATA(nid)->node_spanned_pages = spanned_pages;
|
|
|
|
}
|
2008-11-24 20:02:35 +08:00
|
|
|
|
powerpc/numa: Use ibm,max-associativity-domains to discover possible nodes
On powerpc systems which allow 'hot-add' of CPU or memory resources,
it may occur that the new resources are to be inserted into nodes that
were not used for these resources at bootup. In the kernel, any node
that is used must be defined and initialized. These empty nodes may
occur when,
* Dedicated vs. shared resources. Shared resources require information
such as the VPHN hcall for CPU assignment to nodes. Associativity
decisions made based on dedicated resource rules, such as
associativity properties in the device tree, may vary from decisions
made using the values returned by the VPHN hcall.
* memoryless nodes at boot. Nodes need to be defined as 'possible' at
boot for operation with other code modules. Previously, the powerpc
code would limit the set of possible nodes to those which have
memory assigned at boot, and were thus online. Subsequent add/remove
of CPUs or memory would only work with this subset of possible
nodes.
* memoryless nodes with CPUs at boot. Due to the previous restriction
on nodes, nodes that had CPUs but no memory were being collapsed
into other nodes that did have memory at boot. In practice this
meant that the node assignment presented by the runtime kernel
differed from the affinity and associativity attributes presented by
the device tree or VPHN hcalls. Nodes that might be known to the
pHyp were not 'possible' in the runtime kernel because they did not
have memory at boot.
This patch ensures that sufficient nodes are defined to support
configuration requirements after boot, as well as at boot. This patch
set fixes a couple of problems.
* Nodes known to powerpc to be memoryless at boot, but to have CPUs in
them are allowed to be 'possible' and 'online'. Memory allocations
for those nodes are taken from another node that does have memory
until and if memory is hot-added to the node. * Nodes which have no
resources assigned at boot, but which may still be referenced
subsequently by affinity or associativity attributes, are kept in
the list of 'possible' nodes for powerpc. Hot-add of memory or CPUs
to the system can reference these nodes and bring them online
instead of redirecting to one of the set of nodes that were known to
have memory at boot.
This patch extracts the value of the lowest domain level (number of
allocable resources) from the device tree property
"ibm,max-associativity-domains" to use as the maximum number of nodes
to setup as possibly available in the system. This new setting will
override the instruction:
nodes_and(node_possible_map, node_possible_map, node_online_map);
presently seen in the function arch/powerpc/mm/numa.c:initmem_init().
If the "ibm,max-associativity-domains" property is not present at
boot, no operation will be performed to define or enable additional
nodes, or enable the above 'nodes_and()'.
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-11-29 06:58:36 +08:00
|
|
|
static void __init find_possible_nodes(void)
|
|
|
|
{
|
|
|
|
struct device_node *rtas;
|
|
|
|
u32 numnodes, i;
|
|
|
|
|
|
|
|
if (min_common_depth <= 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
rtas = of_find_node_by_path("/rtas");
|
|
|
|
if (!rtas)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (of_property_read_u32_index(rtas,
|
|
|
|
"ibm,max-associativity-domains",
|
|
|
|
min_common_depth, &numnodes))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
for (i = 0; i < numnodes; i++) {
|
powerpc/numa: Ensure nodes initialized for hotplug
This patch fixes some problems encountered at runtime with
configurations that support memory-less nodes, or that hot-add CPUs
into nodes that are memoryless during system execution after boot. The
problems of interest include:
* Nodes known to powerpc to be memoryless at boot, but to have CPUs in
them are allowed to be 'possible' and 'online'. Memory allocations
for those nodes are taken from another node that does have memory
until and if memory is hot-added to the node.
* Nodes which have no resources assigned at boot, but which may still
be referenced subsequently by affinity or associativity attributes,
are kept in the list of 'possible' nodes for powerpc. Hot-add of
memory or CPUs to the system can reference these nodes and bring
them online instead of redirecting the references to one of the set
of nodes known to have memory at boot.
Note that this software operates under the context of CPU hotplug. We
are not doing memory hotplug in this code, but rather updating the
kernel's CPU topology (i.e. arch_update_cpu_topology /
numa_update_cpu_topology). We are initializing a node that may be used
by CPUs or memory before it can be referenced as invalid by a CPU
hotplug operation. CPU hotplug operations are protected by a range of
APIs including cpu_maps_update_begin/cpu_maps_update_done,
cpus_read/write_lock / cpus_read/write_unlock, device locks, and more.
Memory hotplug operations, including try_online_node, are protected by
mem_hotplug_begin/mem_hotplug_done, device locks, and more. In the
case of CPUs being hot-added to a previously memoryless node, the
try_online_node operation occurs wholly within the CPU locks with no
overlap. Using HMC hot-add/hot-remove operations, we have been able to
add and remove CPUs to any possible node without failures. HMC
operations involve a degree self-serialization, though.
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-11-29 06:58:40 +08:00
|
|
|
if (!node_possible(i))
|
powerpc/numa: Use ibm,max-associativity-domains to discover possible nodes
On powerpc systems which allow 'hot-add' of CPU or memory resources,
it may occur that the new resources are to be inserted into nodes that
were not used for these resources at bootup. In the kernel, any node
that is used must be defined and initialized. These empty nodes may
occur when,
* Dedicated vs. shared resources. Shared resources require information
such as the VPHN hcall for CPU assignment to nodes. Associativity
decisions made based on dedicated resource rules, such as
associativity properties in the device tree, may vary from decisions
made using the values returned by the VPHN hcall.
* memoryless nodes at boot. Nodes need to be defined as 'possible' at
boot for operation with other code modules. Previously, the powerpc
code would limit the set of possible nodes to those which have
memory assigned at boot, and were thus online. Subsequent add/remove
of CPUs or memory would only work with this subset of possible
nodes.
* memoryless nodes with CPUs at boot. Due to the previous restriction
on nodes, nodes that had CPUs but no memory were being collapsed
into other nodes that did have memory at boot. In practice this
meant that the node assignment presented by the runtime kernel
differed from the affinity and associativity attributes presented by
the device tree or VPHN hcalls. Nodes that might be known to the
pHyp were not 'possible' in the runtime kernel because they did not
have memory at boot.
This patch ensures that sufficient nodes are defined to support
configuration requirements after boot, as well as at boot. This patch
set fixes a couple of problems.
* Nodes known to powerpc to be memoryless at boot, but to have CPUs in
them are allowed to be 'possible' and 'online'. Memory allocations
for those nodes are taken from another node that does have memory
until and if memory is hot-added to the node. * Nodes which have no
resources assigned at boot, but which may still be referenced
subsequently by affinity or associativity attributes, are kept in
the list of 'possible' nodes for powerpc. Hot-add of memory or CPUs
to the system can reference these nodes and bring them online
instead of redirecting to one of the set of nodes that were known to
have memory at boot.
This patch extracts the value of the lowest domain level (number of
allocable resources) from the device tree property
"ibm,max-associativity-domains" to use as the maximum number of nodes
to setup as possibly available in the system. This new setting will
override the instruction:
nodes_and(node_possible_map, node_possible_map, node_online_map);
presently seen in the function arch/powerpc/mm/numa.c:initmem_init().
If the "ibm,max-associativity-domains" property is not present at
boot, no operation will be performed to define or enable additional
nodes, or enable the above 'nodes_and()'.
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-11-29 06:58:36 +08:00
|
|
|
node_set(i, node_possible_map);
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
of_node_put(rtas);
|
|
|
|
}
|
|
|
|
|
2014-09-17 20:15:33 +08:00
|
|
|
void __init initmem_init(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
powerpc: reorder per-cpu NUMA information's initialization
There is an issue currently where NUMA information is used on powerpc
(and possibly ia64) before it has been read from the device-tree, which
leads to large slab consumption with CONFIG_SLUB and memoryless nodes.
NUMA powerpc non-boot CPU's cpu_to_node/cpu_to_mem is only accurate
after start_secondary(), similar to ia64, which is invoked via
smp_init().
Commit 6ee0578b4daae ("workqueue: mark init_workqueues() as
early_initcall()") made init_workqueues() be invoked via
do_pre_smp_initcalls(), which is obviously before the secondary
processors are online.
Additionally, the following commits changed init_workqueues() to use
cpu_to_node to determine the node to use for kthread_create_on_node:
bce903809ab3f ("workqueue: add wq_numa_tbl_len and
wq_numa_possible_cpumask[]")
f3f90ad469342 ("workqueue: determine NUMA node of workers accourding to
the allowed cpumask")
Therefore, when init_workqueues() runs, it sees all CPUs as being on
Node 0. On LPARs or KVM guests where Node 0 is memoryless, this leads to
a high number of slab deactivations
(http://www.spinics.net/lists/linux-mm/msg67489.html).
Fix this by initializing the powerpc-specific CPU<->node/local memory
node mapping as early as possible, which on powerpc is
do_init_bootmem(). Currently that function initializes the mapping for
the boot CPU, but we extend it to setup the mapping for all possible
CPUs. Then, in smp_prepare_cpus(), we can correspondingly set the
per-cpu values for all possible CPUs. That ensures that before the
early_initcalls run (and really as early as possible), the per-cpu NUMA
mapping is accurate.
While testing memoryless nodes on PowerKVM guests with a fix to the
workqueue logic to use cpu_to_mem() instead of cpu_to_node(), with a
guest topology of:
available: 2 nodes (0-1)
node 0 cpus: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
node 0 size: 0 MB
node 0 free: 0 MB
node 1 cpus: 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99
node 1 size: 16336 MB
node 1 free: 15329 MB
node distances:
node 0 1
0: 10 40
1: 40 10
the slab consumption decreases from
Slab: 932416 kB
SUnreclaim: 902336 kB
to
Slab: 395264 kB
SUnreclaim: 359424 kB
And we a corresponding increase in the slab efficiency from
slab mem objs slabs
used active active
------------------------------------------------------------
kmalloc-16384 337 MB 11.28% 100.00%
task_struct 288 MB 9.93% 100.00%
to
slab mem objs slabs
used active active
------------------------------------------------------------
kmalloc-16384 37 MB 100.00% 100.00%
task_struct 31 MB 100.00% 100.00%
Powerpc didn't support memoryless nodes until recently (64bb80d87f01
"powerpc/numa: Enable CONFIG_HAVE_MEMORYLESS_NODES" and 8c272261194d
"powerpc/numa: Enable USE_PERCPU_NUMA_NODE_ID"). Those commits also
helped improve memory consumption with these kind of environments.
Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2014-07-18 07:15:12 +08:00
|
|
|
int nid, cpu;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-07-12 12:36:09 +08:00
|
|
|
max_low_pfn = memblock_end_of_DRAM() >> PAGE_SHIFT;
|
2005-04-17 06:20:36 +08:00
|
|
|
max_pfn = max_low_pfn;
|
|
|
|
|
|
|
|
if (parse_numa_properties())
|
|
|
|
setup_nonnuma();
|
|
|
|
|
2014-09-17 20:15:33 +08:00
|
|
|
memblock_dump_all();
|
|
|
|
|
powerpc/numa: Reset node_possible_map to only node_online_map
Raghu noticed an issue with excessive memory allocation on power with a
simple cgroup test, specifically, in mem_cgroup_css_alloc ->
for_each_node -> alloc_mem_cgroup_per_zone_info(), which ends up blowing
up the kmalloc-2048 slab (to the order of 200MB for 400 cgroup
directories).
The underlying issue is that NODES_SHIFT on power is 8 (256 NUMA nodes
possible), which defines node_possible_map, which in turn defines the
value of nr_node_ids in setup_nr_node_ids and the iteration of
for_each_node.
In practice, we never see a system with 256 NUMA nodes, and in fact, we
do not support node hotplug on power in the first place, so the nodes
that are online when we come up are the nodes that will be present for
the lifetime of this kernel. So let's, at least, drop the NUMA possible
map down to the online map at runtime. This is similar to what x86 does
in its initialization routines.
mem_cgroup_css_alloc should also be fixed to only iterate over
memory-populated nodes and handle hotplug, but that is a separate
change.
Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
Cc: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2015-03-11 07:50:59 +08:00
|
|
|
/*
|
powerpc/numa: Use ibm,max-associativity-domains to discover possible nodes
On powerpc systems which allow 'hot-add' of CPU or memory resources,
it may occur that the new resources are to be inserted into nodes that
were not used for these resources at bootup. In the kernel, any node
that is used must be defined and initialized. These empty nodes may
occur when,
* Dedicated vs. shared resources. Shared resources require information
such as the VPHN hcall for CPU assignment to nodes. Associativity
decisions made based on dedicated resource rules, such as
associativity properties in the device tree, may vary from decisions
made using the values returned by the VPHN hcall.
* memoryless nodes at boot. Nodes need to be defined as 'possible' at
boot for operation with other code modules. Previously, the powerpc
code would limit the set of possible nodes to those which have
memory assigned at boot, and were thus online. Subsequent add/remove
of CPUs or memory would only work with this subset of possible
nodes.
* memoryless nodes with CPUs at boot. Due to the previous restriction
on nodes, nodes that had CPUs but no memory were being collapsed
into other nodes that did have memory at boot. In practice this
meant that the node assignment presented by the runtime kernel
differed from the affinity and associativity attributes presented by
the device tree or VPHN hcalls. Nodes that might be known to the
pHyp were not 'possible' in the runtime kernel because they did not
have memory at boot.
This patch ensures that sufficient nodes are defined to support
configuration requirements after boot, as well as at boot. This patch
set fixes a couple of problems.
* Nodes known to powerpc to be memoryless at boot, but to have CPUs in
them are allowed to be 'possible' and 'online'. Memory allocations
for those nodes are taken from another node that does have memory
until and if memory is hot-added to the node. * Nodes which have no
resources assigned at boot, but which may still be referenced
subsequently by affinity or associativity attributes, are kept in
the list of 'possible' nodes for powerpc. Hot-add of memory or CPUs
to the system can reference these nodes and bring them online
instead of redirecting to one of the set of nodes that were known to
have memory at boot.
This patch extracts the value of the lowest domain level (number of
allocable resources) from the device tree property
"ibm,max-associativity-domains" to use as the maximum number of nodes
to setup as possibly available in the system. This new setting will
override the instruction:
nodes_and(node_possible_map, node_possible_map, node_online_map);
presently seen in the function arch/powerpc/mm/numa.c:initmem_init().
If the "ibm,max-associativity-domains" property is not present at
boot, no operation will be performed to define or enable additional
nodes, or enable the above 'nodes_and()'.
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-11-29 06:58:36 +08:00
|
|
|
* Modify the set of possible NUMA nodes to reflect information
|
|
|
|
* available about the set of online nodes, and the set of nodes
|
|
|
|
* that we expect to make use of for this platform's affinity
|
|
|
|
* calculations.
|
powerpc/numa: Reset node_possible_map to only node_online_map
Raghu noticed an issue with excessive memory allocation on power with a
simple cgroup test, specifically, in mem_cgroup_css_alloc ->
for_each_node -> alloc_mem_cgroup_per_zone_info(), which ends up blowing
up the kmalloc-2048 slab (to the order of 200MB for 400 cgroup
directories).
The underlying issue is that NODES_SHIFT on power is 8 (256 NUMA nodes
possible), which defines node_possible_map, which in turn defines the
value of nr_node_ids in setup_nr_node_ids and the iteration of
for_each_node.
In practice, we never see a system with 256 NUMA nodes, and in fact, we
do not support node hotplug on power in the first place, so the nodes
that are online when we come up are the nodes that will be present for
the lifetime of this kernel. So let's, at least, drop the NUMA possible
map down to the online map at runtime. This is similar to what x86 does
in its initialization routines.
mem_cgroup_css_alloc should also be fixed to only iterate over
memory-populated nodes and handle hotplug, but that is a separate
change.
Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
Cc: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2015-03-11 07:50:59 +08:00
|
|
|
*/
|
|
|
|
nodes_and(node_possible_map, node_possible_map, node_online_map);
|
|
|
|
|
powerpc/numa: Use ibm,max-associativity-domains to discover possible nodes
On powerpc systems which allow 'hot-add' of CPU or memory resources,
it may occur that the new resources are to be inserted into nodes that
were not used for these resources at bootup. In the kernel, any node
that is used must be defined and initialized. These empty nodes may
occur when,
* Dedicated vs. shared resources. Shared resources require information
such as the VPHN hcall for CPU assignment to nodes. Associativity
decisions made based on dedicated resource rules, such as
associativity properties in the device tree, may vary from decisions
made using the values returned by the VPHN hcall.
* memoryless nodes at boot. Nodes need to be defined as 'possible' at
boot for operation with other code modules. Previously, the powerpc
code would limit the set of possible nodes to those which have
memory assigned at boot, and were thus online. Subsequent add/remove
of CPUs or memory would only work with this subset of possible
nodes.
* memoryless nodes with CPUs at boot. Due to the previous restriction
on nodes, nodes that had CPUs but no memory were being collapsed
into other nodes that did have memory at boot. In practice this
meant that the node assignment presented by the runtime kernel
differed from the affinity and associativity attributes presented by
the device tree or VPHN hcalls. Nodes that might be known to the
pHyp were not 'possible' in the runtime kernel because they did not
have memory at boot.
This patch ensures that sufficient nodes are defined to support
configuration requirements after boot, as well as at boot. This patch
set fixes a couple of problems.
* Nodes known to powerpc to be memoryless at boot, but to have CPUs in
them are allowed to be 'possible' and 'online'. Memory allocations
for those nodes are taken from another node that does have memory
until and if memory is hot-added to the node. * Nodes which have no
resources assigned at boot, but which may still be referenced
subsequently by affinity or associativity attributes, are kept in
the list of 'possible' nodes for powerpc. Hot-add of memory or CPUs
to the system can reference these nodes and bring them online
instead of redirecting to one of the set of nodes that were known to
have memory at boot.
This patch extracts the value of the lowest domain level (number of
allocable resources) from the device tree property
"ibm,max-associativity-domains" to use as the maximum number of nodes
to setup as possibly available in the system. This new setting will
override the instruction:
nodes_and(node_possible_map, node_possible_map, node_online_map);
presently seen in the function arch/powerpc/mm/numa.c:initmem_init().
If the "ibm,max-associativity-domains" property is not present at
boot, no operation will be performed to define or enable additional
nodes, or enable the above 'nodes_and()'.
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-11-29 06:58:36 +08:00
|
|
|
find_possible_nodes();
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
for_each_online_node(nid) {
|
2006-09-27 16:49:49 +08:00
|
|
|
unsigned long start_pfn, end_pfn;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-09-27 16:49:49 +08:00
|
|
|
get_pfn_range_for_nid(nid, &start_pfn, &end_pfn);
|
2014-09-17 20:15:33 +08:00
|
|
|
setup_node_data(nid, start_pfn, end_pfn);
|
2008-10-09 18:18:40 +08:00
|
|
|
sparse_memory_present_with_active_regions(nid);
|
2008-11-24 20:02:35 +08:00
|
|
|
}
|
2009-06-03 05:16:38 +08:00
|
|
|
|
2014-09-17 20:15:36 +08:00
|
|
|
sparse_init();
|
2010-04-26 23:32:43 +08:00
|
|
|
|
|
|
|
setup_node_to_cpumask_map();
|
|
|
|
|
powerpc: Fix the setup of CPU-to-Node mappings during CPU online
On POWER platforms, the hypervisor can notify the guest kernel about dynamic
changes in the cpu-numa associativity (VPHN topology update). Hence the
cpu-to-node mappings that we got from the firmware during boot, may no longer
be valid after such updates. This is handled using the arch_update_cpu_topology()
hook in the scheduler, and the sched-domains are rebuilt according to the new
mappings.
But unfortunately, at the moment, CPU hotplug ignores these updated mappings
and instead queries the firmware for the cpu-to-numa relationships and uses
them during CPU online. So the kernel can end up assigning wrong NUMA nodes
to CPUs during subsequent CPU hotplug online operations (after booting).
Further, a particularly problematic scenario can result from this bug:
On POWER platforms, the SMT mode can be switched between 1, 2, 4 (and even 8)
threads per core. The switch to Single-Threaded (ST) mode is performed by
offlining all except the first CPU thread in each core. Switching back to
SMT mode involves onlining those other threads back, in each core.
Now consider this scenario:
1. During boot, the kernel gets the cpu-to-node mappings from the firmware
and assigns the CPUs to NUMA nodes appropriately, during CPU online.
2. Later on, the hypervisor updates the cpu-to-node mappings dynamically and
communicates this update to the kernel. The kernel in turn updates its
cpu-to-node associations and rebuilds its sched domains. Everything is
fine so far.
3. Now, the user switches the machine from SMT to ST mode (say, by running
ppc64_cpu --smt=1). This involves offlining all except 1 thread in each
core.
4. The user then tries to switch back from ST to SMT mode (say, by running
ppc64_cpu --smt=4), and this involves onlining those threads back. Since
CPU hotplug ignores the new mappings, it queries the firmware and tries to
associate the newly onlined sibling threads to the old NUMA nodes. This
results in sibling threads within the same core getting associated with
different NUMA nodes, which is incorrect.
The scheduler's build-sched-domains code gets thoroughly confused with this
and enters an infinite loop and causes soft-lockups, as explained in detail
in commit 3be7db6ab (powerpc: VPHN topology change updates all siblings).
So to fix this, use the numa_cpu_lookup_table to remember the updated
cpu-to-node mappings, and use them during CPU hotplug online operations.
Further, we also need to ensure that all threads in a core are assigned to a
common NUMA node, irrespective of whether all those threads were online during
the topology update. To achieve this, we take care not to use cpu_sibling_mask()
since it is not hotplug invariant. Instead, we use cpu_first_sibling_thread()
and set up the mappings manually using the 'threads_per_core' value for that
particular platform. This helps us ensure that we don't hit this bug with any
combination of CPU hotplug and SMT mode switching.
Cc: stable@vger.kernel.org
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2013-12-30 19:35:34 +08:00
|
|
|
reset_numa_cpu_lookup_table();
|
2016-07-18 22:07:28 +08:00
|
|
|
|
powerpc: reorder per-cpu NUMA information's initialization
There is an issue currently where NUMA information is used on powerpc
(and possibly ia64) before it has been read from the device-tree, which
leads to large slab consumption with CONFIG_SLUB and memoryless nodes.
NUMA powerpc non-boot CPU's cpu_to_node/cpu_to_mem is only accurate
after start_secondary(), similar to ia64, which is invoked via
smp_init().
Commit 6ee0578b4daae ("workqueue: mark init_workqueues() as
early_initcall()") made init_workqueues() be invoked via
do_pre_smp_initcalls(), which is obviously before the secondary
processors are online.
Additionally, the following commits changed init_workqueues() to use
cpu_to_node to determine the node to use for kthread_create_on_node:
bce903809ab3f ("workqueue: add wq_numa_tbl_len and
wq_numa_possible_cpumask[]")
f3f90ad469342 ("workqueue: determine NUMA node of workers accourding to
the allowed cpumask")
Therefore, when init_workqueues() runs, it sees all CPUs as being on
Node 0. On LPARs or KVM guests where Node 0 is memoryless, this leads to
a high number of slab deactivations
(http://www.spinics.net/lists/linux-mm/msg67489.html).
Fix this by initializing the powerpc-specific CPU<->node/local memory
node mapping as early as possible, which on powerpc is
do_init_bootmem(). Currently that function initializes the mapping for
the boot CPU, but we extend it to setup the mapping for all possible
CPUs. Then, in smp_prepare_cpus(), we can correspondingly set the
per-cpu values for all possible CPUs. That ensures that before the
early_initcalls run (and really as early as possible), the per-cpu NUMA
mapping is accurate.
While testing memoryless nodes on PowerKVM guests with a fix to the
workqueue logic to use cpu_to_mem() instead of cpu_to_node(), with a
guest topology of:
available: 2 nodes (0-1)
node 0 cpus: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
node 0 size: 0 MB
node 0 free: 0 MB
node 1 cpus: 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99
node 1 size: 16336 MB
node 1 free: 15329 MB
node distances:
node 0 1
0: 10 40
1: 40 10
the slab consumption decreases from
Slab: 932416 kB
SUnreclaim: 902336 kB
to
Slab: 395264 kB
SUnreclaim: 359424 kB
And we a corresponding increase in the slab efficiency from
slab mem objs slabs
used active active
------------------------------------------------------------
kmalloc-16384 337 MB 11.28% 100.00%
task_struct 288 MB 9.93% 100.00%
to
slab mem objs slabs
used active active
------------------------------------------------------------
kmalloc-16384 37 MB 100.00% 100.00%
task_struct 31 MB 100.00% 100.00%
Powerpc didn't support memoryless nodes until recently (64bb80d87f01
"powerpc/numa: Enable CONFIG_HAVE_MEMORYLESS_NODES" and 8c272261194d
"powerpc/numa: Enable USE_PERCPU_NUMA_NODE_ID"). Those commits also
helped improve memory consumption with these kind of environments.
Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2014-07-18 07:15:12 +08:00
|
|
|
/*
|
|
|
|
* We need the numa_cpu_lookup_table to be accurate for all CPUs,
|
|
|
|
* even before we online them, so that we can use cpu_to_{node,mem}
|
|
|
|
* early in boot, cf. smp_prepare_cpus().
|
2016-07-18 22:07:28 +08:00
|
|
|
* _nocalls() + manual invocation is used because cpuhp is not yet
|
|
|
|
* initialized for the boot CPU.
|
powerpc: reorder per-cpu NUMA information's initialization
There is an issue currently where NUMA information is used on powerpc
(and possibly ia64) before it has been read from the device-tree, which
leads to large slab consumption with CONFIG_SLUB and memoryless nodes.
NUMA powerpc non-boot CPU's cpu_to_node/cpu_to_mem is only accurate
after start_secondary(), similar to ia64, which is invoked via
smp_init().
Commit 6ee0578b4daae ("workqueue: mark init_workqueues() as
early_initcall()") made init_workqueues() be invoked via
do_pre_smp_initcalls(), which is obviously before the secondary
processors are online.
Additionally, the following commits changed init_workqueues() to use
cpu_to_node to determine the node to use for kthread_create_on_node:
bce903809ab3f ("workqueue: add wq_numa_tbl_len and
wq_numa_possible_cpumask[]")
f3f90ad469342 ("workqueue: determine NUMA node of workers accourding to
the allowed cpumask")
Therefore, when init_workqueues() runs, it sees all CPUs as being on
Node 0. On LPARs or KVM guests where Node 0 is memoryless, this leads to
a high number of slab deactivations
(http://www.spinics.net/lists/linux-mm/msg67489.html).
Fix this by initializing the powerpc-specific CPU<->node/local memory
node mapping as early as possible, which on powerpc is
do_init_bootmem(). Currently that function initializes the mapping for
the boot CPU, but we extend it to setup the mapping for all possible
CPUs. Then, in smp_prepare_cpus(), we can correspondingly set the
per-cpu values for all possible CPUs. That ensures that before the
early_initcalls run (and really as early as possible), the per-cpu NUMA
mapping is accurate.
While testing memoryless nodes on PowerKVM guests with a fix to the
workqueue logic to use cpu_to_mem() instead of cpu_to_node(), with a
guest topology of:
available: 2 nodes (0-1)
node 0 cpus: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
node 0 size: 0 MB
node 0 free: 0 MB
node 1 cpus: 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99
node 1 size: 16336 MB
node 1 free: 15329 MB
node distances:
node 0 1
0: 10 40
1: 40 10
the slab consumption decreases from
Slab: 932416 kB
SUnreclaim: 902336 kB
to
Slab: 395264 kB
SUnreclaim: 359424 kB
And we a corresponding increase in the slab efficiency from
slab mem objs slabs
used active active
------------------------------------------------------------
kmalloc-16384 337 MB 11.28% 100.00%
task_struct 288 MB 9.93% 100.00%
to
slab mem objs slabs
used active active
------------------------------------------------------------
kmalloc-16384 37 MB 100.00% 100.00%
task_struct 31 MB 100.00% 100.00%
Powerpc didn't support memoryless nodes until recently (64bb80d87f01
"powerpc/numa: Enable CONFIG_HAVE_MEMORYLESS_NODES" and 8c272261194d
"powerpc/numa: Enable USE_PERCPU_NUMA_NODE_ID"). Those commits also
helped improve memory consumption with these kind of environments.
Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2014-07-18 07:15:12 +08:00
|
|
|
*/
|
2016-12-22 03:19:54 +08:00
|
|
|
cpuhp_setup_state_nocalls(CPUHP_POWER_NUMA_PREPARE, "powerpc/numa:prepare",
|
2016-07-18 22:07:28 +08:00
|
|
|
ppc_numa_cpu_prepare, ppc_numa_cpu_dead);
|
|
|
|
for_each_present_cpu(cpu)
|
|
|
|
numa_setup_cpu(cpu);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int __init early_numa(char *p)
|
|
|
|
{
|
|
|
|
if (!p)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (strstr(p, "off"))
|
|
|
|
numa_enabled = 0;
|
|
|
|
|
|
|
|
if (strstr(p, "debug"))
|
|
|
|
numa_debug = 1;
|
|
|
|
|
2008-02-01 12:57:31 +08:00
|
|
|
p = strstr(p, "fake=");
|
|
|
|
if (p)
|
|
|
|
cmdline = p + strlen("fake=");
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
early_param("numa", early_numa);
|
2005-12-06 04:06:42 +08:00
|
|
|
|
2014-10-11 00:04:49 +08:00
|
|
|
static bool topology_updates_enabled = true;
|
|
|
|
|
|
|
|
static int __init early_topology_updates(char *p)
|
|
|
|
{
|
|
|
|
if (!p)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!strcmp(p, "off")) {
|
|
|
|
pr_info("Disabling topology updates\n");
|
|
|
|
topology_updates_enabled = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
early_param("topology_updates", early_topology_updates);
|
|
|
|
|
2005-12-06 04:06:42 +08:00
|
|
|
#ifdef CONFIG_MEMORY_HOTPLUG
|
2008-07-03 11:25:08 +08:00
|
|
|
/*
|
2009-02-17 16:08:30 +08:00
|
|
|
* Find the node associated with a hot added memory section for
|
|
|
|
* memory represented in the device tree by the property
|
|
|
|
* ibm,dynamic-reconfiguration-memory/ibm,dynamic-memory.
|
2008-07-03 11:25:08 +08:00
|
|
|
*/
|
2017-12-02 00:47:21 +08:00
|
|
|
static int hot_add_drconf_scn_to_nid(unsigned long scn_addr)
|
2008-07-03 11:25:08 +08:00
|
|
|
{
|
2017-12-02 00:47:21 +08:00
|
|
|
struct drmem_lmb *lmb;
|
2010-07-23 08:35:52 +08:00
|
|
|
unsigned long lmb_size;
|
2009-02-17 16:08:30 +08:00
|
|
|
int nid = -1;
|
2008-07-03 11:25:08 +08:00
|
|
|
|
2017-12-02 00:47:21 +08:00
|
|
|
lmb_size = drmem_lmb_size();
|
2008-07-03 11:25:08 +08:00
|
|
|
|
2017-12-02 00:47:21 +08:00
|
|
|
for_each_drmem_lmb(lmb) {
|
2008-07-03 11:25:08 +08:00
|
|
|
/* skip this block if it is reserved or not assigned to
|
|
|
|
* this partition */
|
2017-12-02 00:47:21 +08:00
|
|
|
if ((lmb->flags & DRCONF_MEM_RESERVED)
|
|
|
|
|| !(lmb->flags & DRCONF_MEM_ASSIGNED))
|
2008-07-03 11:25:08 +08:00
|
|
|
continue;
|
|
|
|
|
2017-12-02 00:47:21 +08:00
|
|
|
if ((scn_addr < lmb->base_addr)
|
|
|
|
|| (scn_addr >= (lmb->base_addr + lmb_size)))
|
2009-02-17 16:08:30 +08:00
|
|
|
continue;
|
|
|
|
|
2017-12-02 00:47:21 +08:00
|
|
|
nid = of_drconf_to_nid_single(lmb);
|
2009-02-17 16:08:30 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nid;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Find the node associated with a hot added memory section for memory
|
|
|
|
* represented in the device tree as a node (i.e. memory@XXXX) for
|
2010-07-12 12:36:09 +08:00
|
|
|
* each memblock.
|
2009-02-17 16:08:30 +08:00
|
|
|
*/
|
2013-10-28 22:20:50 +08:00
|
|
|
static int hot_add_node_scn_to_nid(unsigned long scn_addr)
|
2009-02-17 16:08:30 +08:00
|
|
|
{
|
2011-08-11 04:44:22 +08:00
|
|
|
struct device_node *memory;
|
2009-02-17 16:08:30 +08:00
|
|
|
int nid = -1;
|
|
|
|
|
2011-08-11 04:44:22 +08:00
|
|
|
for_each_node_by_type(memory, "memory") {
|
2009-02-17 16:08:30 +08:00
|
|
|
unsigned long start, size;
|
|
|
|
int ranges;
|
2013-08-07 00:01:44 +08:00
|
|
|
const __be32 *memcell_buf;
|
2009-02-17 16:08:30 +08:00
|
|
|
unsigned int len;
|
|
|
|
|
|
|
|
memcell_buf = of_get_property(memory, "reg", &len);
|
|
|
|
if (!memcell_buf || len <= 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* ranges in cell */
|
|
|
|
ranges = (len >> 2) / (n_mem_addr_cells + n_mem_size_cells);
|
|
|
|
|
|
|
|
while (ranges--) {
|
|
|
|
start = read_n_cells(n_mem_addr_cells, &memcell_buf);
|
|
|
|
size = read_n_cells(n_mem_size_cells, &memcell_buf);
|
|
|
|
|
|
|
|
if ((scn_addr < start) || (scn_addr >= (start + size)))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
nid = of_node_to_nid_single(memory);
|
|
|
|
break;
|
|
|
|
}
|
2008-07-03 11:25:08 +08:00
|
|
|
|
2009-02-17 16:08:30 +08:00
|
|
|
if (nid >= 0)
|
|
|
|
break;
|
2008-07-03 11:25:08 +08:00
|
|
|
}
|
|
|
|
|
2011-08-11 04:44:21 +08:00
|
|
|
of_node_put(memory);
|
|
|
|
|
2009-02-17 16:08:30 +08:00
|
|
|
return nid;
|
2008-07-03 11:25:08 +08:00
|
|
|
}
|
|
|
|
|
2005-12-06 04:06:42 +08:00
|
|
|
/*
|
|
|
|
* Find the node associated with a hot added memory section. Section
|
2010-07-12 12:36:09 +08:00
|
|
|
* corresponds to a SPARSEMEM section, not an MEMBLOCK. It is assumed that
|
|
|
|
* sections are fully contained within a single MEMBLOCK.
|
2005-12-06 04:06:42 +08:00
|
|
|
*/
|
|
|
|
int hot_add_scn_to_nid(unsigned long scn_addr)
|
|
|
|
{
|
|
|
|
struct device_node *memory = NULL;
|
2016-12-13 08:42:52 +08:00
|
|
|
int nid;
|
2005-12-06 04:06:42 +08:00
|
|
|
|
|
|
|
if (!numa_enabled || (min_common_depth < 0))
|
2010-03-06 05:42:43 +08:00
|
|
|
return first_online_node;
|
2008-07-03 11:25:08 +08:00
|
|
|
|
|
|
|
memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
|
|
|
|
if (memory) {
|
2017-12-02 00:47:21 +08:00
|
|
|
nid = hot_add_drconf_scn_to_nid(scn_addr);
|
2008-07-03 11:25:08 +08:00
|
|
|
of_node_put(memory);
|
2009-02-17 16:08:30 +08:00
|
|
|
} else {
|
|
|
|
nid = hot_add_node_scn_to_nid(scn_addr);
|
2008-07-03 11:25:08 +08:00
|
|
|
}
|
2005-12-06 04:06:42 +08:00
|
|
|
|
2016-11-17 00:45:03 +08:00
|
|
|
if (nid < 0 || !node_possible(nid))
|
2010-03-06 05:42:43 +08:00
|
|
|
nid = first_online_node;
|
2005-12-06 04:06:42 +08:00
|
|
|
|
2009-02-17 16:08:30 +08:00
|
|
|
return nid;
|
2005-12-06 04:06:42 +08:00
|
|
|
}
|
2009-02-17 16:08:30 +08:00
|
|
|
|
2010-10-27 01:35:12 +08:00
|
|
|
static u64 hot_add_drconf_memory_max(void)
|
|
|
|
{
|
2016-05-12 21:34:14 +08:00
|
|
|
struct device_node *memory = NULL;
|
powerpc/numa: Fix multiple bugs in memory_hotplug_max()
memory_hotplug_max() uses hot_add_drconf_memory_max() to get maxmimum
addressable memory by referring to ibm,dyanamic-memory property. There
are three problems with the current approach:
1 hot_add_drconf_memory_max() assumes that ibm,dynamic-memory includes
all the LMBs of the guest, but that is not true for PowerKVM which
populates only DR LMBs (LMBs that can be hotplugged/removed) in that
property.
2 hot_add_drconf_memory_max() multiplies lmb-size with lmb-count to arrive
at the max possible address. Since ibm,dynamic-memory doesn't include
RMA LMBs, the address thus obtained will be less than the actual max
address. For example, if max possible memory size is 32G, with lmb-size
of 256MB there can be 127 LMBs in ibm,dynamic-memory (1 LMB for RMA
which won't be present here). hot_add_drconf_memory_max() would then
return the max addressable memory as 127 * 256MB = 31.75GB, the max
address should have been 32G which is what ibm,lrdr-capacity shows.
3 In PowerKVM, there can be a gap between the end of boot time RAM and
beginning of hotplug RAM area. So just multiplying lmb-count with
lmb-size will not provide the correct max possible address for PowerKVM.
This patch fixes 1 by using ibm,lrdr-capacity property to return the max
addressable memory whenever the property is present. Then it fixes 2 & 3
by fetching the address of the last LMB in ibm,dynamic-memory property.
Fixes: cd34206e949b ("powerpc: Add memory_hotplug_max()")
Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2016-05-12 21:34:15 +08:00
|
|
|
struct device_node *dn = NULL;
|
|
|
|
const __be64 *lrdr = NULL;
|
|
|
|
|
|
|
|
dn = of_find_node_by_path("/rtas");
|
|
|
|
if (dn) {
|
|
|
|
lrdr = of_get_property(dn, "ibm,lrdr-capacity", NULL);
|
|
|
|
of_node_put(dn);
|
|
|
|
if (lrdr)
|
|
|
|
return be64_to_cpup(lrdr);
|
|
|
|
}
|
2010-10-27 01:35:12 +08:00
|
|
|
|
2016-05-12 21:34:14 +08:00
|
|
|
memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
|
|
|
|
if (memory) {
|
|
|
|
of_node_put(memory);
|
2017-12-02 00:47:21 +08:00
|
|
|
return drmem_lmb_memory_max();
|
2016-05-12 21:34:14 +08:00
|
|
|
}
|
powerpc/numa: Fix multiple bugs in memory_hotplug_max()
memory_hotplug_max() uses hot_add_drconf_memory_max() to get maxmimum
addressable memory by referring to ibm,dyanamic-memory property. There
are three problems with the current approach:
1 hot_add_drconf_memory_max() assumes that ibm,dynamic-memory includes
all the LMBs of the guest, but that is not true for PowerKVM which
populates only DR LMBs (LMBs that can be hotplugged/removed) in that
property.
2 hot_add_drconf_memory_max() multiplies lmb-size with lmb-count to arrive
at the max possible address. Since ibm,dynamic-memory doesn't include
RMA LMBs, the address thus obtained will be less than the actual max
address. For example, if max possible memory size is 32G, with lmb-size
of 256MB there can be 127 LMBs in ibm,dynamic-memory (1 LMB for RMA
which won't be present here). hot_add_drconf_memory_max() would then
return the max addressable memory as 127 * 256MB = 31.75GB, the max
address should have been 32G which is what ibm,lrdr-capacity shows.
3 In PowerKVM, there can be a gap between the end of boot time RAM and
beginning of hotplug RAM area. So just multiplying lmb-count with
lmb-size will not provide the correct max possible address for PowerKVM.
This patch fixes 1 by using ibm,lrdr-capacity property to return the max
addressable memory whenever the property is present. Then it fixes 2 & 3
by fetching the address of the last LMB in ibm,dynamic-memory property.
Fixes: cd34206e949b ("powerpc: Add memory_hotplug_max()")
Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2016-05-12 21:34:15 +08:00
|
|
|
return 0;
|
2010-10-27 01:35:12 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* memory_hotplug_max - return max address of memory that may be added
|
|
|
|
*
|
|
|
|
* This is currently only used on systems that support drconfig memory
|
|
|
|
* hotplug.
|
|
|
|
*/
|
|
|
|
u64 memory_hotplug_max(void)
|
|
|
|
{
|
|
|
|
return max(hot_add_drconf_memory_max(), memblock_end_of_DRAM());
|
|
|
|
}
|
2005-12-06 04:06:42 +08:00
|
|
|
#endif /* CONFIG_MEMORY_HOTPLUG */
|
2010-12-01 20:31:15 +08:00
|
|
|
|
2011-01-21 03:00:51 +08:00
|
|
|
/* Virtual Processor Home Node (VPHN) support */
|
2010-12-18 06:07:47 +08:00
|
|
|
#ifdef CONFIG_PPC_SPLPAR
|
2015-02-23 23:14:31 +08:00
|
|
|
|
|
|
|
#include "vphn.h"
|
|
|
|
|
2013-04-24 14:02:13 +08:00
|
|
|
struct topology_update_data {
|
|
|
|
struct topology_update_data *next;
|
|
|
|
unsigned int cpu;
|
|
|
|
int old_nid;
|
|
|
|
int new_nid;
|
|
|
|
};
|
|
|
|
|
2017-09-09 04:47:47 +08:00
|
|
|
#define TOPOLOGY_DEF_TIMER_SECS 60
|
|
|
|
|
2011-01-29 20:24:34 +08:00
|
|
|
static u8 vphn_cpu_change_counts[NR_CPUS][MAX_DISTANCE_REF_POINTS];
|
2010-12-01 20:31:15 +08:00
|
|
|
static cpumask_t cpu_associativity_changes_mask;
|
|
|
|
static int vphn_enabled;
|
2013-04-24 14:00:35 +08:00
|
|
|
static int prrn_enabled;
|
|
|
|
static void reset_topology_timer(void);
|
2017-09-09 04:47:47 +08:00
|
|
|
static int topology_timer_secs = 1;
|
2017-09-09 04:47:27 +08:00
|
|
|
static int topology_inited;
|
|
|
|
static int topology_update_needed;
|
2010-12-01 20:31:15 +08:00
|
|
|
|
2017-09-09 04:47:47 +08:00
|
|
|
/*
|
|
|
|
* Change polling interval for associativity changes.
|
|
|
|
*/
|
|
|
|
int timed_topology_update(int nsecs)
|
|
|
|
{
|
|
|
|
if (vphn_enabled) {
|
|
|
|
if (nsecs > 0)
|
|
|
|
topology_timer_secs = nsecs;
|
|
|
|
else
|
|
|
|
topology_timer_secs = TOPOLOGY_DEF_TIMER_SECS;
|
|
|
|
|
|
|
|
reset_topology_timer();
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2010-12-01 20:31:15 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Store the current values of the associativity change counters in the
|
|
|
|
* hypervisor.
|
|
|
|
*/
|
|
|
|
static void setup_cpu_associativity_change_counters(void)
|
|
|
|
{
|
2011-01-21 03:01:35 +08:00
|
|
|
int cpu;
|
2010-12-01 20:31:15 +08:00
|
|
|
|
2011-01-29 20:24:34 +08:00
|
|
|
/* The VPHN feature supports a maximum of 8 reference points */
|
|
|
|
BUILD_BUG_ON(MAX_DISTANCE_REF_POINTS > 8);
|
|
|
|
|
2010-12-01 20:31:15 +08:00
|
|
|
for_each_possible_cpu(cpu) {
|
2011-01-21 03:01:35 +08:00
|
|
|
int i;
|
2010-12-01 20:31:15 +08:00
|
|
|
u8 *counts = vphn_cpu_change_counts[cpu];
|
|
|
|
volatile u8 *hypervisor_counts = lppaca[cpu].vphn_assoc_counts;
|
|
|
|
|
2011-01-29 20:24:34 +08:00
|
|
|
for (i = 0; i < distance_ref_points_depth; i++)
|
2010-12-01 20:31:15 +08:00
|
|
|
counts[i] = hypervisor_counts[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The hypervisor maintains a set of 8 associativity change counters in
|
|
|
|
* the VPA of each cpu that correspond to the associativity levels in the
|
|
|
|
* ibm,associativity-reference-points property. When an associativity
|
|
|
|
* level changes, the corresponding counter is incremented.
|
|
|
|
*
|
|
|
|
* Set a bit in cpu_associativity_changes_mask for each cpu whose home
|
|
|
|
* node associativity levels have changed.
|
|
|
|
*
|
|
|
|
* Returns the number of cpus with unhandled associativity changes.
|
|
|
|
*/
|
|
|
|
static int update_cpu_associativity_changes_mask(void)
|
|
|
|
{
|
2013-04-24 14:00:35 +08:00
|
|
|
int cpu;
|
2010-12-01 20:31:15 +08:00
|
|
|
cpumask_t *changes = &cpu_associativity_changes_mask;
|
|
|
|
|
|
|
|
for_each_possible_cpu(cpu) {
|
|
|
|
int i, changed = 0;
|
|
|
|
u8 *counts = vphn_cpu_change_counts[cpu];
|
|
|
|
volatile u8 *hypervisor_counts = lppaca[cpu].vphn_assoc_counts;
|
|
|
|
|
2011-01-29 20:24:34 +08:00
|
|
|
for (i = 0; i < distance_ref_points_depth; i++) {
|
2011-01-29 20:26:19 +08:00
|
|
|
if (hypervisor_counts[i] != counts[i]) {
|
2010-12-01 20:31:15 +08:00
|
|
|
counts[i] = hypervisor_counts[i];
|
|
|
|
changed = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (changed) {
|
2013-07-25 09:13:21 +08:00
|
|
|
cpumask_or(changes, changes, cpu_sibling_mask(cpu));
|
|
|
|
cpu = cpu_last_thread_sibling(cpu);
|
2010-12-01 20:31:15 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-24 14:00:35 +08:00
|
|
|
return cpumask_weight(changes);
|
2010-12-01 20:31:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Retrieve the new associativity information for a virtual processor's
|
|
|
|
* home node.
|
|
|
|
*/
|
2013-08-07 00:01:44 +08:00
|
|
|
static long hcall_vphn(unsigned long cpu, __be32 *associativity)
|
2010-12-01 20:31:15 +08:00
|
|
|
{
|
2011-01-21 03:01:35 +08:00
|
|
|
long rc;
|
2010-12-01 20:31:15 +08:00
|
|
|
long retbuf[PLPAR_HCALL9_BUFSIZE] = {0};
|
|
|
|
u64 flags = 1;
|
|
|
|
int hwcpu = get_hard_smp_processor_id(cpu);
|
|
|
|
|
|
|
|
rc = plpar_hcall9(H_HOME_NODE_ASSOCIATIVITY, retbuf, flags, hwcpu);
|
|
|
|
vphn_unpack_associativity(retbuf, associativity);
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static long vphn_get_associativity(unsigned long cpu,
|
2013-08-07 00:01:44 +08:00
|
|
|
__be32 *associativity)
|
2010-12-01 20:31:15 +08:00
|
|
|
{
|
2011-01-21 03:01:35 +08:00
|
|
|
long rc;
|
2010-12-01 20:31:15 +08:00
|
|
|
|
|
|
|
rc = hcall_vphn(cpu, associativity);
|
|
|
|
|
|
|
|
switch (rc) {
|
|
|
|
case H_FUNCTION:
|
|
|
|
printk(KERN_INFO
|
|
|
|
"VPHN is not supported. Disabling polling...\n");
|
|
|
|
stop_topology_update();
|
|
|
|
break;
|
|
|
|
case H_HARDWARE:
|
|
|
|
printk(KERN_ERR
|
|
|
|
"hcall_vphn() experienced a hardware fault "
|
|
|
|
"preventing VPHN. Disabling polling...\n");
|
|
|
|
stop_topology_update();
|
2017-09-09 04:47:27 +08:00
|
|
|
break;
|
|
|
|
case H_SUCCESS:
|
|
|
|
dbg("VPHN hcall succeeded. Reset polling...\n");
|
2017-09-09 04:47:47 +08:00
|
|
|
timed_topology_update(0);
|
2017-09-09 04:47:27 +08:00
|
|
|
break;
|
2010-12-01 20:31:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
powerpc/numa: Ensure nodes initialized for hotplug
This patch fixes some problems encountered at runtime with
configurations that support memory-less nodes, or that hot-add CPUs
into nodes that are memoryless during system execution after boot. The
problems of interest include:
* Nodes known to powerpc to be memoryless at boot, but to have CPUs in
them are allowed to be 'possible' and 'online'. Memory allocations
for those nodes are taken from another node that does have memory
until and if memory is hot-added to the node.
* Nodes which have no resources assigned at boot, but which may still
be referenced subsequently by affinity or associativity attributes,
are kept in the list of 'possible' nodes for powerpc. Hot-add of
memory or CPUs to the system can reference these nodes and bring
them online instead of redirecting the references to one of the set
of nodes known to have memory at boot.
Note that this software operates under the context of CPU hotplug. We
are not doing memory hotplug in this code, but rather updating the
kernel's CPU topology (i.e. arch_update_cpu_topology /
numa_update_cpu_topology). We are initializing a node that may be used
by CPUs or memory before it can be referenced as invalid by a CPU
hotplug operation. CPU hotplug operations are protected by a range of
APIs including cpu_maps_update_begin/cpu_maps_update_done,
cpus_read/write_lock / cpus_read/write_unlock, device locks, and more.
Memory hotplug operations, including try_online_node, are protected by
mem_hotplug_begin/mem_hotplug_done, device locks, and more. In the
case of CPUs being hot-added to a previously memoryless node, the
try_online_node operation occurs wholly within the CPU locks with no
overlap. Using HMC hot-add/hot-remove operations, we have been able to
add and remove CPUs to any possible node without failures. HMC
operations involve a degree self-serialization, though.
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-11-29 06:58:40 +08:00
|
|
|
static inline int find_and_online_cpu_nid(int cpu)
|
|
|
|
{
|
|
|
|
__be32 associativity[VPHN_ASSOC_BUFSIZE] = {0};
|
|
|
|
int new_nid;
|
|
|
|
|
|
|
|
/* Use associativity from first thread for all siblings */
|
|
|
|
vphn_get_associativity(cpu, associativity);
|
|
|
|
new_nid = associativity_to_nid(associativity);
|
|
|
|
if (new_nid < 0 || !node_possible(new_nid))
|
|
|
|
new_nid = first_online_node;
|
|
|
|
|
|
|
|
if (NODE_DATA(new_nid) == NULL) {
|
|
|
|
#ifdef CONFIG_MEMORY_HOTPLUG
|
|
|
|
/*
|
|
|
|
* Need to ensure that NODE_DATA is initialized for a node from
|
|
|
|
* available memory (see memblock_alloc_try_nid). If unable to
|
|
|
|
* init the node, then default to nearest node that has memory
|
|
|
|
* installed.
|
|
|
|
*/
|
|
|
|
if (try_online_node(new_nid))
|
|
|
|
new_nid = first_online_node;
|
|
|
|
#else
|
|
|
|
/*
|
|
|
|
* Default to using the nearest node that has memory installed.
|
|
|
|
* Otherwise, it would be necessary to patch the kernel MM code
|
|
|
|
* to deal with more memoryless-node error conditions.
|
|
|
|
*/
|
|
|
|
new_nid = first_online_node;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
return new_nid;
|
|
|
|
}
|
|
|
|
|
2013-04-24 14:02:13 +08:00
|
|
|
/*
|
|
|
|
* Update the CPU maps and sysfs entries for a single CPU when its NUMA
|
|
|
|
* characteristics change. This function doesn't perform any locking and is
|
|
|
|
* only safe to call from stop_machine().
|
|
|
|
*/
|
|
|
|
static int update_cpu_topology(void *data)
|
|
|
|
{
|
|
|
|
struct topology_update_data *update;
|
|
|
|
unsigned long cpu;
|
|
|
|
|
|
|
|
if (!data)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2013-07-25 09:13:21 +08:00
|
|
|
cpu = smp_processor_id();
|
2013-04-24 14:02:13 +08:00
|
|
|
|
|
|
|
for (update = data; update; update = update->next) {
|
2014-10-18 08:50:40 +08:00
|
|
|
int new_nid = update->new_nid;
|
2013-04-24 14:02:13 +08:00
|
|
|
if (cpu != update->cpu)
|
|
|
|
continue;
|
|
|
|
|
2014-10-18 08:49:44 +08:00
|
|
|
unmap_cpu_from_node(cpu);
|
2014-10-18 08:50:40 +08:00
|
|
|
map_cpu_to_node(cpu, new_nid);
|
|
|
|
set_cpu_numa_node(cpu, new_nid);
|
|
|
|
set_cpu_numa_mem(cpu, local_memory_node(new_nid));
|
2013-04-24 14:03:48 +08:00
|
|
|
vdso_getcpu_init();
|
2013-04-24 14:02:13 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
powerpc: Fix the setup of CPU-to-Node mappings during CPU online
On POWER platforms, the hypervisor can notify the guest kernel about dynamic
changes in the cpu-numa associativity (VPHN topology update). Hence the
cpu-to-node mappings that we got from the firmware during boot, may no longer
be valid after such updates. This is handled using the arch_update_cpu_topology()
hook in the scheduler, and the sched-domains are rebuilt according to the new
mappings.
But unfortunately, at the moment, CPU hotplug ignores these updated mappings
and instead queries the firmware for the cpu-to-numa relationships and uses
them during CPU online. So the kernel can end up assigning wrong NUMA nodes
to CPUs during subsequent CPU hotplug online operations (after booting).
Further, a particularly problematic scenario can result from this bug:
On POWER platforms, the SMT mode can be switched between 1, 2, 4 (and even 8)
threads per core. The switch to Single-Threaded (ST) mode is performed by
offlining all except the first CPU thread in each core. Switching back to
SMT mode involves onlining those other threads back, in each core.
Now consider this scenario:
1. During boot, the kernel gets the cpu-to-node mappings from the firmware
and assigns the CPUs to NUMA nodes appropriately, during CPU online.
2. Later on, the hypervisor updates the cpu-to-node mappings dynamically and
communicates this update to the kernel. The kernel in turn updates its
cpu-to-node associations and rebuilds its sched domains. Everything is
fine so far.
3. Now, the user switches the machine from SMT to ST mode (say, by running
ppc64_cpu --smt=1). This involves offlining all except 1 thread in each
core.
4. The user then tries to switch back from ST to SMT mode (say, by running
ppc64_cpu --smt=4), and this involves onlining those threads back. Since
CPU hotplug ignores the new mappings, it queries the firmware and tries to
associate the newly onlined sibling threads to the old NUMA nodes. This
results in sibling threads within the same core getting associated with
different NUMA nodes, which is incorrect.
The scheduler's build-sched-domains code gets thoroughly confused with this
and enters an infinite loop and causes soft-lockups, as explained in detail
in commit 3be7db6ab (powerpc: VPHN topology change updates all siblings).
So to fix this, use the numa_cpu_lookup_table to remember the updated
cpu-to-node mappings, and use them during CPU hotplug online operations.
Further, we also need to ensure that all threads in a core are assigned to a
common NUMA node, irrespective of whether all those threads were online during
the topology update. To achieve this, we take care not to use cpu_sibling_mask()
since it is not hotplug invariant. Instead, we use cpu_first_sibling_thread()
and set up the mappings manually using the 'threads_per_core' value for that
particular platform. This helps us ensure that we don't hit this bug with any
combination of CPU hotplug and SMT mode switching.
Cc: stable@vger.kernel.org
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2013-12-30 19:35:34 +08:00
|
|
|
static int update_lookup_table(void *data)
|
|
|
|
{
|
|
|
|
struct topology_update_data *update;
|
|
|
|
|
|
|
|
if (!data)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Upon topology update, the numa-cpu lookup table needs to be updated
|
|
|
|
* for all threads in the core, including offline CPUs, to ensure that
|
|
|
|
* future hotplug operations respect the cpu-to-node associativity
|
|
|
|
* properly.
|
|
|
|
*/
|
|
|
|
for (update = data; update; update = update->next) {
|
|
|
|
int nid, base, j;
|
|
|
|
|
|
|
|
nid = update->new_nid;
|
|
|
|
base = cpu_first_thread_sibling(update->cpu);
|
|
|
|
|
|
|
|
for (j = 0; j < threads_per_core; j++) {
|
|
|
|
update_numa_cpu_lookup_table(base + j, nid);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-12-01 20:31:15 +08:00
|
|
|
/*
|
|
|
|
* Update the node maps and sysfs entries for each cpu whose home node
|
2012-06-08 05:04:34 +08:00
|
|
|
* has changed. Returns 1 when the topology has changed, and 0 otherwise.
|
2017-06-21 06:08:30 +08:00
|
|
|
*
|
|
|
|
* cpus_locked says whether we already hold cpu_hotplug_lock.
|
2010-12-01 20:31:15 +08:00
|
|
|
*/
|
2017-06-21 06:08:30 +08:00
|
|
|
int numa_update_cpu_topology(bool cpus_locked)
|
2010-12-01 20:31:15 +08:00
|
|
|
{
|
2013-07-25 09:13:21 +08:00
|
|
|
unsigned int cpu, sibling, changed = 0;
|
2013-04-24 14:02:13 +08:00
|
|
|
struct topology_update_data *updates, *ud;
|
2013-04-24 14:03:48 +08:00
|
|
|
cpumask_t updated_cpus;
|
2011-12-22 06:29:42 +08:00
|
|
|
struct device *dev;
|
2013-07-25 09:13:21 +08:00
|
|
|
int weight, new_nid, i = 0;
|
2010-12-01 20:31:15 +08:00
|
|
|
|
2017-09-09 04:47:27 +08:00
|
|
|
if (!prrn_enabled && !vphn_enabled) {
|
|
|
|
if (!topology_inited)
|
|
|
|
topology_update_needed = 1;
|
2014-10-11 00:04:49 +08:00
|
|
|
return 0;
|
2017-09-09 04:47:27 +08:00
|
|
|
}
|
2014-10-11 00:04:49 +08:00
|
|
|
|
2013-04-24 14:02:13 +08:00
|
|
|
weight = cpumask_weight(&cpu_associativity_changes_mask);
|
|
|
|
if (!weight)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
updates = kzalloc(weight * (sizeof(*updates)), GFP_KERNEL);
|
|
|
|
if (!updates)
|
|
|
|
return 0;
|
2010-12-01 20:31:15 +08:00
|
|
|
|
2013-04-24 14:03:48 +08:00
|
|
|
cpumask_clear(&updated_cpus);
|
|
|
|
|
2013-04-24 14:00:35 +08:00
|
|
|
for_each_cpu(cpu, &cpu_associativity_changes_mask) {
|
2013-07-25 09:13:21 +08:00
|
|
|
/*
|
|
|
|
* If siblings aren't flagged for changes, updates list
|
|
|
|
* will be too short. Skip on this update and set for next
|
|
|
|
* update.
|
|
|
|
*/
|
|
|
|
if (!cpumask_subset(cpu_sibling_mask(cpu),
|
|
|
|
&cpu_associativity_changes_mask)) {
|
|
|
|
pr_info("Sibling bits not set for associativity "
|
|
|
|
"change, cpu%d\n", cpu);
|
|
|
|
cpumask_or(&cpu_associativity_changes_mask,
|
|
|
|
&cpu_associativity_changes_mask,
|
|
|
|
cpu_sibling_mask(cpu));
|
|
|
|
cpu = cpu_last_thread_sibling(cpu);
|
|
|
|
continue;
|
|
|
|
}
|
2010-12-01 20:31:15 +08:00
|
|
|
|
powerpc/numa: Ensure nodes initialized for hotplug
This patch fixes some problems encountered at runtime with
configurations that support memory-less nodes, or that hot-add CPUs
into nodes that are memoryless during system execution after boot. The
problems of interest include:
* Nodes known to powerpc to be memoryless at boot, but to have CPUs in
them are allowed to be 'possible' and 'online'. Memory allocations
for those nodes are taken from another node that does have memory
until and if memory is hot-added to the node.
* Nodes which have no resources assigned at boot, but which may still
be referenced subsequently by affinity or associativity attributes,
are kept in the list of 'possible' nodes for powerpc. Hot-add of
memory or CPUs to the system can reference these nodes and bring
them online instead of redirecting the references to one of the set
of nodes known to have memory at boot.
Note that this software operates under the context of CPU hotplug. We
are not doing memory hotplug in this code, but rather updating the
kernel's CPU topology (i.e. arch_update_cpu_topology /
numa_update_cpu_topology). We are initializing a node that may be used
by CPUs or memory before it can be referenced as invalid by a CPU
hotplug operation. CPU hotplug operations are protected by a range of
APIs including cpu_maps_update_begin/cpu_maps_update_done,
cpus_read/write_lock / cpus_read/write_unlock, device locks, and more.
Memory hotplug operations, including try_online_node, are protected by
mem_hotplug_begin/mem_hotplug_done, device locks, and more. In the
case of CPUs being hot-added to a previously memoryless node, the
try_online_node operation occurs wholly within the CPU locks with no
overlap. Using HMC hot-add/hot-remove operations, we have been able to
add and remove CPUs to any possible node without failures. HMC
operations involve a degree self-serialization, though.
Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com>
Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2017-11-29 06:58:40 +08:00
|
|
|
new_nid = find_and_online_cpu_nid(cpu);
|
2013-07-25 09:13:21 +08:00
|
|
|
|
|
|
|
if (new_nid == numa_cpu_lookup_table[cpu]) {
|
|
|
|
cpumask_andnot(&cpu_associativity_changes_mask,
|
|
|
|
&cpu_associativity_changes_mask,
|
|
|
|
cpu_sibling_mask(cpu));
|
2017-09-09 04:47:27 +08:00
|
|
|
dbg("Assoc chg gives same node %d for cpu%d\n",
|
|
|
|
new_nid, cpu);
|
2013-07-25 09:13:21 +08:00
|
|
|
cpu = cpu_last_thread_sibling(cpu);
|
|
|
|
continue;
|
|
|
|
}
|
2010-12-01 20:31:15 +08:00
|
|
|
|
2013-07-25 09:13:21 +08:00
|
|
|
for_each_cpu(sibling, cpu_sibling_mask(cpu)) {
|
|
|
|
ud = &updates[i++];
|
2017-09-09 04:47:56 +08:00
|
|
|
ud->next = &updates[i];
|
2013-07-25 09:13:21 +08:00
|
|
|
ud->cpu = sibling;
|
|
|
|
ud->new_nid = new_nid;
|
|
|
|
ud->old_nid = numa_cpu_lookup_table[sibling];
|
|
|
|
cpumask_set_cpu(sibling, &updated_cpus);
|
|
|
|
}
|
|
|
|
cpu = cpu_last_thread_sibling(cpu);
|
2013-04-24 14:02:13 +08:00
|
|
|
}
|
|
|
|
|
2017-09-09 04:47:56 +08:00
|
|
|
/*
|
|
|
|
* Prevent processing of 'updates' from overflowing array
|
|
|
|
* where last entry filled in a 'next' pointer.
|
|
|
|
*/
|
|
|
|
if (i)
|
|
|
|
updates[i-1].next = NULL;
|
|
|
|
|
2014-10-11 00:04:49 +08:00
|
|
|
pr_debug("Topology update for the following CPUs:\n");
|
|
|
|
if (cpumask_weight(&updated_cpus)) {
|
|
|
|
for (ud = &updates[0]; ud; ud = ud->next) {
|
|
|
|
pr_debug("cpu %d moving from node %d "
|
|
|
|
"to %d\n", ud->cpu,
|
|
|
|
ud->old_nid, ud->new_nid);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
power, sched: stop updating inside arch_update_cpu_topology() when nothing to be update
Since v1:
Edited the comment according to Srivatsa's suggestion.
During the testing, we encounter below WARN followed by Oops:
WARNING: at kernel/sched/core.c:6218
...
NIP [c000000000101660] .build_sched_domains+0x11d0/0x1200
LR [c000000000101358] .build_sched_domains+0xec8/0x1200
PACATMSCRATCH [800000000000f032]
Call Trace:
[c00000001b103850] [c000000000101358] .build_sched_domains+0xec8/0x1200
[c00000001b1039a0] [c00000000010aad4] .partition_sched_domains+0x484/0x510
[c00000001b103aa0] [c00000000016d0a8] .rebuild_sched_domains+0x68/0xa0
[c00000001b103b30] [c00000000005cbf0] .topology_work_fn+0x10/0x30
...
Oops: Kernel access of bad area, sig: 11 [#1]
...
NIP [c00000000045c000] .__bitmap_weight+0x60/0xf0
LR [c00000000010132c] .build_sched_domains+0xe9c/0x1200
PACATMSCRATCH [8000000000029032]
Call Trace:
[c00000001b1037a0] [c000000000288ff4] .kmem_cache_alloc_node_trace+0x184/0x3a0
[c00000001b103850] [c00000000010132c] .build_sched_domains+0xe9c/0x1200
[c00000001b1039a0] [c00000000010aad4] .partition_sched_domains+0x484/0x510
[c00000001b103aa0] [c00000000016d0a8] .rebuild_sched_domains+0x68/0xa0
[c00000001b103b30] [c00000000005cbf0] .topology_work_fn+0x10/0x30
...
This was caused by that 'sd->groups == NULL' after building groups, which
was caused by the empty 'sd->span'.
The cpu's domain contained nothing because the cpu was assigned to a wrong
node, due to the following unfortunate sequence of events:
1. The hypervisor sent a topology update to the guest OS, to notify changes
to the cpu-node mapping. However, the update was actually redundant - i.e.,
the "new" mapping was exactly the same as the old one.
2. Due to this, the 'updated_cpus' mask turned out to be empty after exiting
the 'for-loop' in arch_update_cpu_topology().
3. So we ended up calling stop-machine() with an empty cpumask list, which made
stop-machine internally elect cpumask_first(cpu_online_mask), i.e., CPU0 as
the cpu to run the payload (the update_cpu_topology() function).
4. This causes update_cpu_topology() to be run by CPU0. And since 'updates'
is kzalloc()'ed inside arch_update_cpu_topology(), update_cpu_topology()
finds update->cpu as well as update->new_nid to be 0. In other words, we
end up assigning CPU0 (and eventually its siblings) to node 0, incorrectly.
Along with the following wrong updating, it causes the sched-domain rebuild
code to break and crash the system.
Fix this by skipping the topology update in cases where we find that
the topology has not actually changed in reality (ie., spurious updates).
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Paul Mackerras <paulus@samba.org>
CC: Nathan Fontenot <nfont@linux.vnet.ibm.com>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: Robert Jennings <rcj@linux.vnet.ibm.com>
CC: Jesse Larrew <jlarrew@linux.vnet.ibm.com>
CC: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
CC: Alistair Popple <alistair@popple.id.au>
Suggested-by: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Michael Wang <wangyun@linux.vnet.ibm.com>
Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2014-04-08 11:19:36 +08:00
|
|
|
/*
|
|
|
|
* In cases where we have nothing to update (because the updates list
|
|
|
|
* is too short or because the new topology is same as the old one),
|
|
|
|
* skip invoking update_cpu_topology() via stop-machine(). This is
|
|
|
|
* necessary (and not just a fast-path optimization) since stop-machine
|
|
|
|
* can end up electing a random CPU to run update_cpu_topology(), and
|
|
|
|
* thus trick us into setting up incorrect cpu-node mappings (since
|
|
|
|
* 'updates' is kzalloc()'ed).
|
|
|
|
*
|
|
|
|
* And for the similar reason, we will skip all the following updating.
|
|
|
|
*/
|
|
|
|
if (!cpumask_weight(&updated_cpus))
|
|
|
|
goto out;
|
|
|
|
|
2017-06-21 06:08:30 +08:00
|
|
|
if (cpus_locked)
|
|
|
|
stop_machine_cpuslocked(update_cpu_topology, &updates[0],
|
|
|
|
&updated_cpus);
|
|
|
|
else
|
|
|
|
stop_machine(update_cpu_topology, &updates[0], &updated_cpus);
|
2013-04-24 14:02:13 +08:00
|
|
|
|
powerpc: Fix the setup of CPU-to-Node mappings during CPU online
On POWER platforms, the hypervisor can notify the guest kernel about dynamic
changes in the cpu-numa associativity (VPHN topology update). Hence the
cpu-to-node mappings that we got from the firmware during boot, may no longer
be valid after such updates. This is handled using the arch_update_cpu_topology()
hook in the scheduler, and the sched-domains are rebuilt according to the new
mappings.
But unfortunately, at the moment, CPU hotplug ignores these updated mappings
and instead queries the firmware for the cpu-to-numa relationships and uses
them during CPU online. So the kernel can end up assigning wrong NUMA nodes
to CPUs during subsequent CPU hotplug online operations (after booting).
Further, a particularly problematic scenario can result from this bug:
On POWER platforms, the SMT mode can be switched between 1, 2, 4 (and even 8)
threads per core. The switch to Single-Threaded (ST) mode is performed by
offlining all except the first CPU thread in each core. Switching back to
SMT mode involves onlining those other threads back, in each core.
Now consider this scenario:
1. During boot, the kernel gets the cpu-to-node mappings from the firmware
and assigns the CPUs to NUMA nodes appropriately, during CPU online.
2. Later on, the hypervisor updates the cpu-to-node mappings dynamically and
communicates this update to the kernel. The kernel in turn updates its
cpu-to-node associations and rebuilds its sched domains. Everything is
fine so far.
3. Now, the user switches the machine from SMT to ST mode (say, by running
ppc64_cpu --smt=1). This involves offlining all except 1 thread in each
core.
4. The user then tries to switch back from ST to SMT mode (say, by running
ppc64_cpu --smt=4), and this involves onlining those threads back. Since
CPU hotplug ignores the new mappings, it queries the firmware and tries to
associate the newly onlined sibling threads to the old NUMA nodes. This
results in sibling threads within the same core getting associated with
different NUMA nodes, which is incorrect.
The scheduler's build-sched-domains code gets thoroughly confused with this
and enters an infinite loop and causes soft-lockups, as explained in detail
in commit 3be7db6ab (powerpc: VPHN topology change updates all siblings).
So to fix this, use the numa_cpu_lookup_table to remember the updated
cpu-to-node mappings, and use them during CPU hotplug online operations.
Further, we also need to ensure that all threads in a core are assigned to a
common NUMA node, irrespective of whether all those threads were online during
the topology update. To achieve this, we take care not to use cpu_sibling_mask()
since it is not hotplug invariant. Instead, we use cpu_first_sibling_thread()
and set up the mappings manually using the 'threads_per_core' value for that
particular platform. This helps us ensure that we don't hit this bug with any
combination of CPU hotplug and SMT mode switching.
Cc: stable@vger.kernel.org
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2013-12-30 19:35:34 +08:00
|
|
|
/*
|
|
|
|
* Update the numa-cpu lookup table with the new mappings, even for
|
|
|
|
* offline CPUs. It is best to perform this update from the stop-
|
|
|
|
* machine context.
|
|
|
|
*/
|
2017-06-21 06:08:30 +08:00
|
|
|
if (cpus_locked)
|
|
|
|
stop_machine_cpuslocked(update_lookup_table, &updates[0],
|
powerpc: Fix the setup of CPU-to-Node mappings during CPU online
On POWER platforms, the hypervisor can notify the guest kernel about dynamic
changes in the cpu-numa associativity (VPHN topology update). Hence the
cpu-to-node mappings that we got from the firmware during boot, may no longer
be valid after such updates. This is handled using the arch_update_cpu_topology()
hook in the scheduler, and the sched-domains are rebuilt according to the new
mappings.
But unfortunately, at the moment, CPU hotplug ignores these updated mappings
and instead queries the firmware for the cpu-to-numa relationships and uses
them during CPU online. So the kernel can end up assigning wrong NUMA nodes
to CPUs during subsequent CPU hotplug online operations (after booting).
Further, a particularly problematic scenario can result from this bug:
On POWER platforms, the SMT mode can be switched between 1, 2, 4 (and even 8)
threads per core. The switch to Single-Threaded (ST) mode is performed by
offlining all except the first CPU thread in each core. Switching back to
SMT mode involves onlining those other threads back, in each core.
Now consider this scenario:
1. During boot, the kernel gets the cpu-to-node mappings from the firmware
and assigns the CPUs to NUMA nodes appropriately, during CPU online.
2. Later on, the hypervisor updates the cpu-to-node mappings dynamically and
communicates this update to the kernel. The kernel in turn updates its
cpu-to-node associations and rebuilds its sched domains. Everything is
fine so far.
3. Now, the user switches the machine from SMT to ST mode (say, by running
ppc64_cpu --smt=1). This involves offlining all except 1 thread in each
core.
4. The user then tries to switch back from ST to SMT mode (say, by running
ppc64_cpu --smt=4), and this involves onlining those threads back. Since
CPU hotplug ignores the new mappings, it queries the firmware and tries to
associate the newly onlined sibling threads to the old NUMA nodes. This
results in sibling threads within the same core getting associated with
different NUMA nodes, which is incorrect.
The scheduler's build-sched-domains code gets thoroughly confused with this
and enters an infinite loop and causes soft-lockups, as explained in detail
in commit 3be7db6ab (powerpc: VPHN topology change updates all siblings).
So to fix this, use the numa_cpu_lookup_table to remember the updated
cpu-to-node mappings, and use them during CPU hotplug online operations.
Further, we also need to ensure that all threads in a core are assigned to a
common NUMA node, irrespective of whether all those threads were online during
the topology update. To achieve this, we take care not to use cpu_sibling_mask()
since it is not hotplug invariant. Instead, we use cpu_first_sibling_thread()
and set up the mappings manually using the 'threads_per_core' value for that
particular platform. This helps us ensure that we don't hit this bug with any
combination of CPU hotplug and SMT mode switching.
Cc: stable@vger.kernel.org
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2013-12-30 19:35:34 +08:00
|
|
|
cpumask_of(raw_smp_processor_id()));
|
2017-06-21 06:08:30 +08:00
|
|
|
else
|
|
|
|
stop_machine(update_lookup_table, &updates[0],
|
|
|
|
cpumask_of(raw_smp_processor_id()));
|
powerpc: Fix the setup of CPU-to-Node mappings during CPU online
On POWER platforms, the hypervisor can notify the guest kernel about dynamic
changes in the cpu-numa associativity (VPHN topology update). Hence the
cpu-to-node mappings that we got from the firmware during boot, may no longer
be valid after such updates. This is handled using the arch_update_cpu_topology()
hook in the scheduler, and the sched-domains are rebuilt according to the new
mappings.
But unfortunately, at the moment, CPU hotplug ignores these updated mappings
and instead queries the firmware for the cpu-to-numa relationships and uses
them during CPU online. So the kernel can end up assigning wrong NUMA nodes
to CPUs during subsequent CPU hotplug online operations (after booting).
Further, a particularly problematic scenario can result from this bug:
On POWER platforms, the SMT mode can be switched between 1, 2, 4 (and even 8)
threads per core. The switch to Single-Threaded (ST) mode is performed by
offlining all except the first CPU thread in each core. Switching back to
SMT mode involves onlining those other threads back, in each core.
Now consider this scenario:
1. During boot, the kernel gets the cpu-to-node mappings from the firmware
and assigns the CPUs to NUMA nodes appropriately, during CPU online.
2. Later on, the hypervisor updates the cpu-to-node mappings dynamically and
communicates this update to the kernel. The kernel in turn updates its
cpu-to-node associations and rebuilds its sched domains. Everything is
fine so far.
3. Now, the user switches the machine from SMT to ST mode (say, by running
ppc64_cpu --smt=1). This involves offlining all except 1 thread in each
core.
4. The user then tries to switch back from ST to SMT mode (say, by running
ppc64_cpu --smt=4), and this involves onlining those threads back. Since
CPU hotplug ignores the new mappings, it queries the firmware and tries to
associate the newly onlined sibling threads to the old NUMA nodes. This
results in sibling threads within the same core getting associated with
different NUMA nodes, which is incorrect.
The scheduler's build-sched-domains code gets thoroughly confused with this
and enters an infinite loop and causes soft-lockups, as explained in detail
in commit 3be7db6ab (powerpc: VPHN topology change updates all siblings).
So to fix this, use the numa_cpu_lookup_table to remember the updated
cpu-to-node mappings, and use them during CPU hotplug online operations.
Further, we also need to ensure that all threads in a core are assigned to a
common NUMA node, irrespective of whether all those threads were online during
the topology update. To achieve this, we take care not to use cpu_sibling_mask()
since it is not hotplug invariant. Instead, we use cpu_first_sibling_thread()
and set up the mappings manually using the 'threads_per_core' value for that
particular platform. This helps us ensure that we don't hit this bug with any
combination of CPU hotplug and SMT mode switching.
Cc: stable@vger.kernel.org
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2013-12-30 19:35:34 +08:00
|
|
|
|
2013-04-24 14:02:13 +08:00
|
|
|
for (ud = &updates[0]; ud; ud = ud->next) {
|
2013-06-25 11:08:05 +08:00
|
|
|
unregister_cpu_under_node(ud->cpu, ud->old_nid);
|
|
|
|
register_cpu_under_node(ud->cpu, ud->new_nid);
|
|
|
|
|
2013-04-24 14:02:13 +08:00
|
|
|
dev = get_cpu_device(ud->cpu);
|
2011-12-22 06:29:42 +08:00
|
|
|
if (dev)
|
|
|
|
kobject_uevent(&dev->kobj, KOBJ_CHANGE);
|
2013-04-24 14:02:13 +08:00
|
|
|
cpumask_clear_cpu(ud->cpu, &cpu_associativity_changes_mask);
|
2012-06-08 05:04:34 +08:00
|
|
|
changed = 1;
|
2010-12-01 20:31:15 +08:00
|
|
|
}
|
|
|
|
|
power, sched: stop updating inside arch_update_cpu_topology() when nothing to be update
Since v1:
Edited the comment according to Srivatsa's suggestion.
During the testing, we encounter below WARN followed by Oops:
WARNING: at kernel/sched/core.c:6218
...
NIP [c000000000101660] .build_sched_domains+0x11d0/0x1200
LR [c000000000101358] .build_sched_domains+0xec8/0x1200
PACATMSCRATCH [800000000000f032]
Call Trace:
[c00000001b103850] [c000000000101358] .build_sched_domains+0xec8/0x1200
[c00000001b1039a0] [c00000000010aad4] .partition_sched_domains+0x484/0x510
[c00000001b103aa0] [c00000000016d0a8] .rebuild_sched_domains+0x68/0xa0
[c00000001b103b30] [c00000000005cbf0] .topology_work_fn+0x10/0x30
...
Oops: Kernel access of bad area, sig: 11 [#1]
...
NIP [c00000000045c000] .__bitmap_weight+0x60/0xf0
LR [c00000000010132c] .build_sched_domains+0xe9c/0x1200
PACATMSCRATCH [8000000000029032]
Call Trace:
[c00000001b1037a0] [c000000000288ff4] .kmem_cache_alloc_node_trace+0x184/0x3a0
[c00000001b103850] [c00000000010132c] .build_sched_domains+0xe9c/0x1200
[c00000001b1039a0] [c00000000010aad4] .partition_sched_domains+0x484/0x510
[c00000001b103aa0] [c00000000016d0a8] .rebuild_sched_domains+0x68/0xa0
[c00000001b103b30] [c00000000005cbf0] .topology_work_fn+0x10/0x30
...
This was caused by that 'sd->groups == NULL' after building groups, which
was caused by the empty 'sd->span'.
The cpu's domain contained nothing because the cpu was assigned to a wrong
node, due to the following unfortunate sequence of events:
1. The hypervisor sent a topology update to the guest OS, to notify changes
to the cpu-node mapping. However, the update was actually redundant - i.e.,
the "new" mapping was exactly the same as the old one.
2. Due to this, the 'updated_cpus' mask turned out to be empty after exiting
the 'for-loop' in arch_update_cpu_topology().
3. So we ended up calling stop-machine() with an empty cpumask list, which made
stop-machine internally elect cpumask_first(cpu_online_mask), i.e., CPU0 as
the cpu to run the payload (the update_cpu_topology() function).
4. This causes update_cpu_topology() to be run by CPU0. And since 'updates'
is kzalloc()'ed inside arch_update_cpu_topology(), update_cpu_topology()
finds update->cpu as well as update->new_nid to be 0. In other words, we
end up assigning CPU0 (and eventually its siblings) to node 0, incorrectly.
Along with the following wrong updating, it causes the sched-domain rebuild
code to break and crash the system.
Fix this by skipping the topology update in cases where we find that
the topology has not actually changed in reality (ie., spurious updates).
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Paul Mackerras <paulus@samba.org>
CC: Nathan Fontenot <nfont@linux.vnet.ibm.com>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: Robert Jennings <rcj@linux.vnet.ibm.com>
CC: Jesse Larrew <jlarrew@linux.vnet.ibm.com>
CC: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
CC: Alistair Popple <alistair@popple.id.au>
Suggested-by: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Michael Wang <wangyun@linux.vnet.ibm.com>
Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2014-04-08 11:19:36 +08:00
|
|
|
out:
|
2013-04-24 14:02:13 +08:00
|
|
|
kfree(updates);
|
2017-09-09 04:47:27 +08:00
|
|
|
topology_update_needed = 0;
|
2012-06-08 05:04:34 +08:00
|
|
|
return changed;
|
2010-12-01 20:31:15 +08:00
|
|
|
}
|
|
|
|
|
2017-06-21 06:08:30 +08:00
|
|
|
int arch_update_cpu_topology(void)
|
|
|
|
{
|
|
|
|
return numa_update_cpu_topology(true);
|
|
|
|
}
|
|
|
|
|
2010-12-01 20:31:15 +08:00
|
|
|
static void topology_work_fn(struct work_struct *work)
|
|
|
|
{
|
|
|
|
rebuild_sched_domains();
|
|
|
|
}
|
|
|
|
static DECLARE_WORK(topology_work, topology_work_fn);
|
|
|
|
|
2013-10-28 22:20:50 +08:00
|
|
|
static void topology_schedule_update(void)
|
2010-12-01 20:31:15 +08:00
|
|
|
{
|
|
|
|
schedule_work(&topology_work);
|
|
|
|
}
|
|
|
|
|
2017-10-05 07:26:59 +08:00
|
|
|
static void topology_timer_fn(struct timer_list *unused)
|
2010-12-01 20:31:15 +08:00
|
|
|
{
|
2013-04-24 14:00:35 +08:00
|
|
|
if (prrn_enabled && cpumask_weight(&cpu_associativity_changes_mask))
|
2010-12-01 20:31:15 +08:00
|
|
|
topology_schedule_update();
|
2013-04-24 14:00:35 +08:00
|
|
|
else if (vphn_enabled) {
|
|
|
|
if (update_cpu_associativity_changes_mask() > 0)
|
|
|
|
topology_schedule_update();
|
|
|
|
reset_topology_timer();
|
|
|
|
}
|
2010-12-01 20:31:15 +08:00
|
|
|
}
|
2017-10-05 07:26:59 +08:00
|
|
|
static struct timer_list topology_timer;
|
2010-12-01 20:31:15 +08:00
|
|
|
|
2013-04-24 14:00:35 +08:00
|
|
|
static void reset_topology_timer(void)
|
2010-12-01 20:31:15 +08:00
|
|
|
{
|
powerpc updates for 4.15
Non-highlights:
- Five fixes for the >128T address space handling, both to fix bugs in our
implementation and to bring the semantics exactly into line with x86.
Highlights:
- Support for a new OPAL call on bare metal machines which gives us a true NMI
(ie. is not masked by MSR[EE]=0) for debugging etc.
- Support for Power9 DD2 in the CXL driver.
- Improvements to machine check handling so that uncorrectable errors can be
reported into the generic memory_failure() machinery.
- Some fixes and improvements for VPHN, which is used under PowerVM to notify
the Linux partition of topology changes.
- Plumbing to enable TM (transactional memory) without suspend on some Power9
processors (PPC_FEATURE2_HTM_NO_SUSPEND).
- Support for emulating vector loads form cache-inhibited memory, on some
Power9 revisions.
- Disable the fast-endian switch "syscall" by default (behind a CONFIG), we
believe it has never had any users.
- A major rework of the API drivers use when initiating and waiting for long
running operations performed by OPAL firmware, and changes to the
powernv_flash driver to use the new API.
- Several fixes for the handling of FP/VMX/VSX while processes are using
transactional memory.
- Optimisations of TLB range flushes when using the radix MMU on Power9.
- Improvements to the VAS facility used to access coprocessors on Power9, and
related improvements to the way the NX crypto driver handles requests.
- Implementation of PMEM_API and UACCESS_FLUSHCACHE for 64-bit.
Thanks to:
Alexey Kardashevskiy, Alistair Popple, Allen Pais, Andrew Donnellan, Aneesh
Kumar K.V, Arnd Bergmann, Balbir Singh, Benjamin Herrenschmidt, Breno Leitao,
Christophe Leroy, Christophe Lombard, Cyril Bur, Frederic Barrat, Gautham R.
Shenoy, Geert Uytterhoeven, Guilherme G. Piccoli, Gustavo Romero, Haren
Myneni, Joel Stanley, Kamalesh Babulal, Kautuk Consul, Markus Elfring, Masami
Hiramatsu, Michael Bringmann, Michael Neuling, Michal Suchanek, Naveen N. Rao,
Nicholas Piggin, Oliver O'Halloran, Paul Mackerras, Pedro Miraglia Franco de
Carvalho, Philippe Bergheaud, Sandipan Das, Seth Forshee, Shriya, Stephen
Rothwell, Stewart Smith, Sukadev Bhattiprolu, Tyrel Datwyler, Vaibhav Jain,
Vaidyanathan Srinivasan, William A. Kennington III.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJaDXGuAAoJEFHr6jzI4aWAEqwP/0TA35KFAK6wqfkCf67z4q+O
I+5piI4eDV4jdCakfoIN1JfjhQRULNePSoCHTccan30mu/bm30p69xtOLL2/h5xH
Mhz/eDBAOo0lrT20nyZfYMW3FnM66wnNf++qJ0O+8L052r4WOB02J0k1uM1ST01D
5Lb5mUoxRLRzCgKRYAYWJifn+IFPUB9NMsvMTym94krAFlIjIzMEQXhDoln+jJMr
QmY5f1BTA/fLfXobn0zwoc/C1oa2PUtxd+rxbwGrLoZ6G843mMqUi90SMr5ybhXp
RzepnBTj4by3vOsnk/X1mANyaZfLsunp75FwnjHdPzKrAS/TuPp8D/iSxxE/PzEq
cLwJFBnFXSgQMefDErXxhHSDz2dAg5r14rsTpDcq2Ko8TPV4rPsuSfmbd9Txekb0
yWHsjoJUBBMl2QcWqIHl+AlV8j1RklF6solcTBcGnH1CZJMfa05VKXV7xGEvOHa0
RJ+/xPyR9KjoB/SUp++9Vmx/M6SwQYFOJlr3Zpg9LNtR8WpoPYu1E6eO+u1Hhzny
eJqaNstH+i+VdY9eqszkAsEBh8o9M/+b+7Wx7TetvU+v368CbXtgFYs9qy2oZjPF
t9sY/BHaHZ8eZ7I00an77a0fVV5B1PVASUtIz5CqkwGpMvX6Z6W2K/XUUFI61kuu
E06HS6Ht8UPJAzrAPUMl
=Rq81
-----END PGP SIGNATURE-----
Merge tag 'powerpc-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc updates from Michael Ellerman:
"A bit of a small release, I suspect in part due to me travelling for
KS. But my backlog of patches to review is smaller than usual, so I
think in part folks just didn't send as much this cycle.
Non-highlights:
- Five fixes for the >128T address space handling, both to fix bugs
in our implementation and to bring the semantics exactly into line
with x86.
Highlights:
- Support for a new OPAL call on bare metal machines which gives us a
true NMI (ie. is not masked by MSR[EE]=0) for debugging etc.
- Support for Power9 DD2 in the CXL driver.
- Improvements to machine check handling so that uncorrectable errors
can be reported into the generic memory_failure() machinery.
- Some fixes and improvements for VPHN, which is used under PowerVM
to notify the Linux partition of topology changes.
- Plumbing to enable TM (transactional memory) without suspend on
some Power9 processors (PPC_FEATURE2_HTM_NO_SUSPEND).
- Support for emulating vector loads form cache-inhibited memory, on
some Power9 revisions.
- Disable the fast-endian switch "syscall" by default (behind a
CONFIG), we believe it has never had any users.
- A major rework of the API drivers use when initiating and waiting
for long running operations performed by OPAL firmware, and changes
to the powernv_flash driver to use the new API.
- Several fixes for the handling of FP/VMX/VSX while processes are
using transactional memory.
- Optimisations of TLB range flushes when using the radix MMU on
Power9.
- Improvements to the VAS facility used to access coprocessors on
Power9, and related improvements to the way the NX crypto driver
handles requests.
- Implementation of PMEM_API and UACCESS_FLUSHCACHE for 64-bit.
Thanks to: Alexey Kardashevskiy, Alistair Popple, Allen Pais, Andrew
Donnellan, Aneesh Kumar K.V, Arnd Bergmann, Balbir Singh, Benjamin
Herrenschmidt, Breno Leitao, Christophe Leroy, Christophe Lombard,
Cyril Bur, Frederic Barrat, Gautham R. Shenoy, Geert Uytterhoeven,
Guilherme G. Piccoli, Gustavo Romero, Haren Myneni, Joel Stanley,
Kamalesh Babulal, Kautuk Consul, Markus Elfring, Masami Hiramatsu,
Michael Bringmann, Michael Neuling, Michal Suchanek, Naveen N. Rao,
Nicholas Piggin, Oliver O'Halloran, Paul Mackerras, Pedro Miraglia
Franco de Carvalho, Philippe Bergheaud, Sandipan Das, Seth Forshee,
Shriya, Stephen Rothwell, Stewart Smith, Sukadev Bhattiprolu, Tyrel
Datwyler, Vaibhav Jain, Vaidyanathan Srinivasan, and William A.
Kennington III"
* tag 'powerpc-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (151 commits)
powerpc/64s: Fix Power9 DD2.0 workarounds by adding DD2.1 feature
powerpc/64s: Fix masking of SRR1 bits on instruction fault
powerpc/64s: mm_context.addr_limit is only used on hash
powerpc/64s/radix: Fix 128TB-512TB virtual address boundary case allocation
powerpc/64s/hash: Allow MAP_FIXED allocations to cross 128TB boundary
powerpc/64s/hash: Fix fork() with 512TB process address space
powerpc/64s/hash: Fix 128TB-512TB virtual address boundary case allocation
powerpc/64s/hash: Fix 512T hint detection to use >= 128T
powerpc: Fix DABR match on hash based systems
powerpc/signal: Properly handle return value from uprobe_deny_signal()
powerpc/fadump: use kstrtoint to handle sysfs store
powerpc/lib: Implement UACCESS_FLUSHCACHE API
powerpc/lib: Implement PMEM API
powerpc/powernv/npu: Don't explicitly flush nmmu tlb
powerpc/powernv/npu: Use flush_all_mm() instead of flush_tlb_mm()
powerpc/powernv/idle: Round up latency and residency values
powerpc/kprobes: refactor kprobe_lookup_name for safer string operations
powerpc/kprobes: Blacklist emulate_update_regs() from kprobes
powerpc/kprobes: Do not disable interrupts for optprobes and kprobes_on_ftrace
powerpc/kprobes: Disable preemption before invoking probe handler for optprobes
...
2017-11-17 04:47:46 +08:00
|
|
|
mod_timer(&topology_timer, jiffies + topology_timer_secs * HZ);
|
2010-12-01 20:31:15 +08:00
|
|
|
}
|
|
|
|
|
2013-04-29 11:45:36 +08:00
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
|
2013-04-24 14:00:35 +08:00
|
|
|
static void stage_topology_update(int core_id)
|
|
|
|
{
|
|
|
|
cpumask_or(&cpu_associativity_changes_mask,
|
|
|
|
&cpu_associativity_changes_mask, cpu_sibling_mask(core_id));
|
|
|
|
reset_topology_timer();
|
|
|
|
}
|
|
|
|
|
|
|
|
static int dt_update_callback(struct notifier_block *nb,
|
|
|
|
unsigned long action, void *data)
|
|
|
|
{
|
2014-11-25 01:58:01 +08:00
|
|
|
struct of_reconfig_data *update = data;
|
2013-04-24 14:00:35 +08:00
|
|
|
int rc = NOTIFY_DONE;
|
|
|
|
|
|
|
|
switch (action) {
|
|
|
|
case OF_RECONFIG_UPDATE_PROPERTY:
|
2013-04-24 14:02:13 +08:00
|
|
|
if (!of_prop_cmp(update->dn->type, "cpu") &&
|
|
|
|
!of_prop_cmp(update->prop->name, "ibm,associativity")) {
|
2013-04-24 14:00:35 +08:00
|
|
|
u32 core_id;
|
|
|
|
of_property_read_u32(update->dn, "reg", &core_id);
|
|
|
|
stage_topology_update(core_id);
|
|
|
|
rc = NOTIFY_OK;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
2010-12-01 20:31:15 +08:00
|
|
|
}
|
|
|
|
|
2013-04-24 14:00:35 +08:00
|
|
|
static struct notifier_block dt_update_nb = {
|
|
|
|
.notifier_call = dt_update_callback,
|
|
|
|
};
|
|
|
|
|
2013-04-29 11:45:36 +08:00
|
|
|
#endif
|
|
|
|
|
2010-12-01 20:31:15 +08:00
|
|
|
/*
|
2013-04-24 14:00:35 +08:00
|
|
|
* Start polling for associativity changes.
|
2010-12-01 20:31:15 +08:00
|
|
|
*/
|
|
|
|
int start_topology_update(void)
|
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
|
2013-04-24 14:00:35 +08:00
|
|
|
if (firmware_has_feature(FW_FEATURE_PRRN)) {
|
|
|
|
if (!prrn_enabled) {
|
|
|
|
prrn_enabled = 1;
|
2013-04-29 11:45:36 +08:00
|
|
|
#ifdef CONFIG_SMP
|
2013-04-24 14:00:35 +08:00
|
|
|
rc = of_reconfig_notifier_register(&dt_update_nb);
|
2013-04-29 11:45:36 +08:00
|
|
|
#endif
|
2013-04-24 14:00:35 +08:00
|
|
|
}
|
2017-09-09 04:47:36 +08:00
|
|
|
}
|
|
|
|
if (firmware_has_feature(FW_FEATURE_VPHN) &&
|
2013-08-07 00:01:26 +08:00
|
|
|
lppaca_shared_proc(get_lppaca())) {
|
2013-04-24 14:00:35 +08:00
|
|
|
if (!vphn_enabled) {
|
|
|
|
vphn_enabled = 1;
|
|
|
|
setup_cpu_associativity_change_counters();
|
2017-10-05 07:26:59 +08:00
|
|
|
timer_setup(&topology_timer, topology_timer_fn,
|
|
|
|
TIMER_DEFERRABLE);
|
2013-04-24 14:00:35 +08:00
|
|
|
reset_topology_timer();
|
|
|
|
}
|
2010-12-01 20:31:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Disable polling for VPHN associativity changes.
|
|
|
|
*/
|
|
|
|
int stop_topology_update(void)
|
|
|
|
{
|
2013-04-24 14:00:35 +08:00
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
if (prrn_enabled) {
|
|
|
|
prrn_enabled = 0;
|
2013-04-29 11:45:36 +08:00
|
|
|
#ifdef CONFIG_SMP
|
2013-04-24 14:00:35 +08:00
|
|
|
rc = of_reconfig_notifier_unregister(&dt_update_nb);
|
2013-04-29 11:45:36 +08:00
|
|
|
#endif
|
2017-09-09 04:47:36 +08:00
|
|
|
}
|
|
|
|
if (vphn_enabled) {
|
2013-04-24 14:00:35 +08:00
|
|
|
vphn_enabled = 0;
|
|
|
|
rc = del_timer_sync(&topology_timer);
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
2010-12-01 20:31:15 +08:00
|
|
|
}
|
2013-04-24 14:07:39 +08:00
|
|
|
|
|
|
|
int prrn_is_enabled(void)
|
|
|
|
{
|
|
|
|
return prrn_enabled;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int topology_read(struct seq_file *file, void *v)
|
|
|
|
{
|
|
|
|
if (vphn_enabled || prrn_enabled)
|
|
|
|
seq_puts(file, "on\n");
|
|
|
|
else
|
|
|
|
seq_puts(file, "off\n");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int topology_open(struct inode *inode, struct file *file)
|
|
|
|
{
|
|
|
|
return single_open(file, topology_read, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t topology_write(struct file *file, const char __user *buf,
|
|
|
|
size_t count, loff_t *off)
|
|
|
|
{
|
|
|
|
char kbuf[4]; /* "on" or "off" plus null. */
|
|
|
|
int read_len;
|
|
|
|
|
|
|
|
read_len = count < 3 ? count : 3;
|
|
|
|
if (copy_from_user(kbuf, buf, read_len))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
kbuf[read_len] = '\0';
|
|
|
|
|
|
|
|
if (!strncmp(kbuf, "on", 2))
|
|
|
|
start_topology_update();
|
|
|
|
else if (!strncmp(kbuf, "off", 3))
|
|
|
|
stop_topology_update();
|
|
|
|
else
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct file_operations topology_ops = {
|
|
|
|
.read = seq_read,
|
|
|
|
.write = topology_write,
|
|
|
|
.open = topology_open,
|
|
|
|
.release = single_release
|
|
|
|
};
|
|
|
|
|
|
|
|
static int topology_update_init(void)
|
|
|
|
{
|
2014-10-11 00:04:49 +08:00
|
|
|
/* Do not poll for changes if disabled at boot */
|
|
|
|
if (topology_updates_enabled)
|
|
|
|
start_topology_update();
|
|
|
|
|
2017-09-09 04:47:27 +08:00
|
|
|
if (vphn_enabled)
|
|
|
|
topology_schedule_update();
|
|
|
|
|
2014-10-10 07:41:28 +08:00
|
|
|
if (!proc_create("powerpc/topology_updates", 0644, NULL, &topology_ops))
|
|
|
|
return -ENOMEM;
|
2013-04-24 14:07:39 +08:00
|
|
|
|
2017-09-09 04:47:27 +08:00
|
|
|
topology_inited = 1;
|
|
|
|
if (topology_update_needed)
|
|
|
|
bitmap_fill(cpumask_bits(&cpu_associativity_changes_mask),
|
|
|
|
nr_cpumask_bits);
|
|
|
|
|
2013-04-24 14:07:39 +08:00
|
|
|
return 0;
|
2010-12-01 20:31:15 +08:00
|
|
|
}
|
2013-04-24 14:07:39 +08:00
|
|
|
device_initcall(topology_update_init);
|
2010-12-18 06:07:47 +08:00
|
|
|
#endif /* CONFIG_PPC_SPLPAR */
|