vfio: selftest: Add SR-IOV UAPI test
Subsystems (4)
v4 cover vfio: selftest: Add SR-IOV UAPI test
Hello,
This series adds a vfio selftest, vfio_pci_sriov_uapi_test.c, to get some coverage on SR-IOV UAPI handling. Specifically, it includes the following cases that iterates over all the iommu modes:
- Setting correct/incorrect/NULL tokens during device init.
- Close the PF device immediately after setting the token.
- Change/override the PF's token after device init.
The test takes care of creating/setting up the VF device, and hence, it can be executed like any other test, simply by passing the PF's BDF to run.sh. For example,
$ ./scripts/setup.sh 0000:16:00.1 $ ./scripts/run.sh ./vfio_pci_sriov_uapi_test
TAP version 13
1..45
# Starting 45 tests from 15 test cases.
# RUN vfio_pci_sriov_uapi_test.vfio_type1_iommu_same_uuid.init_token_match ...
Created 1 VF (0000:1a:00.0) under the PF: 0000:16:00.1
# OK vfio_pci_sriov_uapi_test.vfio_type1_iommu_same_uuid.init_token_match
ok 1 vfio_pci_sriov_uapi_test.vfio_type1_iommu_same_uuid.init_token_match
# RUN vfio_pci_sriov_uapi_test.vfio_type1_iommu_same_uuid.pf_early_close ...
Created 1 VF (0000:1a:00.0) under the PF: 0000:16:00.1
# OK vfio_pci_sriov_uapi_test.vfio_type1_iommu_same_uuid.pf_early_close
ok 2 vfio_pci_sriov_uapi_test.vfio_type1_iommu_same_uuid.pf_early_close [...]
# RUN vfio_pci_sriov_uapi_test.iommufd_null_uuid.override_token ...
Created 1 VF (0000:1a:00.0) under the PF: 0000:16:00.1
# OK vfio_pci_sriov_uapi_test.iommufd_null_uuid.override_token
ok 45 vfio_pci_sriov_uapi_test.iommufd_null_uuid.override_token # PASSED: 45 / 45 tests passed.
# Totals: pass:45 fail:0 xfail:0 xpass:0 skip:0 error:0
Thank you.
Raghavendra
v4: Suggestions by David and Alex
- Assert that the value computed in sysfs_val_get() in an int. Rename the function to sysfs_val_get_int() to better reflect what the function is doing. (Alex)
- Add the missing Signed-off-by tag in patch-7 (David).
v3: Suggestions by David Matlack (thanks!)
- Introduce a patch to add -Wall and -Werror to the vfio Makefile.
- Use snprintf_assert() where they were missed.
- Rename the functions as suggested in the sysfs lib and the test file.
- Alloc the output char * buffer in the functions sysfs_driver_get() and sysfs_sriov_vf_bdf_get() instead of relying on the caller to pass one. The caller is now responsible for freeing these buffers.
- Remove unnecessary initializations of local variables in sysfs and the vfio_pci_device libraries.
- Move the inclusion of -luuid to the top level Makefile.
- Introduce vfio_pci_device_{alloc|free}() and let the test and the functions in vfio_pci_device.c use this.
- Return -errno for the ioctl failure in __vfio_device_bind_iommufd() instead of directly calling ioctl_assert().
- Since the vfio-pci driver sets the 'driver_override' to the driver of PF, instead of clearing sriov_drivers_autoprobe and binding the VF explicitly to the 'vfio-pci' driver, only assert that it's already bound.
- By extension to the above point, remove the unnecessary functions from the sysfs lib.
v2: Suggestions by David Matlack (thank you)
- Introduce snprintf_assert() to check against content trucation.
- Introduce a new sysfs library to handle all the common vfio/pci sysfs operations.
- Rename vfio_pci_container_get_device_fd() to vfio_pci_group_get_device_fd().
- Use a fixed size 'arg' array instead of dynamic allocation in __vfio_pci_group_get_device_fd().
- Exclude vfio_pci_device_init() to accept the 'vf_token' arg.
- Move the vfio_pci_sriov_uapi_test.c global variable to the FIXTURE() struct or as TEST_F() local variables.
- test_vfio_pci_container_setup() returns 'int' to indicate status.
- Skip the test if nr_vfs != 0.
- Explicitly set "sriov_drivers_autoprobe" for the PF.
- Make sure to bind the VF device to the "vfio-pci" driver.
- Cleanup the things done by FIXTURE_SETUP() in FIXTURE_TEARDOWN().
v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/all/[email protected]/
Raghavendra Rao Ananta (8):
vfio: selftests: Add -Wall and -Werror to the Makefile
vfio: selftests: Introduce snprintf_assert()
vfio: selftests: Introduce a sysfs lib
vfio: selftests: Extend container/iommufd setup for passing vf_token
vfio: selftests: Expose more vfio_pci_device functions
vfio: selftests: Add helper to set/override a vf_token
vfio: selftests: Add helpers to alloc/free vfio_pci_device
vfio: selftests: Add tests to validate SR-IOV UAPI
tools/testing/selftests/vfio/Makefile | 4 + .../selftests/vfio/lib/include/libvfio.h | 1 + .../vfio/lib/include/libvfio/assert.h | 5 + .../vfio/lib/include/libvfio/sysfs.h | 12 ++ .../lib/include/libvfio/vfio_pci_device.h | 11 + tools/testing/selftests/vfio/lib/libvfio.mk | 1 + tools/testing/selftests/vfio/lib/sysfs.c | 141 ++++++++++++ .../selftests/vfio/lib/vfio_pci_device.c | 156 ++++++++++---- .../selftests/vfio/vfio_dma_mapping_test.c | 6 +- .../selftests/vfio/vfio_pci_device_test.c | 21 +- .../selftests/vfio/vfio_pci_sriov_uapi_test.c | 200 ++++++++++++++++++ 11 files changed, 507 insertions(+), 51 deletions(-) create mode 100644 tools/testing/selftests/vfio/lib/include/libvfio/sysfs.h create mode 100644 tools/testing/selftests/vfio/lib/sysfs.c create mode 100644 tools/testing/selftests/vfio/vfio_pci_sriov_uapi_test.c
base-commit: d721f52e31553a848e0e9947ca15a49c5674aef3 --
2.53.0.414.gf7e9f6c205-goog
PATCH v4 1/8 vfio: selftests: Add -Wall and -Werror to the Makefile
Add the compiler flags, -Wall and -Werror, to catch all the build warnings and flag them as a build error, respectively. This is to ensure that no obvious programmer errors are introduced. We can add -Wno-* flags in the future to ignore specific warnings as necesasry.
--- tools/testing/selftests/vfio/Makefile | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/vfio/Makefile +1 -0
@@ -15,6 +15,7 @@ include lib/libvfio.mk CFLAGS += -I$(top_srcdir)/tools/include CFLAGS += -MD +CFLAGS += -Wall -Werror CFLAGS += $(EXTRA_CFLAGS) LDFLAGS += -pthread
Signature · 1 line
2.53.0.414.gf7e9f6c205-goog
PATCH v4 2/8 vfio: selftests: Introduce snprintf_assert()
In reply to Raghavendra Rao AnantaIntroduce snprintf_assert() to protect the users of snprintf() to fail if the requested operation was truncated due to buffer limits. VFIO tests and libraries, including a new sysfs library that will be introduced by an upcoming patch, rely quite heavily on snprintf()s to build PCI sysfs paths. Having a protection against this will be helpful to prevent false test failures.
--- .../vfio/lib/include/libvfio/assert.h | 5 +++++ .../selftests/vfio/lib/vfio_pci_device.c | 8 +++---- .../selftests/vfio/vfio_dma_mapping_test.c | 6 +++--- .../selftests/vfio/vfio_pci_device_test.c | 21 ++++++++++--------- 4 files changed, 23 insertions(+), 17 deletions(-)
tools/testing/selftests/vfio/lib/include/libvfio/assert.h +5 -0
@@ -51,4 +51,9 @@ VFIO_ASSERT_EQ(__ret, 0, "ioctl(%s, %s, %s) returned %d\n", #_fd, #_op, #_arg, __ret); \ } while (0) +#define snprintf_assert (_s, _size, _fmt, ...) do { \ + int __ret = snprintf(_s, _size, _fmt, ##__VA_ARGS__); \ + VFIO_ASSERT_LT(__ret, _size); \ +} while (0) +#endif /* SELFTESTS_VFIO_LIB_INCLUDE_LIBVFIO_ASSERT_H */
tools/testing/selftests/vfio/lib/vfio_pci_device.c +4 -4
@@ -188,7 +188,7 @@ static unsigned int vfio_pci_get_group_from_dev(const char *bdf)unsigned int group;int ret; -snprintf (sysfs_path,PATH_MAX ,"%s/%s/iommu_group" ,PCI_SYSFS_PATH , bdf); +snprintf_assert (sysfs_path,PATH_MAX ,"%s/%s/iommu_group" ,PCI_SYSFS_PATH , bdf); ret =readlink (sysfs_path, dev_iommu_group_path,sizeof (dev_iommu_group_path));VFIO_ASSERT_NE (ret,-1 ,"Failed to get the IOMMU group for device: %s\n" , bdf);
@@ -208,7 +208,7 @@ static void vfio_pci_group_setup(struct vfio_pci_device *device, const char *bdfint group; group =vfio_pci_get_group_from_dev (bdf); -snprintf (group_path,sizeof (group_path),"/dev/vfio/%d" , group); +snprintf_assert (group_path,sizeof (group_path),"/dev/vfio/%d" , group); device->group_fd =open (group_path,O_RDWR );VFIO_ASSERT_GE (device->group_fd,0 ,"open(%s) failed\n" , group_path);
@@ -279,7 +279,7 @@ const char *vfio_pci_get_cdev_path(const char *bdf) cdev_path =calloc (PATH_MAX ,1 );VFIO_ASSERT_NOT_NULL (cdev_path); -snprintf (dir_path,sizeof (dir_path),"/sys/bus/pci/devices/%s/vfio-dev/" , bdf); +snprintf_assert (dir_path,sizeof (dir_path),"/sys/bus/pci/devices/%s/vfio-dev/" , bdf); dir =opendir (dir_path);VFIO_ASSERT_NOT_NULL (dir,"Failed to open directory %s\n" , dir_path);
@@ -289,7 +289,7 @@ const char *vfio_pci_get_cdev_path(const char *bdf)if (strncmp ("vfio" , entry->d_name,4 ))continue ; -snprintf (cdev_path,PATH_MAX ,"/dev/vfio/devices/%s" , entry->d_name); +snprintf_assert (cdev_path,PATH_MAX ,"/dev/vfio/devices/%s" , entry->d_name);break ; }
tools/testing/selftests/vfio/vfio_dma_mapping_test.c +3 -3
@@ -45,9 +45,9 @@ static int intel_iommu_mapping_get(const char *bdf, u64 iova,FILE *file;char *rest; -snprintf (iommu_mapping_path,sizeof (iommu_mapping_path), -"/sys/kernel/debug/iommu/intel/%s/domain_translation_struct" , - bdf); +snprintf_assert (iommu_mapping_path,sizeof (iommu_mapping_path), +"/sys/kernel/debug/iommu/intel/%s/domain_translation_struct" , + bdf);printf ("Searching for IOVA 0x%lx in %s\n" , iova, iommu_mapping_path);
tools/testing/selftests/vfio/vfio_pci_device_test.c +11 -10
@@ -39,16 +39,17 @@ FIXTURE_TEARDOWN(vfio_pci_device_test)iommu_cleanup (self->iommu); } -#define read_pci_id_from_sysfs (_file) ({ \ - char __sysfs_path[PATH_MAX]; \ - char __buf[32]; \ - int __fd; \ - \ - snprintf(__sysfs_path, PATH_MAX, "/sys/bus/pci/devices/%s/%s", device_bdf, _file); \ - ASSERT_GT((__fd = open(__sysfs_path, O_RDONLY)), 0); \ - ASSERT_GT(read(__fd, __buf, ARRAY_SIZE(__buf)), 0); \ - ASSERT_EQ(0, close(__fd)); \ - (u16)strtoul(__buf, NULL, 0); \ +#define read_pci_id_from_sysfs (_file) ({ \ + char __sysfs_path[PATH_MAX]; \ + char __buf[32]; \ + int __fd; \ + \ + snprintf_assert(__sysfs_path, PATH_MAX, "/sys/bus/pci/devices/%s/%s", \ + device_bdf, _file); \ + ASSERT_GT((__fd = open(__sysfs_path, O_RDONLY)), 0); \ + ASSERT_GT(read(__fd, __buf, ARRAY_SIZE(__buf)), 0); \ + ASSERT_EQ(0, close(__fd)); \ + (u16)strtoul(__buf, NULL, 0); \ })TEST_F (vfio_pci_device_test, config_space_read_write)
Signature · 1 line
2.53.0.414.gf7e9f6c205-goog
PATCH v4 3/8 vfio: selftests: Introduce a sysfs lib
In reply to Raghavendra Rao AnantaIntroduce a sysfs library to handle the common reads/writes to the PCI sysfs files, for example, getting the total number of VFs supported by the device via /sys/bus/pci/devices/$BDF/sriov_totalvfs. The library will be used in the upcoming test patch to configure the VFs for a given PF device.
Opportunistically, move vfio_pci_get_group_from_dev() to this library as it falls under the same bucket. Rename it to sysfs_iommu_group_get() to align with other function names.
--- .../selftests/vfio/lib/include/libvfio.h | 1 + .../vfio/lib/include/libvfio/sysfs.h | 12 ++ tools/testing/selftests/vfio/lib/libvfio.mk | 1 + tools/testing/selftests/vfio/lib/sysfs.c | 141 ++++++++++++++++++ .../selftests/vfio/lib/vfio_pci_device.c | 22 +-- 5 files changed, 156 insertions(+), 21 deletions(-) create mode 100644 tools/testing/selftests/vfio/lib/include/libvfio/sysfs.h create mode 100644 tools/testing/selftests/vfio/lib/sysfs.c
tools/testing/selftests/vfio/lib/include/libvfio.h +1 -0
@@ -5,6 +5,7 @@#include <libvfio/assert.h> #include <libvfio/iommu.h> #include <libvfio/iova_allocator.h> +#include <libvfio/sysfs.h> #include <libvfio/vfio_pci_device.h> #include <libvfio/vfio_pci_driver.h>
tools/testing/selftests/vfio/lib/include/libvfio/sysfs.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef SELFTESTS_VFIO_LIB_INCLUDE_LIBVFIO_SYSFS_H +#define SELFTESTS_VFIO_LIB_INCLUDE_LIBVFIO_SYSFS_H + +int sysfs_sriov_totalvfs_get (const char *bdf); +int sysfs_sriov_numvfs_get (const char *bdf); +void sysfs_sriov_numvfs_set (const char *bdfs,int numvfs); +char *sysfs_sriov_vf_bdf_get (const char *pf_bdf,int i); +unsigned int sysfs_iommu_group_get (const char *bdf); +char *sysfs_driver_get (const char *bdf); + +#endif /* SELFTESTS_VFIO_LIB_INCLUDE_LIBVFIO_SYSFS_H */
tools/testing/selftests/vfio/lib/libvfio.mk +1 -0
@@ -6,6 +6,7 @@ LIBVFIO_SRCDIR := $(selfdir)/vfio/lib LIBVFIO_C := iommu.c LIBVFIO_C += iova_allocator.c LIBVFIO_C += libvfio.c +LIBVFIO_C += sysfs.c LIBVFIO_C += vfio_pci_device.c LIBVFIO_C += vfio_pci_driver.c
tools/testing/selftests/vfio/lib/sysfs.c new file +141 -0
141 lines not on this page · raw message
tools/testing/selftests/vfio/lib/vfio_pci_device.c +1 -21
@@ -22,8 +22,6 @@#include "../../../kselftest.h" #include <libvfio.h> -#define PCI_SYSFS_PATH "/sys/bus/pci/devices" -static void vfio_pci_irq_set (struct vfio_pci_device *device,u32 index,u32 vector,u32 count,int *fds) {
@@ -181,24 +179,6 @@ void vfio_pci_device_reset(struct vfio_pci_device *device)ioctl_assert (device->fd,VFIO_DEVICE_RESET ,NULL ); } -static unsigned int vfio_pci_get_group_from_dev (const char *bdf) -{ -char dev_iommu_group_path[PATH_MAX ] = {0 }; -char sysfs_path[PATH_MAX ] = {0 }; -unsigned int group; -int ret; - -snprintf_assert (sysfs_path,PATH_MAX ,"%s/%s/iommu_group" ,PCI_SYSFS_PATH , bdf); - - ret =readlink (sysfs_path, dev_iommu_group_path,sizeof (dev_iommu_group_path)); -VFIO_ASSERT_NE (ret,-1 ,"Failed to get the IOMMU group for device: %s\n" , bdf); - - ret =sscanf (basename (dev_iommu_group_path),"%u" , &group); -VFIO_ASSERT_EQ (ret,1 ,"Failed to get the IOMMU group for device: %s\n" , bdf); - -return group; -} -static void vfio_pci_group_setup (struct vfio_pci_device *device,const char *bdf) {struct vfio_group_status group_status = {
@@ -207,7 +187,7 @@ static void vfio_pci_group_setup(struct vfio_pci_device *device, const char *bdfchar group_path[32 ];int group; - group =vfio_pci_get_group_from_dev (bdf); + group =sysfs_iommu_group_get (bdf);snprintf_assert (group_path,sizeof (group_path),"/dev/vfio/%d" , group); device->group_fd =open (group_path,O_RDWR );
Signature · 1 line
2.53.0.414.gf7e9f6c205-goog
PATCH v4 4/8 vfio: selftests: Extend container/iommufd setup for passing vf_token
In reply to Raghavendra Rao AnantaA UUID is normally set as a vf_token to correspond the VFs with the PFs, if they are both bound by the vfio-pci driver. This is true for iommufd-based approach and container-based approach. The token can be set either during device creation (VFIO_GROUP_GET_DEVICE_FD) in container-based approach or during iommu bind (VFIO_DEVICE_BIND_IOMMUFD) in the iommu-fd case. Hence extend the functions, vfio_pci_iommufd_setup() and vfio_pci_container_setup(), to accept vf_token as an (optional) argument and handle the necessary setup.
No functional changes are expected.
--- tools/testing/selftests/vfio/Makefile | 2 + .../selftests/vfio/lib/vfio_pci_device.c | 45 +++++++++++++++---- 2 files changed, 39 insertions(+), 8 deletions(-)
tools/testing/selftests/vfio/Makefile +2 -0
@@ -20,6 +20,8 @@ CFLAGS += $(EXTRA_CFLAGS) LDFLAGS += -pthread +LDLIBS += -luuid + $(TEST_GEN_PROGS): %: %.o $(LIBVFIO_O) $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< $(LIBVFIO_O) $(LDLIBS) -o $@
tools/testing/selftests/vfio/lib/vfio_pci_device.c +37 -8
93 lines not on this page · raw message
Signature · 1 line
2.53.0.414.gf7e9f6c205-goog
PATCH v4 5/8 vfio: selftests: Expose more vfio_pci_device functions
In reply to Raghavendra Rao AnantaRefactor and make the functions called under device initialization public. A later patch adds a test that calls these functions to validate the UAPI of SR-IOV devices. Opportunistically, to test the success and failure cases of the UAPI, split the functions dealing with VFIO_GROUP_GET_DEVICE_FD and VFIO_DEVICE_BIND_IOMMUFD into a core function and another one that asserts the ioctl. The former will be used for testing the SR-IOV UAPI, hence only export these.
--- .../lib/include/libvfio/vfio_pci_device.h | 7 +++ .../selftests/vfio/lib/vfio_pci_device.c | 47 ++++++++++++++----- 2 files changed, 42 insertions(+), 12 deletions(-)
tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_device.h +7 -0
@@ -122,4 +122,11 @@ static inline bool vfio_pci_device_match(struct vfio_pci_device *device,const char *vfio_pci_get_cdev_path (const char *bdf); +void vfio_pci_group_setup (struct vfio_pci_device *device,const char *bdf); +void __vfio_pci_group_get_device_fd (struct vfio_pci_device *device, +const char *bdf,const char *vf_token); +void vfio_container_set_iommu (struct vfio_pci_device *device); +void vfio_pci_cdev_open (struct vfio_pci_device *device,const char *bdf); +int __vfio_device_bind_iommufd (int device_fd,int iommufd,const char *vf_token); +#endif /* SELFTESTS_VFIO_LIB_INCLUDE_LIBVFIO_VFIO_PCI_DEVICE_H */
tools/testing/selftests/vfio/lib/vfio_pci_device.c +35 -12
105 lines not on this page · raw message
Signature · 1 line
2.53.0.414.gf7e9f6c205-goog
PATCH v4 6/8 vfio: selftests: Add helper to set/override a vf_token
In reply to Raghavendra Rao AnantaAdd a helper function, vfio_device_set_vf_token(), to set or override a vf_token. Not only at init, but a vf_token can also be set via the VFIO_DEVICE_FEATURE ioctl, by setting the VFIO_DEVICE_FEATURE_PCI_VF_TOKEN flag. Hence, add an API to utilize this functionality from the test code. The subsequent commit will use this to test the functionality of this method to set the vf_token.
--- .../lib/include/libvfio/vfio_pci_device.h | 2 ++ .../selftests/vfio/lib/vfio_pci_device.c | 34 +++++++++++++++++++ 2 files changed, 36 insertions(+)
tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_device.h +2 -0
@@ -129,4 +129,6 @@ void vfio_container_set_iommu(struct vfio_pci_device *device);void vfio_pci_cdev_open (struct vfio_pci_device *device,const char *bdf);int __vfio_device_bind_iommufd (int device_fd,int iommufd,const char *vf_token); +void vfio_device_set_vf_token (int fd,const char *vf_token); +#endif /* SELFTESTS_VFIO_LIB_INCLUDE_LIBVFIO_VFIO_PCI_DEVICE_H */
tools/testing/selftests/vfio/lib/vfio_pci_device.c +34 -0
@@ -109,6 +109,40 @@ static void vfio_pci_irq_get(struct vfio_pci_device *device, u32 index,ioctl_assert (device->fd,VFIO_DEVICE_GET_IRQ_INFO , irq_info); } +static int vfio_device_feature_ioctl (int fd,u32 flags,void *data, +size_t data_size) +{ +u8 buffer[sizeof (struct vfio_device_feature ) + data_size] = {}; +struct vfio_device_feature *feature = (void *)buffer; + +memcpy (feature->data, data, data_size); + + feature->argsz =sizeof (buffer); + feature->flags = flags; + +return ioctl (fd,VFIO_DEVICE_FEATURE , feature); +} + +static void vfio_device_feature_set (int fd,u16 feature,void *data,size_t data_size) +{ +u32 flags =VFIO_DEVICE_FEATURE_SET | feature; +int ret; + + ret =vfio_device_feature_ioctl (fd, flags, data, data_size); +VFIO_ASSERT_EQ (ret,0 ,"Failed to set feature %u\n" , feature); +} + +void vfio_device_set_vf_token (int fd,const char *vf_token) +{ +uuid_t token_uuid = {0 }; + +VFIO_ASSERT_NOT_NULL (vf_token,"vf_token is NULL" ); +VFIO_ASSERT_EQ (uuid_parse (vf_token, token_uuid),0 ); + +vfio_device_feature_set (fd,VFIO_DEVICE_FEATURE_PCI_VF_TOKEN , + token_uuid,sizeof (uuid_t)); +} +static void vfio_pci_region_get (struct vfio_pci_device *device,int index,struct vfio_region_info *info) {
Signature · 1 line
2.53.0.414.gf7e9f6c205-goog
PATCH v4 7/8 vfio: selftests: Add helpers to alloc/free vfio_pci_device
In reply to Raghavendra Rao AnantaAdd a helper, vfio_pci_device_alloc(), to allocate 'struct vfio_pci_device'. The subsequent test patch will utilize this to get the struct with very minimal initialization done. Internally, let vfio_pci_device_init() also make use of this function and later do the full initialization.
Symmetrically, add a free variant, vfio_pci_device_free(), to be used in a similar fashion.
No functional change intended.
--- .../vfio/lib/include/libvfio/vfio_pci_device.h | 2 ++ .../selftests/vfio/lib/vfio_pci_device.c | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-)
tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_device.h +2 -0
@@ -38,6 +38,8 @@ struct vfio_pci_device {#define dev_info (_dev, _fmt, ...) printf("%s: " _fmt, (_dev)->bdf, ##__VA_ARGS__)#define dev_err (_dev, _fmt, ...) fprintf(stderr, "%s: " _fmt, (_dev)->bdf, ##__VA_ARGS__) +struct vfio_pci_device *vfio_pci_device_alloc (const char *bdf,struct iommu *iommu); +void vfio_pci_device_free (struct vfio_pci_device *device);struct vfio_pci_device *vfio_pci_device_init (const char *bdf,struct iommu *iommu);void vfio_pci_device_cleanup (struct vfio_pci_device *device);
tools/testing/selftests/vfio/lib/vfio_pci_device.c +16 -2
@@ -397,7 +397,7 @@ static void vfio_pci_iommufd_setup(struct vfio_pci_device *device,vfio_device_attach_iommufd_pt (device->fd, device->iommu->ioas_id); } -struct vfio_pci_device *vfio_pci_device_init (const char *bdf,struct iommu *iommu) +struct vfio_pci_device *vfio_pci_device_alloc (const char *bdf,struct iommu *iommu) {struct vfio_pci_device *device;
@@ -408,6 +408,20 @@ struct vfio_pci_device *vfio_pci_device_init(const char *bdf, struct iommu *iomm device->iommu = iommu; device->bdf = bdf; +return device; +} + +void vfio_pci_device_free (struct vfio_pci_device *device) +{ +free (device); +} + +struct vfio_pci_device *vfio_pci_device_init (const char *bdf,struct iommu *iommu) +{ +struct vfio_pci_device *device; + + device =vfio_pci_device_alloc (bdf, iommu); +if (iommu->mode->container_path)vfio_pci_container_setup (device, bdf,NULL );else
@@ -440,5 +454,5 @@ void vfio_pci_device_cleanup(struct vfio_pci_device *device)if (device->group_fd)VFIO_ASSERT_EQ (close (device->group_fd),0 ); -free (device); +vfio_pci_device_free (device); }
Signature · 1 line
2.53.0.414.gf7e9f6c205-goog
PATCH v4 8/8 vfio: selftests: Add tests to validate SR-IOV UAPI
In reply to Raghavendra Rao AnantaAdd a selftest, vfio_pci_sriov_uapi_test.c, to validate the SR-IOV UAPI, including the following cases, iterating over all the IOMMU modes currently supported:
- Setting correct/incorrect/NULL tokens during device init.
- Close the PF device immediately after setting the token.
- Change/override the PF's token after device init.
--- tools/testing/selftests/vfio/Makefile | 1 + .../selftests/vfio/vfio_pci_sriov_uapi_test.c | 200 ++++++++++++++++++ 2 files changed, 201 insertions(+) create mode 100644 tools/testing/selftests/vfio/vfio_pci_sriov_uapi_test.c
tools/testing/selftests/vfio/Makefile +1 -0
@@ -4,6 +4,7 @@ TEST_GEN_PROGS += vfio_iommufd_setup_test TEST_GEN_PROGS += vfio_pci_device_test TEST_GEN_PROGS += vfio_pci_device_init_perf_test TEST_GEN_PROGS += vfio_pci_driver_test +TEST_GEN_PROGS += vfio_pci_sriov_uapi_test TEST_FILES += scripts/cleanup.sh TEST_FILES += scripts/lib.sh
tools/testing/selftests/vfio/vfio_pci_sriov_uapi_test.c new file +200 -0
200 lines not on this page · raw message
Signature · 1 line
2.53.0.414.gf7e9f6c205-goog
Quoted 9 lines · Raghavendra Rao Ananta
Raghavendra Rao Ananta (8):
vfio: selftests: Add -Wall and -Werror to theMakefile
vfio: selftests: Introducesnprintf_assert()
vfio: selftests: Introduce a sysfs lib
vfio: selftests: Extend container/iommufd setup for passingvf_token
vfio: selftests: Expose morevfio_pci_devicefunctions
vfio: selftests: Add helper to set/override avf_token
vfio: selftests: Add helpers to alloc/freevfio_pci_device
vfio: selftests: Add tests to validate SR-IOV UAPI
Alex Williamson
maintainerQuoted 111 lines · On Tue, 24 Feb 2026 18:25:24 +0000 Raghavendra Rao Ananta <[email protected]>…
Hello,
This series adds a vfio selftest,
vfio_pci_sriov_uapi_test.c, to get some coverage on SR-IOV UAPI handling. Specifically, it includes the following cases that iterates over all the iommu modes:
- Setting correct/incorrect/NULL tokens during device init.
- Close the PF device immediately after setting the token.
- Change/override the PF's token after device init.The test takes care of creating/setting up the VF device, and hence, it can be executed like any other test, simply by passing the PF's BDF to
run.sh. For example,$ ./scripts/setup.sh 0000:16:00.1 $ ./scripts/run.sh ./vfio_pci_sriov_uapi_testTAP version 13
1..45
# Starting 45 tests from 15 test cases.
# RUN vfio_pci_sriov_uapi_test.vfio_type1_iommu_same_uuid.init_token_match ...
Created 1 VF (0000:1a:00.0) under the PF: 0000:16:00.1
# OK vfio_pci_sriov_uapi_test.vfio_type1_iommu_same_uuid.init_token_match
ok 1 vfio_pci_sriov_uapi_test.vfio_type1_iommu_same_uuid.init_token_match
# RUN vfio_pci_sriov_uapi_test.vfio_type1_iommu_same_uuid.pf_early_close ...
Created 1 VF (0000:1a:00.0) under the PF: 0000:16:00.1
# OK vfio_pci_sriov_uapi_test.vfio_type1_iommu_same_uuid.pf_early_close
ok 2 vfio_pci_sriov_uapi_test.vfio_type1_iommu_same_uuid.pf_early_close [...]
# RUN vfio_pci_sriov_uapi_test.iommufd_null_uuid.override_token ...
Created 1 VF (0000:1a:00.0) under the PF: 0000:16:00.1
# OK vfio_pci_sriov_uapi_test.iommufd_null_uuid.override_token
ok 45 vfio_pci_sriov_uapi_test.iommufd_null_uuid.override_token # PASSED: 45 / 45 tests passed.
# Totals: pass:45 fail:0 xfail:0 xpass:0 skip:0 error:0Thank you.
Raghavendrav4: Suggestions by David and Alex
- Assert that the value computed insysfs_val_get()in an int. Rename the function tosysfs_val_get_int()to better reflect what the function is doing. (Alex)
- Add the missing Signed-off-by tag in patch-7 (David).v3: Suggestions by David Matlack (thanks!)
- Introduce a patch to add -Wall and -Werror to the vfioMakefile.
- Usesnprintf_assert()where they were missed.
- Rename the functions as suggested in the sysfs lib and the test file.
- Alloc the output char * buffer in the functionssysfs_driver_get()andsysfs_sriov_vf_bdf_get()instead of relying on the caller to pass one. The caller is now responsible for freeing these buffers.
- Remove unnecessary initializations of local variables in sysfs and thevfio_pci_devicelibraries.
- Move the inclusion of -luuid to the top levelMakefile.
- Introduce vfio_pci_device_{alloc|free}() and let the test and the functions invfio_pci_device.cuse this.
- Return -errno for the ioctl failure in__vfio_device_bind_iommufd()instead of directly callingioctl_assert().
- Since the vfio-pci driver sets the 'driver_override' to the driver of PF, instead of clearingsriov_drivers_autoprobeand binding the VF explicitly to the 'vfio-pci' driver, only assert that it's already bound.
- By extension to the above point, remove the unnecessary functions from the sysfs lib.v2: Suggestions by David Matlack (thank you)
- Introducesnprintf_assert()to check against content trucation.
- Introduce a new sysfs library to handle all the common vfio/pci sysfs operations.
- Renamevfio_pci_container_get_device_fd()tovfio_pci_group_get_device_fd().
- Use a fixed size 'arg' array instead of dynamic allocation in__vfio_pci_group_get_device_fd().
- Excludevfio_pci_device_init()to accept the 'vf_token' arg.
- Move thevfio_pci_sriov_uapi_test.cglobal variable to theFIXTURE()struct or asTEST_F()local variables.
-test_vfio_pci_container_setup()returns 'int' to indicate status.
- Skip the test ifnr_vfs!= 0.
- Explicitly set "sriov_drivers_autoprobe" for the PF.
- Make sure to bind the VF device to the "vfio-pci" driver.
- Cleanup the things done byFIXTURE_SETUP()inFIXTURE_TEARDOWN().v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/all/[email protected]/Raghavendra Rao Ananta (8):
vfio: selftests: Add -Wall and -Werror to theMakefile
vfio: selftests: Introducesnprintf_assert()
vfio: selftests: Introduce a sysfs lib
vfio: selftests: Extend container/iommufd setup for passingvf_token
vfio: selftests: Expose morevfio_pci_devicefunctions
vfio: selftests: Add helper to set/override avf_token
vfio: selftests: Add helpers to alloc/freevfio_pci_device
vfio: selftests: Add tests to validate SR-IOV UAPItools/testing/selftests/vfio/Makefile | 4 + .../selftests/vfio/lib/include/libvfio.h | 1 + .../vfio/lib/include/libvfio/assert.h | 5 + .../vfio/lib/include/libvfio/sysfs.h | 12 ++ .../lib/include/libvfio/vfio_pci_device.h | 11 + tools/testing/selftests/vfio/lib/libvfio.mk | 1 + tools/testing/selftests/vfio/lib/sysfs.c | 141 ++++++++++++ .../selftests/vfio/lib/vfio_pci_device.c | 156 ++++++++++---- .../selftests/vfio/vfio_dma_mapping_test.c | 6 +- .../selftests/vfio/vfio_pci_device_test.c | 21 +- .../selftests/vfio/vfio_pci_sriov_uapi_test.c | 200 ++++++++++++++++++ 11 files changed, 507 insertions(+), 51 deletions(-) create mode 100644 tools/testing/selftests/vfio/lib/include/libvfio/sysfs.h create mode 100644 tools/testing/selftests/vfio/lib/sysfs.c create mode 100644 tools/testing/selftests/vfio/vfio_pci_sriov_uapi_test.c
Quoted 1 line
base-commit:
d721f52e31553a848e0e9947ca15a49c5674aef3
Please rebase:
$ git log --oneline --no-merges d721f52e31553a848e0e9947ca15a49c5674aef3..v7.0-rc1 tools/testing/selftests/vfio/a55d4bbbe644 vfio: selftests: only build tests on arm64 and x86_64 1c588bca3bd5 vfio: selftests: Drop IOMMU mapping size assertions for VFIO_TYPE1_IOMMU 080723f4d4c3 vfio: selftests: Add vfio_dma_mapping_mmio_test 557dbdf6c4e9 vfio: selftests: Align BAR mmaps for efficient IOMMU mapping 03b7c2d763c9 vfio: selftests: Centralize IOMMU mode name definitions 193120dddd1a vfio: selftests: Drop <uapi/linux/types.h> includes e6fbd1759c9e selftests: complete kselftest include centralization
Thanks,
Alex
Quoted 5 lines · Alex Williamson
Quoted 2 lines
base-commit:
d721f52e31553a848e0e9947ca15a49c5674aef3Please rebase:
Quoted 8 lines
$ git log --oneline --no-merges d721f52e31553a848e0e9947ca15a49c5674aef3..v7.0-rc1 tools/testing/selftests/vfio/a55d4bbbe644 vfio: selftests: only build tests on arm64 and x86_64 1c588bca3bd5 vfio: selftests: Drop IOMMU mapping size assertions for VFIO_TYPE1_IOMMU 080723f4d4c3 vfio: selftests: Add vfio_dma_mapping_mmio_test 557dbdf6c4e9 vfio: selftests: Align BAR mmaps for efficient IOMMU mapping 03b7c2d763c9 vfio: selftests: Centralize IOMMU mode name definitions 193120dddd1a vfio: selftests: Drop <uapi/linux/types.h> includes e6fbd1759c9e selftests: complete kselftest include centralization
Rebased to v7.0-rc1 in v5:
https://lore.kernel.org/all/[email protected]/
Thank you.
Raghavendra