From: Eric Auger <eric.auger@linaro.org>
To: eric.auger@st.com, eric.auger@linaro.org, robin.murphy@arm.com,
alex.williamson@redhat.com, will.deacon@arm.com, joro@8bytes.org,
tglx@linutronix.de, jason@lakedaemon.net, marc.zyngier@arm.com,
christoffer.dall@linaro.org,
linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org
Cc: patches@linaro.org, Manish.Jaggi@caviumnetworks.com,
linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org
Subject: [RFC v4 09/14] msi: IOMMU map the doorbell address when needed
Date: Fri, 26 Feb 2016 17:35:49 +0000 [thread overview]
Message-ID: <1456508154-2253-10-git-send-email-eric.auger@linaro.org> (raw)
In-Reply-To: <1456508154-2253-1-git-send-email-eric.auger@linaro.org>
In case the msi_desc references a device attached to an iommu
domain and this iommu domain requires MSI mapping, the msi
address (aka doorbell) needs to be mapped in the IOMMU. Else any
MSI write transaction will cause a fault.
We perform this action at msi message composition time. We
need to track when the doorbell address changes. On domain deactivate,
we now also call the composition function with a new erase parameter.
In case the mapping fails we just WARN_ON.
Signed-off-by: Eric Auger <eric.auger@linaro.org>
---
v3 -> v4:
- that code was formely in irq-gic-common.c
"irqchip/gicv2m/v3-its-pci-msi: IOMMU map the MSI frame when needed"
also the [un]mapping was done in irq_write_msi_msg; now done on compose
v2 -> v3:
- protect iova/addr manipulation with CONFIG_ARCH_DMA_ADDR_T_64BIT and
CONFIG_PHYS_ADDR_T_64BIT
- only expose gic_pci_msi_domain_write_msg in case CONFIG_IOMMU_API &
CONFIG_PCI_MSI_IRQ_DOMAIN are set.
- gic_set/unset_msi_addr duly become static
---
kernel/irq/msi.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 109 insertions(+), 3 deletions(-)
diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index 9b0ba4a..93bd861 100644
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -17,6 +17,8 @@
/* Temparory solution for building, will be removed later */
#include <linux/pci.h>
+#include <linux/iommu.h>
+#include <linux/dma-reserved-iommu.h>
struct msi_desc *alloc_msi_entry(struct device *dev)
{
@@ -55,6 +57,110 @@ static inline void irq_chip_write_msi_msg(struct irq_data *data,
data->chip->irq_write_msi_msg(data, msg);
}
+static int msi_map_doorbell(struct iommu_domain *d, struct msi_msg *msg)
+{
+#ifdef CONFIG_IOMMU_DMA_RESERVED
+ dma_addr_t iova;
+ phys_addr_t addr;
+ int ret;
+
+#ifdef CONFIG_PHYS_ADDR_T_64BIT
+ addr = ((phys_addr_t)(msg->address_hi) << 32) | msg->address_lo;
+#else
+ addr = msg->address_lo;
+#endif
+
+ ret = iommu_get_single_reserved(d, addr, IOMMU_WRITE, &iova);
+ if (!ret) {
+ msg->address_lo = lower_32_bits(iova);
+ msg->address_hi = upper_32_bits(iova);
+ }
+ return ret;
+#else
+ return -ENODEV;
+#endif
+}
+
+static void msi_unmap_doorbell(struct iommu_domain *d, struct msi_msg *msg)
+{
+#ifdef CONFIG_IOMMU_DMA_RESERVED
+ dma_addr_t iova;
+
+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
+ iova = ((dma_addr_t)(msg->address_hi) << 32) | msg->address_lo;
+#else
+ iova = msg->address_lo;
+#endif
+
+ iommu_put_single_reserved(d, iova);
+#endif
+}
+
+#ifdef CONFIG_IOMMU_API
+static struct iommu_domain *
+ irq_data_to_msi_mapping_domain(struct irq_data *irq_data)
+{
+
+ struct msi_desc *desc;
+ struct device *dev;
+ struct iommu_domain *d;
+ int ret;
+
+ desc = irq_data_get_msi_desc(irq_data);
+ if (!desc)
+ return NULL;
+
+ dev = msi_desc_to_dev(desc);
+
+ d = iommu_get_domain_for_dev(dev);
+ if (!d)
+ return NULL;
+
+ ret = iommu_domain_get_attr(d, DOMAIN_ATTR_MSI_MAPPING, NULL);
+ if (!ret)
+ return d;
+ else
+ return NULL;
+}
+#else
+static inline iommu_domain *
+ irq_data_to_msi_mapping_domain(struct irq_data *irq_data)
+{
+ return NULL;
+}
+#endif /* CONFIG_IOMMU_API */
+
+static int msi_compose(struct irq_data *irq_data,
+ struct msi_msg *msg, bool erase)
+{
+ struct msi_msg old_msg;
+ struct iommu_domain *d;
+ int ret = 0;
+
+ d = irq_data_to_msi_mapping_domain(irq_data);
+ if (unlikely(d))
+ get_cached_msi_msg(irq_data->irq, &old_msg);
+
+ if (erase)
+ memset(msg, 0, sizeof(*msg));
+ else
+ ret = irq_chip_compose_msi_msg(irq_data, msg);
+
+ if (!d)
+ goto out;
+
+ /* handle (re-)mapping of MSI doorbell */
+ if ((old_msg.address_lo != msg->address_lo) ||
+ (old_msg.address_hi != msg->address_hi))
+ msi_unmap_doorbell(d, &old_msg);
+
+ if (!erase)
+ WARN_ON(msi_map_doorbell(d, msg));
+
+out:
+ return ret;
+}
+
/**
* msi_domain_set_affinity - Generic affinity setter function for MSI domains
* @irq_data: The irq data associated to the interrupt
@@ -73,7 +179,7 @@ int msi_domain_set_affinity(struct irq_data *irq_data,
ret = parent->chip->irq_set_affinity(parent, mask, force);
if (ret >= 0 && ret != IRQ_SET_MASK_OK_DONE) {
- BUG_ON(irq_chip_compose_msi_msg(irq_data, &msg));
+ BUG_ON(msi_compose(irq_data, &msg, false));
irq_chip_write_msi_msg(irq_data, &msg);
}
@@ -85,7 +191,7 @@ static void msi_domain_activate(struct irq_domain *domain,
{
struct msi_msg msg;
- BUG_ON(irq_chip_compose_msi_msg(irq_data, &msg));
+ BUG_ON(msi_compose(irq_data, &msg, false));
irq_chip_write_msi_msg(irq_data, &msg);
}
@@ -94,7 +200,7 @@ static void msi_domain_deactivate(struct irq_domain *domain,
{
struct msi_msg msg;
- memset(&msg, 0, sizeof(msg));
+ msi_compose(irq_data, &msg, true);
irq_chip_write_msi_msg(irq_data, &msg);
}
--
1.9.1
next prev parent reply other threads:[~2016-02-26 17:35 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 17:35 [RFC v4 00/14] KVM PCIe/MSI passthrough on ARM/ARM64 Eric Auger
2016-02-26 17:35 ` [RFC v4 01/14] iommu: Add DOMAIN_ATTR_MSI_MAPPING attribute Eric Auger
2016-02-26 17:35 ` [RFC v4 02/14] iommu: introduce a reserved iova cookie Eric Auger
2016-02-26 17:35 ` [RFC v4 03/14] dma-reserved-iommu: alloc/free_reserved_iova_domain Eric Auger
2016-02-26 17:35 ` [RFC v4 04/14] dma-reserved-iommu: reserved binding rb-tree and helpers Eric Auger
2016-02-26 17:35 ` [RFC v4 05/14] dma-reserved-iommu: iommu_get/put_single_reserved Eric Auger
2016-02-26 17:35 ` [RFC v4 06/14] dma-reserved-iommu: iommu_unmap_reserved Eric Auger
2016-02-26 17:35 ` [RFC v4 07/14] msi: Add a new MSI_FLAG_IRQ_REMAPPING flag Eric Auger
2016-02-26 18:06 ` Thomas Gleixner
2016-02-29 15:25 ` Eric Auger
2016-02-26 17:35 ` [RFC v4 08/14] msi: export msi_get_domain_info Eric Auger
2016-02-26 17:35 ` Eric Auger [this message]
2016-02-26 18:19 ` [RFC v4 09/14] msi: IOMMU map the doorbell address when needed Thomas Gleixner
2016-02-29 15:27 ` Eric Auger
2016-02-26 17:35 ` [RFC v4 10/14] vfio: introduce VFIO_IOVA_RESERVED vfio_dma type Eric Auger
2016-02-26 17:35 ` [RFC v4 11/14] vfio: allow the user to register reserved iova range for MSI mapping Eric Auger
2016-02-26 17:35 ` [RFC v4 12/14] vfio/type1: also check IRQ remapping capability at msi domain Eric Auger
2016-02-26 17:35 ` [RFC v4 13/14] iommu/arm-smmu: do not advertise IOMMU_CAP_INTR_REMAP Eric Auger
2016-02-26 17:35 ` [RFC v4 14/14] vfio/type1: return MSI mapping requirements with VFIO_IOMMU_GET_INFO Eric Auger
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=1456508154-2253-10-git-send-email-eric.auger@linaro.org \
--to=eric.auger@linaro.org \
--cc=Manish.Jaggi@caviumnetworks.com \
--cc=alex.williamson@redhat.com \
--cc=christoffer.dall@linaro.org \
--cc=eric.auger@st.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jason@lakedaemon.net \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=patches@linaro.org \
--cc=robin.murphy@arm.com \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.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).