Revert iommu patch series from 24.04_linux-nvidia-6.14-next

[tdavenvidia]

Revert the patch series that is no longer needed for creating correct iommu groups using ACS.

[nvmochs]

@tdavenvidia

• Did you encounter any issues while reverting or were the reverts made cleanly?
• What testing was performed for this PR with the patches reverted?

[tdavenvidia]

@tdavenvidia

• Did you encounter any issues while reverting or were the reverts made cleanly?
  No issue while revert. revert was clean.
• What testing was performed for this PR with the patches reverted?
  GPUDirect RDMA test using data direct with appropriate ACS settings was successful.

[nvmochs]

I compared the files touched by these revert commits with the large virtualization series that was merged recently via PR 167:

Files modified by the revert commits on this PR:

❮ git diff --name-only c463b4606ade^..64bc1160d094   
drivers/iommu/iommu.c
drivers/pci/ats.c
drivers/pci/pci.c
drivers/pci/pci.h
drivers/pci/quirks.c
drivers/pci/search.c
include/linux/pci.h
include/uapi/linux/pci_regs.h

Files modified by the virtualization series:

❯ git diff --name-only 723642469d4e^..62bbd4d5d7de  | grep -E 'pci|iommu.c'
drivers/iommu/dma-iommu.c
drivers/iommu/intel/iommu.c
drivers/iommu/iommu.c
drivers/iommu/iommufd/viommu.c
drivers/iommu/of_iommu.c
drivers/iommu/virtio-iommu.c
drivers/pci/ats.c
drivers/vfio/pci/nvgrace-gpu/Kconfig
drivers/vfio/pci/nvgrace-gpu/Makefile
drivers/vfio/pci/nvgrace-gpu/egm.c
drivers/vfio/pci/nvgrace-gpu/main.c
drivers/vfio/pci/vfio_pci.c
include/linux/pci-ats.h

So only these 2 files are common to both series:

drivers/iommu/iommu.c
drivers/pci/ats.c

These are the commits from the virtualization series that touched these files:

❮ git log --oneline --follow 723642469d4e^..62bbd4d5d7de -- drivers/pci/ats.c
992faafa8cc1 iommufd: Extend IOMMU_GET_HW_INFO to report PASID capability

❯ git log --oneline --follow 723642469d4e^..62bbd4d5d7de -- drivers/iommu/iommu.c
4b2ff8f7cef2 iommu: Hide ops.domain_alloc behind CONFIG_FSL_PAMU
a62d83bec993 iommu/virtio: Move to domain_alloc_paging()
6c2ef7b26158 iommu: Add domain_alloc_identity()
0346cb7850ea iommu: Fix crash in report_iommu_fault()
20b522d7796c iommu: Skip PASID validation for devices without PASID capability
560ec681d285 iommu: Introduce a replace API for device pasid
f1a83ae3250a NVIDIA: SAUCE: Revert "iommu: Skip PASID validation for devices without PASID capability"
iommu: Require passing new handles to APIs supporting handle
45657027c72c iommu: Drop sw_msi from iommu_domain
62cbd6c54652 iommu: Sort out domain user data
10fba8252f96 iommu: Keep dev->iommu state consistent
d3ce1f5571c5 iommu: Unexport iommu_fwspec_free()
3e107fa4f430 iommu: Swap the order of setting group->pasid_array and calling attach op of iommu drivers
d9a80646fc51 iommu: Store either domain or handle in group->pasid_array
b0465e3ab80f iommu: Drop iommu_group_replace_domain()
2766f3aaa03f iommu: Make @handle mandatory in iommu_{attach|replace}_group_handle()
a015d04302c1 iommu: Make iommu_dma_prepare_msi() into a generic operation

I went through each of these commits and verified their contents are still present on this branch with the reverted commits, i.e. I don't see anything from the virtualization PR being disturbed this these reverts.

[tdavenvidia]

I compared the files touched by these revert commits with the large virtualization series that was merged recently via PR 167:

Files modified by the revert commits on this PR:

