mbox series

[v6,00/16] Update SMMUv3 to the modern iommu API (part 1/3)

Message ID 0-v6-96275f25c39d+2d4-smmuv3_newapi_p1_jgg@nvidia.com (mailing list archive)
Headers show
Series Update SMMUv3 to the modern iommu API (part 1/3) | expand

Message

Jason Gunthorpe Feb. 26, 2024, 5:07 p.m. UTC
The SMMUv3 driver was originally written in 2015 when the iommu driver
facing API looked quite different. The API has evolved, especially lately,
and the driver has fallen behind.

This work aims to bring make the SMMUv3 driver the best IOMMU driver with
the most comprehensive implementation of the API. After all parts it
addresses:

 - Global static BLOCKED and IDENTITY domains with 'never fail' attach
   semantics. BLOCKED is desired for efficient VFIO.

 - Support map before attach for PAGING iommu_domains.

 - attach_dev failure does not change the HW configuration.

 - Fully hitless transitions between IDENTITY -> DMA -> IDENTITY.
   The API has IOMMU_RESV_DIRECT which is expected to be
   continuously translating.

 - Safe transitions between PAGING -> BLOCKED, do not ever temporarily
   do IDENTITY. This is required for iommufd security.

 - Full PASID API support including:
    - S1/SVA domains attached to PASIDs
    - IDENTITY/BLOCKED/S1 attached to RID
    - Change of the RID domain while PASIDs are attached

 - Streamlined SVA support using the core infrastructure

 - Hitless, whenever possible, change between two domains

 - iommufd IOMMU_GET_HW_INFO, IOMMU_HWPT_ALLOC_NEST_PARENT, and
   IOMMU_DOMAIN_NESTED support

Over all these things are going to become more accessible to iommufd, and
exposed to VMs, so it is important for the driver to have a robust
implementation of the API.

The work is split into three parts, with this part largely focusing on the
STE and building up to the BLOCKED & IDENTITY global static domains.

The second part largely focuses on the CD and builds up to having a common
PASID infrastructure that SVA and S1 domains equally use.

The third part has some random cleanups and the iommufd related parts.

Overall this takes the approach of turning the STE/CD programming upside
down where the CD/STE value is computed right at a driver callback
function and then pushed down into programming logic. The programming
logic hides the details of the required CD/STE tear-less update. This
makes the CD/STE functions independent of the arm_smmu_domain which makes
it fairly straightforward to untangle all the different call chains, and
add news ones.

Further, this frees the arm_smmu_domain related logic from keeping track
of what state the STE/CD is currently in so it can carefully sequence the
correct update. There are many new update pairs that are subtly introduced
as the work progresses.

The locking to support BTM via arm_smmu_asid_lock is a bit subtle right
now and patches throughout this work adjust and tighten this so that it is
clearer and doesn't get broken.

Once the lower STE layers no longer need to touch arm_smmu_domain we can
isolate struct arm_smmu_domain to be only used for PAGING domains, audit
all the to_smmu_domain() calls to be only in PAGING domain ops, and
introduce the normal global static BLOCKED/IDENTITY domains using the new
STE infrastructure. Part 2 will ultimately migrate SVA over to use
arm_smmu_domain as well.

All parts are on github:

 https://github.com/jgunthorpe/linux/commits/smmuv3_newapi

v6:
 - Rebase to v6.8-rc6
 - Commit message updates
 - Move arm_smmu_entry_writer_ops and related to part 2
 - Use "if (cfg & BIT(0))" style for arm_smmu_get_ste_used()
 - arm_smmu_init_bypass_stes() -> arm_smmu_init_initial_stes()
 - Fix to use STRTAB_STE_1_SHCFG_INCOMING for the S2
 - Update kunit in part 3 to test the S1/S2
v5: https://lore.kernel.org/r/0-v5-cd1be8dd9c71+3fa-smmuv3_newapi_p1_jgg@nvidia.com
 - Rebase on v6.8-rc3
 - Remove the writer argument to arm_smmu_entry_writer_ops get_used()
 - Swap order of hweight tests so one call to hweight8() can be removed
 - Add STRTAB_STE_2_S2VMID used for STRTAB_STE_0_CFG_S1_TRANS, for
   S2 bypass the VMID is used but 0
 - Be more exact when generating STEs and store 0's to document the HW
   is using that value and 0 is actually a deliberate choice for VMID and
   SHCFG.
 - Remove cd_table argument to arm_smmu_make_cdtable_ste()
 - Put arm_smmu_rmr_install_bypass_ste() after setting up a 2 level table
 - Pull patch "Check that the RID domain is S1 in SVA" from part 2 to
   guard against memory corruption on failure paths
 - Tighten the used logic for SHCFG to accommodate nesting patches in
   part 3
 - Additional comments and commit message adjustments
