Commit 89604647 authored by Wei Wang's avatar Wei Wang Committed by Paolo Bonzini
Browse files

KVM: x86: Introduce kvm_x86_call() to simplify static calls of kvm_x86_ops 



Introduces kvm_x86_call(), to streamline the usage of static calls of
kvm_x86_ops. The current implementation of these calls is verbose and
could lead to alignment challenges. This makes the code susceptible to
exceeding the "80 columns per single line of code" limit as defined in
the coding-style document. Another issue with the existing implementation
is that the addition of kvm_x86_ prefix to hooks at the static_call sites
hinders code readability and navigation. kvm_x86_call() is added to
improve code readability and maintainability, while adhering to the coding
style guidelines.

Signed-off-by: default avatarWei Wang <wei.w.wang@intel.com>
Link: https://lore.kernel.org/r/20240507133103.15052-3-wei.w.wang@intel.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f4854bf7

arch/x86/include/asm/kvm_host.h

+6 −4
Original line number Diff line number Diff line
@@ -1874,6 +1874,8 @@ extern bool __read_mostly allow_smaller_maxphyaddr; 
extern bool __read_mostly enable_apicv;

extern struct kvm_x86_ops kvm_x86_ops;



#define kvm_x86_call(func) static_call(kvm_x86_##func)



#define KVM_X86_OP(func) \

	DECLARE_STATIC_CALL(kvm_x86_##func, *(((struct kvm_x86_ops *)0)->func));

#define KVM_X86_OP_OPTIONAL KVM_X86_OP
@@ -1897,7 +1899,7 @@ void kvm_arch_free_vm(struct kvm *kvm); 
static inline int kvm_arch_flush_remote_tlbs(struct kvm *kvm)

{

	if (kvm_x86_ops.flush_remote_tlbs &&

	    !static_call(kvm_x86_flush_remote_tlbs)(kvm))

	    !kvm_x86_call(flush_remote_tlbs)(kvm))

		return 0;

	else

		return -ENOTSUPP;
@@ -1910,7 +1912,7 @@ static inline int kvm_arch_flush_remote_tlbs_range(struct kvm *kvm, gfn_t gfn, 
	if (!kvm_x86_ops.flush_remote_tlbs_range)

		return -EOPNOTSUPP;



	return static_call(kvm_x86_flush_remote_tlbs_range)(kvm, gfn, nr_pages);

	return kvm_x86_call(flush_remote_tlbs_range)(kvm, gfn, nr_pages);

}

#endif /* CONFIG_HYPERV */
@@ -2309,12 +2311,12 @@ static inline bool kvm_irq_is_postable(struct kvm_lapic_irq *irq) 


static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu)

{

	static_call(kvm_x86_vcpu_blocking)(vcpu);

	kvm_x86_call(vcpu_blocking)(vcpu);

}



static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu)

{

	static_call(kvm_x86_vcpu_unblocking)(vcpu);

	kvm_x86_call(vcpu_unblocking)(vcpu);

}



static inline int kvm_cpu_get_apicid(int mps_cpu)

arch/x86/kvm/cpuid.c

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) 
						    vcpu->arch.cpuid_nent));



	/* Invoke the vendor callback only after the above state is updated. */

	static_call(kvm_x86_vcpu_after_set_cpuid)(vcpu);

	kvm_x86_call(vcpu_after_set_cpuid)(vcpu);



	/*

	 * Except for the MMU, which needs to do its thing any vendor specific

arch/x86/kvm/hyperv.c

+3 −3
Original line number Diff line number Diff line
@@ -1417,7 +1417,7 @@ static int kvm_hv_set_msr_pw(struct kvm_vcpu *vcpu, u32 msr, u64 data, 
		}



		/* vmcall/vmmcall */

		static_call(kvm_x86_patch_hypercall)(vcpu, instructions + i);

		kvm_x86_call(patch_hypercall)(vcpu, instructions + i);

		i += 3;



		/* ret */
