Skip to contentSkip to conversation

xen/i386: reserve Xen pagetables

PATCH In review Jeremy Fitzhardinge 1 participant 2 messages May 7, 2009 – May 8, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 4/5 xen/i386: reserve Xen pagetables

The Xen pagetables are no longer implicitly reserved as part of the other i386_start_kernel reservations, so make sure we explicitly reserve them. This prevents them from being released into the general kernel free page pool and reused.

---
arch/x86/xen/mmu.c | 5 +++++

1 files changed, 5 insertions(+), 0 deletions(-)
arch/x86/xen/mmu.c +0 -0
index 9842b12..e25a78e 100644
@@ -1794,6 +1794,11 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
 
	pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(swapper_pg_dir)));

+ reserve_early(__pa(xen_start_info->pt_base),
+ __pa(xen_start_info->pt_base +
+ xen_start_info->nr_pt_frames * PAGE_SIZE),
+ "XEN PAGETABLES");
+

	return swapper_pg_dir;
}

#endif /* CONFIG_X86_64 */

Signature · 1 line
1.6.0.6
#1 lore raw

[tip:x86/urgent] x86: xen, i386: reserve Xen pagetables

Commit-ID:  33df4db04a79660150e1948e3296eeb451ac121b
Gitweb:     http://git.kernel.org/tip/33df4db04a79660150e1948e3296eeb451ac121b
Author:     Jeremy Fitzhardinge <[email protected]>
AuthorDate: Thu, 7 May 2009 11:56:44 -0700
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 8 May 2009 10:49:11 +0200

x86: xen, i386: reserve Xen pagetables

The Xen pagetables are no longer implicitly reserved as part of the other i386_start_kernel reservations, so make sure we explicitly reserve them. This prevents them from being released into the general kernel free page pool and reused.

[ Impact: fix Xen guest crash ]

LKML-Reference: <[email protected]>

---
 arch/x86/xen/mmu.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
arch/x86/xen/mmu.c +5 -0
index 9842b12..e25a78e 100644
@@ -1794,6 +1794,11 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
 
 	pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(swapper_pg_dir)));
 
+	reserve_early(__pa(xen_start_info->pt_base),
+		      __pa(xen_start_info->pt_base +
+			   xen_start_info->nr_pt_frames * PAGE_SIZE),
+		      "XEN PAGETABLES");
+
 	return swapper_pg_dir;
 }
 #endif	/* CONFIG_X86_64 */