v4: https://lore.kernel.org/r/0-v4-c93b774edcc4+42d2b-smmuv3_newapi_p1_jgg@nvidia.com
 - Rebase on v6.8-rc1. Patches 1-3 merged
 - Replace patch "Make STE programming independent of the callers" with
   Michael's version
    * Describe the core API desire for hitless updates
    * Replace the iterator with STE/CD specific function pointers.
      This lets the logic be written top down instead of rolled into an
      iterator
    * Optimize away a sync when the critical qword is the only qword
      to update
 - Pass master not smmu to arm_smmu_write_ste() throughout
 - arm_smmu_make_s2_domain_ste() should use data[1] = not |= since
   it is known to be zero
 - Return errno's from domain_alloc() paths
v3: https://lore.kernel.org/r/0-v3-d794f8d934da+411a-smmuv3_newapi_p1_jgg@nvidia.com
 - Use some local variables in arm_smmu_get_step_for_sid() for clarity
 - White space and spelling changes
 - Commit message updates
 - Keep master->domain_head initialized to avoid a list_del corruption
v2: https://lore.kernel.org/r/0-v2-de8b10590bf5+400-smmuv3_newapi_p1_jgg@nvidia.com
 - Rebased on v6.7-rc1
 - Improve the comment for arm_smmu_write_entry_step()
 - Fix the botched memcmp
 - Document the spec justification for the SHCFG exclusion in used
 - Include STRTAB_STE_1_SHCFG for STRTAB_STE_0_CFG_S2_TRANS in used
 - WARN_ON for unknown STEs in used
 - Fix error unwind in arm_smmu_attach_dev()
 - Whitespace, spelling, and checkpatch related items
v1: https://lore.kernel.org/r/0-v1-e289ca9121be+2be-smmuv3_newapi_p1_jgg@nvidia.com

Jason Gunthorpe (16):
  iommu/arm-smmu-v3: Make STE programming independent of the callers
  iommu/arm-smmu-v3: Consolidate the STE generation for abort/bypass
  iommu/arm-smmu-v3: Move the STE generation for S1 and S2 domains into
    functions
  iommu/arm-smmu-v3: Build the whole STE in
    arm_smmu_make_s2_domain_ste()
  iommu/arm-smmu-v3: Hold arm_smmu_asid_lock during all of attach_dev
  iommu/arm-smmu-v3: Compute the STE only once for each master
  iommu/arm-smmu-v3: Do not change the STE twice during
    arm_smmu_attach_dev()
  iommu/arm-smmu-v3: Put writing the context descriptor in the right
    order
  iommu/arm-smmu-v3: Pass smmu_domain to arm_enable/disable_ats()
  iommu/arm-smmu-v3: Remove arm_smmu_master->domain
  iommu/arm-smmu-v3: Check that the RID domain is S1 in SVA
  iommu/arm-smmu-v3: Add a global static IDENTITY domain
  iommu/arm-smmu-v3: Add a global static BLOCKED domain
  iommu/arm-smmu-v3: Use the identity/blocked domain during release
  iommu/arm-smmu-v3: Pass arm_smmu_domain and arm_smmu_device to
    finalize
  iommu/arm-smmu-v3: Convert to domain_alloc_paging()

 .../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c   |   8 +-
 drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c   | 730 ++++++++++++------
 drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h   |   4 -
 3 files changed, 498 insertions(+), 244 deletions(-)


base-commit: d206a76d7d2726f3b096037f2079ce0bd3ba329b

Comments

Will Deacon Feb. 29, 2024, 4:34 p.m. UTC | #1
On Mon, 26 Feb 2024 13:07:11 -0400, Jason Gunthorpe wrote:
> The SMMUv3 driver was originally written in 2015 when the iommu driver
> facing API looked quite different. The API has evolved, especially lately,
> and the driver has fallen behind.
> 
> This work aims to bring make the SMMUv3 driver the best IOMMU driver with
> the most comprehensive implementation of the API. After all parts it
> addresses:
> 
> [...]

Applied to will (for-joerg/arm-smmu/updates), thanks!

[01/16] iommu/arm-smmu-v3: Make STE programming independent of the callers
        https://git.kernel.org/will/c/ae91f6552c30
[02/16] iommu/arm-smmu-v3: Consolidate the STE generation for abort/bypass
        https://git.kernel.org/will/c/12dacfb5b938
[03/16] iommu/arm-smmu-v3: Move the STE generation for S1 and S2 domains into functions
        https://git.kernel.org/will/c/352bd64cd828
[04/16] iommu/arm-smmu-v3: Build the whole STE in arm_smmu_make_s2_domain_ste()
        https://git.kernel.org/will/c/d36464f40f29
[05/16] iommu/arm-smmu-v3: Hold arm_smmu_asid_lock during all of attach_dev
        https://git.kernel.org/will/c/d8cd200609cf
[06/16] iommu/arm-smmu-v3: Compute the STE only once for each master
        https://git.kernel.org/will/c/327e10b47ae9
[07/16] iommu/arm-smmu-v3: Do not change the STE twice during arm_smmu_attach_dev()
        https://git.kernel.org/will/c/8c73c32c83ce
[08/16] iommu/arm-smmu-v3: Put writing the context descriptor in the right order
        https://git.kernel.org/will/c/d2e053d73247
