Commit 14717e20 authored by Alex Williamson's avatar Alex Williamson Committed by Paolo Bonzini
Browse files

kvm: Conditionally register IRQ bypass consumer 



If we don't support a mechanism for bypassing IRQs, don't register as
a consumer.  This eliminates meaningless dev_info()s when the connect
fails between producer and consumer, such as on AMD systems where
kvm_x86_ops->update_pi_irte is not implemented

Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b52f3ed0

arch/x86/kvm/x86.c

+8 −11
Original line number Diff line number Diff line
@@ -8358,21 +8358,23 @@ 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 kvm_x86_ops->update_pi_irte != NULL;

}



int kvm_arch_irq_bypass_add_producer(struct irq_bypass_consumer *cons,

				      struct irq_bypass_producer *prod)

{

	struct kvm_kernel_irqfd *irqfd =

		container_of(cons, struct kvm_kernel_irqfd, consumer);



	if (kvm_x86_ops->update_pi_irte) {

	irqfd->producer = prod;



	return kvm_x86_ops->update_pi_irte(irqfd->kvm,

					   prod->irq, irqfd->gsi, 1);

}



	return -EINVAL;

}



void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons,

				      struct irq_bypass_producer *prod)

{
@@ -8380,11 +8382,6 @@ void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons, 
	struct kvm_kernel_irqfd *irqfd =

		container_of(cons, struct kvm_kernel_irqfd, consumer);



	if (!kvm_x86_ops->update_pi_irte) {

		WARN_ON(irqfd->producer != NULL);

		return;

	}



	WARN_ON(irqfd->producer != prod);

	irqfd->producer = NULL;

include/linux/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -1185,6 +1185,7 @@ static inline void kvm_vcpu_set_dy_eligible(struct kvm_vcpu *vcpu, bool val) 
#endif /* CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT */



#ifdef CONFIG_HAVE_KVM_IRQ_BYPASS

bool kvm_arch_has_irq_bypass(void);

int kvm_arch_irq_bypass_add_producer(struct irq_bypass_consumer *,

			   struct irq_bypass_producer *);

void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *,

virt/kvm/eventfd.c

+10 −8
Original line number Diff line number Diff line
@@ -408,6 +408,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args) 
	 */

	fdput(f);

#ifdef CONFIG_HAVE_KVM_IRQ_BYPASS

	if (kvm_arch_has_irq_bypass()) {

		irqfd->consumer.token = (void *)irqfd->eventfd;

		irqfd->consumer.add_producer = kvm_arch_irq_bypass_add_producer;

		irqfd->consumer.del_producer = kvm_arch_irq_bypass_del_producer;
@@ -417,6 +418,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args) 
		if (ret)

			pr_info("irq bypass consumer (token %p) registration fails: %d\n",

				irqfd->consumer.token, ret);

	}

#endif



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE