iommu.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: Eric Auger <eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
To: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>,
	eric.auger-qxv4g6HH51o@public.gmane.org,
	alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
	will.deacon-5wv7dgnIgG8@public.gmane.org,
	joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org,
	tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org,
	jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org,
	marc.zyngier-5wv7dgnIgG8@public.gmane.org,
	christoffer.dall-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Cc: julien.grall-5wv7dgnIgG8@public.gmane.org,
	patches-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
	p.fedin-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
	pranav.sawargaonkar-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Subject: Re: [PATCH v7 09/10] iommu/dma-reserved-iommu: iommu_msi_mapping_translate_msg
Date: Thu, 21 Apr 2016 10:40:10 +0200	[thread overview]
Message-ID: <571891EA.9030002@linaro.org> (raw)
In-Reply-To: <5717BC43.5070005-5wv7dgnIgG8@public.gmane.org>

On 04/20/2016 07:28 PM, Robin Murphy wrote:
> On 19/04/16 17:56, Eric Auger wrote:
>> Introduce iommu_msi_mapping_translate_msg whose role consists in
>> detecting whether the device's MSIs must to be mapped into an IOMMU.
>> It case it must, the function overrides the MSI msg originally composed
>> and replaces the doorbell's PA by a pre-allocated and pre-mapped reserved
>> IOVA. In case the corresponding PA region is not found, the function
>> returns an error.
>>
>> This function is likely to be called in some code that cannot sleep. This
>> is the reason why the allocation/mapping is done separately.
>>
>> Signed-off-by: Eric Auger <eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
>>
>> ---
>>
>> v7: creation
>> ---
>>   drivers/iommu/dma-reserved-iommu.c | 69
>> ++++++++++++++++++++++++++++++++++++++
>>   include/linux/dma-reserved-iommu.h | 27 +++++++++++++++
>>   2 files changed, 96 insertions(+)
>>
>> diff --git a/drivers/iommu/dma-reserved-iommu.c
>> b/drivers/iommu/dma-reserved-iommu.c
>> index 907a17f..603ee45 100644
>> --- a/drivers/iommu/dma-reserved-iommu.c
>> +++ b/drivers/iommu/dma-reserved-iommu.c
>> @@ -18,6 +18,14 @@
>>   #include <linux/iommu.h>
>>   #include <linux/iova.h>
>>   #include <linux/msi.h>
>> +#include <linux/irq.h>
>> +
>> +#ifdef CONFIG_PHYS_ADDR_T_64BIT
>> +#define msg_to_phys_addr(msg) \
>> +    (((phys_addr_t)((msg)->address_hi) << 32) | (msg)->address_lo)
>> +#else
>> +#define msg_to_phys_addr(msg)    ((msg)->address_lo)
>> +#endif
>>
>>   struct reserved_iova_domain {
>>       struct iova_domain *iovad;
>> @@ -351,3 +359,64 @@ struct iommu_domain
>> *iommu_msi_mapping_desc_to_domain(struct msi_desc *desc)
>>       return d;
>>   }
>>   EXPORT_SYMBOL_GPL(iommu_msi_mapping_desc_to_domain);
>> +
>> +static dma_addr_t iommu_find_reserved_iova(struct iommu_domain *domain,
>> +                    phys_addr_t addr, size_t size)
>> +{
>> +    unsigned long  base_pfn, end_pfn, nb_iommu_pages, order, flags;
>> +    size_t iommu_page_size, binding_size;
>> +    struct iommu_reserved_binding *b;
>> +    phys_addr_t aligned_base, offset;
>> +    dma_addr_t iova = DMA_ERROR_CODE;
>> +    struct iova_domain *iovad;
>> +
>> +    spin_lock_irqsave(&domain->reserved_lock, flags);
>> +
>> +    iovad = (struct iova_domain *)domain->reserved_iova_cookie;
>> +
>> +    if (!iovad)
>> +        goto unlock;
>> +
>> +    order = iova_shift(iovad);
>> +    base_pfn = addr >> order;
>> +    end_pfn = (addr + size - 1) >> order;
>> +    aligned_base = base_pfn << order;
>> +    offset = addr - aligned_base;
>> +    nb_iommu_pages = end_pfn - base_pfn + 1;
>> +    iommu_page_size = 1 << order;
>> +    binding_size = nb_iommu_pages * iommu_page_size;
> 
> This all looks rather familiar...
> 
>> +    b = find_reserved_binding(domain, aligned_base, binding_size);
> 
> ...which implies that at least some of it should be factored into that guy.
ok. Besides, with your compact rewriting proposal, maybe it is not worth
anymore ;-)