❮ git diff --name-only c463b4606ade^..64bc1160d094   
drivers/iommu/iommu.c
drivers/pci/ats.c
drivers/pci/pci.c
drivers/pci/pci.h
drivers/pci/quirks.c
drivers/pci/search.c
include/linux/pci.h
include/uapi/linux/pci_regs.h

Files modified by the virtualization series:

❯ git diff --name-only 723642469d4e^..62bbd4d5d7de  | grep -E 'pci|iommu.c'
drivers/iommu/dma-iommu.c
drivers/iommu/intel/iommu.c
drivers/iommu/iommu.c
drivers/iommu/iommufd/viommu.c
drivers/iommu/of_iommu.c
drivers/iommu/virtio-iommu.c
drivers/pci/ats.c
drivers/vfio/pci/nvgrace-gpu/Kconfig
drivers/vfio/pci/nvgrace-gpu/Makefile
drivers/vfio/pci/nvgrace-gpu/egm.c
drivers/vfio/pci/nvgrace-gpu/main.c
drivers/vfio/pci/vfio_pci.c
include/linux/pci-ats.h

So only these 2 files are common to both series:

drivers/iommu/iommu.c
drivers/pci/ats.c

These are the commits from the virtualization series that touched these files:

❮ git log --oneline --follow 723642469d4e^..62bbd4d5d7de -- drivers/pci/ats.c
992faafa8cc1 iommufd: Extend IOMMU_GET_HW_INFO to report PASID capability

❯ git log --oneline --follow 723642469d4e^..62bbd4d5d7de -- drivers/iommu/iommu.c
4b2ff8f7cef2 iommu: Hide ops.domain_alloc behind CONFIG_FSL_PAMU
a62d83bec993 iommu/virtio: Move to domain_alloc_paging()
6c2ef7b26158 iommu: Add domain_alloc_identity()
0346cb7850ea iommu: Fix crash in report_iommu_fault()
20b522d7796c iommu: Skip PASID validation for devices without PASID capability
560ec681d285 iommu: Introduce a replace API for device pasid
f1a83ae3250a NVIDIA: SAUCE: Revert "iommu: Skip PASID validation for devices without PASID capability"
iommu: Require passing new handles to APIs supporting handle
45657027c72c iommu: Drop sw_msi from iommu_domain
62cbd6c54652 iommu: Sort out domain user data
10fba8252f96 iommu: Keep dev->iommu state consistent
d3ce1f5571c5 iommu: Unexport iommu_fwspec_free()
3e107fa4f430 iommu: Swap the order of setting group->pasid_array and calling attach op of iommu drivers
d9a80646fc51 iommu: Store either domain or handle in group->pasid_array
b0465e3ab80f iommu: Drop iommu_group_replace_domain()
2766f3aaa03f iommu: Make @handle mandatory in iommu_{attach|replace}_group_handle()
a015d04302c1 iommu: Make iommu_dma_prepare_msi() into a generic operation

I went through each of these commits and verified their contents are still present on this branch with the reverted commits, i.e. I don't see anything from the virtualization PR being disturbed this these reverts.

@nvmochs
Thanks for double checking.
So looks good to you?

[clsotog]

Acked-by: Carol L Soto <[email protected]>

[nirmoy]

Thanks @nvmochs for the details analysis. I also looked for backport note in: git log --follow 723642469d4e^..62bbd4d5d7de -- drivers/iommu/iommu.c there was none. This gives me more confidence that the iommu grouping series is independent of the iommufd patches.

[nirmoy]

Acked-by: Nirmoy Das <[email protected]>

[nvmochs]

Acked-by: Matthew R. Ochs <[email protected]>

[nvmochs]

LP: https://bugs.launchpad.net/ubuntu/+source/linux-nvidia-6.14/+bug/2121418

[nvmochs]

Compared old commits with new commits, only change is the corrected author. My ack still stands.

❯ git show c463b4606ade^..64bc1160d094 > /tmp/a

❯ git show 18a93b212775^..65e9cb376edb > /tmp/b

