2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* acpi_numa.c - ACPI NUMA support
|
|
|
|
*
|
|
|
|
* Copyright (C) 2002 Takayoshi Kochi <t-kochi@bq.jp.nec.com>
|
|
|
|
*
|
|
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
*
|
|
|
|
*/
|
2016-05-25 06:35:31 +08:00
|
|
|
|
|
|
|
#define pr_fmt(fmt) "ACPI: " fmt
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/acpi.h>
|
2009-11-18 06:27:32 +08:00
|
|
|
#include <linux/numa.h>
|
acpi: Add acpi_map_pxm_to_online_node()
The kernel initializes CPU & memory's NUMA topology from ACPI
SRAT table. Some other ACPI tables, such as NFIT and DMAR, also
contain proximity IDs for their device's NUMA topology. This
information can be used to improve performance of these devices.
This patch introduces acpi_map_pxm_to_online_node(), which is
similar to acpi_map_pxm_to_node(), but always returns an online
node. When the mapped node from a given proximity ID is offline,
it looks up the node distance table and returns the nearest
online node.
ACPI device drivers, which are called after the NUMA initialization
has completed in the kernel, can call this interface to obtain their
device NUMA topology from ACPI tables. Such drivers do not have to
deal with offline nodes. A node may be offline when a device
proximity ID is unique, SRAT memory entry does not exist, or NUMA is
disabled, ex. "numa=off" on x86.
This patch also moves the pxm range check from acpi_get_node() to
acpi_map_pxm_to_node().
Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
2015-06-20 07:14:15 +08:00
|
|
|
#include <linux/nodemask.h>
|
|
|
|
#include <linux/topology.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-06-23 17:03:19 +08:00
|
|
|
static nodemask_t nodes_found_map = NODE_MASK_NONE;
|
|
|
|
|
|
|
|
/* maps to convert between proximity domain and logical node ID */
|
2007-12-13 16:32:26 +08:00
|
|
|
static int pxm_to_node_map[MAX_PXM_DOMAINS]
|
2009-11-18 06:27:32 +08:00
|
|
|
= { [0 ... MAX_PXM_DOMAINS - 1] = NUMA_NO_NODE };
|
2007-12-13 16:32:26 +08:00
|
|
|
static int node_to_pxm_map[MAX_NUMNODES]
|
2009-11-18 06:27:32 +08:00
|
|
|
= { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
|
2006-06-23 17:03:19 +08:00
|
|
|
|
2012-01-17 17:18:02 +08:00
|
|
|
unsigned char acpi_srat_revision __initdata;
|
|
|
|
|
2007-05-17 13:11:06 +08:00
|
|
|
int pxm_to_node(int pxm)
|
2006-06-23 17:03:19 +08:00
|
|
|
{
|
|
|
|
if (pxm < 0)
|
2009-11-18 06:27:32 +08:00
|
|
|
return NUMA_NO_NODE;
|
2006-06-23 17:03:19 +08:00
|
|
|
return pxm_to_node_map[pxm];
|
|
|
|
}
|
|
|
|
|
2007-05-17 13:11:06 +08:00
|
|
|
int node_to_pxm(int node)
|
2006-06-23 17:03:19 +08:00
|
|
|
{
|
|
|
|
if (node < 0)
|
|
|
|
return PXM_INVAL;
|
|
|
|
return node_to_pxm_map[node];
|
|
|
|
}
|
|
|
|
|
2014-01-25 06:48:01 +08:00
|
|
|
static void __acpi_map_pxm_to_node(int pxm, int node)
|
2007-07-21 23:10:32 +08:00
|
|
|
{
|
2010-03-26 07:33:04 +08:00
|
|
|
if (pxm_to_node_map[pxm] == NUMA_NO_NODE || node < pxm_to_node_map[pxm])
|
|
|
|
pxm_to_node_map[pxm] = node;
|
|
|
|
if (node_to_pxm_map[node] == PXM_INVAL || pxm < node_to_pxm_map[node])
|
|
|
|
node_to_pxm_map[node] = pxm;
|
2007-07-21 23:10:32 +08:00
|
|
|
}
|
|
|
|
|
2007-05-25 04:57:40 +08:00
|
|
|
int acpi_map_pxm_to_node(int pxm)
|
2006-06-23 17:03:19 +08:00
|
|
|
{
|
acpi: Add acpi_map_pxm_to_online_node()
The kernel initializes CPU & memory's NUMA topology from ACPI
SRAT table. Some other ACPI tables, such as NFIT and DMAR, also
contain proximity IDs for their device's NUMA topology. This
information can be used to improve performance of these devices.
This patch introduces acpi_map_pxm_to_online_node(), which is
similar to acpi_map_pxm_to_node(), but always returns an online
node. When the mapped node from a given proximity ID is offline,
it looks up the node distance table and returns the nearest
online node.
ACPI device drivers, which are called after the NUMA initialization
has completed in the kernel, can call this interface to obtain their
device NUMA topology from ACPI tables. Such drivers do not have to
deal with offline nodes. A node may be offline when a device
proximity ID is unique, SRAT memory entry does not exist, or NUMA is
disabled, ex. "numa=off" on x86.
This patch also moves the pxm range check from acpi_get_node() to
acpi_map_pxm_to_node().
Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
2015-06-20 07:14:15 +08:00
|
|
|
int node;
|
|
|
|
|
|
|
|
if (pxm < 0 || pxm >= MAX_PXM_DOMAINS)
|
|
|
|
return NUMA_NO_NODE;
|
|
|
|
|
|
|
|
node = pxm_to_node_map[pxm];
|
2006-06-23 17:03:19 +08:00
|
|
|
|
2013-08-30 09:25:40 +08:00
|
|
|
if (node == NUMA_NO_NODE) {
|
2006-06-23 17:03:19 +08:00
|
|
|
if (nodes_weight(nodes_found_map) >= MAX_NUMNODES)
|
2009-11-18 06:27:32 +08:00
|
|
|
return NUMA_NO_NODE;
|
2006-06-23 17:03:19 +08:00
|
|
|
node = first_unset_node(nodes_found_map);
|
2007-07-21 23:10:32 +08:00
|
|
|
__acpi_map_pxm_to_node(pxm, node);
|
2006-06-23 17:03:19 +08:00
|
|
|
node_set(node, nodes_found_map);
|
|
|
|
}
|
|
|
|
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
acpi: Add acpi_map_pxm_to_online_node()
The kernel initializes CPU & memory's NUMA topology from ACPI
SRAT table. Some other ACPI tables, such as NFIT and DMAR, also
contain proximity IDs for their device's NUMA topology. This
information can be used to improve performance of these devices.
This patch introduces acpi_map_pxm_to_online_node(), which is
similar to acpi_map_pxm_to_node(), but always returns an online
node. When the mapped node from a given proximity ID is offline,
it looks up the node distance table and returns the nearest
online node.
ACPI device drivers, which are called after the NUMA initialization
has completed in the kernel, can call this interface to obtain their
device NUMA topology from ACPI tables. Such drivers do not have to
deal with offline nodes. A node may be offline when a device
proximity ID is unique, SRAT memory entry does not exist, or NUMA is
disabled, ex. "numa=off" on x86.
This patch also moves the pxm range check from acpi_get_node() to
acpi_map_pxm_to_node().
Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
2015-06-20 07:14:15 +08:00
|
|
|
/**
|
|
|
|
* acpi_map_pxm_to_online_node - Map proximity ID to online node
|
|
|
|
* @pxm: ACPI proximity ID
|
|
|
|
*
|
|
|
|
* This is similar to acpi_map_pxm_to_node(), but always returns an online
|
|
|
|
* node. When the mapped node from a given proximity ID is offline, it
|
|
|
|
* looks up the node distance table and returns the nearest online node.
|
|
|
|
*
|
|
|
|
* ACPI device drivers, which are called after the NUMA initialization has
|
|
|
|
* completed in the kernel, can call this interface to obtain their device
|
|
|
|
* NUMA topology from ACPI tables. Such drivers do not have to deal with
|
|
|
|
* offline nodes. A node may be offline when a device proximity ID is
|
|
|
|
* unique, SRAT memory entry does not exist, or NUMA is disabled, ex.
|
|
|
|
* "numa=off" on x86.
|
|
|
|
*/
|
|
|
|
int acpi_map_pxm_to_online_node(int pxm)
|
|
|
|
{
|
|
|
|
int node, n, dist, min_dist;
|
|
|
|
|
|
|
|
node = acpi_map_pxm_to_node(pxm);
|
|
|
|
|
|
|
|
if (node == NUMA_NO_NODE)
|
|
|
|
node = 0;
|
|
|
|
|
|
|
|
if (!node_online(node)) {
|
|
|
|
min_dist = INT_MAX;
|
|
|
|
for_each_online_node(n) {
|
|
|
|
dist = node_distance(node, n);
|
|
|
|
if (dist < min_dist) {
|
|
|
|
min_dist = dist;
|
|
|
|
node = n;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(acpi_map_pxm_to_online_node);
|
|
|
|
|
2007-07-21 23:09:56 +08:00
|
|
|
static void __init
|
|
|
|
acpi_table_print_srat_entry(struct acpi_subtable_header *header)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
switch (header->type) {
|
2007-02-03 00:48:22 +08:00
|
|
|
case ACPI_SRAT_TYPE_CPU_AFFINITY:
|
2005-08-05 12:44:28 +08:00
|
|
|
{
|
2007-02-03 00:48:22 +08:00
|
|
|
struct acpi_srat_cpu_affinity *p =
|
|
|
|
(struct acpi_srat_cpu_affinity *)header;
|
2016-05-25 06:35:32 +08:00
|
|
|
pr_debug("SRAT Processor (id[0x%02x] eid[0x%02x]) in proximity domain %d %s\n",
|
|
|
|
p->apic_id, p->local_sapic_eid,
|
|
|
|
p->proximity_domain_lo,
|
|
|
|
(p->flags & ACPI_SRAT_CPU_ENABLED) ?
|
|
|
|
"enabled" : "disabled");
|
2005-08-05 12:44:28 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
|
|
|
|
2007-02-03 00:48:22 +08:00
|
|
|
case ACPI_SRAT_TYPE_MEMORY_AFFINITY:
|
2005-08-05 12:44:28 +08:00
|
|
|
{
|
2007-02-03 00:48:22 +08:00
|
|
|
struct acpi_srat_mem_affinity *p =
|
|
|
|
(struct acpi_srat_mem_affinity *)header;
|
2016-05-25 06:35:32 +08:00
|
|
|
pr_debug("SRAT Memory (0x%lx length 0x%lx) in proximity domain %d %s%s%s\n",
|
|
|
|
(unsigned long)p->base_address,
|
|
|
|
(unsigned long)p->length,
|
|
|
|
p->proximity_domain,
|
|
|
|
(p->flags & ACPI_SRAT_MEM_ENABLED) ?
|
|
|
|
"enabled" : "disabled",
|
|
|
|
(p->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) ?
|
|
|
|
" hot-pluggable" : "",
|
|
|
|
(p->flags & ACPI_SRAT_MEM_NON_VOLATILE) ?
|
|
|
|
" non-volatile" : "");
|
2005-08-05 12:44:28 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
|
|
|
|
2009-03-31 05:55:30 +08:00
|
|
|
case ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY:
|
|
|
|
{
|
|
|
|
struct acpi_srat_x2apic_cpu_affinity *p =
|
|
|
|
(struct acpi_srat_x2apic_cpu_affinity *)header;
|
2016-05-25 06:35:32 +08:00
|
|
|
pr_debug("SRAT Processor (x2apicid[0x%08x]) in proximity domain %d %s\n",
|
|
|
|
p->apic_id,
|
|
|
|
p->proximity_domain,
|
|
|
|
(p->flags & ACPI_SRAT_CPU_ENABLED) ?
|
|
|
|
"enabled" : "disabled");
|
2009-03-31 05:55:30 +08:00
|
|
|
}
|
|
|
|
break;
|
2016-05-25 06:35:32 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
default:
|
2016-05-25 06:35:31 +08:00
|
|
|
pr_warn("Found unsupported SRAT entry (type = 0x%x)\n",
|
|
|
|
header->type);
|
2005-04-17 06:20:36 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-06-10 07:48:18 +08:00
|
|
|
/*
|
|
|
|
* A lot of BIOS fill in 10 (= no distance) everywhere. This messes
|
|
|
|
* up the NUMA heuristics which wants the local node to have a smaller
|
|
|
|
* distance than the others.
|
|
|
|
* Do some quick checks here and only use the SLIT if it passes.
|
|
|
|
*/
|
2013-08-13 18:31:14 +08:00
|
|
|
static int __init slit_valid(struct acpi_table_slit *slit)
|
2008-06-10 07:48:18 +08:00
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
int d = slit->locality_count;
|
|
|
|
for (i = 0; i < d; i++) {
|
|
|
|
for (j = 0; j < d; j++) {
|
|
|
|
u8 val = slit->entry[d*i + j];
|
|
|
|
if (i == j) {
|
|
|
|
if (val != LOCAL_DISTANCE)
|
|
|
|
return 0;
|
|
|
|
} else if (val <= LOCAL_DISTANCE)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2007-02-03 00:48:22 +08:00
|
|
|
static int __init acpi_parse_slit(struct acpi_table_header *table)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2015-02-05 17:33:14 +08:00
|
|
|
struct acpi_table_slit *slit = (struct acpi_table_slit *)table;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-06-10 07:48:18 +08:00
|
|
|
if (!slit_valid(slit)) {
|
2016-05-25 06:35:31 +08:00
|
|
|
pr_info("SLIT table looks invalid. Not used.\n");
|
2008-06-10 07:48:18 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
acpi_numa_slit_init(slit);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-01-28 08:19:15 +08:00
|
|
|
void __init __weak
|
2009-03-31 05:55:30 +08:00
|
|
|
acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
|
|
|
|
{
|
2016-05-25 06:35:31 +08:00
|
|
|
pr_warn("Found unsupported x2apic [0x%08x] SRAT entry\n", pa->apic_id);
|
2009-03-31 05:55:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int __init
|
|
|
|
acpi_parse_x2apic_affinity(struct acpi_subtable_header *header,
|
|
|
|
const unsigned long end)
|
|
|
|
{
|
|
|
|
struct acpi_srat_x2apic_cpu_affinity *processor_affinity;
|
|
|
|
|
|
|
|
processor_affinity = (struct acpi_srat_x2apic_cpu_affinity *)header;
|
|
|
|
if (!processor_affinity)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
acpi_table_print_srat_entry(header);
|
|
|
|
|
|
|
|
/* let architecture-dependent part to do it */
|
|
|
|
acpi_numa_x2apic_affinity_init(processor_affinity);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static int __init
|
2009-03-31 05:55:30 +08:00
|
|
|
acpi_parse_processor_affinity(struct acpi_subtable_header *header,
|
2005-08-05 12:44:28 +08:00
|
|
|
const unsigned long end)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-02-03 00:48:22 +08:00
|
|
|
struct acpi_srat_cpu_affinity *processor_affinity;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-02-03 00:48:22 +08:00
|
|
|
processor_affinity = (struct acpi_srat_cpu_affinity *)header;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!processor_affinity)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
acpi_table_print_srat_entry(header);
|
|
|
|
|
|
|
|
/* let architecture-dependent part to do it */
|
|
|
|
acpi_numa_processor_affinity_init(processor_affinity);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-07-31 23:41:09 +08:00
|
|
|
static int __initdata parsed_numa_memblks;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static int __init
|
2007-02-03 00:48:22 +08:00
|
|
|
acpi_parse_memory_affinity(struct acpi_subtable_header * header,
|
2005-08-05 12:44:28 +08:00
|
|
|
const unsigned long end)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-02-03 00:48:22 +08:00
|
|
|
struct acpi_srat_mem_affinity *memory_affinity;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-02-03 00:48:22 +08:00
|
|
|
memory_affinity = (struct acpi_srat_mem_affinity *)header;
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!memory_affinity)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
acpi_table_print_srat_entry(header);
|
|
|
|
|
|
|
|
/* let architecture-dependent part to do it */
|
2012-07-31 23:41:09 +08:00
|
|
|
if (!acpi_numa_memory_affinity_init(memory_affinity))
|
|
|
|
parsed_numa_memblks++;
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-02-03 00:48:22 +08:00
|
|
|
static int __init acpi_parse_srat(struct acpi_table_header *table)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2015-02-05 17:33:14 +08:00
|
|
|
struct acpi_table_srat *srat = (struct acpi_table_srat *)table;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2012-01-17 17:18:02 +08:00
|
|
|
acpi_srat_revision = srat->header.revision;
|
|
|
|
|
2010-07-21 06:18:36 +08:00
|
|
|
/* Real work done in acpi_table_parse_srat below. */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-07-21 23:09:56 +08:00
|
|
|
static int __init
|
2007-02-03 00:48:22 +08:00
|
|
|
acpi_table_parse_srat(enum acpi_srat_type id,
|
2013-01-12 23:29:38 +08:00
|
|
|
acpi_tbl_entry_handler handler, unsigned int max_entries)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-02-11 11:17:07 +08:00
|
|
|
return acpi_table_parse_entries(ACPI_SIG_SRAT,
|
2005-08-05 12:44:28 +08:00
|
|
|
sizeof(struct acpi_table_srat), id,
|
|
|
|
handler, max_entries);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
x86, ACPI, mm: Revert movablemem_map support
Tim found:
WARNING: at arch/x86/kernel/smpboot.c:324 topology_sane.isra.2+0x6f/0x80()
Hardware name: S2600CP
sched: CPU #1's llc-sibling CPU #0 is not on the same node! [node: 1 != 0]. Ignoring dependency.
smpboot: Booting Node 1, Processors #1
Modules linked in:
Pid: 0, comm: swapper/1 Not tainted 3.9.0-0-generic #1
Call Trace:
set_cpu_sibling_map+0x279/0x449
start_secondary+0x11d/0x1e5
Don Morris reproduced on a HP z620 workstation, and bisected it to
commit e8d195525809 ("acpi, memory-hotplug: parse SRAT before memblock
is ready")
It turns out movable_map has some problems, and it breaks several things
1. numa_init is called several times, NOT just for srat. so those
nodes_clear(numa_nodes_parsed)
memset(&numa_meminfo, 0, sizeof(numa_meminfo))
can not be just removed. Need to consider sequence is: numaq, srat, amd, dummy.
and make fall back path working.
2. simply split acpi_numa_init to early_parse_srat.
a. that early_parse_srat is NOT called for ia64, so you break ia64.
b. for (i = 0; i < MAX_LOCAL_APIC; i++)
set_apicid_to_node(i, NUMA_NO_NODE)
still left in numa_init. So it will just clear result from early_parse_srat.
it should be moved before that....
c. it breaks ACPI_TABLE_OVERIDE...as the acpi table scan is moved
early before override from INITRD is settled.
3. that patch TITLE is total misleading, there is NO x86 in the title,
but it changes critical x86 code. It caused x86 guys did not
pay attention to find the problem early. Those patches really should
be routed via tip/x86/mm.
4. after that commit, following range can not use movable ram:
a. real_mode code.... well..funny, legacy Node0 [0,1M) could be hot-removed?
b. initrd... it will be freed after booting, so it could be on movable...
c. crashkernel for kdump...: looks like we can not put kdump kernel above 4G
anymore.
d. init_mem_mapping: can not put page table high anymore.
e. initmem_init: vmemmap can not be high local node anymore. That is
not good.
If node is hotplugable, the mem related range like page table and
vmemmap could be on the that node without problem and should be on that
node.
We have workaround patch that could fix some problems, but some can not
be fixed.
So just remove that offending commit and related ones including:
f7210e6c4ac7 ("mm/memblock.c: use CONFIG_HAVE_MEMBLOCK_NODE_MAP to
protect movablecore_map in memblock_overlaps_region().")
01a178a94e8e ("acpi, memory-hotplug: support getting hotplug info from
SRAT")
27168d38fa20 ("acpi, memory-hotplug: extend movablemem_map ranges to
the end of node")
e8d195525809 ("acpi, memory-hotplug: parse SRAT before memblock is
ready")
fb06bc8e5f42 ("page_alloc: bootmem limit with movablecore_map")
42f47e27e761 ("page_alloc: make movablemem_map have higher priority")
6981ec31146c ("page_alloc: introduce zone_movable_limit[] to keep
movable limit for nodes")
34b71f1e04fc ("page_alloc: add movable_memmap kernel parameter")
4d59a75125d5 ("x86: get pg_data_t's memory from other node")
Later we should have patches that will make sure kernel put page table
and vmemmap on local node ram instead of push them down to node0. Also
need to find way to put other kernel used ram to local node ram.
Reported-by: Tim Gardner <tim.gardner@canonical.com>
Reported-by: Don Morris <don.morris@hp.com>
Bisected-by: Don Morris <don.morris@hp.com>
Tested-by: Don Morris <don.morris@hp.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Tejun Heo <tj@kernel.org>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-03-02 06:51:27 +08:00
|
|
|
int __init acpi_numa_init(void)
|
acpi, memory-hotplug: parse SRAT before memblock is ready
On linux, the pages used by kernel could not be migrated. As a result,
if a memory range is used by kernel, it cannot be hot-removed. So if we
want to hot-remove memory, we should prevent kernel from using it.
The way now used to prevent this is specify a memory range by
movablemem_map boot option and set it as ZONE_MOVABLE.
But when the system is booting, memblock will allocate memory, and
reserve the memory for kernel. And before we parse SRAT, and know the
node memory ranges, memblock is working. And it may allocate memory in
ranges to be set as ZONE_MOVABLE. This memory can be used by kernel,
and never be freed.
So, let's parse SRAT before memblock is called first. And it is early
enough.
The first call of memblock_find_in_range_node() is in:
setup_arch()
|-->setup_real_mode()
so, this patch add a function early_parse_srat() to parse SRAT, and call
it before setup_real_mode() is called.
NOTE:
1) early_parse_srat() is called before numa_init(), and has initialized
numa_meminfo. So DO NOT clear numa_nodes_parsed in numa_init() and DO
NOT zero numa_meminfo in numa_init(), otherwise we will lose memory
numa info.
2) I don't know why using count of memory affinities parsed from SRAT
as a return value in original acpi_numa_init(). So I add a static
variable srat_mem_cnt to remember this count and use it as the return
value of the new acpi_numa_init()
[mhocko@suse.cz: parse SRAT before memblock is ready fix]
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Reviewed-by: Wen Congyang <wency@cn.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Jianguo Wu <wujianguo@huawei.com>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Wu Jianguo <wujianguo@huawei.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Len Brown <lenb@kernel.org>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-23 08:33:44 +08:00
|
|
|
{
|
x86, ACPI, mm: Revert movablemem_map support
Tim found:
WARNING: at arch/x86/kernel/smpboot.c:324 topology_sane.isra.2+0x6f/0x80()
Hardware name: S2600CP
sched: CPU #1's llc-sibling CPU #0 is not on the same node! [node: 1 != 0]. Ignoring dependency.
smpboot: Booting Node 1, Processors #1
Modules linked in:
Pid: 0, comm: swapper/1 Not tainted 3.9.0-0-generic #1
Call Trace:
set_cpu_sibling_map+0x279/0x449
start_secondary+0x11d/0x1e5
Don Morris reproduced on a HP z620 workstation, and bisected it to
commit e8d195525809 ("acpi, memory-hotplug: parse SRAT before memblock
is ready")
It turns out movable_map has some problems, and it breaks several things
1. numa_init is called several times, NOT just for srat. so those
nodes_clear(numa_nodes_parsed)
memset(&numa_meminfo, 0, sizeof(numa_meminfo))
can not be just removed. Need to consider sequence is: numaq, srat, amd, dummy.
and make fall back path working.
2. simply split acpi_numa_init to early_parse_srat.
a. that early_parse_srat is NOT called for ia64, so you break ia64.
b. for (i = 0; i < MAX_LOCAL_APIC; i++)
set_apicid_to_node(i, NUMA_NO_NODE)
still left in numa_init. So it will just clear result from early_parse_srat.
it should be moved before that....
c. it breaks ACPI_TABLE_OVERIDE...as the acpi table scan is moved
early before override from INITRD is settled.
3. that patch TITLE is total misleading, there is NO x86 in the title,
but it changes critical x86 code. It caused x86 guys did not
pay attention to find the problem early. Those patches really should
be routed via tip/x86/mm.
4. after that commit, following range can not use movable ram:
a. real_mode code.... well..funny, legacy Node0 [0,1M) could be hot-removed?
b. initrd... it will be freed after booting, so it could be on movable...
c. crashkernel for kdump...: looks like we can not put kdump kernel above 4G
anymore.
d. init_mem_mapping: can not put page table high anymore.
e. initmem_init: vmemmap can not be high local node anymore. That is
not good.
If node is hotplugable, the mem related range like page table and
vmemmap could be on the that node without problem and should be on that
node.
We have workaround patch that could fix some problems, but some can not
be fixed.
So just remove that offending commit and related ones including:
f7210e6c4ac7 ("mm/memblock.c: use CONFIG_HAVE_MEMBLOCK_NODE_MAP to
protect movablecore_map in memblock_overlaps_region().")
01a178a94e8e ("acpi, memory-hotplug: support getting hotplug info from
SRAT")
27168d38fa20 ("acpi, memory-hotplug: extend movablemem_map ranges to
the end of node")
e8d195525809 ("acpi, memory-hotplug: parse SRAT before memblock is
ready")
fb06bc8e5f42 ("page_alloc: bootmem limit with movablecore_map")
42f47e27e761 ("page_alloc: make movablemem_map have higher priority")
6981ec31146c ("page_alloc: introduce zone_movable_limit[] to keep
movable limit for nodes")
34b71f1e04fc ("page_alloc: add movable_memmap kernel parameter")
4d59a75125d5 ("x86: get pg_data_t's memory from other node")
Later we should have patches that will make sure kernel put page table
and vmemmap on local node ram instead of push them down to node0. Also
need to find way to put other kernel used ram to local node ram.
Reported-by: Tim Gardner <tim.gardner@canonical.com>
Reported-by: Don Morris <don.morris@hp.com>
Bisected-by: Don Morris <don.morris@hp.com>
Tested-by: Don Morris <don.morris@hp.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Tejun Heo <tj@kernel.org>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-03-02 06:51:27 +08:00
|
|
|
int cnt = 0;
|
|
|
|
|
2010-12-17 11:09:58 +08:00
|
|
|
/*
|
|
|
|
* Should not limit number with cpu num that is from NR_CPUS or nr_cpus=
|
|
|
|
* SRAT cpu entries could have different order with that in MADT.
|
|
|
|
* So go over all cpu entries in SRAT to get apicid to node mapping.
|
|
|
|
*/
|
2009-09-26 06:20:04 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* SRAT: Static Resource Affinity Table */
|
2007-02-11 10:28:03 +08:00
|
|
|
if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) {
|
2016-04-21 17:29:00 +08:00
|
|
|
struct acpi_subtable_proc srat_proc[2];
|
|
|
|
|
|
|
|
memset(srat_proc, 0, sizeof(srat_proc));
|
|
|
|
srat_proc[0].id = ACPI_SRAT_TYPE_CPU_AFFINITY;
|
|
|
|
srat_proc[0].handler = acpi_parse_processor_affinity;
|
|
|
|
srat_proc[1].id = ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY;
|
|
|
|
srat_proc[1].handler = acpi_parse_x2apic_affinity;
|
|
|
|
|
|
|
|
acpi_table_parse_entries_array(ACPI_SIG_SRAT,
|
|
|
|
sizeof(struct acpi_table_srat),
|
|
|
|
srat_proc, ARRAY_SIZE(srat_proc), 0);
|
|
|
|
|
x86, ACPI, mm: Revert movablemem_map support
Tim found:
WARNING: at arch/x86/kernel/smpboot.c:324 topology_sane.isra.2+0x6f/0x80()
Hardware name: S2600CP
sched: CPU #1's llc-sibling CPU #0 is not on the same node! [node: 1 != 0]. Ignoring dependency.
smpboot: Booting Node 1, Processors #1
Modules linked in:
Pid: 0, comm: swapper/1 Not tainted 3.9.0-0-generic #1
Call Trace:
set_cpu_sibling_map+0x279/0x449
start_secondary+0x11d/0x1e5
Don Morris reproduced on a HP z620 workstation, and bisected it to
commit e8d195525809 ("acpi, memory-hotplug: parse SRAT before memblock
is ready")
It turns out movable_map has some problems, and it breaks several things
1. numa_init is called several times, NOT just for srat. so those
nodes_clear(numa_nodes_parsed)
memset(&numa_meminfo, 0, sizeof(numa_meminfo))
can not be just removed. Need to consider sequence is: numaq, srat, amd, dummy.
and make fall back path working.
2. simply split acpi_numa_init to early_parse_srat.
a. that early_parse_srat is NOT called for ia64, so you break ia64.
b. for (i = 0; i < MAX_LOCAL_APIC; i++)
set_apicid_to_node(i, NUMA_NO_NODE)
still left in numa_init. So it will just clear result from early_parse_srat.
it should be moved before that....
c. it breaks ACPI_TABLE_OVERIDE...as the acpi table scan is moved
early before override from INITRD is settled.
3. that patch TITLE is total misleading, there is NO x86 in the title,
but it changes critical x86 code. It caused x86 guys did not
pay attention to find the problem early. Those patches really should
be routed via tip/x86/mm.
4. after that commit, following range can not use movable ram:
a. real_mode code.... well..funny, legacy Node0 [0,1M) could be hot-removed?
b. initrd... it will be freed after booting, so it could be on movable...
c. crashkernel for kdump...: looks like we can not put kdump kernel above 4G
anymore.
d. init_mem_mapping: can not put page table high anymore.
e. initmem_init: vmemmap can not be high local node anymore. That is
not good.
If node is hotplugable, the mem related range like page table and
vmemmap could be on the that node without problem and should be on that
node.
We have workaround patch that could fix some problems, but some can not
be fixed.
So just remove that offending commit and related ones including:
f7210e6c4ac7 ("mm/memblock.c: use CONFIG_HAVE_MEMBLOCK_NODE_MAP to
protect movablecore_map in memblock_overlaps_region().")
01a178a94e8e ("acpi, memory-hotplug: support getting hotplug info from
SRAT")
27168d38fa20 ("acpi, memory-hotplug: extend movablemem_map ranges to
the end of node")
e8d195525809 ("acpi, memory-hotplug: parse SRAT before memblock is
ready")
fb06bc8e5f42 ("page_alloc: bootmem limit with movablecore_map")
42f47e27e761 ("page_alloc: make movablemem_map have higher priority")
6981ec31146c ("page_alloc: introduce zone_movable_limit[] to keep
movable limit for nodes")
34b71f1e04fc ("page_alloc: add movable_memmap kernel parameter")
4d59a75125d5 ("x86: get pg_data_t's memory from other node")
Later we should have patches that will make sure kernel put page table
and vmemmap on local node ram instead of push them down to node0. Also
need to find way to put other kernel used ram to local node ram.
Reported-by: Tim Gardner <tim.gardner@canonical.com>
Reported-by: Don Morris <don.morris@hp.com>
Bisected-by: Don Morris <don.morris@hp.com>
Tested-by: Don Morris <don.morris@hp.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Tejun Heo <tj@kernel.org>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-03-02 06:51:27 +08:00
|
|
|
cnt = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
|
|
|
|
acpi_parse_memory_affinity,
|
|
|
|
NR_NODE_MEMBLKS);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* SLIT: System Locality Information Table */
|
2007-02-11 10:28:03 +08:00
|
|
|
acpi_table_parse(ACPI_SIG_SLIT, acpi_parse_slit);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
x86, ACPI, mm: Revert movablemem_map support
Tim found:
WARNING: at arch/x86/kernel/smpboot.c:324 topology_sane.isra.2+0x6f/0x80()
Hardware name: S2600CP
sched: CPU #1's llc-sibling CPU #0 is not on the same node! [node: 1 != 0]. Ignoring dependency.
smpboot: Booting Node 1, Processors #1
Modules linked in:
Pid: 0, comm: swapper/1 Not tainted 3.9.0-0-generic #1
Call Trace:
set_cpu_sibling_map+0x279/0x449
start_secondary+0x11d/0x1e5
Don Morris reproduced on a HP z620 workstation, and bisected it to
commit e8d195525809 ("acpi, memory-hotplug: parse SRAT before memblock
is ready")
It turns out movable_map has some problems, and it breaks several things
1. numa_init is called several times, NOT just for srat. so those
nodes_clear(numa_nodes_parsed)
memset(&numa_meminfo, 0, sizeof(numa_meminfo))
can not be just removed. Need to consider sequence is: numaq, srat, amd, dummy.
and make fall back path working.
2. simply split acpi_numa_init to early_parse_srat.
a. that early_parse_srat is NOT called for ia64, so you break ia64.
b. for (i = 0; i < MAX_LOCAL_APIC; i++)
set_apicid_to_node(i, NUMA_NO_NODE)
still left in numa_init. So it will just clear result from early_parse_srat.
it should be moved before that....
c. it breaks ACPI_TABLE_OVERIDE...as the acpi table scan is moved
early before override from INITRD is settled.
3. that patch TITLE is total misleading, there is NO x86 in the title,
but it changes critical x86 code. It caused x86 guys did not
pay attention to find the problem early. Those patches really should
be routed via tip/x86/mm.
4. after that commit, following range can not use movable ram:
a. real_mode code.... well..funny, legacy Node0 [0,1M) could be hot-removed?
b. initrd... it will be freed after booting, so it could be on movable...
c. crashkernel for kdump...: looks like we can not put kdump kernel above 4G
anymore.
d. init_mem_mapping: can not put page table high anymore.
e. initmem_init: vmemmap can not be high local node anymore. That is
not good.
If node is hotplugable, the mem related range like page table and
vmemmap could be on the that node without problem and should be on that
node.
We have workaround patch that could fix some problems, but some can not
be fixed.
So just remove that offending commit and related ones including:
f7210e6c4ac7 ("mm/memblock.c: use CONFIG_HAVE_MEMBLOCK_NODE_MAP to
protect movablecore_map in memblock_overlaps_region().")
01a178a94e8e ("acpi, memory-hotplug: support getting hotplug info from
SRAT")
27168d38fa20 ("acpi, memory-hotplug: extend movablemem_map ranges to
the end of node")
e8d195525809 ("acpi, memory-hotplug: parse SRAT before memblock is
ready")
fb06bc8e5f42 ("page_alloc: bootmem limit with movablecore_map")
42f47e27e761 ("page_alloc: make movablemem_map have higher priority")
6981ec31146c ("page_alloc: introduce zone_movable_limit[] to keep
movable limit for nodes")
34b71f1e04fc ("page_alloc: add movable_memmap kernel parameter")
4d59a75125d5 ("x86: get pg_data_t's memory from other node")
Later we should have patches that will make sure kernel put page table
and vmemmap on local node ram instead of push them down to node0. Also
need to find way to put other kernel used ram to local node ram.
Reported-by: Tim Gardner <tim.gardner@canonical.com>
Reported-by: Don Morris <don.morris@hp.com>
Bisected-by: Don Morris <don.morris@hp.com>
Tested-by: Don Morris <don.morris@hp.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Tejun Heo <tj@kernel.org>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-03-02 06:51:27 +08:00
|
|
|
if (cnt < 0)
|
|
|
|
return cnt;
|
2012-07-31 23:41:09 +08:00
|
|
|
else if (!parsed_numa_memblks)
|
2012-07-31 23:41:08 +08:00
|
|
|
return -ENOENT;
|
2011-02-16 19:13:06 +08:00
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2014-01-25 06:48:01 +08:00
|
|
|
static int acpi_get_pxm(acpi_handle h)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2008-10-10 14:22:59 +08:00
|
|
|
unsigned long long pxm;
|
2005-04-17 06:20:36 +08:00
|
|
|
acpi_status status;
|
|
|
|
acpi_handle handle;
|
|
|
|
acpi_handle phandle = h;
|
|
|
|
|
|
|
|
do {
|
|
|
|
handle = phandle;
|
|
|
|
status = acpi_evaluate_integer(handle, "_PXM", NULL, &pxm);
|
|
|
|
if (ACPI_SUCCESS(status))
|
2006-10-01 06:28:50 +08:00
|
|
|
return pxm;
|
2005-04-17 06:20:36 +08:00
|
|
|
status = acpi_get_parent(handle, &phandle);
|
2005-08-05 12:44:28 +08:00
|
|
|
} while (ACPI_SUCCESS(status));
|
2005-04-17 06:20:36 +08:00
|
|
|
return -1;
|
|
|
|
}
|
2006-06-27 17:53:31 +08:00
|
|
|
|
2014-01-25 06:25:10 +08:00
|
|
|
int acpi_get_node(acpi_handle handle)
|
2006-06-27 17:53:31 +08:00
|
|
|
{
|
2014-01-25 06:42:17 +08:00
|
|
|
int pxm;
|
2006-06-27 17:53:31 +08:00
|
|
|
|
|
|
|
pxm = acpi_get_pxm(handle);
|
|
|
|
|
2014-01-25 06:42:17 +08:00
|
|
|
return acpi_map_pxm_to_node(pxm);
|
2006-06-27 17:53:31 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(acpi_get_node);
|