From: Benjamin Gaignard <benjamin.gaignard@collabora.com>
To: aiyengar1990@gmail.com, "Joerg Roedel (AMD)" <joro@8bytes.org>,
Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>
Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org,
stable@vger.kernel.org
Subject: Re: [PATCH 1/3] iommu/vsi: Don't use the identity domain as a paging domain
Date: Mon, 16 Nov 2026 09:07:38 +0100 [thread overview]
Message-ID: <07e7d928-754b-422d-a9bc-963acbe98653@collabora.com> (raw)
In-Reply-To: <20261114-iommu-vsi-fixes-v1-1-1fc7728dfd35@gmail.com>
Le 14/11/2026 à 01:14, Arun Iyengar via B4 Relay a écrit :
> From: Arun Iyengar <aiyengar1990@gmail.com>
>
> vsi_identity_domain is a bare struct iommu_domain, but identity attach
> and resume pass it to to_vsi_domain() and take the lock of that
> vsi_iommu_domain, which is memory past the static domain. Identity
> attach also unlinks the IOMMU from its old domain's list without that
> domain's lock.
>
> Take the old paging domain's lock to unlink the IOMMU, and only the
> IOMMU lock otherwise. Resume touches neither the page tables nor the
> domain's list, so it needs only the IOMMU lock.
>
> Fixes: 917ace84b770 ("iommu: Add verisilicon IOMMU driver")
> Reported-by: Sashiko <sashiko-bot@kernel.org>
> Closes: https://sashiko.dev/#/patchset/20261113-vsi-iommu-pm-ref-v1-0-fd917eebdf18@gmail.com?part=1
> Cc: stable@vger.kernel.org
> Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com>
Reviewed-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
> ---
> drivers/iommu/vsi-iommu.c | 45 ++++++++++++++++++++++++++-------------------
> 1 file changed, 26 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/iommu/vsi-iommu.c b/drivers/iommu/vsi-iommu.c
> index 3dec58224953..5156e8a2e7fc 100644
> --- a/drivers/iommu/vsi-iommu.c
> +++ b/drivers/iommu/vsi-iommu.c
> @@ -497,31 +497,42 @@ static void vsi_iommu_disable(struct vsi_iommu *iommu)
> iommu->enable = false;
> }
>
> +/* Take the IOMMU off the list of its paging domain, if it has one. */
> +static void vsi_iommu_list_del(struct vsi_iommu *iommu)
> +{
> + struct vsi_iommu_domain *vsi_domain;
> + unsigned long flags;
> +
> + if (!iommu->domain || iommu->domain == &vsi_identity_domain)
> + return;
> +
> + vsi_domain = to_vsi_domain(iommu->domain);
> + spin_lock_irqsave(&vsi_domain->lock, flags);
> + list_del_init(&iommu->node);
> + spin_unlock_irqrestore(&vsi_domain->lock, flags);
> +}
> +
> static int vsi_iommu_identity_attach(struct iommu_domain *domain,
> struct device *dev, struct iommu_domain *old)
> {
> struct vsi_iommu *iommu = dev_iommu_priv_get(dev);
> - struct vsi_iommu_domain *vsi_domain = to_vsi_domain(domain);
> unsigned long flags;
> int ret;
>
> + if (iommu->domain == domain)
> + return 0;
> +
> ret = pm_runtime_resume_and_get(iommu->dev);
> if (ret < 0)
> return ret;
>
> - spin_lock_irqsave(&vsi_domain->lock, flags);
> - spin_lock(&iommu->lock);
> - if (iommu->domain == domain)
> - goto unlock;
> + vsi_iommu_list_del(iommu);
>
> + spin_lock_irqsave(&iommu->lock, flags);
> vsi_iommu_disable(iommu);
> - list_del_init(&iommu->node);
> -
> iommu->domain = domain;
> + spin_unlock_irqrestore(&iommu->lock, flags);
>
> -unlock:
> - spin_unlock(&iommu->lock);
> - spin_unlock_irqrestore(&vsi_domain->lock, flags);
> pm_runtime_put_autosuspend(iommu->dev);
> return 0;
> }
> @@ -537,11 +548,12 @@ static struct iommu_domain vsi_identity_domain = {
>
> static void vsi_iommu_enable(struct vsi_iommu *iommu, struct iommu_domain *domain)
> {
> - struct vsi_iommu_domain *vsi_domain = to_vsi_domain(domain);
> + struct vsi_iommu_domain *vsi_domain;
>
> if (domain == &vsi_identity_domain)
> return;
>
> + vsi_domain = to_vsi_domain(domain);
> writel(vsi_domain->pta_dma, iommu->regs + VSI_MMU_AHB_TLB_ARRAY_BASE_L_BASE);
> writel(VSI_MMU_OUT_OF_BOUND, iommu->regs + VSI_MMU_CONFIG1_BASE);
> writel(VSI_MMU_BIT_ENABLE, iommu->regs + VSI_MMU_AHB_EXCEPTION_BASE);
> @@ -758,15 +770,10 @@ static int __maybe_unused vsi_iommu_resume(struct device *dev)
> if (ret)
> return ret;
>
> - if (iommu->domain) {
> - struct vsi_iommu_domain *vsi_domain = to_vsi_domain(iommu->domain);
> -
> - spin_lock_irqsave(&vsi_domain->lock, flags);
> - spin_lock(&iommu->lock);
> + spin_lock_irqsave(&iommu->lock, flags);
> + if (iommu->domain)
> vsi_iommu_enable(iommu, iommu->domain);
> - spin_unlock(&iommu->lock);
> - spin_unlock_irqrestore(&vsi_domain->lock, flags);
> - }
> + spin_unlock_irqrestore(&iommu->lock, flags);
>
> return 0;
> }
>
next prev parent reply other threads:[~2026-11-16 8:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-14 0:14 [PATCH 0/3] iommu/vsi: Fix the domain locking and a probe leak Arun Iyengar via B4 Relay
2026-11-14 0:14 ` [PATCH 1/3] iommu/vsi: Don't use the identity domain as a paging domain Arun Iyengar via B4 Relay
2026-11-16 8:07 ` Benjamin Gaignard [this message]
2026-11-14 0:14 ` [PATCH 2/3] iommu/vsi: Unlink the IOMMU from its old domain under that domain's lock Arun Iyengar via B4 Relay
2026-11-16 8:08 ` Benjamin Gaignard
2026-11-14 0:14 ` [PATCH 3/3] iommu/vsi: Unprepare the clocks when getting the IRQ fails Arun Iyengar via B4 Relay
2026-11-16 8:08 ` Benjamin Gaignard
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=07e7d928-754b-422d-a9bc-963acbe98653@collabora.com \
--to=benjamin.gaignard@collabora.com \
--cc=aiyengar1990@gmail.com \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=stable@vger.kernel.org \
--cc=will@kernel.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
all inboxes | Powered by JetHome®