❯ sdiff -s /tmp/a /tmp/b
commit 64bc1160d094c3eac28fde80a6414aa277b104e3		      |	commit 65e9cb376edb806579a396f5c5936b950466dcb0
Author: root <[email protected]>		      |	Author: Tushar Dave <[email protected]>
commit a2f03a9658d00bb5f03091c68f703fd823fd2e49		      |	commit ab7fdccc131e29d52b88fe8c17e9d026c1c7a104
Author: root <[email protected]>		      |	Author: Tushar Dave <[email protected]>
commit a050ffb442f40b5ac698f83d279d85e03b927a70		      |	commit f17333e159baac239a473d4e0622c1410ceaaab9
Author: root <[email protected]>		      |	Author: Tushar Dave <[email protected]>
commit 00bedaf2d086bfb80d820d307076d52237c1a7c6		      |	commit a7f84350b578fefa6563eff9769e3720a5e3889b
Author: root <[email protected]>		      |	Author: Tushar Dave <[email protected]>
commit b8b8f93b408b9500c5875ba5db2dfeda53d84515		      |	commit 02eb53f1800dd3ab802f3cb4bbe057b31d6e535b
Author: root <[email protected]>		      |	Author: Tushar Dave <[email protected]>
commit a134a4d6de02c88867db0ca0f95191ec8d01dbc2		      |	commit cecb8ce8f767e7c2fe7b2d0f4d8079f0ea61f6a0
Author: root <[email protected]>		      |	Author: Tushar Dave <[email protected]>
commit 1ee10da82dc9ed5f8de26a60816fee7d7aac16c1		      |	commit aab8a7471e37260e0e64b87160fced648a4e2cac
Author: root <[email protected]>		      |	Author: Tushar Dave <[email protected]>
commit 5849591c29cbe96e029cd5da6c5f63672eee05df		      |	commit 5fde07f78cde22951d5dc4a5a1394a7b20859d5f
Author: root <[email protected]>		      |	Author: Tushar Dave <[email protected]>
commit b8dc78ff880cd1bb825aee1b1c4cbb7476e514e7		      |	commit a6776892c4e8b28b1005a038e32e37f69b2fc37c
Author: root <[email protected]>		      |	Author: Tushar Dave <[email protected]>
commit c4cdaa7acedc220c5a09525a6e0a51d8beda1b86		      |	commit c0d309c88adad1d799c275886f62901444236501
Author: root <[email protected]>		      |	Author: Tushar Dave <[email protected]>
commit 1aa7f6bb787b3251c17a99b99515499ce0a472d2		      |	commit 6ede36f2fd47df84c1fbaeabdba8cd9cc3831379
Author: root <[email protected]>		      |	Author: Tushar Dave <[email protected]>
commit 51155002c478e0af5f965f576fa21b587d431dba		      |	commit 4912cd4ecfb461551aa4df7bb840b2b578047cd3
Author: root <[email protected]>		      |	Author: Tushar Dave <[email protected]>
commit 2898ed5ea86a8f3ec2afc60ee2f932b2065f65d4		      |	commit 6789ed1843c2178c0b0ebba58280d0cb92229d62
Author: root <[email protected]>		      |	Author: Tushar Dave <[email protected]>
commit cc93cdd281b2e84f1118b321c662d82cbca4d4f9		      |	commit e885b4ffb1a077d905cae25c080758c5d8bb5cf0
Author: root <[email protected]>		      |	Author: Tushar Dave <[email protected]>
commit be8134b2ec128e7c3eb97104179515954006f592		      |	commit 9d299a3a2aa8ec1af32a8397a0fc07485e76a492
Author: root <[email protected]>		      |	Author: Tushar Dave <[email protected]>
commit c463b4606adebc5e7bee9523ad0bfb4a30010b99		      |	commit 18a93b2127753c6b67c1cb3d9496d13075d7b1fa
Author: root <[email protected]>		      |	Author: Tushar Dave <[email protected]>

[clsotog]

Acked-by: Carol L Soto <[email protected]>

[nvmochs]

Merged and present in https://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-nvidia/+git/noble/log/?h=nvidia-6.14-next

Closing PR.