|
@@ -1106,8 +1106,7 @@ static void drop_large_spte(struct kvm_vcpu *vcpu, u64 *sptep)
|
|
|
|
|
|
/*
|
|
|
* Write-protect on the specified @sptep, @pt_protect indicates whether
|
|
|
- * spte writ-protection is caused by protecting shadow page table.
|
|
|
- * @flush indicates whether tlb need be flushed.
|
|
|
+ * spte write-protection is caused by protecting shadow page table.
|
|
|
*
|
|
|
* Note: write protection is difference between drity logging and spte
|
|
|
* protection:
|
|
@@ -1116,10 +1115,9 @@ static void drop_large_spte(struct kvm_vcpu *vcpu, u64 *sptep)
|
|
|
* - for spte protection, the spte can be writable only after unsync-ing
|
|
|
* shadow page.
|
|
|
*
|
|
|
- * Return true if the spte is dropped.
|
|
|
+ * Return true if tlb need be flushed.
|
|
|
*/
|
|
|
-static bool
|
|
|
-spte_write_protect(struct kvm *kvm, u64 *sptep, bool *flush, bool pt_protect)
|
|
|
+static bool spte_write_protect(struct kvm *kvm, u64 *sptep, bool pt_protect)
|
|
|
{
|
|
|
u64 spte = *sptep;
|
|
|
|
|
@@ -1129,17 +1127,11 @@ spte_write_protect(struct kvm *kvm, u64 *sptep, bool *flush, bool pt_protect)
|
|
|
|
|
|
rmap_printk("rmap_write_protect: spte %p %llx\n", sptep, *sptep);
|
|
|
|
|
|
- if (__drop_large_spte(kvm, sptep)) {
|
|
|
- *flush |= true;
|
|
|
- return true;
|
|
|
- }
|
|
|
-
|
|
|
if (pt_protect)
|
|
|
spte &= ~SPTE_MMU_WRITEABLE;
|
|
|
spte = spte & ~PT_WRITABLE_MASK;
|
|
|
|
|
|
- *flush |= mmu_spte_update(sptep, spte);
|
|
|
- return false;
|
|
|
+ return mmu_spte_update(sptep, spte);
|
|
|
}
|
|
|
|
|
|
static bool __rmap_write_protect(struct kvm *kvm, unsigned long *rmapp,
|
|
@@ -1151,11 +1143,8 @@ static bool __rmap_write_protect(struct kvm *kvm, unsigned long *rmapp,
|
|
|
|
|
|
for (sptep = rmap_get_first(*rmapp, &iter); sptep;) {
|
|
|
BUG_ON(!(*sptep & PT_PRESENT_MASK));
|
|
|
- if (spte_write_protect(kvm, sptep, &flush, pt_protect)) {
|
|
|
- sptep = rmap_get_first(*rmapp, &iter);
|
|
|
- continue;
|
|
|
- }
|
|
|
|
|
|
+ flush |= spte_write_protect(kvm, sptep, pt_protect);
|
|
|
sptep = rmap_get_next(&iter);
|
|
|
}
|
|
|
|
|
@@ -2596,6 +2585,8 @@ static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write,
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
+ drop_large_spte(vcpu, iterator.sptep);
|
|
|
+
|
|
|
if (!is_shadow_present_pte(*iterator.sptep)) {
|
|
|
u64 base_addr = iterator.addr;
|
|
|
|