Commit 87276880 authored by Feng Wu's avatar Feng Wu Committed by Paolo Bonzini
Browse files

KVM: x86: select IRQ_BYPASS_MANAGER 



Select IRQ_BYPASS_MANAGER for x86 when CONFIG_KVM is set

Signed-off-by: default avatarFeng Wu <feng.wu@intel.com>
Reviewed-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent efc64404

arch/x86/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/perf_event.h>

#include <linux/pvclock_gtod.h>

#include <linux/clocksource.h>

#include <linux/irqbypass.h>



#include <asm/pvclock-abi.h>

#include <asm/desc.h>

arch/x86/kvm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ config KVM 
	select ANON_INODES

	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQFD

	select IRQ_BYPASS_MANAGER

	select HAVE_KVM_IRQ_BYPASS

	select HAVE_KVM_IRQ_ROUTING

	select HAVE_KVM_EVENTFD

	select KVM_APIC_ARCHITECTURE

arch/x86/kvm/x86.c

+53 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 
#include <linux/pci.h>

#include <linux/timekeeper_internal.h>

#include <linux/pvclock_gtod.h>

#include <linux/kvm_irqfd.h>

#include <linux/irqbypass.h>

#include <trace/events/kvm.h>



#define CREATE_TRACE_POINTS
@@ -8079,6 +8081,57 @@ bool kvm_arch_has_noncoherent_dma(struct kvm *kvm) 
}

EXPORT_SYMBOL_GPL(kvm_arch_has_noncoherent_dma);



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)

{

	int ret;

	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;



	/*

	 * When producer of consumer is unregistered, we change back to

	 * remapped mode, so we can re-use the current implementation

	 * when the irq is masked/disabed or the consumer side (KVM

	 * int this case doesn't want to receive the interrupts.

	*/

	ret = kvm_x86_ops->update_pi_irte(irqfd->kvm, prod->irq, irqfd->gsi, 0);

	if (ret)

		printk(KERN_INFO "irq bypass consumer (token %p) unregistration"

		       " fails: %d\n", irqfd->consumer.token, ret);

}



int kvm_arch_update_irqfd_routing(struct kvm *kvm, unsigned int host_irq,

				   uint32_t guest_irq, bool set)

{

	if (!kvm_x86_ops->update_pi_irte)

		return -EINVAL;



	return kvm_x86_ops->update_pi_irte(kvm, host_irq, guest_irq, set);

}



EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_exit);

EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_fast_mmio);

EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_inj_virq);