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

KVM: x86/mmu: Make dirty log size hook (PML) a value, not a function 



Store the vendor-specific dirty log size in a variable, there's no need
to wrap it in a function since the value is constant after
hardware_setup() runs.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210213005015.1651772-9-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2855f982

arch/x86/include/asm/kvm-x86-ops.h

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ KVM_X86_OP_NULL(slot_enable_log_dirty) 
KVM_X86_OP_NULL(slot_disable_log_dirty)

KVM_X86_OP_NULL(flush_log_dirty)

KVM_X86_OP_NULL(enable_log_dirty_pt_masked)

KVM_X86_OP_NULL(cpu_dirty_log_size)

KVM_X86_OP_NULL(pre_block)

KVM_X86_OP_NULL(post_block)

KVM_X86_OP_NULL(vcpu_blocking)

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -1294,7 +1294,7 @@ struct kvm_x86_ops { 
	void (*enable_log_dirty_pt_masked)(struct kvm *kvm,

					   struct kvm_memory_slot *slot,

					   gfn_t offset, unsigned long mask);

	int (*cpu_dirty_log_size)(void);

	int cpu_dirty_log_size;



	/* pmu operations of sub-arch */

	const struct kvm_pmu_ops *pmu_ops;

arch/x86/kvm/mmu/mmu.c

+1 −4
Original line number Diff line number Diff line
@@ -1294,10 +1294,7 @@ void kvm_arch_mmu_enable_log_dirty_pt_masked(struct kvm *kvm, 


int kvm_cpu_dirty_log_size(void)

{

	if (kvm_x86_ops.cpu_dirty_log_size)

		return static_call(kvm_x86_cpu_dirty_log_size)();



	return 0;

	return kvm_x86_ops.cpu_dirty_log_size;

}



bool kvm_mmu_slot_gfn_write_protect(struct kvm *kvm,

arch/x86/kvm/vmx/vmx.c

+2 −7
Original line number Diff line number Diff line
@@ -7642,11 +7642,6 @@ static bool vmx_check_apicv_inhibit_reasons(ulong bit) 
	return supported & BIT(bit);

}



static int vmx_cpu_dirty_log_size(void)

{

	return enable_pml ? PML_ENTITY_NUM : 0;

}



static struct kvm_x86_ops vmx_x86_ops __initdata = {

	.hardware_unsetup = hardware_unsetup,
@@ -7750,6 +7745,7 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = { 
	.slot_disable_log_dirty = vmx_slot_disable_log_dirty,

	.flush_log_dirty = vmx_flush_log_dirty,

	.enable_log_dirty_pt_masked = vmx_enable_log_dirty_pt_masked,

	.cpu_dirty_log_size = PML_ENTITY_NUM,



	.pre_block = vmx_pre_block,

	.post_block = vmx_post_block,
@@ -7777,7 +7773,6 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = { 


	.msr_filter_changed = vmx_msr_filter_changed,

	.complete_emulated_msr = kvm_complete_insn_gp,

	.cpu_dirty_log_size = vmx_cpu_dirty_log_size,



	.vcpu_deliver_sipi_vector = kvm_vcpu_deliver_sipi_vector,

};
@@ -7899,7 +7894,7 @@ static __init int hardware_setup(void) 
		vmx_x86_ops.slot_disable_log_dirty = NULL;

		vmx_x86_ops.flush_log_dirty = NULL;

		vmx_x86_ops.enable_log_dirty_pt_masked = NULL;

		vmx_x86_ops.cpu_dirty_log_size = NULL;

		vmx_x86_ops.cpu_dirty_log_size = 0;

	}



	if (!cpu_has_vmx_preemption_timer())