Skip to contentSkip to conversation

powerpc: always trim to numa memory to lmb_end_of_DRAM

PATCH Milton Miller 1 participant 1 message Oct 21, 2008 PowerPC

lore
Share & tools
lore
#0 lore raw

numa_enforce_memory_limit tried to be smart and only call lmb_end_of_DRAM when a memory limit was set via mem= on the command line. However, the early boot code will also limit memory added to the lmb system when iommu=off is specified. When this happens, the page allocator is given pages not in the linear mapping and this results in a fatal data reference to the unmapped page.

--
X-Patchwork-ID: 19577
Changelog edited. Patch compiled on next-20081017

A previous version of this patch, id 11774, also looked if if iommu=off was specified, but it was requested that the check just be removed.

http://oldpatchwork.ozlabs.org/linuxppc/patch?id=11774

---

arch/powerpc/mm/numa.c +2 -4
index cf4bffb..590406c 100644
@@ -472,12 +472,10 @@ static unsigned long __init numa_enforce_memory_limit(unsigned long start,
 	/*
 	 * We use lmb_end_of_DRAM() in here instead of memory_limit because
 	 * we've already adjusted it for the limit and it takes care of
-	 * having memory holes below the limit.
+	 * having memory holes below the limit.  Also, in the case of
+	 * iommu_is_off, memory_limit is not set but is implicitly enforced.
 	 */
 
-	if (! memory_limit)
-		return size;
-
 	if (start + size <= lmb_end_of_DRAM())
 		return size;