| From foo@baz Sat Sep 29 04:29:21 PDT 2018 |
| From: Dan Williams <dan.j.williams@intel.com> |
| Date: Fri, 6 Jul 2018 09:08:01 -0700 |
| Subject: x86/numa_emulation: Fix emulated-to-physical node mapping |
| |
| From: Dan Williams <dan.j.williams@intel.com> |
| |
| [ Upstream commit 3b6c62f363a19ce82bf378187ab97c9dc01e3927 ] |
| |
| Without this change the distance table calculation for emulated nodes |
| may use the wrong numa node and report an incorrect distance. |
| |
| Signed-off-by: Dan Williams <dan.j.williams@intel.com> |
| Cc: David Rientjes <rientjes@google.com> |
| Cc: Linus Torvalds <torvalds@linux-foundation.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Cc: Wei Yang <richard.weiyang@gmail.com> |
| Cc: linux-mm@kvack.org |
| Link: http://lkml.kernel.org/r/153089328103.27680.14778434392225818887.stgit@dwillia2-desk3.amr.corp.intel.com |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/x86/mm/numa_emulation.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/x86/mm/numa_emulation.c |
| +++ b/arch/x86/mm/numa_emulation.c |
| @@ -60,7 +60,7 @@ static int __init emu_setup_memblk(struc |
| eb->nid = nid; |
| |
| if (emu_nid_to_phys[nid] == NUMA_NO_NODE) |
| - emu_nid_to_phys[nid] = nid; |
| + emu_nid_to_phys[nid] = pb->nid; |
| |
| pb->start += size; |
| if (pb->start >= pb->end) { |
