Patch "x86/numa_emulation: Fix emulated-to-physical node mapping" has been added to the 3.18-stable tree

Commit Message

Greg Kroah-Hartman Sept. 29, 2018, 12:06 p.m. UTC

This is a note to let you know that I've just added the patch titled

    x86/numa_emulation: Fix emulated-to-physical node mapping

to the 3.18-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     x86-numa_emulation-fix-emulated-to-physical-node-mapping.patch
and it can be found in the queue-3.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[e-mail]> know about it.


From foo@baz Sat Sep 29 04:32:11 PDT 2018
From: Dan Williams <[e-mail]>
Date: Fri, 6 Jul 2018 09:08:01 -0700
Subject: x86/numa_emulation: Fix emulated-to-physical node mapping

From: Dan Williams <[e-mail]>

[ 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 <[e-mail]>
Cc: David Rientjes <[e-mail]>
Cc: Linus Torvalds <[e-mail]>
Cc: Peter Zijlstra <[e-mail]>
Cc: Thomas Gleixner <[e-mail]>
Cc: Wei Yang <[e-mail]>
Cc: [e-mail]
Link: http://lkml.kernel.org/r/[e-mail]
Signed-off-by: Ingo Molnar <[e-mail]>
Signed-off-by: Sasha Levin <[e-mail]>
Signed-off-by: Greg Kroah-Hartman <[e-mail]>
---
 arch/x86/mm/numa_emulation.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



Patches currently in stable-queue which might be from [e-mail] are

queue-3.18/x86-numa_emulation-fix-emulated-to-physical-node-mapping.patch

Patch

--- 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) {