rpms/kernel/devel linux-2.6-x86_64-page-table-setup.patch, NONE, 1.1 kernel-2.6.spec, 1.1854, 1.1855

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6423

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-x86_64-page-table-setup.patch 
Log Message:
experiment.


linux-2.6-x86_64-page-table-setup.patch:
 init.c |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)

--- NEW FILE linux-2.6-x86_64-page-table-setup.patch ---
Don't try to put kernel page tables beyond ZONE_DMA32.

For not fully explained reasons it broke mem=... on several setups.

Also minor cleanup.

Cc: axboe at suse.de

Signed-off-by: Andi Kleen <ak at suse.de>

Index: linux/arch/x86_64/mm/init.c
===================================================================
--- linux.orig/arch/x86_64/mm/init.c
+++ linux/arch/x86_64/mm/init.c
@@ -262,19 +262,11 @@ static void __init find_early_table_spac
 	tables = round_up(puds * sizeof(pud_t), PAGE_SIZE) +
 		 round_up(pmds * sizeof(pmd_t), PAGE_SIZE);
 
-	/* Put page tables beyond the DMA zones if possible.
-	   RED-PEN might be better to spread them out more over
-	   memory to avoid hotspots */
-	if (end > MAX_DMA32_PFN<<PAGE_SHIFT)
-		start = MAX_DMA32_PFN << PAGE_SHIFT;
-	else if (end > MAX_DMA_PFN << PAGE_SHIFT)
-		start = MAX_DMA_PFN << PAGE_SHIFT;
-	else
-		start = 0x8000;
-
-	table_start = find_e820_area(start, end, tables);
-	if (table_start == -1)
-		table_start = find_e820_area(0x8000, end, tables);
+ 	/* RED-PEN putting page tables only on node 0 could
+ 	   cause a hotspot and fill up ZONE_DMA. The page tables
+ 	   need roughly 0.5KB per GB. */
+ 	start = 0x8000;
+ 	table_start = find_e820_area(start, end, tables);
 	if (table_start == -1UL)
 		panic("Cannot find space for the kernel page tables");
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1854
retrieving revision 1.1855
diff -u -r1.1854 -r1.1855
--- kernel-2.6.spec	14 Jan 2006 09:51:58 -0000	1.1854
+++ kernel-2.6.spec	16 Jan 2006 00:57:51 -0000	1.1855
@@ -221,6 +221,7 @@
 Patch203: linux-2.6.14-intel-cache-build.patch
 Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch205: linux-2.6-edid-check.patch
+Patch206: linux-2.6-x86_64-page-table-setup.patch
 
 # 300 - 399   ppc(64)
 Patch300: linux-2.6.15-default-powerpc.patch
@@ -619,6 +620,8 @@
 %patch204 -p1
 # Reboot thru bios on HP laptops.
 %patch205 -p1
+# Revert some page table setup changes.
+%patch206 -p1
 
 # 
 # ppc64
@@ -1356,6 +1359,9 @@
 %endif
 
 %changelog
+* Sun Jan 15 2006 Dave Jones <davej at redhat.com>
+- Revert some x86-64 page table changes as an experiment.
+
 * Sat Jan 14 2006 David Woodhouse <dwmw2 at redhat.com>
 - 2.6.15-git10
 - Re-enable Wacom driver on PPC