evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Joerg Roedel 2010-09-10 17:30:45 +02:00 • committed by Avi Kivity
parent 52fde8df7d
commit 3241f22da8
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/x86/kvm/mmu.c
View file

@ -2578,12 +2578,12 @@ static void paging_free(struct kvm_vcpu *vcpu)
nonpaging_free(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; int bit7;
bit7 = (gpte >> 7) & 1; 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 #define PTTYPE 64
@ -2859,7 +2859,7 @@ static void mmu_pte_write_new_pte(struct kvm_vcpu *vcpu,
return; 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; return;
++vcpu->kvm->stat.mmu_pte_updated; ++vcpu->kvm->stat.mmu_pte_updated;

7
arch/x86/kvm/paging_tmpl.h
View file

@ -168,7 +168,7 @@ walk:
break; break;
} }
if (is_rsvd_bits_set(vcpu, pte, walker->level)) { if (is_rsvd_bits_set(&vcpu->arch.mmu, pte, walker->level)) {
rsvd_fault = true; rsvd_fault = true;
break; break;
} }
@ -327,6 +327,7 @@ static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw,
u64 *sptep) u64 *sptep)
{ {
struct kvm_mmu_page *sp; struct kvm_mmu_page *sp;
struct kvm_mmu *mmu = &vcpu->arch.mmu;
pt_element_t *gptep = gw->prefetch_ptes; pt_element_t *gptep = gw->prefetch_ptes;
u64 *spte; u64 *spte;
int i; int i;
@ -358,7 +359,7 @@ static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw,
gpte = gptep[i]; gpte = gptep[i];
if (!is_present_gpte(gpte) || 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) if (!sp->unsync)
__set_spte(spte, shadow_notrap_nonpresent_pte); __set_spte(spte, shadow_notrap_nonpresent_pte);
continue; continue;
@ -713,7 +714,7 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
return -EINVAL; return -EINVAL;
gfn = gpte_to_gfn(gpte); 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) || gfn != sp->gfns[i] || !is_present_gpte(gpte)
|| !(gpte & PT_ACCESSED_MASK)) { || !(gpte & PT_ACCESSED_MASK)) {
u64 nonpresent; u64 nonpresent;