Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1182689

[v5 09/19] vfio: Register/unregister irq_bypass_producer

Show all headers | View raw

This patch adds the registration/unregistration of an
irq_bypass_producer for MSI/MSIx on vfio pci devices.

Signed-off-by: Feng Wu <feng.wu@intel.com>
---
 drivers/vfio/pci/vfio_pci_intrs.c   | 19 +++++++++++++++++++
 drivers/vfio/pci/vfio_pci_private.h |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c
index 1f577b4..4795606 100644
--- a/drivers/vfio/pci/vfio_pci_intrs.c
+++ b/drivers/vfio/pci/vfio_pci_intrs.c
@@ -305,6 +305,16 @@ static int vfio_msi_enable(struct vfio_pci_device *vdev, int nvec, bool msix)
 	return 0;
 }
 
+void vfio_pci_add_consumer(struct irq_bypass_producer *prod,
+			     struct irq_bypass_consumer *cons)
+{
+}
+
+void vfio_pci_del_consumer(struct irq_bypass_producer *prod,
+			     struct irq_bypass_consumer *cons)
+{
+}
+
 static int vfio_msi_set_vector_signal(struct vfio_pci_device *vdev,
 				      int vector, int fd, bool msix)
 {
@@ -319,6 +329,7 @@ static int vfio_msi_set_vector_signal(struct vfio_pci_device *vdev,
 
 	if (vdev->ctx[vector].trigger) {
 		free_irq(irq, vdev->ctx[vector].trigger);
+		irq_bypass_unregister_producer(&vdev->ctx[vector].producer);
 		kfree(vdev->ctx[vector].name);
 		eventfd_ctx_put(vdev->ctx[vector].trigger);
 		vdev->ctx[vector].trigger = NULL;
@@ -360,6 +371,14 @@ static int vfio_msi_set_vector_signal(struct vfio_pci_device *vdev,
 		return ret;
 	}
 
+	INIT_LIST_HEAD(&vdev->ctx[vector].producer.node);
+	vdev->ctx[vector].producer.token = trigger;
+	vdev->ctx[vector].producer.irq = irq;
+	vdev->ctx[vector].producer.add_consumer = vfio_pci_add_consumer;
+	vdev->ctx[vector].producer.del_consumer = vfio_pci_del_consumer;
+	ret = irq_bypass_register_producer(&vdev->ctx[vector].producer);
+	WARN_ON(ret);
+
 	vdev->ctx[vector].trigger = trigger;
 
 	return 0;
diff --git a/drivers/vfio/pci/vfio_pci_private.h b/drivers/vfio/pci/vfio_pci_private.h
index ae0e1b4..0e7394f 100644
--- a/drivers/vfio/pci/vfio_pci_private.h
+++ b/drivers/vfio/pci/vfio_pci_private.h
@@ -13,6 +13,7 @@
 
 #include <linux/mutex.h>
 #include <linux/pci.h>
+#include <linux/irqbypass.h>
 
 #ifndef VFIO_PCI_PRIVATE_H
 #define VFIO_PCI_PRIVATE_H
@@ -29,6 +30,7 @@ struct vfio_pci_irq_ctx {
 	struct virqfd		*mask;
 	char			*name;
 	bool			masked;
+	struct irq_bypass_producer	producer;
 };
 
 struct vfio_pci_device {
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[v5 00/19] Add VT-d Posted-Interrupts support Feng Wu <feng.wu@intel.com> - 2015-07-13 12:00 +0200
  [v5 07/19] KVM: make kvm_set_msi_irq() public Feng Wu <feng.wu@intel.com> - 2015-07-13 12:00 +0200
  [v5 11/19] KVM: create kvm_irqfd.h Feng Wu <feng.wu@intel.com> - 2015-07-13 12:00 +0200
  [v5 06/19] KVM: Make struct kvm_irq_routing_table accessible Feng Wu <feng.wu@intel.com> - 2015-07-13 12:00 +0200
  [v5 17/19] KVM: Update Posted-Interrupts Descriptor when vCPU is preempted Feng Wu <feng.wu@intel.com> - 2015-07-13 12:00 +0200
  [v5 01/19] KVM: Extend struct pi_desc for VT-d Posted-Interrupts Feng Wu <feng.wu@intel.com> - 2015-07-13 12:00 +0200
  [v5 10/19] KVM, x86: Select IRQ_BYPASS_MANAGER for KVM_INTEL Feng Wu <feng.wu@intel.com> - 2015-07-13 12:10 +0200
  [v5 14/19] KVM: x86: Add arch specific routines for irqbypass manager Feng Wu <feng.wu@intel.com> - 2015-07-13 12:10 +0200
  [v5 16/19] KVM: Add an arch specific hooks in 'struct kvm_kernel_irqfd' Feng Wu <feng.wu@intel.com> - 2015-07-13 12:10 +0200
  [v5 18/19] KVM: Update Posted-Interrupts Descriptor when vCPU is blocked Feng Wu <feng.wu@intel.com> - 2015-07-13 12:10 +0200
  [v5 02/19] KVM: Add some helper functions for Posted-Interrupts Feng Wu <feng.wu@intel.com> - 2015-07-13 12:10 +0200
  [v5 13/19] KVM: x86: Update IRTE for posted-interrupts Feng Wu <feng.wu@intel.com> - 2015-07-13 12:10 +0200
  [v5 15/19] KVM: eventfd: add irq bypass consumer management Feng Wu <feng.wu@intel.com> - 2015-07-13 12:10 +0200
  [v5 12/19] KVM: eventfd: add irq bypass information in irqfd Feng Wu <feng.wu@intel.com> - 2015-07-13 12:10 +0200
  [v5 05/19] KVM: Add interfaces to control PI outside vmx Feng Wu <feng.wu@intel.com> - 2015-07-13 12:10 +0200
  [v5 09/19] vfio: Register/unregister irq_bypass_producer Feng Wu <feng.wu@intel.com> - 2015-07-13 12:10 +0200
    Re: [v5 09/19] vfio: Register/unregister irq_bypass_producer Eric Auger <eric.auger@linaro.org> - 2015-07-13 15:00 +0200
  [v5 03/19] KVM: Define a new interface kvm_intr_is_single_vcpu() Feng Wu <feng.wu@intel.com> - 2015-07-13 12:10 +0200
  [v5 08/19] vfio: Select IRQ_BYPASS_MANAGER for vfio PCI devices Feng Wu <feng.wu@intel.com> - 2015-07-13 12:10 +0200

csiph-web