Skip to content

Commit 1f99734

Browse files
shvipinsean-jc
authored andcommitted
KVM: x86/mmu: Remove handle_changed_spte_dirty_log()
Remove handle_changed_spte_dirty_log() as there is no code flow which sets 4KiB SPTE writable and hit this path. This function marks the page dirty in a memslot only if new SPTE is 4KiB in size and writable. Current users of handle_changed_spte_dirty_log() are: 1. set_spte_gfn() - Create only non writable SPTEs. 2. write_protect_gfn() - Change an SPTE to non writable. 3. zap leaf and roots APIs - Everything is 0. 4. handle_removed_pt() - Sets SPTEs to REMOVED_SPTE 5. tdp_mmu_link_sp() - Makes non leaf SPTEs. There is also no path which creates a writable 4KiB without going through make_spte() and this functions takes care of marking SPTE dirty in the memslot if it is PT_WRITABLE. Signed-off-by: Vipin Sharma <vipinsh@google.com> Reviewed-by: David Matlack <dmatlack@google.com> [sean: add blurb to __handle_changed_spte()'s comment] Link: https://lore.kernel.org/r/20230321220021.2119033-13-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 0b7cc25 commit 1f99734

File tree

1 file changed

+3
-23
lines changed

1 file changed

+3
-23
lines changed

arch/x86/kvm/mmu/tdp_mmu.c

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -345,24 +345,6 @@ static void handle_changed_spte_acc_track(u64 old_spte, u64 new_spte, int level)
345345
kvm_set_pfn_accessed(spte_to_pfn(old_spte));
346346
}
347347

348-
static void handle_changed_spte_dirty_log(struct kvm *kvm, int as_id, gfn_t gfn,
349-
u64 old_spte, u64 new_spte, int level)
350-
{
351-
bool pfn_changed;
352-
struct kvm_memory_slot *slot;
353-
354-
if (level > PG_LEVEL_4K)
355-
return;
356-
357-
pfn_changed = spte_to_pfn(old_spte) != spte_to_pfn(new_spte);
358-
359-
if ((!is_writable_pte(old_spte) || pfn_changed) &&
360-
is_writable_pte(new_spte)) {
361-
slot = __gfn_to_memslot(__kvm_memslots(kvm, as_id), gfn);
362-
mark_page_dirty_in_slot(kvm, slot, gfn);
363-
}
364-
}
365-
366348
static void tdp_account_mmu_page(struct kvm *kvm, struct kvm_mmu_page *sp)
367349
{
368350
kvm_account_pgtable_pages((void *)sp->spt, +1);
@@ -516,7 +498,9 @@ static void handle_removed_pt(struct kvm *kvm, tdp_ptep_t pt, bool shared)
516498
* the MMU lock and the operation must synchronize with other
517499
* threads that might be modifying SPTEs.
518500
*
519-
* Handle bookkeeping that might result from the modification of a SPTE.
501+
* Handle bookkeeping that might result from the modification of a SPTE. Note,
502+
* dirty logging updates are handled in common code, not here (see make_spte()
503+
* and fast_pf_fix_direct_spte()).
520504
*/
521505
static void __handle_changed_spte(struct kvm *kvm, int as_id, gfn_t gfn,
522506
u64 old_spte, u64 new_spte, int level,
@@ -613,8 +597,6 @@ static void handle_changed_spte(struct kvm *kvm, int as_id, gfn_t gfn,
613597
__handle_changed_spte(kvm, as_id, gfn, old_spte, new_spte, level,
614598
shared);
615599
handle_changed_spte_acc_track(old_spte, new_spte, level);
616-
handle_changed_spte_dirty_log(kvm, as_id, gfn, old_spte,
617-
new_spte, level);
618600
}
619601

620602
/*
@@ -725,8 +707,6 @@ static u64 tdp_mmu_set_spte(struct kvm *kvm, int as_id, tdp_ptep_t sptep,
725707

726708
__handle_changed_spte(kvm, as_id, gfn, old_spte, new_spte, level, false);
727709
handle_changed_spte_acc_track(old_spte, new_spte, level);
728-
handle_changed_spte_dirty_log(kvm, as_id, gfn, old_spte, new_spte,
729-
level);
730710
return old_spte;
731711
}
732712

0 commit comments

Comments
 (0)