Commit 3241f22d authored by Joerg Roedel's avatar Joerg Roedel Committed by Avi Kivity
Browse files

KVM: MMU: Let is_rsvd_bits_set take mmu context instead of vcpu 



This patch changes is_rsvd_bits_set() function prototype to
take only a kvm_mmu context instead of a full vcpu.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 52fde8df

arch/x86/kvm/mmu.c

+3 −3
Original line number Diff line number Diff line
@@ -2578,12 +2578,12 @@ static void paging_free(struct kvm_vcpu *vcpu) 
	nonpaging_free(vcpu);

}



static bool is_rsvd_bits_set(struct kvm_vcpu *vcpu, u64 gpte, int level)

static bool is_rsvd_bits_set(struct kvm_mmu *mmu, u64 gpte, int level)

{

	int bit7;



	bit7 = (gpte >> 7) & 1;

	return (gpte & vcpu->arch.mmu.rsvd_bits_mask[bit7][level-1]) != 0;

	return (gpte & mmu->rsvd_bits_mask[bit7][level-1]) != 0;

}



#define PTTYPE 64
@@ -2859,7 +2859,7 @@ static void mmu_pte_write_new_pte(struct kvm_vcpu *vcpu, 
		return;

        }



	if (is_rsvd_bits_set(vcpu, *(u64 *)new, PT_PAGE_TABLE_LEVEL))

	if (is_rsvd_bits_set(&vcpu->arch.mmu, *(u64 *)new, PT_PAGE_TABLE_LEVEL))

		return;



	++vcpu->kvm->stat.mmu_pte_updated;

arch/x86/kvm/paging_tmpl.h

+4 −3
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int FNAME(walk_addr)(struct guest_walker *walker, 
			break;

		}



		if (is_rsvd_bits_set(vcpu, pte, walker->level)) {

		if (is_rsvd_bits_set(&vcpu->arch.mmu, pte, walker->level)) {

			rsvd_fault = true;

			break;

		}
@@ -327,6 +327,7 @@ static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw, 
				u64 *sptep)

{

	struct kvm_mmu_page *sp;

	struct kvm_mmu *mmu = &vcpu->arch.mmu;

	pt_element_t *gptep = gw->prefetch_ptes;

	u64 *spte;

	int i;
@@ -358,7 +359,7 @@ static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw, 
		gpte = gptep[i];



		if (!is_present_gpte(gpte) ||

		      is_rsvd_bits_set(vcpu, gpte, PT_PAGE_TABLE_LEVEL)) {

		      is_rsvd_bits_set(mmu, gpte, PT_PAGE_TABLE_LEVEL)) {

			if (!sp->unsync)

				__set_spte(spte, shadow_notrap_nonpresent_pte);

			continue;
@@ -713,7 +714,7 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp, 
			return -EINVAL;



		gfn = gpte_to_gfn(gpte);

		if (is_rsvd_bits_set(vcpu, gpte, PT_PAGE_TABLE_LEVEL)

		if (is_rsvd_bits_set(&vcpu->arch.mmu, gpte, PT_PAGE_TABLE_LEVEL)

		      || gfn != sp->gfns[i] || !is_present_gpte(gpte)

		      || !(gpte & PT_ACCESSED_MASK)) {

			u64 nonpresent;