vfio-pci: Accept a non-zero open_count on reset
Subsystems (2)
PATCH v2 1/1 vfio-pci: Accept a non-zero open_count on reset
The implementation of close_device() for vfio-pci inspects the open_count of every device in the device set to determine whether a reset is needed. This count is always non-zero for the device being closed, effectively disabling the reset logic.
After commit 2cd8b14aaa66 ("vfio/pci: Move to the device set infrastructure"), failure to create a new file for a device would cause the reset to be skipped due to open_count being decremented after calling close_device() in the error path.
After commit eadd86f835c6 ("vfio: Remove calls to vfio_group_add_container_user()"), releasing a device would always skip the reset due to an ordering change in vfio_device_fops_release().
Failing to reset the device leaves it in an unknown state, potentially causing errors when it is bound to a different driver.
This issue was observed with a Radeon RX Vega 56 [1002:687f] (rev c3) assigned to a Windows guest. After shutting down the guest, unbinding the device from vfio-pci, and binding the device to amdgpu:
[ 548.007102] [drm:psp_hw_start [amdgpu]] *ERROR* PSP create ring failed! [ 548.027174] [drm:psp_hw_init [amdgpu]] *ERROR* PSP firmware loading failed [ 548.027242] [drm:amdgpu_device_fw_loading [amdgpu]] *ERROR* hw_init of IP block <psp> failed -22 [ 548.027306] amdgpu 0000:0a:00.0: amdgpu: amdgpu_device_ip_init failed [ 548.027308] amdgpu 0000:0a:00.0: amdgpu: Fatal error during GPU init
---
v1 -> v2:
- Changed reset behavior instead of open_count ordering
- Retitled from "vfio: Decrement open_count before close_device()"
v1: https://lore.kernel.org/kvm/[email protected]/
drivers/vfio/pci/vfio_pci_core.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/vfio/pci/vfio_pci_core.c +13 -8
@@ -174,7 +174,7 @@ static void vfio_pci_probe_mmaps(struct vfio_pci_core_device *vdev) }struct vfio_pci_group_info ; -static void vfio_pci_dev_set_try_reset (struct vfio_device_set *dev_set); +static void vfio_pci_core_try_reset (struct vfio_pci_core_device *vdev);static int vfio_pci_dev_set_hot_reset (struct vfio_device_set *dev_set,struct vfio_pci_group_info *groups);
@@ -667,7 +667,7 @@ void vfio_pci_core_disable(struct vfio_pci_core_device *vdev) out:pci_disable_device (pdev); -vfio_pci_dev_set_try_reset (vdev->vdev.dev_set); +vfio_pci_core_try_reset (vdev);/* Put the pm-runtime usage counter acquired during enable */ if (!disable_idle_d3)
@@ -2483,14 +2483,18 @@ static int vfio_pci_dev_set_hot_reset(struct vfio_device_set *dev_set,return ret; } -static bool vfio_pci_dev_set_needs_reset (struct vfio_device_set *dev_set) +static bool vfio_pci_core_needs_reset (struct vfio_pci_core_device *vdev) { +struct vfio_device_set *dev_set = vdev->vdev.dev_set;struct vfio_pci_core_device *cur;bool needs_reset = false; +if (vdev->vdev.open_count >1 ) +return false; +list_for_each_entry (cur, &dev_set->device_list, vdev.dev_set_list) { -/* No VFIO device in the set can have an open device FD */ -if (cur->vdev.open_count) +/* Only the VFIO device being reset can have an open FD */ +if (cur != vdev && cur->vdev.open_count)return false; needs_reset |= cur->needs_reset; }
@@ -2498,19 +2502,20 @@ static bool vfio_pci_dev_set_needs_reset(struct vfio_device_set *dev_set) }/* -* If a bus or slot reset is available for the provided dev_set and: +* If a bus or slot reset is available for the provided device and: * - All of the devices affected by that bus or slot reset are unused * - At least one of the affected devices is marked dirty via * needs_reset (such as by lack of FLR support) * Then attempt to perform that bus or slot reset. */ -static void vfio_pci_dev_set_try_reset (struct vfio_device_set *dev_set) +static void vfio_pci_core_try_reset (struct vfio_pci_core_device *vdev) { +struct vfio_device_set *dev_set = vdev->vdev.dev_set;struct vfio_pci_core_device *cur;struct pci_dev *pdev;bool reset_done = false; -if (!vfio_pci_dev_set_needs_reset (dev_set)) +if (!vfio_pci_core_needs_reset (vdev))return ; pdev =vfio_pci_dev_set_resettable (dev_set);
Signature · 1 line
2.37.4
drivers/vfio/pci/vfio_pci_core.c static int vfio_pci_dev_set_hot_reset(struct vfio_device_set *dev_set, · line 2493
Quoted 12 lines
From: Anthony DeRossi <[email protected]>
Sent: Thursday, October 27, 2022 3:43 AMdrivers/vfio/pci/vfio_pci_core.c +4
-1-static bool vfio_pci_dev_set_needs_reset (struct vfio_device_set *dev_set) +static bool vfio_pci_core_needs_reset (struct vfio_pci_core_device *vdev) { +struct vfio_device_set *dev_set = vdev->vdev.dev_set;struct vfio_pci_core_device *cur;bool needs_reset = false; +if (vdev->vdev.open_count >1 ) +return false;
WARN_ON()
drivers/vfio/pci/vfio_pci_core.c static int vfio_pci_dev_set_hot_reset(struct vfio_device_set *dev_set, · line 2498
Quoted 7 lines
drivers/vfio/pci/vfio_pci_core.c +3
-2+list_for_each_entry (cur, &dev_set->device_list, vdev.dev_set_list) { -/* No VFIO device in the set can have an open device FD */ -if (cur->vdev.open_count) +/* Only the VFIO device being reset can have an open FD */ +if (cur != vdev && cur->vdev.open_count)return false;
not caused by this patch but while at it...
open_count is defined not for driver use:
/* Members below here are private, not for driver use */ unsigned int index; struct device device; /* device.kref covers object life circle */ refcount_t refcount; /* user count on registered device*/ unsigned int open_count; struct completion comp; struct list_head group_next; struct list_head iommu_entry;
prefer to a wrapper or move it to the public section of vfio_device.
Quoted 36 lines · Kevin
drivers/vfio/pci/vfio_pci_core.c static int vfio_pci_dev_set_hot_reset(struct vfio_device_set *dev_set, · line 2493
Quoted 12 lines
From: Anthony DeRossi <[email protected]>
Sent: Thursday, October 27, 2022 3:43 AMdrivers/vfio/pci/vfio_pci_core.c +4
-1-static bool vfio_pci_dev_set_needs_reset (struct vfio_device_set *dev_set) +static bool vfio_pci_core_needs_reset (struct vfio_pci_core_device *vdev) { +struct vfio_device_set *dev_set = vdev->vdev.dev_set;struct vfio_pci_core_device *cur;bool needs_reset = false; +if (vdev->vdev.open_count >1 ) +return false;
WARN_ON()drivers/vfio/pci/vfio_pci_core.c static int vfio_pci_dev_set_hot_reset(struct vfio_device_set *dev_set, · line 2498
Quoted 7 lines
drivers/vfio/pci/vfio_pci_core.c +3
-2+list_for_each_entry (cur, &dev_set->device_list, vdev.dev_set_list) { -/* No VFIO device in the set can have an open device FD */ -if (cur->vdev.open_count) +/* Only the VFIO device being reset can have an open FD */ +if (cur != vdev && cur->vdev.open_count)return false;not caused by this patch but while at it...
open_countis defined not for driver use:/* Members below here are private, not for driver use */ unsigned int index; struct device device; /* device.kref covers object life circle */ refcount_t refcount; /* user count on registered device*/ unsigned int open_count; struct completion comp; struct list_head group_next; struct list_head iommu_entry;
Quoted 1 line
prefer to a wrapper or move it to the public section of
vfio_device.
I've been meaning to take a deeper look, but I'm thinking vfio_pci doesn't need open_count at all any more.
open_count was from before we changed the core code to call open_device only once. If we are only a call chain from open_device/close_device then we know that the open_count must be 1.
Jason
Quoted 2 lines · Jason Gunthorpe
I've been meaning to take a deeper look, but I'm thinking
vfio_pcidoesn't needopen_countat all any more.
I spent some time looking at it, but I'm not very familiar with this area.
None of the fields in vfio_pci_core_device look usable as a substitute for open_count, but calling pci_is_enabled() on the PCI device might be sufficient. pci_enable_device()/pci_disable_device() appear to be called in the right locations in vfio_pci_core.
I'm happy to submit a separate patch to check pci_is_enabled() if the PCI device life cycle makes sense.
Anthony
Quoted 11 lines · On Wed, 2 Nov 2022 06:14:24 +0000 Anthony DeRossi <[email protected]> wrote:
Quoted 2 lines · Jason Gunthorpe
I've been meaning to take a deeper look, but I'm thinking
vfio_pcidoesn't needopen_countat all any more.I spent some time looking at it, but I'm not very familiar with this area.
None of the fields in
vfio_pci_core_devicelook usable as a substitute foropen_count, but callingpci_is_enabled()on the PCI device might be sufficient. pci_enable_device()/pci_disable_device() appear to be called in the right locations invfio_pci_core.
I think that could work too, but of course it's PCI specific. If we had a vfio core helper to get the open count for the device set, that would make it more universally available. Thanks,
Alex
Quoted 3 lines · Alex Williamson
I think that could work too, but of course it's PCI specific. If we had a vfio core helper to get the open count for the device set, that would make it more universally available.
Thanks for the suggestion. I sent a new series with this change.
v4: https://lore.kernel.org/kvm/[email protected]/
Anthony
Quoted 37 lines · On Tue, 1 Nov 2022 08:38:21 -0300 Jason Gunthorpe <[email protected]> wrote:
Quoted 36 lines · Kevin
drivers/vfio/pci/vfio_pci_core.c static int vfio_pci_dev_set_hot_reset(struct vfio_device_set *dev_set, · line 2493
Quoted 12 lines
From: Anthony DeRossi <[email protected]>
Sent: Thursday, October 27, 2022 3:43 AMdrivers/vfio/pci/vfio_pci_core.c +4
-1-static bool vfio_pci_dev_set_needs_reset (struct vfio_device_set *dev_set) +static bool vfio_pci_core_needs_reset (struct vfio_pci_core_device *vdev) { +struct vfio_device_set *dev_set = vdev->vdev.dev_set;struct vfio_pci_core_device *cur;bool needs_reset = false; +if (vdev->vdev.open_count >1 ) +return false;
WARN_ON()drivers/vfio/pci/vfio_pci_core.c static int vfio_pci_dev_set_hot_reset(struct vfio_device_set *dev_set, · line 2498
Quoted 7 lines
drivers/vfio/pci/vfio_pci_core.c +3
-2+list_for_each_entry (cur, &dev_set->device_list, vdev.dev_set_list) { -/* No VFIO device in the set can have an open device FD */ -if (cur->vdev.open_count) +/* Only the VFIO device being reset can have an open FD */ +if (cur != vdev && cur->vdev.open_count)return false;not caused by this patch but while at it...
open_countis defined not for driver use:/* Members below here are private, not for driver use */ unsigned int index; struct device device; /* device.kref covers object life circle */ refcount_t refcount; /* user count on registered device*/ unsigned int open_count; struct completion comp; struct list_head group_next; struct list_head iommu_entry;
Quoted 8 lines
Quoted 1 line
prefer to a wrapper or move it to the public section of
vfio_device.I've been meaning to take a deeper look, but I'm thinking
vfio_pcidoesn't needopen_countat all any more.
open_countwas from before we changed the core code to callopen_deviceonly once. If we are only a call chain from open_device/close_device then we know that theopen_countmust be 1.
That accounts for the first test, we don't need to test open_count on the calling device in this path, but the idea here is that we want to test whether we're the last close_device among the set. Not sure how we'd do that w/o some visibility to open_count. Maybe we need a vfio_device_set_open_count() that when 1 we know we're the first open or last close? Thanks,
Alex
Quoted 10 lines · Alex Williamson
Quoted 3 lines
open_countwas from before we changed the core code to callopen_deviceonly once. If we are only a call chain from open_device/close_device then we know that theopen_countmust be 1.That accounts for the first test, we don't need to test
open_counton the calling device in this path, but the idea here is that we want to test whether we're the lastclose_deviceamong the set. Not sure how we'd do that w/o some visibility toopen_count. Maybe we need avfio_device_set_open_count()that when 1 we know we're the first open or last close? Thanks,
Right, we are checking the open count on all the devices in the set, so I think that just this hunk is fine:
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/vfio/pci/vfio_pci_core.c static int vfio_pci_dev_set_hot_reset(struct vfio_device_set *dev_set, · line 2498
Quoted 3 lines
drivers/vfio/pci/vfio_pci_core.c +1
-1-if (cur->vdev.open_count) +if (cur != vdev && cur->vdev.open_count)return false;
Because vfio_pci_dev_set_needs_reset() is always called from open/close (which is how it picks up the devset lock), so we never need to consider the current device by definition, it is always "just being closed"
A little comment to explain this and that should be it?
Jason
Quoted 24 lines · On Thu, 3 Nov 2022 19:25:06 -0300 Jason Gunthorpe <[email protected]> wrote:
Quoted 10 lines · Alex Williamson
Quoted 3 lines
open_countwas from before we changed the core code to callopen_deviceonly once. If we are only a call chain from open_device/close_device then we know that theopen_countmust be 1.That accounts for the first test, we don't need to test
open_counton the calling device in this path, but the idea here is that we want to test whether we're the lastclose_deviceamong the set. Not sure how we'd do that w/o some visibility toopen_count. Maybe we need avfio_device_set_open_count()that when 1 we know we're the first open or last close? Thanks,Right, we are checking the open count on all the devices in the set, so I think that just this hunk is fine:
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/vfio/pci/vfio_pci_core.c static int vfio_pci_dev_set_hot_reset(struct vfio_device_set *dev_set, · line 2498
Quoted 3 lines
drivers/vfio/pci/vfio_pci_core.c +1
-1-if (cur->vdev.open_count) +if (cur != vdev && cur->vdev.open_count)return false;Because
vfio_pci_dev_set_needs_reset()is always called from open/close (which is how it picks up the devset lock), so we never need to consider the current device by definition, it is always "just being closed"
Quoted 1 line
A little comment to explain this and that should be it?
Yes, but the open question Kevin raised was that open_count is listed as private in the header, so we ought not to be looking at it at all from vfio-pci-core unless we want to change that or provide an alternate interface to it. Thanks,
Alex
Quoted 1 line · Kevin
WARN_ON()
I sent an updated patch with this change. Thanks.
v3: https://lore.kernel.org/kvm/[email protected]/
Anthony