[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-33df4db04a79660150e1948e3296eeb451ac121b@git.kernel.org>
Date: Fri, 8 May 2009 09:07:14 GMT
From: tip-bot for Jeremy Fitzhardinge <jeremy@...p.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
torvalds@...ux-foundation.org, jeremy.fitzhardinge@...rix.com,
jeremy@...p.org, bdonlan@...il.com, tglx@...utronix.de,
mingo@...e.hu, xen-devel@...ts.xensource.com
Subject: [tip:x86/urgent] x86: xen, i386: reserve Xen pagetables
Commit-ID: 33df4db04a79660150e1948e3296eeb451ac121b
Gitweb: http://git.kernel.org/tip/33df4db04a79660150e1948e3296eeb451ac121b
Author: Jeremy Fitzhardinge <jeremy@...p.org>
AuthorDate: Thu, 7 May 2009 11:56:44 -0700
Committer: Ingo Molnar <mingo@...e.hu>
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 ]
Also-Bisected-by: Bryan Donlan <bdonlan@...il.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@...rix.com>
Cc: Xen-devel <xen-devel@...ts.xensource.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
LKML-Reference: <4A032EEC.30509@...p.org>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/xen/mmu.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 9842b12..e25a78e 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -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 */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists