Skip to content

Commit

Permalink
powerpc/mm: allow memory hotplug into a memoryless node
Browse files Browse the repository at this point in the history
Patch series "enable movable nodes on non-x86 configs", v7.

This patchset allows more configs to make use of movable nodes.  When
CONFIG_MOVABLE_NODE is selected, there are two ways to introduce such
nodes into the system:

1. Discover movable nodes at boot. Currently this is only possible on
   x86, but we will enable configs supporting fdt to do the same.

2. Hotplug and online all of a node's memory using online_movable. This
   is already possible on any config supporting memory hotplug, not
   just x86, but the Kconfig doesn't say so. We will fix that.

We'll also remove some cruft on power which would prevent (2).

This patch (of 5):

Remove the check which prevents us from hotplugging into an empty node.

The original commit b226e46 ("[PATCH] powerpc: don't add memory to
empty node/zone"), states that this was intended to be a temporary measure.
It is a workaround for an oops which no longer occurs.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Reza Arbab <[email protected]>
Reviewed-by: Aneesh Kumar K.V <[email protected]>
Acked-by: Balbir Singh <[email protected]>
Acked-by: Michael Ellerman <[email protected]>
Cc: "Aneesh Kumar K.V" <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Alistair Popple <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Bharata B Rao <[email protected]>
Cc: Frank Rowand <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Nathan Fontenot <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Stewart Smith <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
rarbab authored and torvalds committed Dec 13, 2016
1 parent 8d303e4 commit 4a3bac4
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions arch/powerpc/mm/numa.c
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ static int hot_add_node_scn_to_nid(unsigned long scn_addr)
int hot_add_scn_to_nid(unsigned long scn_addr)
{
struct device_node *memory = NULL;
int nid, found = 0;
int nid;

if (!numa_enabled || (min_common_depth < 0))
return first_online_node;
Expand All @@ -1101,17 +1101,6 @@ int hot_add_scn_to_nid(unsigned long scn_addr)
if (nid < 0 || !node_online(nid))
nid = first_online_node;

if (NODE_DATA(nid)->node_spanned_pages)
return nid;

for_each_online_node(nid) {
if (NODE_DATA(nid)->node_spanned_pages) {
found = 1;
break;
}
}

BUG_ON(!found);
return nid;
}

Expand Down

0 comments on commit 4a3bac4

Please sign in to comment.