lkml.org 
[lkml]   [2020]   [May]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v1] iommu/tegra-smmu: Add missing locks around mapping operations
From
Date
25.05.2020 11:35, Thierry Reding пишет:
> On Sun, May 24, 2020 at 09:37:55PM +0300, Dmitry Osipenko wrote:
>> The mapping operations of the Tegra SMMU driver are subjected to a race
>> condition issues because SMMU Address Space isn't allocated and freed
>> atomically, while it should be. This patch makes the mapping operations
>> atomic, it fixes an accidentally released Host1x Address Space problem
>> which happens while running multiple graphics tests in parallel on
>> Tegra30, i.e. by having multiple threads racing with each other in the
>> Host1x's submission and completion code paths, performing IOVA mappings
>> and unmappings in parallel.
>>
>> Cc: <stable@vger.kernel.org>
>> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
>> ---
>> drivers/iommu/tegra-smmu.c | 43 +++++++++++++++++++++++++++++++++-----
>> 1 file changed, 38 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
>> index 7426b7666e2b..4f956a797838 100644
>> --- a/drivers/iommu/tegra-smmu.c
>> +++ b/drivers/iommu/tegra-smmu.c
>> @@ -12,6 +12,7 @@
>> #include <linux/of_device.h>
>> #include <linux/platform_device.h>
>> #include <linux/slab.h>
>> +#include <linux/spinlock.h>
>> #include <linux/dma-mapping.h>
>>
>> #include <soc/tegra/ahb.h>
>> @@ -49,6 +50,7 @@ struct tegra_smmu_as {
>> struct iommu_domain domain;
>> struct tegra_smmu *smmu;
>> unsigned int use_count;
>> + spinlock_t lock;
>> u32 *count;
>> struct page **pts;
>> struct page *pd;
>> @@ -308,6 +310,8 @@ static struct iommu_domain *tegra_smmu_domain_alloc(unsigned type)
>> return NULL;
>> }
>>
>> + spin_lock_init(&as->lock);
>> +
>> /* setup aperture */
>> as->domain.geometry.aperture_start = 0;
>> as->domain.geometry.aperture_end = 0xffffffff;
>> @@ -578,7 +582,7 @@ static u32 *as_get_pte(struct tegra_smmu_as *as, dma_addr_t iova,
>> struct page *page;
>> dma_addr_t dma;
>>
>> - page = alloc_page(GFP_KERNEL | __GFP_DMA | __GFP_ZERO);
>> + page = alloc_page(GFP_ATOMIC | __GFP_DMA | __GFP_ZERO);
>
> I'm not sure this is a good idea. My recollection is that GFP_ATOMIC
> will allocate from a special reserved region of memory, which may be
> easily exhausted.

So far I haven't noticed any problems. Will be great if you could
provide more details about the pool size and how this exhaustion problem
could be reproduced in practice.

> Is there any reason why we need the spinlock? Can't we use a mutex
> instead?

This is what other IOMMU drivers do. I guess mutex might be too
expensive, it may create a noticeable contention which you don't want to
have in a case of a GPU submission code path.

I also suspect that drivers of other platforms are using IOMMU API in
interrupt context, although today this is not needed for Tegra.

>> if (!page)
>> return NULL;
>>
>> @@ -655,8 +659,9 @@ static void tegra_smmu_set_pte(struct tegra_smmu_as *as, unsigned long iova,
>> smmu_flush(smmu);
>> }
>>
>> -static int tegra_smmu_map(struct iommu_domain *domain, unsigned long iova,
>> - phys_addr_t paddr, size_t size, int prot, gfp_t gfp)
>> +static int
>> +tegra_smmu_map_locked(struct iommu_domain *domain, unsigned long iova,
>> + phys_addr_t paddr, size_t size, int prot, gfp_t gfp)
>
> I think it's more typical to use the _unlocked suffix for functions that
> don't take a lock themselves.

Personally I can't feel the difference. Both variants are good to me. I
can replace the literal postfix with a __tegra_smmu prefix, similarly to
what we have in the GART driver, to avoid bikeshedding.

>> {
>> struct tegra_smmu_as *as = to_smmu_as(domain);
>> dma_addr_t pte_dma;
>> @@ -685,8 +690,9 @@ static int tegra_smmu_map(struct iommu_domain *domain, unsigned long iova,
>> return 0;
>> }
>>
>> -static size_t tegra_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
>> - size_t size, struct iommu_iotlb_gather *gather)
>> +static size_t
>> +tegra_smmu_unmap_locked(struct iommu_domain *domain, unsigned long iova,
>> + size_t size, struct iommu_iotlb_gather *gather)
>> {
>> struct tegra_smmu_as *as = to_smmu_as(domain);
>> dma_addr_t pte_dma;
>> @@ -702,6 +708,33 @@ static size_t tegra_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
>> return size;
>> }
>>
>> +static int tegra_smmu_map(struct iommu_domain *domain, unsigned long iova,
>> + phys_addr_t paddr, size_t size, int prot, gfp_t gfp)
>> +{
>> + struct tegra_smmu_as *as = to_smmu_as(domain);
>> + unsigned long flags;
>> + int ret;
>> +
>> + spin_lock_irqsave(&as->lock, flags);
>> + ret = tegra_smmu_map_locked(domain, iova, paddr, size, prot, gfp);
>> + spin_unlock_irqrestore(&as->lock, flags);
>> +
>> + return ret;
>> +}
>> +
>> +static size_t tegra_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
>> + size_t size, struct iommu_iotlb_gather *gather)
>> +{
>> + struct tegra_smmu_as *as = to_smmu_as(domain);
>> + unsigned long flags;
>> +
>> + spin_lock_irqsave(&as->lock, flags);
>> + size = tegra_smmu_unmap_locked(domain, iova, size, gather);
>> + spin_unlock_irqrestore(&as->lock, flags);
>> +
>> + return size;
>> +}
>
> Why the extra functions here? We never call locked vs. unlocked variants
> in the driver and the IOMMU framework only has a single callback, so I
> think the locking can just move into the main implementation.

Because this makes code cleaner, easier to read and follow. You don't
need to care about handling error code paths. This is the same what we
do in the GART driver. Pretty much every other IOMMU driver use this
code pattern as well.

\
 
 \ /
  Last update: 2020-05-25 12:52    [W:0.085 / U:6.800 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site