Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05345b0f authored Jun 16, 2008 by Jeremy Fitzhardinge Committed by Ingo Molnar Jun 20, 2008

xen: mask unwanted pte bits in __supported_pte_mask



[ Stable: this isn't a bugfix in itself, but it's a pre-requiste
  for "xen: don't drop NX bit" ]

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Stable Kernel <stable@kernel.org>
Cc: the arch/x86 maintainers <x86@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 46539383

arch/x86/xen/enlighten.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1228,6 +1228,11 @@ asmlinkage void __init xen_start_kernel(void)
		if (xen_feature(XENFEAT_supervisor_mode_kernel))
		pv_info.kernel_rpl = 0;

		/* Prevent unwanted bits from being set in PTEs. */
		__supported_pte_mask &= ~_PAGE_GLOBAL;
		if (!is_initial_xendomain())
		__supported_pte_mask &= ~(_PAGE_PWT \| _PAGE_PCD);

		/* set the limit of our address space */
		xen_reserve_top();

arch/x86/xen/mmu.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -199,10 +199,8 @@ pgdval_t xen_pgd_val(pgd_t pgd)

		pte_t xen_make_pte(pteval_t pte)
		{
		if (pte & _PAGE_PRESENT) {
		if (pte & _PAGE_PRESENT)
		pte = phys_to_machine(XPADDR(pte)).maddr;
		pte &= ~(_PAGE_PCD \| _PAGE_PWT);
		}

		return (pte_t){ .pte = pte };
		}