From: Feng Wu <feng.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
To: pbonzini-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org,
mtosatti-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Cc: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org
Subject: [PATCH v7 09/17] vfio: Register/unregister irq_bypass_producer
Date: Tue, 25 Aug 2015 16:50:12 +0800 [thread overview]
Message-ID: <1440492620-15934-10-git-send-email-feng.wu@intel.com> (raw)
In-Reply-To: <1440492620-15934-1-git-send-email-feng.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
This patch adds the registration/unregistration of an
irq_bypass_producer for MSI/MSIx on vfio pci devices.
v6:
- Make the add_consumer and del_consumer callbacks static
- Remove pointless INIT_LIST_HEAD to 'vdev->ctx[vector].producer.node)'
- Use dev_info instead of WARN_ON() when irq_bypass_register_producer fails
- Remove optional dummy callbacks for irq producer
Signed-off-by: Feng Wu <feng.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
drivers/vfio/pci/vfio_pci_intrs.c | 9 +++++++++
drivers/vfio/pci/vfio_pci_private.h | 2 ++
2 files changed, 11 insertions(+)
diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c
index 1f577b4..c65299d 100644
--- a/drivers/vfio/pci/vfio_pci_intrs.c
+++ b/drivers/vfio/pci/vfio_pci_intrs.c
@@ -319,6 +319,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 +361,14 @@ static int vfio_msi_set_vector_signal(struct vfio_pci_device *vdev,
return ret;
}
+ vdev->ctx[vector].producer.token = trigger;
+ vdev->ctx[vector].producer.irq = irq;
+ ret = irq_bypass_register_producer(&vdev->ctx[vector].producer);
+ if (unlikely(ret))
+ dev_info(&pdev->dev,
+ "irq bypass producer (token %p) registeration fails: %d\n",
+ vdev->ctx[vector].producer.token, 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
next prev parent reply other threads:[~2015-08-25 8:50 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-25 8:50 [PATCH v7 00/17] Add VT-d Posted-Interrupts support Feng Wu
2015-08-25 8:50 ` [PATCH v7 04/17] KVM: Get Posted-Interrupts descriptor address from 'struct kvm_vcpu' Feng Wu
[not found] ` <1440492620-15934-5-git-send-email-feng.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-09-11 10:50 ` Paolo Bonzini
[not found] ` <1440492620-15934-1-git-send-email-feng.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-08-25 8:50 ` [PATCH v7 01/17] KVM: Extend struct pi_desc for VT-d Posted-Interrupts Feng Wu
2015-08-25 8:50 ` [PATCH v7 02/17] KVM: Add some helper functions for Posted-Interrupts Feng Wu
2015-09-11 10:16 ` Paolo Bonzini
2015-08-25 8:50 ` [PATCH v7 03/17] KVM: Define a new interface kvm_intr_is_single_vcpu() Feng Wu
[not found] ` <1440492620-15934-4-git-send-email-feng.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-09-11 10:20 ` Paolo Bonzini
2015-08-25 8:50 ` [PATCH v7 05/17] KVM: Add interfaces to control PI outside vmx Feng Wu
2015-08-25 8:50 ` [PATCH v7 06/17] KVM: Make struct kvm_irq_routing_table accessible Feng Wu
2015-09-11 10:50 ` Paolo Bonzini
2015-08-25 8:50 ` [PATCH v7 07/17] KVM: make kvm_set_msi_irq() public Feng Wu
[not found] ` <1440492620-15934-8-git-send-email-feng.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-09-11 10:53 ` Paolo Bonzini
2015-08-25 8:50 ` [PATCH v7 08/17] vfio: Select IRQ_BYPASS_MANAGER for vfio PCI devices Feng Wu
[not found] ` <1440492620-15934-9-git-send-email-feng.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-09-11 10:54 ` Paolo Bonzini
2015-08-25 8:50 ` Feng Wu [this message]
2015-08-25 8:50 ` [PATCH v7 10/17] KVM: x86: Update IRTE for posted-interrupts Feng Wu
2015-08-25 19:57 ` Alex Williamson
[not found] ` <1440532664.20355.9.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2015-08-26 0:36 ` Wu, Feng
2015-09-11 10:29 ` Paolo Bonzini
2015-08-25 8:50 ` [PATCH v7 11/17] KVM: Define two weak arch callbacks for irq bypass manager Feng Wu
[not found] ` <1440492620-15934-12-git-send-email-feng.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-09-11 10:41 ` Paolo Bonzini
2015-08-25 8:50 ` [PATCH v7 12/17] KVM: Implement IRQ bypass consumer callbacks for x86 Feng Wu
2015-09-11 10:31 ` Paolo Bonzini
2015-08-25 8:50 ` [PATCH v7 13/17] KVM: Add an arch specific hooks in 'struct kvm_kernel_irqfd' Feng Wu
2015-09-11 10:39 ` Paolo Bonzini
2015-08-25 8:50 ` [PATCH v7 14/17] KVM: Update Posted-Interrupts Descriptor when vCPU is preempted Feng Wu
[not found] ` <1440492620-15934-15-git-send-email-feng.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-09-11 10:56 ` Paolo Bonzini
2015-08-25 8:50 ` [PATCH v7 15/17] KVM: Update Posted-Interrupts Descriptor when vCPU is blocked Feng Wu
2015-09-11 11:21 ` Paolo Bonzini
2015-09-14 7:57 ` Wu, Feng
2015-08-25 8:50 ` [PATCH v7 16/17] KVM: Warn if 'SN' is set during posting interrupts by software Feng Wu
[not found] ` <1440492620-15934-17-git-send-email-feng.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-09-11 10:59 ` Paolo Bonzini
2015-08-25 8:50 ` [PATCH v7 17/17] iommu/vt-d: Add a command line parameter for VT-d posted-interrupts Feng Wu
2015-09-11 11:05 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440492620-15934-10-git-send-email-feng.wu@intel.com \
--to=feng.wu-ral2jqcrhueavxtiumwx3w@public.gmane.org \
--cc=alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org \
--cc=kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=mtosatti-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=pbonzini-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox