Skip to content

vfio: selftests: Support for multi-device tests

David Matlack kvm linux-kselftest lkml 4 versions – Applied

Status from this message: Applied to vfio next branch for v6.19. Thanks,

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest18 patches 1 replyApplied
  2. v318 patches 4 repliesSuperseded
  3. v218 patches 8 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v112 patches12 repliesSuperseded

Changes in v4 from the cover letter

- Collect Reviewed-bys from Raghavendra
- Check iommu is not null in vfio_pci_device_init() (Raghavendra)
- Do not include any fixes for the kernel-test-robot errors on riscv. These issues also exist when building the VFIO selftests without this series using kernel-test-robot's cross compiler. The issue appears to be that the cross compiler used by ktr does not have libc, which the selftests depend on.

Patches in v4 Applied

#Subject and filesSizeRepliesApplied
1/18vfio: selftests: Move run.sh into scripts directorytools/testing/selftests/vfio/Makefile tools/testing/selftests/vfio/scripts/run.sh+3 -10 replies
2/18vfio: selftests: Split run.sh into separate scriptstools/testing/selftests/vfio/Makefile tools/testing/selftests/vfio/scripts/cleanup.sh tools/testing/selftests/vfio/scripts/lib.sh +2 more+140 -990 replies
3/18vfio: selftests: Allow passing multiple BDFs on the command linetools/testing/selftests/vfio/lib/include/vfio_util.h tools/testing/selftests/vfio/lib/vfio_pci_device.c+48 -110 replies
4/18vfio: selftests: Rename struct vfio_iommu_mode to iommu_modetools/testing/selftests/vfio/lib/include/vfio_util.h tools/testing/selftests/vfio/lib/vfio_pci_device.c+4 -40 replies
5/18vfio: selftests: Introduce struct iommutools/testing/selftests/vfio/lib/include/vfio_util.h tools/testing/selftests/vfio/lib/vfio_pci_device.c+49 -420 replies
6/18vfio: selftests: Support multiple devices in the same container/iommufdtools/testing/selftests/vfio/lib/include/vfio_util.h tools/testing/selftests/vfio/lib/vfio_pci_device.c tools/testing/selftests/vfio/vfio_dma_mapping_test.c +2 more+107 -500 replies
7/18vfio: selftests: Eliminate overly chatty loggingtools/testing/selftests/vfio/lib/vfio_pci_driver.c+0 -140 replies
8/18vfio: selftests: Prefix logs with device BDF where relevanttools/testing/selftests/vfio/lib/drivers/dsa/dsa.c tools/testing/selftests/vfio/lib/drivers/ioat/ioat.c tools/testing/selftests/vfio/lib/include/vfio_util.h +1 more+30 -250 replies
9/18vfio: selftests: Upgrade driver logging to dev_err()tools/testing/selftests/vfio/lib/drivers/dsa/dsa.c tools/testing/selftests/vfio/lib/drivers/ioat/ioat.c+4 -40 replies
10/18vfio: selftests: Rename struct vfio_dma_region to dma_regiontools/testing/selftests/vfio/lib/include/vfio_util.h tools/testing/selftests/vfio/lib/vfio_pci_device.c tools/testing/selftests/vfio/vfio_dma_mapping_test.c +1 more+21 -210 replies
11/18vfio: selftests: Move IOMMU library code into iommu.ctools/testing/selftests/vfio/lib/include/vfio_util.h tools/testing/selftests/vfio/lib/iommu.c tools/testing/selftests/vfio/lib/libvfio.mk +1 more+527 -4530 replies
12/18vfio: selftests: Move IOVA allocator into iova_allocator.ctools/testing/selftests/vfio/lib/iova_allocator.c tools/testing/selftests/vfio/lib/libvfio.mk tools/testing/selftests/vfio/lib/vfio_pci_device.c+95 -710 replies
13/18vfio: selftests: Stop passing device for IOMMU operationstools/testing/selftests/vfio/lib/include/vfio_util.h tools/testing/selftests/vfio/lib/iova_allocator.c tools/testing/selftests/vfio/vfio_dma_mapping_test.c +1 more+22 -650 replies
14/18vfio: selftests: Rename vfio_util.h to libvfio.htools/testing/selftests/vfio/lib/drivers/dsa/dsa.c tools/testing/selftests/vfio/lib/drivers/ioat/ioat.c tools/testing/selftests/vfio/lib/include/libvfio.h +8 more+13 -130 replies
15/18vfio: selftests: Move vfio_selftests_*() helpers into libvfio.ctools/testing/selftests/vfio/lib/libvfio.c tools/testing/selftests/vfio/lib/libvfio.mk tools/testing/selftests/vfio/lib/vfio_pci_device.c+79 -710 replies
16/18vfio: selftests: Split libvfio.h into separate header filestools/testing/selftests/vfio/lib/include/libvfio.h tools/testing/selftests/vfio/lib/include/libvfio/assert.h tools/testing/selftests/vfio/lib/include/libvfio/iommu.h +3 more+381 -3340 replies
17/18vfio: selftests: Eliminate INVALID_IOVAtools/testing/selftests/vfio/lib/include/libvfio/iommu.h tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_device.h tools/testing/selftests/vfio/lib/iommu.c +1 more+13 -100 replies
18/18vfio: selftests: Add vfio_pci_device_init_perf_testtools/testing/selftests/vfio/Makefile tools/testing/selftests/vfio/vfio_pci_device_init_perf_test.c+171 -00 replies

