Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d80a9eb3 authored by Wei Yang's avatar Wei Yang Committed by Ingo Molnar
Browse files

x86/numa_emulation: Assign physnode_mask directly from numa_nodes_parsed 



numa_init() has already called init_func(), which is responsible for
setting numa_nodes_parsed, so use this nodemask instead of re-finding it
when calling numa_emulation().

This patch gets the physnode_mask directly from numa_nodes_parsed. At
the same time, it corrects the comment of these two functions.

Signed-off-by: default avatarWei Yang <richard.weiyang@gmail.com>
Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: bp@alien8.de
Cc: kirill@shutemov.name
Cc: tj@kernel.org
Link: http://lkml.kernel.org/r/20170708013059.29708-3-richard.weiyang@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 158f424f

arch/x86/mm/numa_emulation.c

+8 −10
Original line number Original line Diff line number Diff line
@@ -75,13 +75,15 @@ static int __init emu_setup_memblk(struct numa_meminfo *ei, 




/*

/*

 * Sets up nr_nodes fake nodes interleaved over physical nodes ranging from addr

 * Sets up nr_nodes fake nodes interleaved over physical nodes ranging from addr

 * to max_addr.  The return value is the number of nodes allocated.

 * to max_addr.

 *

 * Returns zero on success or negative on error.

 */

 */

static int __init split_nodes_interleave(struct numa_meminfo *ei,

static int __init split_nodes_interleave(struct numa_meminfo *ei,

					 struct numa_meminfo *pi,

					 struct numa_meminfo *pi,

					 u64 addr, u64 max_addr, int nr_nodes)

					 u64 addr, u64 max_addr, int nr_nodes)

{

{

	nodemask_t physnode_mask = NODE_MASK_NONE;

	nodemask_t physnode_mask = numa_nodes_parsed;

	u64 size;

	u64 size;

	int big;

	int big;

	int nid = 0;

	int nid = 0;
@@ -116,9 +118,6 @@ static int __init split_nodes_interleave(struct numa_meminfo *ei, 
		return -1;

		return -1;

	}

	}





	for (i = 0; i < pi->nr_blks; i++)

		node_set(pi->blk[i].nid, physnode_mask);



	/*

	/*

	 * Continue to fill physical nodes with fake nodes until there is no

	 * Continue to fill physical nodes with fake nodes until there is no

	 * memory left on any of them.

	 * memory left on any of them.
@@ -200,13 +199,15 @@ static u64 __init find_end_of_node(u64 start, u64 max_addr, u64 size) 




/*

/*

 * Sets up fake nodes of `size' interleaved over physical nodes ranging from

 * Sets up fake nodes of `size' interleaved over physical nodes ranging from

 * `addr' to `max_addr'.  The return value is the number of nodes allocated.

 * `addr' to `max_addr'.

 *

 * Returns zero on success or negative on error.

 */

 */

static int __init split_nodes_size_interleave(struct numa_meminfo *ei,

static int __init split_nodes_size_interleave(struct numa_meminfo *ei,

					      struct numa_meminfo *pi,

					      struct numa_meminfo *pi,

					      u64 addr, u64 max_addr, u64 size)

					      u64 addr, u64 max_addr, u64 size)

{

{

	nodemask_t physnode_mask = NODE_MASK_NONE;

	nodemask_t physnode_mask = numa_nodes_parsed;

	u64 min_size;

	u64 min_size;

	int nid = 0;

	int nid = 0;

	int i, ret;

	int i, ret;
@@ -231,9 +232,6 @@ static int __init split_nodes_size_interleave(struct numa_meminfo *ei, 
	}

	}

	size &= FAKE_NODE_MIN_HASH_MASK;

	size &= FAKE_NODE_MIN_HASH_MASK;





	for (i = 0; i < pi->nr_blks; i++)

		node_set(pi->blk[i].nid, physnode_mask);



	/*

	/*

	 * Fill physical nodes with fake nodes of size until there is no memory

	 * Fill physical nodes with fake nodes of size until there is no memory

	 * left on any of them.

	 * left on any of them.