Eric
> 
>> +    if (b && (b->addr <= aligned_base) &&
>> +        (aligned_base t + binding_size <=  b->addr + b->size))
>> +        iova = b->iova + offset + aligned_base - b->addr;
>> +unlock:
>> +    spin_unlock_irqrestore(&domain->reserved_lock, flags);
>> +    return iova;
>> +}
>> +
>> +int iommu_msi_mapping_translate_msg(struct irq_data *data, struct
>> msi_msg *msg)
>> +{
>> +    struct iommu_domain *d;
>> +    struct msi_desc *desc;
>> +    dma_addr_t iova;
>> +
>> +    desc = irq_data_get_msi_desc(data);
>> +    if (!desc)
>> +        return -EINVAL;
>> +
>> +    d = iommu_msi_mapping_desc_to_domain(desc);
>> +    if (!d)
>> +        return 0;
>> +
>> +    iova = iommu_find_reserved_iova(d, msg_to_phys_addr(msg),
>> +                    sizeof(phys_addr_t));
>> +
>> +    if (iova == DMA_ERROR_CODE)
>> +        return -EINVAL;
>> +
>> +    msg->address_lo = lower_32_bits(iova);
>> +    msg->address_hi = upper_32_bits(iova);
>> +    return 0;
>> +}
>> +EXPORT_SYMBOL_GPL(iommu_msi_mapping_translate_msg);
>> diff --git a/include/linux/dma-reserved-iommu.h
>> b/include/linux/dma-reserved-iommu.h
>> index 8373929..04e1912f 100644
>> --- a/include/linux/dma-reserved-iommu.h
>> +++ b/include/linux/dma-reserved-iommu.h
>> @@ -20,6 +20,8 @@
>>
>>   struct iommu_domain;
>>   struct msi_desc;
>> +struct irq_data;
>> +struct msi_msg;
>>
>>   #ifdef CONFIG_IOMMU_DMA_RESERVED
>>
>> @@ -82,6 +84,25 @@ void iommu_put_reserved_iova(struct iommu_domain
>> *domain, phys_addr_t addr);
>>    */
>>   struct iommu_domain *iommu_msi_mapping_desc_to_domain(struct
>> msi_desc *desc);
>>
>> +/**
>> + * iommu_msi_mapping_translate_msg: in case the MSI transaction is
>> translated
>> + * by an IOMMU, the msg address must be an IOVA instead of a physical
>> address.
>> + * This function overwrites the original MSI message containing the
>> doorbell
>> + * physical address, result of the primary composition, with the
>> doorbell IOVA.
>> + *
>> + * The doorbell physical address must be bound previously to an IOVA
>> using
>> + * iommu_get_reserved_iova
>> + *
>> + * @data: irq data handle
>> + * @msg: original msi message containing the PA to be overwritten with
>> + * the IOVA
>> + *
>> + * return 0 if the MSI does not need to be mapped or when the PA/IOVA
>> + * were successfully swapped; return -EINVAL if the addresses need
>> + * to be swapped but not IOMMU binding is found
>> + */
>> +int iommu_msi_mapping_translate_msg(struct irq_data *data, struct
>> msi_msg *msg);
>> +
>>   #else
>>
>>   static inline int
>> @@ -111,5 +132,11 @@ iommu_msi_mapping_desc_to_domain(struct msi_desc
>> *desc)
>>       return NULL;
>>   }
>>
>> +static inline int iommu_msi_mapping_translate_msg(struct irq_data *data,
>> +                          struct msi_msg *msg)
>> +{
>> +    return 0;
>> +}
>> +
>>   #endif    /* CONFIG_IOMMU_DMA_RESERVED */
>>   #endif    /* __DMA_RESERVED_IOMMU_H */
>>
> 

  parent reply	other threads:[~2016-04-21  8:40 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-19 16:56 [PATCH v7 00/10] KVM PCIe/MSI passthrough on ARM/ARM64: kernel part 1/3: iommu changes Eric Auger
     [not found] ` <1461084994-2355-1-git-send-email-eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-19 16:56   ` [PATCH v7 01/10] iommu: Add DOMAIN_ATTR_MSI_MAPPING attribute Eric Auger
     [not found]     ` <1461084994-2355-2-git-send-email-eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-20 12:47       ` Robin Murphy
     [not found]         ` <57177A4E.4090804-5wv7dgnIgG8@public.gmane.org>
2016-04-20 15:58           ` Eric Auger
     [not found]             ` <5717A738.9090904-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-22 11:31               ` Robin Murphy
     [not found]                 ` <571A0B78.6070509-5wv7dgnIgG8@public.gmane.org>
2016-04-22 12:00                   ` Eric Auger
     [not found]                     ` <571A1273.9060808-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-22 14:49                       ` Robin Murphy
     [not found]                         ` <571A3A10.70601-5wv7dgnIgG8@public.gmane.org>
2016-04-22 15:33                           ` Eric Auger
2016-04-19 16:56   ` [PATCH v7 02/10] iommu/arm-smmu: advertise " Eric Auger
2016-04-19 16:56   ` [PATCH v7 03/10] iommu: introduce a reserved iova cookie Eric Auger
     [not found]     ` <1461084994-2355-4-git-send-email-eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-20 12:55       ` Robin Murphy
     [not found]         ` <57177C31.9090004-5wv7dgnIgG8@public.gmane.org>
2016-04-20 16:14           ` Eric Auger
     [not found]             ` <5717AAC9.10505-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-22 12:36               ` Robin Murphy
     [not found]                 ` <571A1AC5.9030905-5wv7dgnIgG8@public.gmane.org>
2016-04-22 13:02                   ` Eric Auger
     [not found]                     ` <571A20C9.9010508-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-22 14:53                       ` Eric Auger
2016-04-19 16:56   ` [PATCH v7 04/10] iommu/dma-reserved-iommu: alloc/free_reserved_iova_domain Eric Auger
     [not found]     ` <1461084994-2355-5-git-send-email-eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-20 13:03       ` Robin Murphy
     [not found]         ` <57177E2A.9090602-5wv7dgnIgG8@public.gmane.org>
2016-04-20 13:11           ` Eric Auger
2016-04-19 16:56   ` [PATCH v7 05/10] iommu/dma-reserved-iommu: reserved binding rb-tree and helpers Eric Auger
     [not found]     ` <1461084994-2355-6-git-send-email-eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-20 13:12       ` Robin Murphy
     [not found]         ` <5717805A.3070602-5wv7dgnIgG8@public.gmane.org>
2016-04-20 16:18           ` Eric Auger
     [not found]             ` <5717ABF2.1030204-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-22 13:05               ` Robin Murphy
2016-04-19 16:56   ` [PATCH v7 06/10] iommu/dma-reserved-iommu: iommu_get/put_reserved_iova Eric Auger
     [not found]     ` <1461084994-2355-7-git-send-email-eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-20 16:58       ` Robin Murphy
     [not found]         ` <5717B541.7090003-5wv7dgnIgG8@public.gmane.org>
2016-04-21  8:43           ` Eric Auger
2016-04-19 16:56   ` [PATCH v7 08/10] iommu/dma-reserved_iommu: iommu_msi_mapping_desc_to_domain Eric Auger
     [not found]     ` <1461084994-2355-9-git-send-email-eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-20 17:19       ` Robin Murphy
     [not found]         ` <5717BA3E.8050901-5wv7dgnIgG8@public.gmane.org>
2016-04-21  8:40           ` Eric Auger
2016-04-19 16:56   ` [PATCH v7 09/10] iommu/dma-reserved-iommu: iommu_msi_mapping_translate_msg Eric Auger
2016-04-20  9:38     ` Marc Zyngier
     [not found]       ` <57174E16.1050004-5wv7dgnIgG8@public.gmane.org>
2016-04-20 12:50         ` Eric Auger
     [not found]     ` <1461084994-2355-10-git-send-email-eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-20 17:28       ` Robin Murphy
     [not found]         ` <5717BC43.5070005-5wv7dgnIgG8@public.gmane.org>
2016-04-21  8:40           ` Eric Auger [this message]
2016-04-19 16:56   ` [PATCH v7 10/10] iommu/arm-smmu: call iommu_free_reserved_iova_domain on domain destruction Eric Auger
     [not found]     ` <1461084994-2355-11-git-send-email-eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-20 17:35       ` Robin Murphy
     [not found]         ` <5717BDF1.7030400-5wv7dgnIgG8@public.gmane.org>
2016-04-21  8:39           ` Eric Auger
2016-04-21 12:18   ` [PATCH v7 00/10] KVM PCIe/MSI passthrough on ARM/ARM64: kernel part 1/3: iommu changes Eric Auger
     [not found]     ` <5718C501.20906-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-21 19:32       ` Alex Williamson
     [not found]         ` <20160421133222.76e45596-1yVPhWWZRC1BDLzU/O5InQ@public.gmane.org>
2016-04-22 12:31           ` Eric Auger
     [not found]             ` <571A1996.5010009-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-22 19:07               ` Alex Williamson
2016-04-19 16:56 ` [PATCH v7 07/10] iommu/dma-reserved-iommu: delete bindings in iommu_free_reserved_iova_domain Eric Auger
     [not found]   ` <1461084994-2355-8-git-send-email-eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-20 17:05     ` Robin Murphy
     [not found]       ` <5717B6D7.4010307-5wv7dgnIgG8@public.gmane.org>
2016-04-21  8:40         ` 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=571891EA.9030002@linaro.org \
    --to=eric.auger-qsej5fyqhm4dnm+yrofe0a@public.gmane.org \
    --cc=alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=christoffer.dall-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
    --cc=eric.auger-qxv4g6HH51o@public.gmane.org \
    --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
    --cc=jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org \
    --cc=joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org \
    --cc=julien.grall-5wv7dgnIgG8@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=marc.zyngier-5wv7dgnIgG8@public.gmane.org \
    --cc=p.fedin-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org \
    --cc=patches-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
    --cc=pranav.sawargaonkar-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    --cc=robin.murphy-5wv7dgnIgG8@public.gmane.org \
    --cc=tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org \
    --cc=will.deacon-5wv7dgnIgG8@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;
as well as URLs for NNTP newsgroup(s).