Commit d28c6cfb authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: MMU: Fix hugepage pdes mapping same physical address with different access 



The kvm mmu keeps a shadow page for hugepage pdes; if several such pdes map
the same physical address, they share the same shadow page.  This is a fairly
common case (kernel mappings on i386 nonpae Linux, for example).

However, if the two pdes map the same memory but with different permissions, kvm
will happily use the cached shadow page.  If the access through the more
permissive pde will occur after the access to the strict pde, an endless pagefault
loop will be generated and the guest will make no progress.

Fix by making the access permissions part of the cache lookup key.

The fix allows Xen pae to boot on kvm and run guest domains.

Thanks to Jeremy Fitzhardinge for reporting the bug and testing the fix.

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 916ce236

drivers/kvm/kvm.h

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ struct kvm_pte_chain { 
 *   bits 4:7 - page table level for this shadow (1-4)

 *   bits 8:9 - page table quadrant for 2-level guests

 *   bit   16 - "metaphysical" - gfn is not a real page (huge page/real mode)

 *   bits 17:18 - "access" - the user and writable bits of a huge page pde

 */

union kvm_mmu_page_role {

	unsigned word;
@@ -118,6 +119,7 @@ union kvm_mmu_page_role { 
		unsigned quadrant : 2;

		unsigned pad_for_nice_hex_output : 6;

		unsigned metaphysical : 1;

		unsigned hugepage_access : 2;

	};

};

drivers/kvm/mmu.c

+5 −3
Original line number Diff line number Diff line
@@ -568,6 +568,7 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu, 
					     gva_t gaddr,

					     unsigned level,

					     int metaphysical,

					     unsigned hugepage_access,

					     u64 *parent_pte)

{

	union kvm_mmu_page_role role;
@@ -581,6 +582,7 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu, 
	role.glevels = vcpu->mmu.root_level;

	role.level = level;

	role.metaphysical = metaphysical;

	role.hugepage_access = hugepage_access;

	if (vcpu->mmu.root_level <= PT32_ROOT_LEVEL) {

		quadrant = gaddr >> (PAGE_SHIFT + (PT64_PT_BITS * level));

		quadrant &= (1 << ((PT32_PT_BITS - PT64_PT_BITS) * level)) - 1;
@@ -780,7 +782,7 @@ static int nonpaging_map(struct kvm_vcpu *vcpu, gva_t v, hpa_t p) 
				>> PAGE_SHIFT;

			new_table = kvm_mmu_get_page(vcpu, pseudo_gfn,

						     v, level - 1,

						     1, &table[index]);

						     1, 0, &table[index]);

			if (!new_table) {

				pgprintk("nonpaging_map: ENOMEM\n");

				return -ENOMEM;
@@ -835,7 +837,7 @@ static void mmu_alloc_roots(struct kvm_vcpu *vcpu) 


		ASSERT(!VALID_PAGE(root));

		page = kvm_mmu_get_page(vcpu, root_gfn, 0,

					PT64_ROOT_LEVEL, 0, NULL);

					PT64_ROOT_LEVEL, 0, 0, NULL);

		root = page->page_hpa;

		++page->root_count;

		vcpu->mmu.root_hpa = root;
@@ -852,7 +854,7 @@ static void mmu_alloc_roots(struct kvm_vcpu *vcpu) 
			root_gfn = 0;

		page = kvm_mmu_get_page(vcpu, root_gfn, i << 30,

					PT32_ROOT_LEVEL, !is_paging(vcpu),

					NULL);

					0, NULL);

		root = page->page_hpa;

		++page->root_count;

		vcpu->mmu.pae_root[i] = root | PT_PRESENT_MASK;

drivers/kvm/paging_tmpl.h

+6 −1
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, 
		u64 shadow_pte;

		int metaphysical;

		gfn_t table_gfn;

		unsigned hugepage_access = 0;



		if (is_present_pte(*shadow_ent) || is_io_pte(*shadow_ent)) {

			if (level == PT_PAGE_TABLE_LEVEL)
@@ -276,6 +277,9 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, 
		if (level - 1 == PT_PAGE_TABLE_LEVEL

		    && walker->level == PT_DIRECTORY_LEVEL) {

			metaphysical = 1;

			hugepage_access = *guest_ent;

			hugepage_access &= PT_USER_MASK | PT_WRITABLE_MASK;

			hugepage_access >>= PT_WRITABLE_SHIFT;

			table_gfn = (*guest_ent & PT_BASE_ADDR_MASK)

				>> PAGE_SHIFT;

		} else {
@@ -283,7 +287,8 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, 
			table_gfn = walker->table_gfn[level - 2];

		}

		shadow_page = kvm_mmu_get_page(vcpu, table_gfn, addr, level-1,

					       metaphysical, shadow_ent);

					       metaphysical, hugepage_access,

					       shadow_ent);

		shadow_addr = shadow_page->page_hpa;

		shadow_pte = shadow_addr | PT_PRESENT_MASK | PT_ACCESSED_MASK

			| PT_WRITABLE_MASK | PT_USER_MASK;

CRA Git | Maintained and supported by SUSTech CRA and CCSE