Commit f25a9dec authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86/mmu: Drop kvm_arch_write_log_dirty() wrapper 



Drop kvm_arch_write_log_dirty() in favor of invoking .write_log_dirty()
directly from FNAME(update_accessed_dirty_bits).  "kvm_arch" is usually
used for x86 functions that are invoked from generic KVM, and implies
that there are external callers, neither of which is true.

Remove the check for a non-NULL kvm_x86_ops hook as the call is wrapped
in PTTYPE_EPT and is unconditionally set by VMX.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200622215832.22090-3-sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e8c22266

arch/x86/kvm/mmu.h

+0 −1
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ void kvm_mmu_gfn_disallow_lpage(struct kvm_memory_slot *slot, gfn_t gfn); 
void kvm_mmu_gfn_allow_lpage(struct kvm_memory_slot *slot, gfn_t gfn);

bool kvm_mmu_slot_gfn_write_protect(struct kvm *kvm,

				    struct kvm_memory_slot *slot, u64 gfn);

int kvm_arch_write_log_dirty(struct kvm_vcpu *vcpu, gpa_t l2_gpa);



int kvm_mmu_post_init_vm(struct kvm *kvm);

void kvm_mmu_pre_destroy_vm(struct kvm *kvm);

arch/x86/kvm/mmu/mmu.c

+0 −15
Original line number Diff line number Diff line
@@ -1738,21 +1738,6 @@ void kvm_arch_mmu_enable_log_dirty_pt_masked(struct kvm *kvm, 
		kvm_mmu_write_protect_pt_masked(kvm, slot, gfn_offset, mask);

}



/**

 * kvm_arch_write_log_dirty - emulate dirty page logging

 * @vcpu: Guest mode vcpu

 *

 * Emulate arch specific page modification logging for the

 * nested hypervisor

 */

int kvm_arch_write_log_dirty(struct kvm_vcpu *vcpu, gpa_t l2_gpa)

{

	if (kvm_x86_ops.write_log_dirty)

		return kvm_x86_ops.write_log_dirty(vcpu, l2_gpa);



	return 0;

}



bool kvm_mmu_slot_gfn_write_protect(struct kvm *kvm,

				    struct kvm_memory_slot *slot, u64 gfn)

{

arch/x86/kvm/mmu/paging_tmpl.h

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static int FNAME(update_accessed_dirty_bits)(struct kvm_vcpu *vcpu, 
				!(pte & PT_GUEST_DIRTY_MASK)) {

			trace_kvm_mmu_set_dirty_bit(table_gfn, index, sizeof(pte));

#if PTTYPE == PTTYPE_EPT

			if (kvm_arch_write_log_dirty(vcpu, addr))

			if (kvm_x86_ops.write_log_dirty(vcpu, addr))

				return -EINVAL;

#endif

			pte |= PT_GUEST_DIRTY_MASK;

CRA Git | Maintained and supported by SUSTech CRA and CCSE