mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-27 18:43:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

vfio: selftests: Retry on EAGAIN during device reset

Browse Source 
Add retry logic to vfio_pci_device_reset() to handle the case where PCI
resets fail due to lock contention, in which case
pci_try_reset_function() returns -EAGAIN.

Suggested-by: David Matlack <dmatlack@google.com>
Signed-off-by: Josh Hilke <jrhilke@google.com>
Acked-by: David Matlack <dmatlack@google.com>
Link: https://lore.kernel.org/r/20260805-igb_v3_b4-v10-3-9c86dc849c0d@google.com
Signed-off-by: Alex Williamson <alex@shazbot.org>
This commit is contained in:
Josh Hilke
2026-08-05 00:21:00 +00:00
committed by Alex Williamson
parent 1583ef1175
commit 28ca5f67e1
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_device.h
View File

@@ -43,6 +43,7 @@ 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);
int __vfio_pci_device_reset(struct vfio_pci_device *device);
void vfio_pci_device_reset(struct vfio_pci_device *device);
void vfio_pci_config_access(struct vfio_pci_device *device, bool write,

20
tools/testing/selftests/vfio/lib/vfio_pci_device.c
View File

@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
#include <libgen.h>
#include <stdint.h>
@@ -259,9 +260,26 @@ void vfio_pci_config_access(struct vfio_pci_device *device, bool write,
write ? "write to" : "read from", config);
}
int __vfio_pci_device_reset(struct vfio_pci_device *device)
{
if (ioctl(device->fd, VFIO_DEVICE_RESET, NULL))
return -errno;
return 0;
}
void vfio_pci_device_reset(struct vfio_pci_device *device)
{
ioctl_assert(device->fd, VFIO_DEVICE_RESET, NULL);
int retries = 20;
int r;
do {
r = __vfio_pci_device_reset(device);
if (r == -EAGAIN)
usleep(10000);
} while (r == -EAGAIN && retries-- > 0);
VFIO_ASSERT_EQ(r, 0, "ioctl(device->fd, VFIO_DEVICE_RESET) failed\n");
}
void vfio_pci_group_setup(struct vfio_pci_device *device, const char *bdf)