motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-16 14:41:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/virtio/virtio-iommu: Migrate to 3-phase reset

Browse source 
Currently the iommu may be reset before the devices
it protects. For example this happens with virtio-net.

Let's use 3-phase reset mechanism and reset the IOMMU on
exit phase after all DMA capable devices have been
reset during the 'enter' or 'hold' phase.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Acked-by: Jason Wang <jasowang@redhat.com>

Message-Id: <20250218182737.76722-2-eric.auger@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Eric Auger 2025-02-18 19:25:31 +01:00 • committed by Michael S. Tsirkin
parent e87b6efb11
commit d261b84d35
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/virtio/trace-events
View file

@ -108,7 +108,7 @@ virtio_pci_notify_write(uint64_t addr, uint64_t val, unsigned int size) "0x%" PR
virtio_pci_notify_write_pio(uint64_t addr, uint64_t val, unsigned int size) "0x%" PRIx64" = 0x%" PRIx64 " (%d)" virtio_pci_notify_write_pio(uint64_t addr, uint64_t val, unsigned int size) "0x%" PRIx64" = 0x%" PRIx64 " (%d)"
# hw/virtio/virtio-iommu.c # hw/virtio/virtio-iommu.c
virtio_iommu_device_reset(void) "reset!" virtio_iommu_device_reset_exit(void) "reset!"
virtio_iommu_system_reset(void) "system reset!" virtio_iommu_system_reset(void) "system reset!"
virtio_iommu_get_features(uint64_t features) "device supports features=0x%"PRIx64 virtio_iommu_get_features(uint64_t features) "device supports features=0x%"PRIx64
virtio_iommu_device_status(uint8_t status) "driver status = %d" virtio_iommu_device_status(uint8_t status) "driver status = %d"

14
hw/virtio/virtio-iommu.c
View file

@ -1504,11 +1504,11 @@ static void virtio_iommu_device_unrealize(DeviceState *dev)
virtio_cleanup(vdev); virtio_cleanup(vdev);
} }
static void virtio_iommu_device_reset(VirtIODevice *vdev) static void virtio_iommu_device_reset_exit(Object *obj, ResetType type)
{ {
VirtIOIOMMU *s = VIRTIO_IOMMU(vdev); VirtIOIOMMU *s = VIRTIO_IOMMU(obj);
trace_virtio_iommu_device_reset(); trace_virtio_iommu_device_reset_exit();
if (s->domains) { if (s->domains) {
g_tree_destroy(s->domains); g_tree_destroy(s->domains);
@ -1668,6 +1668,7 @@ static void virtio_iommu_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
ResettableClass *rc = RESETTABLE_CLASS(klass);
device_class_set_props(dc, virtio_iommu_properties); device_class_set_props(dc, virtio_iommu_properties);
dc->vmsd = &vmstate_virtio_iommu; dc->vmsd = &vmstate_virtio_iommu;
@ -1675,7 +1676,12 @@ static void virtio_iommu_class_init(ObjectClass *klass, void *data)
set_bit(DEVICE_CATEGORY_MISC, dc->categories); set_bit(DEVICE_CATEGORY_MISC, dc->categories);
vdc->realize = virtio_iommu_device_realize; vdc->realize = virtio_iommu_device_realize;
vdc->unrealize = virtio_iommu_device_unrealize; vdc->unrealize = virtio_iommu_device_unrealize;
vdc->reset = virtio_iommu_device_reset;
/*
* Use 'exit' reset phase to make sure all DMA requests
* have been quiesced during 'enter' or 'hold' phase
*/
rc->phases.exit = virtio_iommu_device_reset_exit;
vdc->get_config = virtio_iommu_get_config; vdc->get_config = virtio_iommu_get_config;
vdc->set_config = virtio_iommu_set_config; vdc->set_config = virtio_iommu_set_config;
vdc->get_features = virtio_iommu_get_features; vdc->get_features = virtio_iommu_get_features;