[09/16] iommu/arm-smmu-v3: Pass smmu_domain to arm_enable/disable_ats()
        https://git.kernel.org/will/c/d550ddc5b789
[10/16] iommu/arm-smmu-v3: Remove arm_smmu_master->domain
        https://git.kernel.org/will/c/1b50017d39f6
[11/16] iommu/arm-smmu-v3: Check that the RID domain is S1 in SVA
        https://git.kernel.org/will/c/ae91f6552c30
[12/16] iommu/arm-smmu-v3: Add a global static IDENTITY domain
        https://git.kernel.org/will/c/12dacfb5b938
[13/16] iommu/arm-smmu-v3: Add a global static BLOCKED domain
        https://git.kernel.org/will/c/352bd64cd828
[14/16] iommu/arm-smmu-v3: Use the identity/blocked domain during release
        https://git.kernel.org/will/c/d36464f40f29
[15/16] iommu/arm-smmu-v3: Pass arm_smmu_domain and arm_smmu_device to finalize
        https://git.kernel.org/will/c/d8cd200609cf
[16/16] iommu/arm-smmu-v3: Convert to domain_alloc_paging()
        https://git.kernel.org/will/c/327e10b47ae9

Cheers,
Jason Gunthorpe Feb. 29, 2024, 8:23 p.m. UTC | #2
On Thu, Feb 29, 2024 at 04:34:13PM +0000, Will Deacon wrote:
> On Mon, 26 Feb 2024 13:07:11 -0400, Jason Gunthorpe wrote:
> > The SMMUv3 driver was originally written in 2015 when the iommu driver
> > facing API looked quite different. The API has evolved, especially lately,
> > and the driver has fallen behind.
> > 
> > This work aims to bring make the SMMUv3 driver the best IOMMU driver with
> > the most comprehensive implementation of the API. After all parts it
> > addresses:
> > 
> > [...]
> 
> Applied to will (for-joerg/arm-smmu/updates), thanks!

Thanks Will! I'll post the rebased part 2 and start getting tags
hopefully next week (I got a flu, just getting back to work now).

Did you notice any contentious patches in there that could use more
attention?

https://lore.kernel.org/linux-iommu/0-v4-e7091cdd9e8d+43b1-smmuv3_newapi_p2_jgg@nvidia.com/

Jason
Nicolin Chen Feb. 29, 2024, 8:47 p.m. UTC | #3
On Thu, Feb 29, 2024 at 04:34:13PM +0000, Will Deacon wrote:
> On Mon, 26 Feb 2024 13:07:11 -0400, Jason Gunthorpe wrote:
> > The SMMUv3 driver was originally written in 2015 when the iommu driver
> > facing API looked quite different. The API has evolved, especially lately,
> > and the driver has fallen behind.
> >
> > This work aims to bring make the SMMUv3 driver the best IOMMU driver with
> > the most comprehensive implementation of the API. After all parts it
> > addresses:
> >
> > [...]
> 
> Applied to will (for-joerg/arm-smmu/updates), thanks!

Oh, that's a great one!

I just found that I forgot to leave my tag at this updated PATCH-1.
I have rerun sanity with this part-1 series and more nesting cases
with the other two parts. If it's not to late:

Tested-by: Nicolin Chen <nicolinc@nvidia.com>

> [01/16] iommu/arm-smmu-v3: Make STE programming independent of the callers
>         https://git.kernel.org/will/c/ae91f6552c30

This link somehow doesn't correspond to the PATCH-1? :)

Thanks
Nicolin
Will Deacon March 1, 2024, 8:01 a.m. UTC | #4
On Thu, Feb 29, 2024 at 12:47:56PM -0800, Nicolin Chen wrote:
> On Thu, Feb 29, 2024 at 04:34:13PM +0000, Will Deacon wrote:
> > On Mon, 26 Feb 2024 13:07:11 -0400, Jason Gunthorpe wrote:
> > > The SMMUv3 driver was originally written in 2015 when the iommu driver
> > > facing API looked quite different. The API has evolved, especially lately,
> > > and the driver has fallen behind.
> > >
> > > This work aims to bring make the SMMUv3 driver the best IOMMU driver with
> > > the most comprehensive implementation of the API. After all parts it
> > > addresses:
> > >
> > > [...]
> > 
> > Applied to will (for-joerg/arm-smmu/updates), thanks!
> 
> Oh, that's a great one!
> 
> I just found that I forgot to leave my tag at this updated PATCH-1.
> I have rerun sanity with this part-1 series and more nesting cases
> with the other two parts. If it's not to late:
> 
> Tested-by: Nicolin Chen <nicolinc@nvidia.com>
> 
> > [01/16] iommu/arm-smmu-v3: Make STE programming independent of the callers
> >         https://git.kernel.org/will/c/ae91f6552c30
> 
> This link somehow doesn't correspond to the PATCH-1? :)

Huh! That's all generated by an ancient version of the 'b4' tool. By the
looks of it, it doesn't like more than ten patches in a series. Given
the other patchsets kicking around, I guess it's time for me to update
it.

Will