From: Jason Gunthorpe <jgg@nvidia.com>
To: iommu@lists.linux.dev, Joerg Roedel <joro@8bytes.org>,
linux-arm-kernel@lists.infradead.org,
Robin Murphy <robin.murphy@arm.com>,
Will Deacon <will@kernel.org>
Cc: Jean-Philippe Brucker <jean-philippe@linaro.org>,
Michael Shavit <mshavit@google.com>,
Nicolin Chen <nicolinc@nvidia.com>
Subject: Re: [PATCH v2 19/27] iommu/arm-smmu-v3: Keep track of arm_smmu_master_domain for SVA
Date: Tue, 5 Dec 2023 19:53:31 -0400 [thread overview]
Message-ID: <20231205235331.GA2805372@nvidia.com> (raw)
In-Reply-To: <19-v2-16665a652079+5947-smmuv3_newapi_p2_jgg@nvidia.com>
On Wed, Nov 01, 2023 at 08:36:37PM -0300, Jason Gunthorpe wrote:
> Currently the smmu_domain->devices list is unused for SVA domains.
> Fill it in with the SSID and master of every arm_smmu_set_pasid()
> using the same logic as the RID attach.
>
> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
> ---
> drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> index 326c82fad90b8a..23bcdf1630c23e 100644
> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> @@ -2712,6 +2712,8 @@ int arm_smmu_set_pasid(struct arm_smmu_master *master,
> struct arm_smmu_domain *sid_smmu_domain =
> to_smmu_domain_safe(iommu_get_domain_for_dev(master->dev));
> struct arm_smmu_cd *cdptr;
> + struct attach_state state;
> + int ret;
>
> if (!sid_smmu_domain || sid_smmu_domain->stage != ARM_SMMU_DOMAIN_S1)
> return -ENODEV;
> @@ -2719,14 +2721,30 @@ int arm_smmu_set_pasid(struct arm_smmu_master *master,
> cdptr = arm_smmu_get_cd_ptr(master, pasid);
> if (!cdptr)
> return -ENOMEM;
> +
> + mutex_lock(&arm_smmu_asid_lock);
> + ret = arm_smmu_attach_prepare(master, smmu_domain, pasid, &state);
> + if (ret)
> + goto out_unlock;
> +
> arm_smmu_write_cd_entry(master, pasid, cdptr, cd);
> +
> + arm_smmu_attach_commit(master, pasid, &state);
> +
> +out_unlock:
> + mutex_unlock(&arm_smmu_asid_lock);
> return 0;
> }
This should be 'return ret'
Jason
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-12-05 23:54 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-01 23:36 [PATCH v2 00/27] Update SMMUv3 to the modern iommu API (part 2/3) Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 01/27] iommu/arm-smmu-v3: Check that the RID domain is S1 in SVA Jason Gunthorpe
2023-12-05 17:47 ` Nicolin Chen
2023-11-01 23:36 ` [PATCH v2 02/27] iommu/arm-smmu-v3: Do not allow a SVA domain to be set on the wrong PASID Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 03/27] iommu/arm-smmu-v3: Do not ATC invalidate the entire domain Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 04/27] iommu/arm-smmu-v3: Add a type for the CD entry Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 05/27] iommu/arm-smmu-v3: Make CD programming use arm_smmu_write_entry_step() Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 06/27] iommu/arm-smmu-v3: Consolidate clearing a CD table entry Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 07/27] iommu/arm-smmu-v3: Move the CD generation for S1 domains into a function Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 08/27] iommu/arm-smmu-v3: Move allocation of the cdtable into arm_smmu_get_cd_ptr() Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 09/27] iommu/arm-smmu-v3: Allocate the CD table entry in advance Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 10/27] iommu/arm-smmu-v3: Move the CD generation for SVA into a function Jason Gunthorpe
2023-12-05 3:03 ` Nicolin Chen
2023-12-05 14:48 ` Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 11/27] iommu/arm-smmu-v3: Lift CD programming out of the SVA notifier code Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 12/27] iommu/arm-smmu-v3: Build the whole CD in arm_smmu_make_s1_cd() Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 13/27] iommu/arm-smmu-v3: Make smmu_domain->devices into an allocated list Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 14/27] iommu/arm-smmu-v3: Make changing domains be hitless for ATS Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 15/27] iommu/arm-smmu-v3: Add ssid to struct arm_smmu_master_domain Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 16/27] iommu/arm-smmu-v3: Keep track of valid CD entries in the cd_table Jason Gunthorpe
2023-11-06 9:02 ` Michael Shavit
2023-11-06 12:26 ` Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 17/27] iommu/arm-smmu-v3: Thread SSID through the arm_smmu_attach_*() interface Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 18/27] iommu/arm-smmu-v3: Make SVA allocate a normal arm_smmu_domain Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 19/27] iommu/arm-smmu-v3: Keep track of arm_smmu_master_domain for SVA Jason Gunthorpe
2023-12-05 23:53 ` Jason Gunthorpe [this message]
2023-11-01 23:36 ` [PATCH v2 20/27] iommu: Add ops->domain_alloc_sva() Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 21/27] iommu/arm-smmu-v3: Put the SVA mmu notifier in the smmu_domain Jason Gunthorpe
2023-11-07 13:28 ` Michael Shavit
2023-11-07 14:00 ` Jason Gunthorpe
2023-11-07 17:33 ` Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 22/27] iommu/arm-smmu-v3: Consolidate freeing the ASID/VMID Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 23/27] iommu/arm-smmu-v3: Move the arm_smmu_asid_xa to per-smmu like vmid Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 24/27] iommu/arm-smmu-v3: Bring back SVA BTM support Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 25/27] iommu/arm-smmu-v3: Allow IDENTITY/BLOCKED to be set while PASID is used Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 26/27] iommu/arm-smmu-v3: Allow a PASID to be set when RID is IDENTITY/BLOCKED Jason Gunthorpe
2023-11-01 23:36 ` [PATCH v2 27/27] iommu/arm-smmu-v3: Allow setting a S1 domain to a PASID Jason Gunthorpe
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=20231205235331.GA2805372@nvidia.com \
--to=jgg@nvidia.com \
--cc=iommu@lists.linux.dev \
--cc=jean-philippe@linaro.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mshavit@google.com \
--cc=nicolinc@nvidia.com \
--cc=robin.murphy@arm.com \
--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;
as well as URLs for NNTP newsgroup(s).