From: Quan Xu <quan.xu@intel.com>
To: andrew.cooper3@citrix.com, eddie.dong@intel.com,
ian.campbell@citrix.com, ian.jackson@eu.citrix.com,
jbeulich@suse.com, jun.nakajima@intel.com, keir@xen.org,
kevin.tian@intel.com, tim@xen.org, yang.z.zhang@intel.com,
george.dunlap@eu.citrix.com
Cc: Quan Xu <quan.xu@intel.com>, xen-devel@lists.xen.org
Subject: [Patch RFC 02/13] vt-d: Register MSI for async invalidation completion interrupt.
Date: Wed, 16 Sep 2015 09:23:56 -0400 [thread overview]
Message-ID: <1442409847-65383-3-git-send-email-quan.xu@intel.com> (raw)
In-Reply-To: <1442409847-65383-1-git-send-email-quan.xu@intel.com>
Signed-off-by: Quan Xu <quan.xu@intel.com>
---
xen/drivers/passthrough/vtd/iommu.c | 133 ++++++++++++++++++++++++++++++++++++
xen/drivers/passthrough/vtd/iommu.h | 10 +++
2 files changed, 143 insertions(+)
diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c
index 17bfb76..db6e3a2 100644
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -54,6 +54,7 @@ bool_t __read_mostly untrusted_msi;
int nr_iommus;
static struct tasklet vtd_fault_tasklet;
+static struct tasklet vtd_qi_tasklet;
static int setup_hwdom_device(u8 devfn, struct pci_dev *);
static void setup_hwdom_rmrr(struct domain *d);
@@ -1068,6 +1069,125 @@ static hw_irq_controller dma_msi_type = {
.set_affinity = dma_msi_set_affinity,
};
+/* IOMMU Queued Invalidation(QI). */
+static void _qi_msi_unmask(struct iommu *iommu)
+{
+ u32 sts;
+ unsigned long flags;
+
+ /* Clear IM bit of DMAR_IECTL_REG. */
+ spin_lock_irqsave(&iommu->register_lock, flags);
+ sts = dmar_readl(iommu->reg, DMAR_IECTL_REG);
+ sts &= ~DMA_IECTL_IM;
+ dmar_writel(iommu->reg, DMAR_IECTL_REG, sts);
+ spin_unlock_irqrestore(&iommu->register_lock, flags);
+}
+
+static void _qi_msi_mask(struct iommu *iommu)
+{
+ u32 sts;
+ unsigned long flags;
+
+ /* Set IM bit of DMAR_IECTL_REG. */
+ spin_lock_irqsave(&iommu->register_lock, flags);
+ sts = dmar_readl(iommu->reg, DMAR_IECTL_REG);
+ sts |= DMA_IECTL_IM;
+ dmar_writel(iommu->reg, DMAR_IECTL_REG, sts);
+ spin_unlock_irqrestore(&iommu->register_lock, flags);
+}
+
+static void _do_iommu_qi(struct iommu *iommu)
+{
+}
+
+static void do_iommu_qi_completion(unsigned long data)
+{
+ struct acpi_drhd_unit *drhd;
+
+ if ( list_empty(&acpi_drhd_units) )
+ {
+ dprintk(XENLOG_ERR VTDPREFIX, "IOMMU: no iommu devices.\n");
+ return;
+ }
+
+ for_each_drhd_unit( drhd )
+ _do_iommu_qi(drhd->iommu);
+}
+
+static void iommu_qi_completion(int irq, void *dev_id,
+ struct cpu_user_regs *regs)
+{
+ tasklet_schedule(&vtd_qi_tasklet);
+}
+
+static void qi_msi_unmask(struct irq_desc *desc)
+{
+ _qi_msi_unmask(desc->action->dev_id);
+}
+
+static void qi_msi_mask(struct irq_desc *desc)
+{
+ _qi_msi_mask(desc->action->dev_id);
+}
+
+static unsigned int qi_msi_startup(struct irq_desc *desc)
+{
+ qi_msi_unmask(desc);
+ return 0;
+}
+
+static void qi_msi_ack(struct irq_desc *desc)
+{
+ irq_complete_move(desc);
+ qi_msi_mask(desc);
+ move_masked_irq(desc);
+}
+
+static void qi_msi_end(struct irq_desc *desc, u8 vector)
+{
+ ack_APIC_irq();
+}
+
+static void qi_msi_set_affinity(struct irq_desc *desc, const cpumask_t *mask)
+{
+ struct msi_msg msg;
+ unsigned int dest;
+ unsigned long flags;
+ struct iommu *iommu = desc->action->dev_id;
+
+ dest = set_desc_affinity(desc, mask);
+ if ( dest == BAD_APICID )
+ {
+ dprintk(XENLOG_ERR VTDPREFIX,
+ "IOMMU: Set invaldaiton interrupt affinity error!\n");
+ return;
+ }
+
+ msi_compose_msg(desc->arch.vector, desc->arch.cpu_mask, &msg);
+ if ( x2apic_enabled )
+ msg.address_hi = dest & 0xFFFFFF00;
+ msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK;
+ msg.address_lo |= MSI_ADDR_DEST_ID(dest);
+ iommu->qi_msi.msg = msg;
+
+ spin_lock_irqsave(&iommu->register_lock, flags);
+ dmar_writel(iommu->reg, DMAR_IEDATA_REG, msg.data);
+ dmar_writel(iommu->reg, DMAR_IEADDR_REG, msg.address_lo);
+ dmar_writel(iommu->reg, DMAR_IEUADDR_REG, msg.address_hi);
+ spin_unlock_irqrestore(&iommu->register_lock, flags);
+}
+
+static hw_irq_controller qi_msi_type = {
+ .typename = "QI_MSI",
+ .startup = qi_msi_startup,
+ .shutdown = qi_msi_mask,
+ .enable = qi_msi_unmask,
+ .disable = qi_msi_mask,
+ .ack = qi_msi_ack,
+ .end = qi_msi_end,
+ .set_affinity = qi_msi_set_affinity,
+};
+
static int __init iommu_set_interrupt(struct acpi_drhd_unit *drhd,
hw_irq_controller *irq_ctrl, const char *devname, struct msi_desc *msi,
void (*irq_handler)(int, void *, struct cpu_user_regs *))
@@ -1123,6 +1243,7 @@ int __init iommu_alloc(struct acpi_drhd_unit *drhd)
return -ENOMEM;
iommu->msi.irq = -1; /* No irq assigned yet. */
+ iommu->qi_msi.irq = -1; /* No irq assigned yet. */
iommu->intel = alloc_intel_iommu();
if ( iommu->intel == NULL )
@@ -1228,6 +1349,9 @@ void __init iommu_free(struct acpi_drhd_unit *drhd)
free_intel_iommu(iommu->intel);
if ( iommu->msi.irq >= 0 )
destroy_irq(iommu->msi.irq);
+ if ( iommu->qi_msi.irq >= 0 )
+ destroy_irq(iommu->qi_msi.irq);
+
xfree(iommu);
}
@@ -1985,6 +2109,9 @@ static void adjust_irq_affinity(struct acpi_drhd_unit *drhd)
cpumask_intersects(&node_to_cpumask(node), cpumask) )
cpumask = &node_to_cpumask(node);
dma_msi_set_affinity(irq_to_desc(drhd->iommu->msi.irq), cpumask);
+
+ if ( ats_enabled )
+ qi_msi_set_affinity(irq_to_desc(drhd->iommu->qi_msi.irq), cpumask);
}
int adjust_vtd_irq_affinities(void)
@@ -2183,6 +2310,11 @@ int __init intel_vtd_setup(void)
ret = iommu_set_interrupt(drhd, &dma_msi_type, "dmar", &drhd->iommu->msi,
iommu_page_fault);
+ if ( ats_enabled )
+ ret = iommu_set_interrupt(drhd, &qi_msi_type, "qi",
+ &drhd->iommu->qi_msi,
+ iommu_qi_completion);
+
if ( ret )
{
dprintk(XENLOG_ERR VTDPREFIX, "IOMMU: interrupt setup failed\n");
@@ -2191,6 +2323,7 @@ int __init intel_vtd_setup(void)
}
softirq_tasklet_init(&vtd_fault_tasklet, do_iommu_page_fault, 0);
+ softirq_tasklet_init(&vtd_qi_tasklet, do_iommu_qi_completion, 0);
if ( !iommu_qinval && iommu_intremap )
{
diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h
index ac71ed1..52d328f 100644
--- a/xen/drivers/passthrough/vtd/iommu.h
+++ b/xen/drivers/passthrough/vtd/iommu.h
@@ -47,6 +47,11 @@
#define DMAR_IQH_REG 0x80 /* invalidation queue head */
#define DMAR_IQT_REG 0x88 /* invalidation queue tail */
#define DMAR_IQA_REG 0x90 /* invalidation queue addr */
+#define DMAR_IECTL_REG 0xA0 /* invalidation event contrl register */
+#define DMAR_IEDATA_REG 0xA4 /* invalidation event data register */
+#define DMAR_IEADDR_REG 0xA8 /* invalidation event address register */
+#define DMAR_IEUADDR_REG 0xAC /* invalidation event upper address register */
+#define DMAR_ICS_REG 0x9C /* invalidation completion status register */
#define DMAR_IRTA_REG 0xB8 /* intr remap */
#define OFFSET_STRIDE (9)
@@ -165,6 +170,10 @@
/* FECTL_REG */
#define DMA_FECTL_IM (((u64)1) << 31)
+/* IECTL_REG */
+#define DMA_IECTL_IM (((u64)1) << 31)
+
+
/* FSTS_REG */
#define DMA_FSTS_PFO ((u64)1 << 0)
#define DMA_FSTS_PPF ((u64)1 << 1)
@@ -515,6 +524,7 @@ struct iommu {
spinlock_t register_lock; /* protect iommu register handling */
u64 root_maddr; /* root entry machine address */
struct msi_desc msi;
+ struct msi_desc qi_msi;
struct intel_iommu *intel;
unsigned long *domid_bitmap; /* domain id bitmap */
u16 *domid_map; /* domain id mapping array */
--
1.8.3.2
next prev parent reply other threads:[~2015-09-16 13:23 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-16 13:23 [Patch RFC 00/13] VT-d Asynchronous Device-TLB Flush for ATS Device Quan Xu
2015-09-16 10:46 ` Ian Jackson
2015-09-16 11:22 ` Julien Grall
2015-09-16 13:47 ` Ian Jackson
2015-09-17 9:06 ` Julien Grall
2015-09-17 10:16 ` Ian Jackson
2015-09-16 13:33 ` Xu, Quan
2015-09-16 13:23 ` [Patch RFC 01/13] vt-d: Redefine iommu_set_interrupt() for registering MSI interrupt Quan Xu
2015-09-29 8:43 ` Jan Beulich
2015-09-16 13:23 ` Quan Xu [this message]
2015-09-29 8:57 ` [Patch RFC 02/13] vt-d: Register MSI for async invalidation completion interrupt Jan Beulich
2015-10-10 8:22 ` Xu, Quan
2015-10-12 7:11 ` Jan Beulich
2015-09-16 13:23 ` [Patch RFC 03/13] vt-d: Track the Device-TLB invalidation status in an invalidation table Quan Xu
2015-09-16 9:33 ` Julien Grall
2015-09-16 13:43 ` Xu, Quan
2015-09-29 9:24 ` Jan Beulich
2015-10-10 12:27 ` Xu, Quan
2015-10-12 7:15 ` Jan Beulich
2015-09-16 13:23 ` [Patch RFC 04/13] vt-d: Clear invalidation table in invaidation interrupt handler Quan Xu
2015-09-29 9:33 ` Jan Beulich
2015-09-16 13:23 ` [Patch RFC 05/13] vt-d: Clear the IWC field of Invalidation Event Control Register in Quan Xu
2015-09-29 9:44 ` Jan Beulich
2015-09-16 13:24 ` [Patch RFC 06/13] vt-d: Introduce a new per-domain flag - qi_flag Quan Xu
2015-09-16 9:34 ` Julien Grall
2015-09-16 13:24 ` [Patch RFC 07/13] vt-d: If the qi_flag is Set, the domain's vCPUs are not allowed to Quan Xu
2015-09-16 9:44 ` Julien Grall
2015-09-16 14:03 ` Xu, Quan
2015-09-16 13:24 ` [Patch RFC 08/13] vt-d: Held on the freed page until the Device-TLB flush is completed Quan Xu
2015-09-16 9:45 ` Julien Grall
2015-09-16 13:24 ` [Patch RFC 09/13] vt-d: Put the page in Queued Invalidation(QI) interrupt handler if Quan Xu
2015-09-16 13:24 ` [Patch RFC 10/13] vt-d: Held on the removed page until the Device-TLB flush is completed Quan Xu
2015-09-16 9:52 ` Julien Grall
2015-09-16 13:24 ` [Patch RFC 11/13] vt-d: If the Device-TLB flush is still not completed when Quan Xu
2015-09-16 9:56 ` Julien Grall
2015-09-23 17:38 ` Konrad Rzeszutek Wilk
2015-09-24 1:40 ` Xu, Quan
2015-09-16 13:24 ` [Patch RFC 12/13] vt-d: For gnttab_transfer, If the Device-TLB flush is still Quan Xu
2015-09-16 13:24 ` [Patch RFC 13/13] vt-d: Set the IF bit in Invalidation Wait Descriptor When submit Device-TLB Quan Xu
2015-09-29 9:46 ` Jan Beulich
2015-09-17 3:26 ` [Patch RFC 00/13] VT-d Asynchronous Device-TLB Flush for ATS Device Xu, Quan
2015-09-21 8:51 ` Jan Beulich
2015-09-21 9:46 ` Xu, Quan
2015-09-21 12:03 ` Jan Beulich
2015-09-21 14:03 ` Xu, Quan
2015-09-21 14:20 ` Jan Beulich
2015-09-21 14:09 ` Xu, Quan
2015-09-23 16:26 ` Tim Deegan
2015-09-28 3:08 ` Xu, Quan
2015-09-28 6:47 ` Jan Beulich
2015-09-29 2:53 ` Xu, Quan
2015-09-29 7:21 ` Jan Beulich
2015-09-30 13:55 ` Xu, Quan
2015-09-30 14:03 ` Jan Beulich
2015-10-13 14:29 ` Xu, Quan
2015-10-13 14:50 ` Jan Beulich
2015-10-14 14:54 ` Xu, Quan
2015-09-29 9:11 ` Tim Deegan
2015-09-29 9:57 ` Jan Beulich
2015-09-30 15:05 ` Xu, Quan
2015-10-01 9:09 ` Tim Deegan
2015-10-07 17:02 ` Xu, Quan
2015-10-08 8:51 ` Jan Beulich
2015-10-09 7:06 ` Xu, Quan
2015-10-09 7:18 ` Jan Beulich
2015-10-09 7:51 ` Xu, Quan
2015-10-10 18:24 ` Tim Deegan
2015-10-11 11:09 ` Xu, Quan
2015-10-12 12:25 ` Jan Beulich
2015-10-13 9:34 ` Tim Deegan
2015-10-14 14:44 ` Xu, Quan
2015-10-12 1:42 ` Zhang, Yang Z
2015-10-12 12:34 ` Jan Beulich
2015-10-13 5:27 ` Zhang, Yang Z
2015-10-13 9:15 ` Jan Beulich
2015-10-14 5:12 ` Zhang, Yang Z
2015-10-14 9:30 ` Jan Beulich
2015-10-15 1:03 ` Zhang, Yang Z
2015-10-15 6:46 ` Jan Beulich
2015-10-15 7:28 ` Zhang, Yang Z
2015-10-15 8:25 ` Jan Beulich
2015-10-15 8:52 ` Zhang, Yang Z
2015-10-15 9:24 ` Jan Beulich
2015-10-15 9:50 ` Zhang, Yang Z
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=1442409847-65383-3-git-send-email-quan.xu@intel.com \
--to=quan.xu@intel.com \
--cc=andrew.cooper3@citrix.com \
--cc=eddie.dong@intel.com \
--cc=george.dunlap@eu.citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=jbeulich@suse.com \
--cc=jun.nakajima@intel.com \
--cc=keir@xen.org \
--cc=kevin.tian@intel.com \
--cc=tim@xen.org \
--cc=xen-devel@lists.xen.org \
--cc=yang.z.zhang@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).