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

Commit 43a3795a authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: MMU: Adjust pte accessors to explicitly indicate guest or shadow pte 



Since the guest and host ptes can have wildly different format, adjust
the pte accessor names to indicate on which type of pte they operate on.

No functional changes.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 439e218a

arch/x86/kvm/mmu.c

+8 −8
Original line number Diff line number Diff line
@@ -240,12 +240,12 @@ static int is_writeble_pte(unsigned long pte) 
	return pte & PT_WRITABLE_MASK;

}



static int is_dirty_pte(unsigned long pte)

static int is_dirty_gpte(unsigned long pte)

{

	return pte & PT_DIRTY_MASK;

}



static int is_rmap_pte(u64 pte)

static int is_rmap_spte(u64 pte)

{

	return is_shadow_present_pte(pte);

}
@@ -502,7 +502,7 @@ static int rmap_add(struct kvm_vcpu *vcpu, u64 *spte, gfn_t gfn, int lpage) 
	unsigned long *rmapp;

	int i, count = 0;



	if (!is_rmap_pte(*spte))

	if (!is_rmap_spte(*spte))

		return count;

	gfn = unalias_gfn(vcpu->kvm, gfn);

	sp = page_header(__pa(spte));
@@ -567,7 +567,7 @@ static void rmap_remove(struct kvm *kvm, u64 *spte) 
	unsigned long *rmapp;

	int i;



	if (!is_rmap_pte(*spte))

	if (!is_rmap_spte(*spte))

		return;

	sp = page_header(__pa(spte));

	pfn = spte_to_pfn(*spte);
@@ -1769,7 +1769,7 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte, 
		 __func__, *shadow_pte, pt_access,

		 write_fault, user_fault, gfn);



	if (is_rmap_pte(*shadow_pte)) {

	if (is_rmap_spte(*shadow_pte)) {

		/*

		 * If we overwrite a PTE page pointer with a 2MB PMD, unlink

		 * the parent of the now unreachable PTE.
@@ -1805,7 +1805,7 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte, 
	page_header_update_slot(vcpu->kvm, shadow_pte, gfn);

	if (!was_rmapped) {

		rmap_count = rmap_add(vcpu, shadow_pte, gfn, largepage);

		if (!is_rmap_pte(*shadow_pte))

		if (!is_rmap_spte(*shadow_pte))

			kvm_release_pfn_clean(pfn);

		if (rmap_count > RMAP_RECYCLE_THRESHOLD)

			rmap_recycle(vcpu, gfn, largepage);
@@ -1984,7 +1984,7 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu) 
		ASSERT(!VALID_PAGE(root));

		if (vcpu->arch.mmu.root_level == PT32E_ROOT_LEVEL) {

			pdptr = kvm_pdptr_read(vcpu, i);

			if (!is_present_pte(pdptr)) {

			if (!is_present_gpte(pdptr)) {

				vcpu->arch.mmu.pae_root[i] = 0;

				continue;

			}
@@ -2475,7 +2475,7 @@ static void mmu_guess_page_from_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa, 
		if ((bytes == 4) && (gpa % 4 == 0))

			memcpy((void *)&gpte, new, 4);

	}

	if (!is_present_pte(gpte))

	if (!is_present_gpte(gpte))

		return;

	gfn = (gpte & PT64_BASE_ADDR_MASK) >> PAGE_SHIFT;

arch/x86/kvm/mmu.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static inline int is_paging(struct kvm_vcpu *vcpu) 
	return vcpu->arch.cr0 & X86_CR0_PG;

}



static inline int is_present_pte(unsigned long pte)

static inline int is_present_gpte(unsigned long pte)

{

	return pte & PT_PRESENT_MASK;

}

arch/x86/kvm/paging_tmpl.h

+11 −11
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int FNAME(walk_addr)(struct guest_walker *walker, 
#if PTTYPE == 64

	if (!is_long_mode(vcpu)) {

		pte = kvm_pdptr_read(vcpu, (addr >> 30) & 3);

		if (!is_present_pte(pte))

		if (!is_present_gpte(pte))

			goto not_present;

		--walker->level;

	}
@@ -155,7 +155,7 @@ static int FNAME(walk_addr)(struct guest_walker *walker, 


		kvm_read_guest(vcpu->kvm, pte_gpa, &pte, sizeof(pte));



		if (!is_present_pte(pte))

		if (!is_present_gpte(pte))

			goto not_present;



		rsvd_fault = is_rsvd_bits_set(vcpu, pte, walker->level);
@@ -205,7 +205,7 @@ static int FNAME(walk_addr)(struct guest_walker *walker, 
		--walker->level;

	}



	if (write_fault && !is_dirty_pte(pte)) {

	if (write_fault && !is_dirty_gpte(pte)) {

		bool ret;



		mark_page_dirty(vcpu->kvm, table_gfn);
@@ -252,7 +252,7 @@ static void FNAME(update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *page, 


	gpte = *(const pt_element_t *)pte;

	if (~gpte & (PT_PRESENT_MASK | PT_ACCESSED_MASK)) {

		if (!is_present_pte(gpte))

		if (!is_present_gpte(gpte))

			set_shadow_pte(spte, shadow_notrap_nonpresent_pte);

		return;

	}
@@ -289,7 +289,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, 
	pt_element_t curr_pte;

	struct kvm_shadow_walk_iterator iterator;



	if (!is_present_pte(gw->ptes[gw->level - 1]))

	if (!is_present_gpte(gw->ptes[gw->level - 1]))

		return NULL;



	for_each_shadow_entry(vcpu, addr, iterator) {
@@ -318,7 +318,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, 
		if (level == PT_DIRECTORY_LEVEL

		    && gw->level == PT_DIRECTORY_LEVEL) {

			direct = 1;

			if (!is_dirty_pte(gw->ptes[level - 1]))

			if (!is_dirty_gpte(gw->ptes[level - 1]))

				access &= ~ACC_WRITE_MASK;

			table_gfn = gpte_to_gfn(gw->ptes[level - 1]);

		} else {
@@ -489,7 +489,7 @@ static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva) 
	if (kvm_read_guest_atomic(vcpu->kvm, pte_gpa, &gpte,

				  sizeof(pt_element_t)))

		return;

	if (is_present_pte(gpte) && (gpte & PT_ACCESSED_MASK)) {

	if (is_present_gpte(gpte) && (gpte & PT_ACCESSED_MASK)) {

		if (mmu_topup_memory_caches(vcpu))

			return;

		kvm_mmu_pte_write(vcpu, pte_gpa, (const u8 *)&gpte,
@@ -536,7 +536,7 @@ static void FNAME(prefetch_page)(struct kvm_vcpu *vcpu, 
		r = kvm_read_guest_atomic(vcpu->kvm, pte_gpa, pt, sizeof pt);

		pte_gpa += ARRAY_SIZE(pt) * sizeof(pt_element_t);

		for (j = 0; j < ARRAY_SIZE(pt); ++j)

			if (r || is_present_pte(pt[j]))

			if (r || is_present_gpte(pt[j]))

				sp->spt[i+j] = shadow_trap_nonpresent_pte;

			else

				sp->spt[i+j] = shadow_notrap_nonpresent_pte;
@@ -574,12 +574,12 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp) 
					  sizeof(pt_element_t)))

			return -EINVAL;



		if (gpte_to_gfn(gpte) != gfn || !is_present_pte(gpte) ||

		if (gpte_to_gfn(gpte) != gfn || !is_present_gpte(gpte) ||

		    !(gpte & PT_ACCESSED_MASK)) {

			u64 nonpresent;



			rmap_remove(vcpu->kvm, &sp->spt[i]);

			if (is_present_pte(gpte))

			if (is_present_gpte(gpte))

				nonpresent = shadow_trap_nonpresent_pte;

			else

				nonpresent = shadow_notrap_nonpresent_pte;
@@ -590,7 +590,7 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp) 
		nr_present++;

		pte_access = sp->role.access & FNAME(gpte_access)(vcpu, gpte);

		set_spte(vcpu, &sp->spt[i], pte_access, 0, 0,

			 is_dirty_pte(gpte), 0, gfn,

			 is_dirty_gpte(gpte), 0, gfn,

			 spte_to_pfn(sp->spt[i]), true, false);

	}

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3) 
		goto out;

	}

	for (i = 0; i < ARRAY_SIZE(pdpte); ++i) {

		if (is_present_pte(pdpte[i]) &&

		if (is_present_gpte(pdpte[i]) &&

		    (pdpte[i] & vcpu->arch.mmu.rsvd_bits_mask[0][2])) {

			ret = 0;

			goto out;