| Message ID | 1456508154-2253-10-git-send-email-eric.auger@linaro.org |
|---|---|
| State | New |
| Headers | show |
Hi Thomas, On 02/26/2016 07:19 PM, Thomas Gleixner wrote: > On Fri, 26 Feb 2016, Eric Auger wrote: >> +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 > > This is completely unreadable. Please make this in a way which is parseable. > A few small inline functions do the trick. OK I will rewrite this. > >> +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 > > Ditto. ok > >> +} >> + >> +#ifdef CONFIG_IOMMU_API >> +static struct iommu_domain * >> + irq_data_to_msi_mapping_domain(struct irq_data *irq_data) > > If you split lines, then the function name starts at the beginning of the line > and not at some randome place. ok > >> +{ >> + >> + struct msi_desc *desc; >> + struct device *dev; >> + struct iommu_domain *d; >> + int ret; > > Please order variables by descending length ok > >> + 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; > > Does anyone except you understand the purpose of the function? Comments have > been invented for a reason. ok I will comment on the role of those functions. > >> +} >> +#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; >> +} > > No, this is not the way we do this. You replace existing functionality by some > new fangled thing. which behaves differently. > > This wants to be seperate patches, which first create a wrapper for > irq_chip_compose_msi_msg() and then adds the new functionality to it including > a proper explanation. > > I have no idea how the above is supposed to be the same as the existing code > for the non iommu case. Sure I will decompose things and provide more explanation. Thank you for your time. Best Regards Eric > > Thanks, > > tglx >
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); }
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(-) -- 1.9.1