Reviews trailers per patch

All 18 patches have a Reviewed-by or Acked-by.

PatchAlex MastroRaghavendra Rao Ananta
1/18R-b T-b R-b
2/18R-b T-b R-b
3/18R-b T-b R-b
4/18R-b T-b R-b
5/18R-b T-b R-b
6/18R-b T-b R-b
7/18R-b T-b R-b
8/18R-b T-b R-b
9/18R-b T-b R-b
10/18R-b T-b R-b
11/18R-b T-b R-b
12/18R-b T-b R-b
13/18R-b T-b R-b
14/18R-b T-b R-b
15/18R-b T-b R-b
16/18R-b T-b R-b
17/18R-b T-b R-b
18/18R-b T-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH v4 00/18] vfio: selftests: Support for multi-device tests

This series adds support for tests that use multiple devices, and adds one new test, vfio_pci_device_init_perf_test, which measures parallel device initialization time to demonstrate the improvement from commit e908f58b6beb ("vfio/pci: Separate SR-IOV VF dev_set").

This series also breaks apart the monolithic vfio_util.h and vfio_pci_device.c into separate files, to account for all the new code. This required quite a bit of code motion so the diffstat looks large. The final layout is more granular and provides a better separation of the IOMMU code from the device code.

Final layout:

C files:
- tools/testing/selftests/vfio/lib/libvfio.c
- tools/testing/selftests/vfio/lib/iommu.c
- tools/testing/selftests/vfio/lib/iova_allocator.c
- tools/testing/selftests/vfio/lib/vfio_pci_device.c
- tools/testing/selftests/vfio/lib/vfio_pci_driver.c

H files:
- tools/testing/selftests/vfio/lib/include/libvfio.h
- tools/testing/selftests/vfio/lib/include/libvfio/assert.h
- tools/testing/selftests/vfio/lib/include/libvfio/iommu.h
- tools/testing/selftests/vfio/lib/include/libvfio/iova_allocator.h
- tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_device.h
- tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_driver.h

Notably, vfio_util.h is now gone and replaced with libvfio.h.

This series is based on vfio/next plus Alex Mastro's series to add the IOVA allocator [1]. It should apply cleanly to vfio/next once Alex's series makes its way to vfio/next via Linus' tree.

This series can be found on GitHub:

https://github.com/dmatlack/linux/tree/vfio/selftests/init_perf_test/v4

[1] https://lore.kernel.org/kvm/[email protected]/

Cc Alex Mastro <[email protected]>
Cc Jason Gunthorpe <[email protected]>
Cc Josh Hilke <[email protected]>
Cc Raghavendra Rao Ananta <[email protected]>
Cc Vipin Sharma <[email protected]>

v4:
- Collect Reviewed-bys from Raghavendra
- Check iommu is not null in vfio_pci_device_init() (Raghavendra)
- Do not include any fixes for the kernel-test-robot errors on riscv. These issues also exist when building the VFIO selftests without this series using kernel-test-robot's cross compiler. The issue appears to be that the cross compiler used by ktr does not have libc, which the selftests depend on.

v3: https://lore.kernel.org/kvm/[email protected]/
- Replace literal with NSEC_PER_SEC (Alex Mastro)
- Fix Makefile accumulate vs. assignment (Alex Mastro)

v2: https://lore.kernel.org/kvm/[email protected]/
- Require tests to call iommu_init() and manage struct iommu objects rather than implicitly doing it in vfio_pci_device_init().
- Drop all the device wrappers for IOMMU methods and require tests to interact with the iommu_*() helper functions directly.
- Add a commit to eliminate INVALID_IOVA. This is a simple cleanup I've been meaning to make.
- Upgrade some driver logging to error (Raghavendra)
- Remove plurality from helper function that fetches BDF from environment variable (Raghavendra)
- Fix cleanup.sh to only delete the device directory when cleaning up all devices (Raghavendra)

v1: https://lore.kernel.org/kvm/[email protected]/

