From: tip-bot for Jeremy Fitzhardinge Subject: [tip:x86/urgent] x86: xen, i386: reserve Xen pagetables Date: Fri, 8 May 2009 09:07:14 GMT Message-ID: References: <4A032EEC.30509@goop.org> Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, jeremy.fitzhardinge@citrix.com, jeremy@goop.org, bdonlan@gmail.com, tglx@linutronix.de, xen-devel@lists.xensource.com, mingo@elte.hu Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: In-Reply-To: <4A032EEC.30509@goop.org> Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: linux-tip-commits@vger.kernel.org Cc: xen-devel@lists.xensource.com, jeremy@goop.org, jeremy.fitzhardinge@citrix.com, bdonlan@gmail.com, linux-kernel@vger.kernel.org, mingo@redhat.com, hpa@zytor.com, tglx@linutronix.de, torvalds@linux-foundation.org, mingo@elte.hu List-Id: xen-devel@lists.xenproject.org Commit-ID: 33df4db04a79660150e1948e3296eeb451ac121b Gitweb: http://git.kernel.org/tip/33df4db04a79660150e1948e3296eeb451ac121b Author: Jeremy Fitzhardinge AuthorDate: Thu, 7 May 2009 11:56:44 -0700 Committer: Ingo Molnar 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 Signed-off-by: Jeremy Fitzhardinge Cc: Xen-devel Cc: Linus Torvalds LKML-Reference: <4A032EEC.30509@goop.org> Signed-off-by: Ingo Molnar --- 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 */