From: "Sironi, Filippo via iommu" <iommu@lists.linux-foundation.org>
To: "Sironi, Filippo" <sironi@amazon.de>,
Joerg Roedel <joro@8bytes.org>,
Filippo Sironi via iommu <iommu@lists.linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 4/5] iommu/amd: Hold the domain lock when calling iommu_map_page
Date: Fri, 20 Sep 2019 18:05:37 +0000 [thread overview]
Message-ID: <AC63DCD0-5322-4ECB-AB42-829AD4FBDFB9@amazon.de> (raw)
In-Reply-To: <1568137765-20278-5-git-send-email-sironi@amazon.de>
> On 10. Sep 2019, at 19:49, Filippo Sironi <sironi@amazon.de> wrote:
>
> iommu_map_page calls into __domain_flush_pages, which requires the
> domain lock since it traverses the device list, which the lock protects.
>
> Signed-off-by: Filippo Sironi <sironi@amazon.de>
> ---
> drivers/iommu/amd_iommu.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
> index d4f25767622e..3714ae5ded31 100644
> --- a/drivers/iommu/amd_iommu.c
> +++ b/drivers/iommu/amd_iommu.c
> @@ -2562,6 +2562,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
> unsigned long address;
> u64 dma_mask;
> int ret;
> + unsigned long flags;
>
> domain = get_domain(dev);
> if (IS_ERR(domain))
> @@ -2587,7 +2588,9 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
>
> bus_addr = address + s->dma_address + (j << PAGE_SHIFT);
> phys_addr = (sg_phys(s) & PAGE_MASK) + (j << PAGE_SHIFT);
> + spin_lock_irqsave(&domain->lock, flags);
> ret = iommu_map_page(domain, bus_addr, phys_addr, PAGE_SIZE, prot, GFP_ATOMIC);
> + spin_unlock_irqrestore(&domain->lock, flags);
> if (ret)
> goto out_unmap;
>
> @@ -3095,7 +3098,9 @@ static int amd_iommu_map(struct iommu_domain *dom, unsigned long iova,
> prot |= IOMMU_PROT_IW;
>
> mutex_lock(&domain->api_lock);
> + spin_lock(&domain->lock);
> ret = iommu_map_page(domain, iova, paddr, page_size, prot, GFP_KERNEL);
> + spin_unlock(&domain->lock);
> mutex_unlock(&domain->api_lock);
The spin_lock/spin_unlock aren't the correct choice.
These should be spin_lock_irqsave and spin_unlock_irqrestore.
Of course, with the variant Joerg suggested, this isn't a
problem anymore.
> domain_flush_np_cache(domain, iova, page_size);
> --
> 2.7.4
>
Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Ralf Herbrich
Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2019-09-20 18:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-10 17:49 iommu/amd: Flushing and locking fixes Filippo Sironi via iommu
2019-09-10 17:49 ` [PATCH 1/5] iommu/amd: Wait for completion of IOTLB flush in attach_device Filippo Sironi via iommu
2019-09-24 9:41 ` Joerg Roedel
2019-09-10 17:49 ` [PATCH 2/5] iommu/amd: Hold the domain lock when calling __map_single Filippo Sironi via iommu
2019-09-10 17:49 ` [PATCH 3/5] iommu/amd: Hold the domain lock when calling __unmap_single Filippo Sironi via iommu
2019-09-10 17:49 ` [PATCH 4/5] iommu/amd: Hold the domain lock when calling iommu_map_page Filippo Sironi via iommu
2019-09-20 18:05 ` Sironi, Filippo via iommu [this message]
2019-09-10 17:49 ` [PATCH 5/5] iommu/amd: Hold the domain lock when calling domain_flush_tlb[_pde] Filippo Sironi via iommu
2019-09-11 11:34 ` iommu/amd: Flushing and locking fixes Joerg Roedel
2019-09-13 17:37 ` Sironi, Filippo via iommu
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=AC63DCD0-5322-4ECB-AB42-829AD4FBDFB9@amazon.de \
--to=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sironi@amazon.de \
/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