David Matlack (18):
vfio: selftests: Move run.sh into scripts directory
vfio: selftests: Split run.sh into separate scripts
vfio: selftests: Allow passing multiple BDFs on the command line
vfio: selftests: Rename struct vfio_iommu_mode to iommu_mode
vfio: selftests: Introduce struct iommu
vfio: selftests: Support multiple devices in the same
container/iommufd
vfio: selftests: Eliminate overly chatty logging
vfio: selftests: Prefix logs with device BDF where relevant
vfio: selftests: Upgrade driver logging to dev_err()
vfio: selftests: Rename struct vfio_dma_region to dma_region
vfio: selftests: Move IOMMU library code into iommu.c
vfio: selftests: Move IOVA allocator into iova_allocator.c
vfio: selftests: Stop passing device for IOMMU operations
vfio: selftests: Rename vfio_util.h to libvfio.h
vfio: selftests: Move vfio_selftests_*() helpers into libvfio.c
vfio: selftests: Split libvfio.h into separate header files
vfio: selftests: Eliminate INVALID_IOVA
vfio: selftests: Add vfio_pci_device_init_perf_test

 tools/testing/selftests/vfio/Makefile         |  10 +-
 .../selftests/vfio/lib/drivers/dsa/dsa.c      |  36 +-
 .../selftests/vfio/lib/drivers/ioat/ioat.c    |  18 +-
 .../selftests/vfio/lib/include/libvfio.h      |  26 +
 .../vfio/lib/include/libvfio/assert.h         |  54 ++
 .../vfio/lib/include/libvfio/iommu.h          |  76 +++
 .../vfio/lib/include/libvfio/iova_allocator.h |  23 +
 .../lib/include/libvfio/vfio_pci_device.h     | 125 ++++
 .../lib/include/libvfio/vfio_pci_driver.h     |  97 +++
 .../selftests/vfio/lib/include/vfio_util.h    | 331 -----------
 tools/testing/selftests/vfio/lib/iommu.c      | 465 +++++++++++++++
 .../selftests/vfio/lib/iova_allocator.c       |  94 +++
 tools/testing/selftests/vfio/lib/libvfio.c    |  78 +++
 tools/testing/selftests/vfio/lib/libvfio.mk   |   5 +-
 .../selftests/vfio/lib/vfio_pci_device.c      | 556 +-----------------
 .../selftests/vfio/lib/vfio_pci_driver.c      |  16 +-
 tools/testing/selftests/vfio/run.sh           | 109 ----
 .../testing/selftests/vfio/scripts/cleanup.sh |  41 ++
 tools/testing/selftests/vfio/scripts/lib.sh   |  42 ++
 tools/testing/selftests/vfio/scripts/run.sh   |  16 +
 tools/testing/selftests/vfio/scripts/setup.sh |  48 ++
 .../selftests/vfio/vfio_dma_mapping_test.c    |  46 +-
 .../selftests/vfio/vfio_iommufd_setup_test.c  |   2 +-
 .../vfio/vfio_pci_device_init_perf_test.c     | 168 ++++++
 .../selftests/vfio/vfio_pci_device_test.c     |  12 +-
 .../selftests/vfio/vfio_pci_driver_test.c     |  51 +-
 26 files changed, 1482 insertions(+), 1063 deletions(-)
 create mode 100644 tools/testing/selftests/vfio/lib/include/libvfio.h
 create mode 100644 tools/testing/selftests/vfio/lib/include/libvfio/assert.h
 create mode 100644 tools/testing/selftests/vfio/lib/include/libvfio/iommu.h
 create mode 100644 tools/testing/selftests/vfio/lib/include/libvfio/iova_allocator.h
 create mode 100644 tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_device.h
 create mode 100644 tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_driver.h
 delete mode 100644 tools/testing/selftests/vfio/lib/include/vfio_util.h
 create mode 100644 tools/testing/selftests/vfio/lib/iommu.c
 create mode 100644 tools/testing/selftests/vfio/lib/iova_allocator.c
 create mode 100644 tools/testing/selftests/vfio/lib/libvfio.c
 delete mode 100755 tools/testing/selftests/vfio/run.sh
 create mode 100755 tools/testing/selftests/vfio/scripts/cleanup.sh
 create mode 100755 tools/testing/selftests/vfio/scripts/lib.sh
 create mode 100755 tools/testing/selftests/vfio/scripts/run.sh
 create mode 100755 tools/testing/selftests/vfio/scripts/setup.sh
 create mode 100644 tools/testing/selftests/vfio/vfio_pci_device_init_perf_test.c

base-commit: fa804aa4ac1b091ef2ec2981f08a1c28aaeba8e7
prerequisite-patch-id: dcf23dcc1198960bda3102eefaa21df60b2e4c54
prerequisite-patch-id: e32e56d5bf7b6c7dd40d737aa3521560407e00f5
prerequisite-patch-id: 4f79a41bf10a4c025ba5f433551b46035aa15878
prerequisite-patch-id: f903a45f0c32319138cd93a007646ab89132b18c

Signature · 1 line
2.52.0.487.g5c8c507ade-goog