|
@@ -1206,7 +1206,7 @@ static void nonpaging_invlpg(struct kvm_vcpu *vcpu, gva_t gva)
|
|
|
|
|
|
static void nonpaging_update_pte(struct kvm_vcpu *vcpu,
|
|
|
struct kvm_mmu_page *sp, u64 *spte,
|
|
|
- const void *pte, unsigned long mmu_seq)
|
|
|
+ const void *pte)
|
|
|
{
|
|
|
WARN_ON(1);
|
|
|
}
|
|
@@ -3163,9 +3163,8 @@ static void mmu_pte_write_zap_pte(struct kvm_vcpu *vcpu,
|
|
|
}
|
|
|
|
|
|
static void mmu_pte_write_new_pte(struct kvm_vcpu *vcpu,
|
|
|
- struct kvm_mmu_page *sp,
|
|
|
- u64 *spte,
|
|
|
- const void *new, unsigned long mmu_seq)
|
|
|
+ struct kvm_mmu_page *sp, u64 *spte,
|
|
|
+ const void *new)
|
|
|
{
|
|
|
if (sp->role.level != PT_PAGE_TABLE_LEVEL) {
|
|
|
++vcpu->kvm->stat.mmu_pde_zapped;
|
|
@@ -3173,7 +3172,7 @@ static void mmu_pte_write_new_pte(struct kvm_vcpu *vcpu,
|
|
|
}
|
|
|
|
|
|
++vcpu->kvm->stat.mmu_pte_updated;
|
|
|
- vcpu->arch.mmu.update_pte(vcpu, sp, spte, new, mmu_seq);
|
|
|
+ vcpu->arch.mmu.update_pte(vcpu, sp, spte, new);
|
|
|
}
|
|
|
|
|
|
static bool need_remote_flush(u64 old, u64 new)
|
|
@@ -3229,7 +3228,6 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
|
|
|
struct kvm_mmu_page *sp;
|
|
|
struct hlist_node *node;
|
|
|
LIST_HEAD(invalid_list);
|
|
|
- unsigned long mmu_seq;
|
|
|
u64 entry, gentry, *spte;
|
|
|
unsigned pte_size, page_offset, misaligned, quadrant, offset;
|
|
|
int level, npte, invlpg_counter, r, flooded = 0;
|
|
@@ -3271,9 +3269,6 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- mmu_seq = vcpu->kvm->mmu_notifier_seq;
|
|
|
- smp_rmb();
|
|
|
-
|
|
|
spin_lock(&vcpu->kvm->mmu_lock);
|
|
|
if (atomic_read(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
|
|
|
gentry = 0;
|
|
@@ -3345,8 +3340,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
|
|
|
if (gentry &&
|
|
|
!((sp->role.word ^ vcpu->arch.mmu.base_role.word)
|
|
|
& mask.word))
|
|
|
- mmu_pte_write_new_pte(vcpu, sp, spte, &gentry,
|
|
|
- mmu_seq);
|
|
|
+ mmu_pte_write_new_pte(vcpu, sp, spte, &gentry);
|
|
|
if (!remote_flush && need_remote_flush(entry, *spte))
|
|
|
remote_flush = true;
|
|
|
++spte;
|