Skip to content

Commit e730087

Browse files
shvipinsean-jc
authored andcommitted
KVM: x86/mmu: Remove "record_dirty_log" in __tdp_mmu_set_spte()
Remove bool parameter "record_dirty_log" from __tdp_mmu_set_spte() and refactor the code as this variable is always set to true by its caller. Signed-off-by: Vipin Sharma <vipinsh@google.com> Reviewed-by: David Matlack <dmatlack@google.com> Link: https://lore.kernel.org/r/20230321220021.2119033-8-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 1e0f429 commit e730087

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

arch/x86/kvm/mmu/tdp_mmu.c

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -708,18 +708,13 @@ static inline int tdp_mmu_zap_spte_atomic(struct kvm *kvm,
708708
* notifier for access tracking. Leaving record_acc_track
709709
* unset in that case prevents page accesses from being
710710
* double counted.
711-
* @record_dirty_log: Record the page as dirty in the dirty bitmap if
712-
* appropriate for the change being made. Should be set
713-
* unless performing certain dirty logging operations.
714-
* Leaving record_dirty_log unset in that case prevents page
715-
* writes from being double counted.
716711
*
717712
* Returns the old SPTE value, which _may_ be different than @old_spte if the
718713
* SPTE had voldatile bits.
719714
*/
720715
static u64 __tdp_mmu_set_spte(struct kvm *kvm, int as_id, tdp_ptep_t sptep,
721716
u64 old_spte, u64 new_spte, gfn_t gfn, int level,
722-
bool record_acc_track, bool record_dirty_log)
717+
bool record_acc_track)
723718
{
724719
lockdep_assert_held_write(&kvm->mmu_lock);
725720

@@ -738,35 +733,34 @@ static u64 __tdp_mmu_set_spte(struct kvm *kvm, int as_id, tdp_ptep_t sptep,
738733

739734
if (record_acc_track)
740735
handle_changed_spte_acc_track(old_spte, new_spte, level);
741-
if (record_dirty_log)
742-
handle_changed_spte_dirty_log(kvm, as_id, gfn, old_spte,
743-
new_spte, level);
736+
737+
handle_changed_spte_dirty_log(kvm, as_id, gfn, old_spte, new_spte,
738+
level);
744739
return old_spte;
745740
}
746741

747742
static inline void _tdp_mmu_set_spte(struct kvm *kvm, struct tdp_iter *iter,
748-
u64 new_spte, bool record_acc_track,
749-
bool record_dirty_log)
743+
u64 new_spte, bool record_acc_track)
750744
{
751745
WARN_ON_ONCE(iter->yielded);
752746

753747
iter->old_spte = __tdp_mmu_set_spte(kvm, iter->as_id, iter->sptep,
754748
iter->old_spte, new_spte,
755749
iter->gfn, iter->level,
756-
record_acc_track, record_dirty_log);
750+
record_acc_track);
757751
}
758752

759753
static inline void tdp_mmu_set_spte(struct kvm *kvm, struct tdp_iter *iter,
760754
u64 new_spte)
761755
{
762-
_tdp_mmu_set_spte(kvm, iter, new_spte, true, true);
756+
_tdp_mmu_set_spte(kvm, iter, new_spte, true);
763757
}
764758

765759
static inline void tdp_mmu_set_spte_no_acc_track(struct kvm *kvm,
766760
struct tdp_iter *iter,
767761
u64 new_spte)
768762
{
769-
_tdp_mmu_set_spte(kvm, iter, new_spte, false, true);
763+
_tdp_mmu_set_spte(kvm, iter, new_spte, false);
770764
}
771765

772766
#define tdp_root_for_each_pte(_iter, _root, _start, _end) \
@@ -916,7 +910,7 @@ bool kvm_tdp_mmu_zap_sp(struct kvm *kvm, struct kvm_mmu_page *sp)
916910
return false;
917911

918912
__tdp_mmu_set_spte(kvm, kvm_mmu_page_as_id(sp), sp->ptep, old_spte, 0,
919-
sp->gfn, sp->role.level + 1, true, true);
913+
sp->gfn, sp->role.level + 1, true);
920914

921915
return true;
922916
}

0 commit comments

Comments
 (0)