[PATCH] x86/numa_emulation: Fix uniform size build failure

* [PATCH] x86/numa_emulation: Fix uniform size build failure
@ 2018-07-03 21:00 Dan Williams
  2018-07-05  8:24 ` Ingo Molnar
  0 siblings, 1 reply; 5+ messages in thread
From: Dan Williams @ 2018-07-03 21:00 UTC (permalink / raw)
  To: mingo
  Cc: David Rientjes, Thomas Gleixner, Wei Yang, kbuild test robot,
	x86, linux-mm, linux-kernel

The calculation of a uniform numa-node size attempted to perform
division with a 64-bit diviser leading to the following failure on
32-bit:

    arch/x86/mm/numa_emulation.o: In function `split_nodes_size_interleave_uniform':
    arch/x86/mm/numa_emulation.c:239: undefined reference to `__udivdi3'

Convert the implementation to do the division in terms of pages and then
shift the result back to an absolute physical address.

Fixes: 93e738834fcc ("x86/numa_emulation: Introduce uniform split capability")
Cc: David Rientjes <rientjes@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wei Yang <richard.weiyang@gmail.com>
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

    Applies to tip/x86/cpu for 4.19.

 arch/x86/mm/numa_emulation.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c
index 039db00541b7..cc7523e45926 100644
--- a/arch/x86/mm/numa_emulation.c
+++ b/arch/x86/mm/numa_emulation.c
@@ -198,6 +198,14 @@ static u64 __init find_end_of_node(u64 start, u64 max_addr, u64 size)
 	return end;
 }
 
+static u64 uniform_size(u64 max_addr, u64 base, int nr_nodes)
+{
+	unsigned long max_pfn = PHYS_PFN(max_addr);
+	unsigned long base_pfn = PHYS_PFN(base);
+
+	return PFN_PHYS((max_pfn - base_pfn) / nr_nodes);
+}
+
 /*
  * Sets up fake nodes of `size' interleaved over physical nodes ranging from
  * `addr' to `max_addr'.
@@ -236,7 +244,7 @@ static int __init split_nodes_size_interleave_uniform(struct numa_meminfo *ei,
 	}
 
 	if (uniform) {
-		min_size = (max_addr - addr) / nr_nodes;
+		min_size = uniform_size(max_addr, addr, nr_nodes);
 		size = min_size;
 	} else {
 		/*

^ permalink raw reply related	[flat|nested] 5+ messages in thread