@@ -1986,7 +1986,7 @@ int kvm_hv_vcpu_flush_tlb(struct kvm_vcpu *vcpu) 
		 */

		gva = entries[i] & PAGE_MASK;

		for (j = 0; j < (entries[i] & ~PAGE_MASK) + 1; j++)

			static_call(kvm_x86_flush_tlb_gva)(vcpu, gva + j * PAGE_SIZE);

			kvm_x86_call(flush_tlb_gva)(vcpu, gva + j * PAGE_SIZE);



		++vcpu->stat.tlb_flush;

	}
@@ -2527,7 +2527,7 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu) 
	 * hypercall generates UD from non zero cpl and real mode

	 * per HYPER-V spec

	 */

	if (static_call(kvm_x86_get_cpl)(vcpu) != 0 || !is_protmode(vcpu)) {

	if (kvm_x86_call(get_cpl)(vcpu) != 0 || !is_protmode(vcpu)) {

		kvm_queue_exception(vcpu, UD_VECTOR);

		return 1;

	}

arch/x86/kvm/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ void __kvm_migrate_timers(struct kvm_vcpu *vcpu) 
{

	__kvm_migrate_apic_timer(vcpu);

	__kvm_migrate_pit_timer(vcpu);

	static_call(kvm_x86_migrate_timers)(vcpu);

	kvm_x86_call(migrate_timers)(vcpu);

}



bool kvm_arch_irqfd_allowed(struct kvm *kvm, struct kvm_irqfd *args)

arch/x86/kvm/kvm_cache_regs.h

+5 −5
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static inline unsigned long kvm_register_read_raw(struct kvm_vcpu *vcpu, int reg 
		return 0;



	if (!kvm_register_is_available(vcpu, reg))

		static_call(kvm_x86_cache_reg)(vcpu, reg);

		kvm_x86_call(cache_reg)(vcpu, reg);



	return vcpu->arch.regs[reg];

}
@@ -138,7 +138,7 @@ static inline u64 kvm_pdptr_read(struct kvm_vcpu *vcpu, int index) 
	might_sleep();  /* on svm */



	if (!kvm_register_is_available(vcpu, VCPU_EXREG_PDPTR))

		static_call(kvm_x86_cache_reg)(vcpu, VCPU_EXREG_PDPTR);

		kvm_x86_call(cache_reg)(vcpu, VCPU_EXREG_PDPTR);



	return vcpu->arch.walk_mmu->pdptrs[index];

}
@@ -153,7 +153,7 @@ static inline ulong kvm_read_cr0_bits(struct kvm_vcpu *vcpu, ulong mask) 
	ulong tmask = mask & KVM_POSSIBLE_CR0_GUEST_BITS;

	if ((tmask & vcpu->arch.cr0_guest_owned_bits) &&

	    !kvm_register_is_available(vcpu, VCPU_EXREG_CR0))

		static_call(kvm_x86_cache_reg)(vcpu, VCPU_EXREG_CR0);

		kvm_x86_call(cache_reg)(vcpu, VCPU_EXREG_CR0);

	return vcpu->arch.cr0 & mask;

}
@@ -175,7 +175,7 @@ static inline ulong kvm_read_cr4_bits(struct kvm_vcpu *vcpu, ulong mask) 
	ulong tmask = mask & KVM_POSSIBLE_CR4_GUEST_BITS;

	if ((tmask & vcpu->arch.cr4_guest_owned_bits) &&

	    !kvm_register_is_available(vcpu, VCPU_EXREG_CR4))

		static_call(kvm_x86_cache_reg)(vcpu, VCPU_EXREG_CR4);

		kvm_x86_call(cache_reg)(vcpu, VCPU_EXREG_CR4);

	return vcpu->arch.cr4 & mask;

}
@@ -190,7 +190,7 @@ static __always_inline bool kvm_is_cr4_bit_set(struct kvm_vcpu *vcpu, 
static inline ulong kvm_read_cr3(struct kvm_vcpu *vcpu)

{

	if (!kvm_register_is_available(vcpu, VCPU_EXREG_CR3))

		static_call(kvm_x86_cache_reg)(vcpu, VCPU_EXREG_CR3);

		kvm_x86_call(cache_reg)(vcpu, VCPU_EXREG_CR3);

	return vcpu->arch.cr3;

}