Commit 5f9e1698 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: arm64, x86: make kvm_arch_has_irq_bypass() inline 



kvm_arch_has_irq_bypass() is a small function and even though it does
not appear in any *really* hot paths, it's also not entirely rare.
Make it inline---it also works out nicely in preparation for using it in
kvm-intel.ko and kvm-amd.ko, since the function is not currently exported.

Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8ffd015d

arch/arm64/include/asm/kvm_host.h

+5 −0
Original line number Diff line number Diff line
@@ -1588,4 +1588,9 @@ void kvm_set_vm_id_reg(struct kvm *kvm, u32 reg, u64 val); 
#define kvm_has_s1poe(k)				\

	(kvm_has_feat((k), ID_AA64MMFR3_EL1, S1POE, IMP))



static inline bool kvm_arch_has_irq_bypass(void)

{

	return true;

}



#endif /* __ARM64_KVM_HOST_H__ */

arch/arm64/kvm/arm.c

+0 −5
Original line number Diff line number Diff line
@@ -2743,11 +2743,6 @@ bool kvm_arch_irqchip_in_kernel(struct kvm *kvm) 
	return irqchip_in_kernel(kvm);

}



bool kvm_arch_has_irq_bypass(void)

{

	return true;

}



int kvm_arch_irq_bypass_add_producer(struct irq_bypass_consumer *cons,

				      struct irq_bypass_producer *prod)

{

arch/x86/include/asm/kvm_host.h

+6 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <asm/mtrr.h>

#include <asm/msr-index.h>

#include <asm/asm.h>

#include <asm/irq_remapping.h>

#include <asm/kvm_page_track.h>

#include <asm/kvm_vcpu_regs.h>

#include <asm/reboot.h>
@@ -2423,4 +2424,9 @@ int memslot_rmap_alloc(struct kvm_memory_slot *slot, unsigned long npages); 
 */

#define KVM_EXIT_HYPERCALL_MBZ		GENMASK_ULL(31, 1)



static inline bool kvm_arch_has_irq_bypass(void)

{

	return enable_apicv && irq_remapping_cap(IRQ_POSTING_CAP);

}



#endif /* _ASM_X86_KVM_HOST_H */

arch/x86/kvm/x86.c

+0 −5
Original line number Diff line number Diff line
@@ -13556,11 +13556,6 @@ bool kvm_arch_has_noncoherent_dma(struct kvm *kvm) 
}

EXPORT_SYMBOL_GPL(kvm_arch_has_noncoherent_dma);



bool kvm_arch_has_irq_bypass(void)

{

	return enable_apicv && irq_remapping_cap(IRQ_POSTING_CAP);

}



int kvm_arch_irq_bypass_add_producer(struct irq_bypass_consumer *cons,

				      struct irq_bypass_producer *prod)

{