vfio: Spring cleanup
v3 cover vfio: Spring cleanup
Hello,
Several large extensions were merged in VFIO recently: migration support with dirty tracking, support for different host IOMMU backend devices, multifd support, etc. This adds up to the previous
extensions: vfio-platform, AP, CCW. The result is that VFIO is now a subsystem of over +16,000 lines of code :
QEMU 2.0 : 3988 total
...
QEMU 10.0 : 16607 total
Organization is weak, naming inconsistent, the vfio-common.h header file and common.c are quite messy. It's time to address the technical debt before adding new features.
This proposal reorganizes some of the VFIO files to isolate features, introduces new files and renames services to better reflect the namespace they belong to. This is code reshuffling and there are no intentional functional changes. If more could be done, please propose ! Timing seems right.
I have taken care to preserve all existing copyright notices in the file headers. I have added one on behalf of my current employer for newly created files. However, original authors may wish to include their own notices as well. If so, please respond to the patch, and I will update the patch in the next spin or before applying.
Here is a (short) list requiring your attention :
* include/hw/vfio/vfio-migration.h
* hw/vfio/vfio-migration-internal.h
Kirti Wankhede and Avihai Horon, NVIDIA
* hw/vfio/vfio-iommufd.h
Joao Martins and Yi Liu, Oracle and Intel
* include/hw/vfio/vfio-region.h
* hw/vfio/region.c
Eric Auger, may be we could reduce the list ?
I think the remaining new files are correctly covered but I am human, so please review and let me know.
I hope we can merge this when the QEMU 10.1 cycle starts and then address the two large series waiting : live update and vfio-user.
What next in terms of cleanups :
- container.c is quite messy
- the pci* files need some love too (add vfio- prefix ?)
- improve overall documentation, structs and routines documentation would be great
- isolate all the low level routines (kvm ioctls) into helpers.c to improve build ?
- improve build to reduce the number of files built per target
https://lore.kernel.org/qemu-devel/[email protected]
- continue the never ending quest of adding 'Error **' parameters, Look for migration_file_set_error, in MemoryListener handlers :
vfio_listener_region_add vfio_listener_log_global_stop vfio_listener_log_sync
and in callback routines for IOMMU notifiers :
vfio_iommu_map_notify
vfio_iommu_map_dirty_notify
memory_region_iommu_replay() would be a start.
- remove vfio-platform (start of QEMU 10.2 cycle ~ September 2025)
Thanks,
C.
Changes in v3:
- Fixed commit log typos
- Removed hw/vfio/vfio-migration.h include from hw/vfio/migration-multifd.c
- Added hw/vfio/vfio-region.h include in hw/vfio/pci.h
- Adjusted Copyright in hw/vfio/vfio-cpr.h
- Renamed vfio_container_vioc_query_dirty_bitmap() to vfio_container_iommu_query_dirty_bitmap()
- Improved hw/vfio/vfio-device.h header description
- Fixed code alignment when renaming VFIODevice related services
Changes in v2:
- Dropped vfio_migration_set_error()
https://lore.kernel.org/qemu-devel/[email protected]/
- Dropped R-b trailers on patches which were modified too much (context changes are ok)
- Improved commit logs of patches adding new files
- Fixed top comment in header files
- Used a 'vfio_migration_' prefix instead of 'vfio_mig_'
- Made vfio_migration_add_bytes_transferred() internal
- Added extra patch for vfio_device_state_is_running/precopy()
- Moved vfio_reset_handler() in device.c
- Moved "dirty tracking" related services into container-base.c and improved naming
- Introduced listener.* files instead of dirty-tracking.*
- Introduced vfio_listener_un/register() routines
Cédric Le Goater (37):
vfio: Move vfio_mig_active() into migration.c
vfio: Rename vfio_reset_bytes_transferred()
vfio: Introduce a new header file for external migration services
vfio: Make vfio_un/block_multiple_devices_migration() static
vfio: Make vfio_viommu_preset() static
vfio: Introduce a new header file for internal migration services
vfio: Move vfio_device_state_is_running/precopy() into migration.c
vfio: Introduce a new header file for VFIOdisplay declarations
vfio: Move VFIOHostDMAWindow definition into spapr.c
vfio: Introduce a new header file for VFIOIOMMUFD declarations
vfio: Introduce new files for VFIORegion definitions and declarations
vfio: Introduce a new header file for VFIOcontainer declarations
vfio: Make vfio_group_list static
vfio: Move VFIOAddressSpace helpers into container-base.c
vfio: Move Host IOMMU type declarations into their respective files
vfio: Introduce a new header file for helper services
vfio: Move vfio_get_info_dma_avail() into helpers.c
vfio: Move vfio_kvm_device_add/del_fd() to helpers.c
vfio: Move vfio_get_device_info() to helpers.c
vfio: Introduce a new file for VFIODevice definitions
vfio: Introduce new files for CPR definitions and declarations
vfio: Move vfio_kvm_device_fd() into helpers.c
vfio: Move vfio_device_list into device.c
vfio: Move vfio_de/attach_device() into device.c
vfio: Move vfio_reset_handler() into device.c
vfio: Move dirty tracking related services into container-base.c
vfio: Make vfio_devices_query_dirty_bitmap() static
vfio: Make vfio_container_query_dirty_bitmap() static
vfio: Rename vfio_devices_all_dirty_tracking_started()
vfio: Rename vfio_devices_all_device_dirty_tracking()
vfio: Rename vfio_get_dirty_bitmap()
vfio: Introduce new files for VFIO MemoryListener
vfio: Rename RAM discard related services
vfio: Introduce vfio_listener_un/register() routines
vfio: Rename vfio-common.h to vfio-device.h
vfio: Rename VFIODevice related services
vfio: Rename VFIOContainer related services
hw/vfio/migration-multifd.h | 2 +-
hw/vfio/pci.h | 4 +-
hw/vfio/vfio-cpr.h | 15 +
hw/vfio/vfio-display.h | 42 ++
hw/vfio/vfio-helpers.h | 35 ++
hw/vfio/vfio-iommufd.h | 34 ++
hw/vfio/vfio-listener.h | 15 +
hw/vfio/vfio-migration-internal.h | 74 +++
include/hw/s390x/vfio-ccw.h | 2 +-
include/hw/vfio/vfio-common.h | 346 -------------
include/hw/vfio/vfio-container-base.h | 12 +-
include/hw/vfio/vfio-container.h | 36 ++
include/hw/vfio/vfio-device.h | 149 ++++++
include/hw/vfio/vfio-migration.h | 16 +
include/hw/vfio/vfio-platform.h | 4 +-
include/hw/vfio/vfio-region.h | 47 ++
backends/iommufd.c | 2 +-
hw/core/sysbus-fdt.c | 1 +
hw/ppc/spapr_pci_vfio.c | 6 +-
hw/s390x/s390-pci-vfio.c | 3 +-
hw/vfio/ap.c | 14 +-
hw/vfio/ccw.c | 30 +-
hw/vfio/container-base.c | 192 ++++++-
hw/vfio/container.c | 123 ++---
hw/vfio/cpr.c | 3 +-
hw/vfio/device.c | 405 +++++++++++++++
hw/vfio/display.c | 10 +-
hw/vfio/helpers.c | 702 +++-----------------------
hw/vfio/igd.c | 10 +-
hw/vfio/iommufd.c | 24 +-
hw/vfio/{common.c => listener.c} | 455 +----------------
hw/vfio/migration-multifd.c | 7 +-
hw/vfio/migration.c | 111 +++-
hw/vfio/pci.c | 70 +--
hw/vfio/platform.c | 15 +-
hw/vfio/region.c | 395 +++++++++++++++
hw/vfio/spapr.c | 10 +-
migration/target.c | 8 +-
hw/vfio/meson.build | 10 +-
hw/vfio/trace-events | 36 +-
40 files changed, 1875 insertions(+), 1600 deletions(-)
create mode 100644 hw/vfio/vfio-cpr.h
create mode 100644 hw/vfio/vfio-display.h
create mode 100644 hw/vfio/vfio-helpers.h
create mode 100644 hw/vfio/vfio-iommufd.h
create mode 100644 hw/vfio/vfio-listener.h
create mode 100644 hw/vfio/vfio-migration-internal.h
delete mode 100644 include/hw/vfio/vfio-common.h
create mode 100644 include/hw/vfio/vfio-container.h
create mode 100644 include/hw/vfio/vfio-device.h
create mode 100644 include/hw/vfio/vfio-migration.h
create mode 100644 include/hw/vfio/vfio-region.h
create mode 100644 hw/vfio/device.c
rename hw/vfio/{common.c => listener.c} (76%)
create mode 100644 hw/vfio/region.cSignature · 1 line
2.49.0
PATCH v3 1/37 vfio: Move vfio_mig_active() into migration.c
vfio_mig_active() is part of the VFIO migration API. Move the definitions where VFIO migration is implemented.
--- hw/vfio/common.c | 16 ---------------- hw/vfio/migration.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-)
hw/vfio/common.c +0 -16
@@ -66,22 +66,6 @@ int vfio_kvm_device_fd = -1;* Device state interfaces */ -bool vfio_mig_active (void ) -{ -VFIODevice *vbasedev; - -if (QLIST_EMPTY (&vfio_device_list)) { -return false; - } - - QLIST_FOREACH(vbasedev, &vfio_device_list, global_next) { -if (vbasedev->migration_blocker) { -return false; - } - } -return true; -} -static Error *multiple_devices_migration_blocker;/*
hw/vfio/migration.c +16 -0
@@ -1062,6 +1062,22 @@ void vfio_mig_add_bytes_transferred(unsigned long val)qatomic_add (&bytes_transferred, val); } +bool vfio_mig_active (void ) +{ +VFIODevice *vbasedev; + +if (QLIST_EMPTY (&vfio_device_list)) { +return false; + } + + QLIST_FOREACH(vbasedev, &vfio_device_list, global_next) { +if (vbasedev->migration_blocker) { +return false; + } + } +return true; +} +/* * Return true when either migration initialized or blocker registered. * Currently only return false when adding blocker fails which will
Signature · 1 line
2.49.0
PATCH v3 2/37 vfio: Rename vfio_reset_bytes_transferred()
In reply to Cédric Le GoaterEnforce a 'vfio_mig_' prefix for the VFIO migration API to better reflect the namespace these routines belong to.
--- include/hw/vfio/vfio-common.h | 2 +- hw/vfio/migration.c | 2 +- migration/target.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
include/hw/vfio/vfio-common.h +1 -1
@@ -295,7 +295,7 @@ int vfio_block_multiple_devices_migration(VFIODevice *vbasedev, Error **errp);void vfio_unblock_multiple_devices_migration (void );bool vfio_viommu_preset (VFIODevice *vbasedev);int64_t vfio_mig_bytes_transferred (void ); -void vfio_reset_bytes_transferred (void ); +void vfio_mig_reset_bytes_transferred (void );void vfio_mig_add_bytes_transferred (unsigned long val);bool vfio_device_state_is_running (VFIODevice *vbasedev);bool vfio_device_state_is_precopy (VFIODevice *vbasedev);
hw/vfio/migration.c +1 -1
@@ -1052,7 +1052,7 @@ int64_t vfio_mig_bytes_transferred(void)return MIN (qatomic_read (&bytes_transferred),INT64_MAX ); } -void vfio_reset_bytes_transferred (void ) +void vfio_mig_reset_bytes_transferred (void ) {qatomic_set (&bytes_transferred,0 ); }
migration/target.c +1 -1
@@ -25,7 +25,7 @@ void migration_populate_vfio_info(MigrationInfo *info)void migration_reset_vfio_bytes_transferred (void ) { -vfio_reset_bytes_transferred (); +vfio_mig_reset_bytes_transferred (); }#else void migration_populate_vfio_info (MigrationInfo *info)
Signature · 1 line
2.49.0
PATCH v3 3/37 vfio: Introduce a new header file for external migration services
In reply to Cédric Le GoaterThe migration core subsystem makes use of the VFIO migration API to collect statistics on the number of bytes transferred. These services are declared in "hw/vfio/vfio-common.h" which also contains VFIO internal declarations. Move the migration declarations into a new header file "hw/vfio/vfio-migration.h" to reduce the exposure of VFIO internals.
While at it, use a 'vfio_migration_' prefix for these services.
To be noted, vfio_migration_add_bytes_transferred() is a VFIO migration internal service which we will be moved in the subsequent patches.
--- include/hw/vfio/vfio-common.h | 5 +---- include/hw/vfio/vfio-migration.h | 16 ++++++++++++++++ hw/vfio/migration-multifd.c | 5 +++-- hw/vfio/migration.c | 11 ++++++----- migration/target.c | 8 ++++---- 5 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 include/hw/vfio/vfio-migration.h
include/hw/vfio/vfio-common.h +1 -4
@@ -290,13 +290,10 @@ extern VFIODeviceList vfio_device_list;extern const MemoryListener vfio_memory_listener;extern int vfio_kvm_device_fd; -bool vfio_mig_active (void );int vfio_block_multiple_devices_migration (VFIODevice *vbasedev,Error **errp);void vfio_unblock_multiple_devices_migration (void );bool vfio_viommu_preset (VFIODevice *vbasedev); -int64_t vfio_mig_bytes_transferred (void ); -void vfio_mig_reset_bytes_transferred (void ); -void vfio_mig_add_bytes_transferred (unsigned long val); +void vfio_migration_add_bytes_transferred (unsigned long val);bool vfio_device_state_is_running (VFIODevice *vbasedev);bool vfio_device_state_is_precopy (VFIODevice *vbasedev);
include/hw/vfio/vfio-migration.h new file +16 -0
@@ -0,0 +1,16 @@ +/* +* VFIO migration interface +* +* Copyright Red Hat, Inc. 2025 +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#ifndef HW_VFIO_VFIO_MIGRATION_H +#define HW_VFIO_VFIO_MIGRATION_H + +bool vfio_migration_active (void ); +int64_t vfio_migration_bytes_transferred (void ); +void vfio_migration_reset_bytes_transferred (void ); + +#endif /* HW_VFIO_VFIO_MIGRATION_H */
hw/vfio/migration-multifd.c +3 -2
@@ -11,6 +11,7 @@#include "qemu/osdep.h" #include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-migration.h" #include "migration/misc.h" #include "qapi/error.h" #include "qemu/bswap.h"
@@ -575,7 +576,7 @@ vfio_save_complete_precopy_thread_config_state(VFIODevice *vbasedev,return false; } -vfio_mig_add_bytes_transferred (packet_len); +vfio_migration_add_bytes_transferred (packet_len);return true; }
@@ -645,7 +646,7 @@ vfio_multifd_save_complete_precopy_thread(SaveLiveCompletePrecopyThreadData *d, goto thread_exit; } -vfio_mig_add_bytes_transferred (packet_size); +vfio_migration_add_bytes_transferred (packet_size); } if (!vfio_save_complete_precopy_thread_config_state(vbasedev,
hw/vfio/migration.c +6 -5
@@ -17,6 +17,7 @@#include "system/runstate.h" #include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-migration.h" #include "migration/misc.h" #include "migration/savevm.h" #include "migration/vmstate.h"
@@ -373,7 +374,7 @@ static ssize_t vfio_save_block(QEMUFile *f, VFIOMigration *migration)qemu_put_be64 (f,VFIO_MIG_FLAG_DEV_DATA_STATE );qemu_put_be64 (f, data_size);qemu_put_buffer (f, migration->data_buffer, data_size); -vfio_mig_add_bytes_transferred (data_size); +vfio_migration_add_bytes_transferred (data_size);trace_vfio_save_block (migration->vbasedev->name, data_size);
@@ -1047,22 +1048,22 @@ static int vfio_block_migration(VFIODevice *vbasedev, Error *err, Error **errp)/* ---------------------------------------------------------------------- */ -int64_t vfio_mig_bytes_transferred (void ) +int64_t vfio_migration_bytes_transferred (void ) {return MIN (qatomic_read (&bytes_transferred),INT64_MAX ); } -void vfio_mig_reset_bytes_transferred (void ) +void vfio_migration_reset_bytes_transferred (void ) {qatomic_set (&bytes_transferred,0 ); } -void vfio_mig_add_bytes_transferred (unsigned long val) +void vfio_migration_add_bytes_transferred (unsigned long val) {qatomic_add (&bytes_transferred, val); } -bool vfio_mig_active (void ) +bool vfio_migration_active (void ) {VFIODevice *vbasedev;
migration/target.c +4 -4
@@ -11,21 +11,21 @@#include CONFIG_DEVICES #ifdef CONFIG_VFIO -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-migration.h" #endif #ifdef CONFIG_VFIO void migration_populate_vfio_info (MigrationInfo *info) { -if (vfio_mig_active ()) { +if (vfio_migration_active ()) { info->vfio =g_malloc0 (sizeof (*info->vfio)); - info->vfio->transferred =vfio_mig_bytes_transferred (); + info->vfio->transferred =vfio_migration_bytes_transferred (); } }void migration_reset_vfio_bytes_transferred (void ) { -vfio_mig_reset_bytes_transferred (); +vfio_migration_reset_bytes_transferred (); }#else void migration_populate_vfio_info (MigrationInfo *info)
Signature · 1 line
2.49.0
PATCH v3 4/37 vfio: Make vfio_un/block_multiple_devices_migration() static
In reply to Cédric Le GoaterBoth of these routines are only used in file "migration.c". Move them there.
--- include/hw/vfio/vfio-common.h | 2 -- hw/vfio/common.c | 62 ----------------------------------- hw/vfio/migration.c | 62 +++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 64 deletions(-)
include/hw/vfio/vfio-common.h +0 -2
@@ -290,8 +290,6 @@ extern VFIODeviceList vfio_device_list;extern const MemoryListener vfio_memory_listener;extern int vfio_kvm_device_fd; -int vfio_block_multiple_devices_migration (VFIODevice *vbasedev,Error **errp); -void vfio_unblock_multiple_devices_migration (void );bool vfio_viommu_preset (VFIODevice *vbasedev);void vfio_migration_add_bytes_transferred (unsigned long val);bool vfio_device_state_is_running (VFIODevice *vbasedev);
hw/vfio/common.c +0 -62
74 lines not on this page · raw message
hw/vfio/migration.c +62 -0
68 lines not on this page · raw message
Signature · 1 line
2.49.0
PATCH v3 5/37 vfio: Make vfio_viommu_preset() static
In reply to Cédric Le GoaterThis routine is only used in file "migration.c". Move it there.
--- include/hw/vfio/vfio-common.h | 1 - hw/vfio/common.c | 5 ----- hw/vfio/migration.c | 5 +++++ 3 files changed, 5 insertions(+), 6 deletions(-)
include/hw/vfio/vfio-common.h +0 -1
@@ -290,7 +290,6 @@ extern VFIODeviceList vfio_device_list;extern const MemoryListener vfio_memory_listener;extern int vfio_kvm_device_fd; -bool vfio_viommu_preset (VFIODevice *vbasedev);void vfio_migration_add_bytes_transferred (unsigned long val);bool vfio_device_state_is_running (VFIODevice *vbasedev);bool vfio_device_state_is_precopy (VFIODevice *vbasedev);
hw/vfio/common.c +0 -5
@@ -66,11 +66,6 @@ int vfio_kvm_device_fd = -1;*/ -bool vfio_viommu_preset (VFIODevice *vbasedev) -{ -return vbasedev->bcontainer->space->as != &address_space_memory; -} -bool vfio_device_state_is_running (VFIODevice *vbasedev) {VFIOMigration *migration = vbasedev->migration;
hw/vfio/migration.c +5 -0
@@ -1141,6 +1141,11 @@ bool vfio_migration_active(void)return true; } +static bool vfio_viommu_preset (VFIODevice *vbasedev) +{ +return vbasedev->bcontainer->space->as != &address_space_memory; +} +/* * Return true when either migration initialized or blocker registered. * Currently only return false when adding blocker fails which will
Signature · 1 line
2.49.0
PATCH v3 6/37 vfio: Introduce a new header file for internal migration services
In reply to Cédric Le GoaterGather all VFIO migration related declarations into "vfio-migration-internal.h" to reduce exposure of VFIO internals in "hw/vfio/vfio-common.h".
--- hw/vfio/vfio-migration-internal.h | 72 +++++++++++++++++++++++++++++++ include/hw/vfio/vfio-common.h | 52 +--------------------- hw/vfio/common.c | 1 + hw/vfio/migration-multifd.c | 2 +- hw/vfio/migration.c | 1 + hw/vfio/pci.c | 1 + 6 files changed, 77 insertions(+), 52 deletions(-) create mode 100644 hw/vfio/vfio-migration-internal.h
hw/vfio/vfio-migration-internal.h new file +72 -0
@@ -0,0 +1,72 @@ +/* +* VFIO migration +* +* Copyright Red Hat, Inc. 2025 +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#ifndef HW_VFIO_VFIO_MIGRATION_INTERNAL_H +#define HW_VFIO_VFIO_MIGRATION_INTERNAL_H + +#ifdef CONFIG_LINUX +#include <linux/vfio.h> +#endif + +#include "qemu/typedefs.h" +#include "qemu/notify.h" + +/* +* Flags to be used as unique delimiters for VFIO devices in the migration +* stream. These flags are composed as: +* 0xffffffff => MSB 32-bit all 1s +* 0xef10 => Magic ID, represents emulated (virtual) function IO +* 0x0000 => 16-bits reserved for flags +* +* The beginning of state information is marked by _DEV_CONFIG_STATE, +* _DEV_SETUP_STATE, or _DEV_DATA_STATE, respectively. The end of a +* certain state information is marked by _END_OF_STATE. +*/ +#define VFIO_MIG_FLAG_END_OF_STATE (0xffffffffef100001ULL) +#define VFIO_MIG_FLAG_DEV_CONFIG_STATE (0xffffffffef100002ULL) +#define VFIO_MIG_FLAG_DEV_SETUP_STATE (0xffffffffef100003ULL) +#define VFIO_MIG_FLAG_DEV_DATA_STATE (0xffffffffef100004ULL) +#define VFIO_MIG_FLAG_DEV_INIT_DATA_SENT (0xffffffffef100005ULL) + +typedef struct VFIODevice VFIODevice ; +typedef struct VFIOMultifd VFIOMultifd ; + +typedef struct VFIOMigration { +struct VFIODevice *vbasedev; +VMChangeStateEntry *vm_state; +NotifierWithReturn migration_state; +uint32_t device_state; +int data_fd; +void *data_buffer; +size_t data_buffer_size; +uint64_t mig_flags; +uint64_t precopy_init_size; +uint64_t precopy_dirty_size; +bool multifd_transfer; +VFIOMultifd *multifd; +bool initial_data_sent; + +bool event_save_iterate_started; +bool event_precopy_empty_hit; +}VFIOMigration ; + +bool vfio_migration_realize (VFIODevice *vbasedev,Error **errp); +void vfio_migration_exit (VFIODevice *vbasedev); +int vfio_save_device_config_state (QEMUFile *f,void *opaque,Error **errp); +int vfio_load_device_config_state (QEMUFile *f,void *opaque); + +#ifdef CONFIG_LINUX +int vfio_migration_set_state (VFIODevice *vbasedev, +enum vfio_device_mig_state new_state, +enum vfio_device_mig_state recover_state, +Error **errp); +#endif + +void vfio_migration_add_bytes_transferred (unsigned long val); + +#endif /* HW_VFIO_VFIO_MIGRATION_INTERNAL_H */
include/hw/vfio/vfio-common.h +1 -51
93 lines not on this page · raw message
hw/vfio/common.c +1 -0
@@ -44,6 +44,7 @@#include "migration/qemu-file.h" #include "system/tcg.h" #include "system/tpm.h" +#include "vfio-migration-internal.h" VFIODeviceList vfio_device_list =QLIST_HEAD_INITIALIZER (vfio_device_list);
hw/vfio/migration-multifd.c +1 -1
@@ -11,7 +11,6 @@#include "qemu/osdep.h" #include "hw/vfio/vfio-common.h" -#include "hw/vfio/vfio-migration.h" #include "migration/misc.h" #include "qapi/error.h" #include "qemu/bswap.h"
@@ -22,6 +21,7 @@#include "io/channel-buffer.h" #include "migration/qemu-file.h" #include "migration-multifd.h" +#include "vfio-migration-internal.h" #include "trace.h" #define VFIO_DEVICE_STATE_CONFIG_STATE (1)
hw/vfio/migration.c +1 -0
@@ -31,6 +31,7 @@#include "pci.h" #include "trace.h" #include "hw/hw.h" +#include "vfio-migration-internal.h" /* * This is an arbitrary size based on migration of mlx5 devices, where typically
hw/vfio/pci.c +1 -0
@@ -44,6 +44,7 @@#include "migration/blocker.h" #include "migration/qemu-file.h" #include "system/iommufd.h" +#include "vfio-migration-internal.h" #define TYPE_VFIO_PCI_NOHOTPLUG "vfio-pci-nohotplug"
Signature · 1 line
2.49.0
PATCH v3 7/37 vfio: Move vfio_device_state_is_running/precopy() into migration.c
In reply to Cédric Le GoaterThese routines are migration related. Move their declaration and implementation under the migration files.
--- hw/vfio/vfio-migration-internal.h | 2 ++ include/hw/vfio/vfio-common.h | 3 --- hw/vfio/common.c | 16 ---------------- hw/vfio/migration.c | 16 ++++++++++++++++ 4 files changed, 18 insertions(+), 19 deletions(-)
hw/vfio/vfio-migration-internal.h +2 -0
@@ -57,6 +57,8 @@ typedef struct VFIOMigration {bool vfio_migration_realize (VFIODevice *vbasedev,Error **errp);void vfio_migration_exit (VFIODevice *vbasedev); +bool vfio_device_state_is_running (VFIODevice *vbasedev); +bool vfio_device_state_is_precopy (VFIODevice *vbasedev);int vfio_save_device_config_state (QEMUFile *f,void *opaque,Error **errp);int vfio_load_device_config_state (QEMUFile *f,void *opaque);
include/hw/vfio/vfio-common.h +0 -3
@@ -252,9 +252,6 @@ extern VFIODeviceList vfio_device_list;extern const MemoryListener vfio_memory_listener;extern int vfio_kvm_device_fd; -bool vfio_device_state_is_running (VFIODevice *vbasedev); -bool vfio_device_state_is_precopy (VFIODevice *vbasedev); -#ifdef CONFIG_LINUX int vfio_get_region_info (VFIODevice *vbasedev,int index,struct vfio_region_info **info);
hw/vfio/common.c +0 -16
@@ -67,22 +67,6 @@ int vfio_kvm_device_fd = -1;*/ -bool vfio_device_state_is_running (VFIODevice *vbasedev) -{ -VFIOMigration *migration = vbasedev->migration; - -return migration->device_state ==VFIO_DEVICE_STATE_RUNNING || - migration->device_state ==VFIO_DEVICE_STATE_RUNNING_P2P ; -} - -bool vfio_device_state_is_precopy (VFIODevice *vbasedev) -{ -VFIOMigration *migration = vbasedev->migration; - -return migration->device_state ==VFIO_DEVICE_STATE_PRE_COPY || - migration->device_state ==VFIO_DEVICE_STATE_PRE_COPY_P2P ; -} -static bool vfio_devices_all_device_dirty_tracking_started (const VFIOContainerBase *bcontainer) {
hw/vfio/migration.c +16 -0
@@ -1223,3 +1223,19 @@ void vfio_migration_exit(VFIODevice *vbasedev)migrate_del_blocker (&vbasedev->migration_blocker); } + +bool vfio_device_state_is_running (VFIODevice *vbasedev) +{ +VFIOMigration *migration = vbasedev->migration; + +return migration->device_state ==VFIO_DEVICE_STATE_RUNNING || + migration->device_state ==VFIO_DEVICE_STATE_RUNNING_P2P ; +} + +bool vfio_device_state_is_precopy (VFIODevice *vbasedev) +{ +VFIOMigration *migration = vbasedev->migration; + +return migration->device_state ==VFIO_DEVICE_STATE_PRE_COPY || + migration->device_state ==VFIO_DEVICE_STATE_PRE_COPY_P2P ; +}
Signature · 1 line
2.49.0
PATCH v3 8/37 vfio: Introduce a new header file for VFIOdisplay declarations
In reply to Cédric Le GoaterGather all VFIOdisplay related declarations into "vfio-display.h" to reduce exposure of VFIO internals in "hw/vfio/vfio-common.h".
--- hw/vfio/pci.h | 1 + hw/vfio/vfio-display.h | 41 +++++++++++++++++++++++++++++++++++ include/hw/vfio/vfio-common.h | 28 ------------------------ hw/vfio/display.c | 2 +- 4 files changed, 43 insertions(+), 29 deletions(-) create mode 100644 hw/vfio/vfio-display.h
hw/vfio/pci.h +1 -0
@@ -20,6 +20,7 @@#include "qemu/timer.h" #include "qom/object.h" #include "system/kvm.h" +#include "vfio-display.h" #define PCI_ANY_ID (~0)
hw/vfio/vfio-display.h new file +41 -0
41 lines not on this page · raw message
include/hw/vfio/vfio-common.h +0 -28
@@ -23,8 +23,6 @@#include "exec/memory.h" #include "qemu/queue.h" -#include "ui/console.h" -#include "hw/display/ramfb.h" #ifdef CONFIG_LINUX #include <linux/vfio.h> #endif
@@ -182,32 +180,6 @@ typedef struct VFIOGroup {#define TYPE_HOST_IOMMU_DEVICE_IOMMUFD_VFIO \ TYPE_HOST_IOMMU_DEVICE_IOMMUFD "-vfio" -typedef struct VFIODMABuf { -QemuDmaBuf *buf; -uint32_t pos_x, pos_y, pos_updates; -uint32_t hot_x, hot_y, hot_updates; -int dmabuf_id; -QTAILQ_ENTRY (VFIODMABuf) next; -}VFIODMABuf ; - -typedef struct VFIODisplay { -QemuConsole *con; -RAMFBState *ramfb; -struct vfio_region_info *edid_info; -struct vfio_region_gfx_edid *edid_regs; -uint8_t *edid_blob; -QEMUTimer *edid_link_timer; -struct { -VFIORegion buffer; -DisplaySurface *surface; - } region; -struct { - QTAILQ_HEAD(, VFIODMABuf) bufs; -VFIODMABuf *primary; -VFIODMABuf *cursor; - } dmabuf; -}VFIODisplay ; -VFIOAddressSpace *vfio_get_address_space (AddressSpace *as);void vfio_put_address_space (VFIOAddressSpace *space); void vfio_address_space_insert(VFIOAddressSpace *space,
hw/vfio/display.c +1 -1
@@ -16,9 +16,9 @@#include "qemu/error-report.h" #include "hw/display/edid.h" -#include "ui/console.h" #include "qapi/error.h" #include "pci.h" +#include "vfio-display.h" #include "trace.h" #ifndef DRM_PLANE_TYPE_PRIMARY
Signature · 1 line
2.49.0
PATCH v3 9/37 vfio: Move VFIOHostDMAWindow definition into spapr.c
In reply to Cédric Le GoaterVFIOHostDMAWindow is only used in file "spapr.c". Move it there.
--- include/hw/vfio/vfio-common.h | 7 ------- hw/vfio/spapr.c | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-)
include/hw/vfio/vfio-common.h +0 -7
@@ -69,13 +69,6 @@ typedef struct VFIOContainer {OBJECT_DECLARE_SIMPLE_TYPE (VFIOContainer,VFIO_IOMMU_LEGACY ); -typedef struct VFIOHostDMAWindow { -hwaddr min_iova; -hwaddr max_iova; -uint64_t iova_pgsizes; -QLIST_ENTRY (VFIOHostDMAWindow) hostwin_next; -}VFIOHostDMAWindow ; -typedef struct IOMMUFDBackend IOMMUFDBackend ; typedef struct VFIOIOASHwpt {
hw/vfio/spapr.c +7 -0
@@ -22,6 +22,13 @@#include "qapi/error.h" #include "trace.h" +typedef struct VFIOHostDMAWindow { +hwaddr min_iova; +hwaddr max_iova; +uint64_t iova_pgsizes; +QLIST_ENTRY (VFIOHostDMAWindow) hostwin_next; +}VFIOHostDMAWindow ; + typedef struct VFIOSpaprContainer { VFIOContainer container; MemoryListener prereg_listener;
Signature · 1 line
2.49.0
PATCH v3 10/37 vfio: Introduce a new header file for VFIOIOMMUFD declarations
In reply to Cédric Le GoaterGather all VFIOIOMMUFD related declarations introduced by commits 5ee3dc7af785 ("vfio/iommufd: Implement the iommufd backend") and 5b1e96e65403 ("vfio/iommufd: Introduce auto domain creation") into "vfio-iommufd.h". This to reduce exposure of VFIO internals in "hw/vfio/vfio-common.h".
--- hw/vfio/vfio-iommufd.h | 34 ++++++++++++++++++++++++++++++++++ include/hw/vfio/vfio-common.h | 21 +++------------------ hw/vfio/iommufd.c | 1 + 3 files changed, 38 insertions(+), 18 deletions(-) create mode 100644 hw/vfio/vfio-iommufd.h
hw/vfio/vfio-iommufd.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* VFIO iommufd +* +* Copyright Red Hat, Inc. 2025 +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#ifndef HW_VFIO_VFIO_IOMMUFD_H +#define HW_VFIO_VFIO_IOMMUFD_H + +#include "hw/vfio/vfio-container-base.h" + +typedef struct VFIODevice VFIODevice ; + +typedef struct VFIOIOASHwpt { +uint32_t hwpt_id; +uint32_t hwpt_flags; + QLIST_HEAD(, VFIODevice) device_list; +QLIST_ENTRY (VFIOIOASHwpt) next; +}VFIOIOASHwpt ; + +typedef struct IOMMUFDBackend IOMMUFDBackend ; + +typedef struct VFIOIOMMUFDContainer { +VFIOContainerBase bcontainer; +IOMMUFDBackend *be; +uint32_t ioas_id; + QLIST_HEAD(, VFIOIOASHwpt) hwpt_list; +}VFIOIOMMUFDContainer ; + +OBJECT_DECLARE_SIMPLE_TYPE (VFIOIOMMUFDContainer,VFIO_IOMMU_IOMMUFD ); + +#endif /* HW_VFIO_VFIO_IOMMUFD_H */
include/hw/vfio/vfio-common.h +3 -18
@@ -69,27 +69,12 @@ typedef struct VFIOContainer {OBJECT_DECLARE_SIMPLE_TYPE (VFIOContainer,VFIO_IOMMU_LEGACY ); -typedef struct IOMMUFDBackend IOMMUFDBackend ; - -typedef struct VFIOIOASHwpt { -uint32_t hwpt_id; -uint32_t hwpt_flags; - QLIST_HEAD(, VFIODevice) device_list; -QLIST_ENTRY (VFIOIOASHwpt) next; -}VFIOIOASHwpt ; - -typedef struct VFIOIOMMUFDContainer { -VFIOContainerBase bcontainer; -IOMMUFDBackend *be; -uint32_t ioas_id; - QLIST_HEAD(, VFIOIOASHwpt) hwpt_list; -}VFIOIOMMUFDContainer ; - -OBJECT_DECLARE_SIMPLE_TYPE (VFIOIOMMUFDContainer,VFIO_IOMMU_IOMMUFD ); -typedef struct VFIODeviceOps VFIODeviceOps ;typedef struct VFIOMigration VFIOMigration ; +typedef struct IOMMUFDBackend IOMMUFDBackend ; +typedef struct VFIOIOASHwpt VFIOIOASHwpt ; + typedef struct VFIODevice { QLIST_ENTRY(VFIODevice) next; QLIST_ENTRY(VFIODevice) container_next;
hw/vfio/iommufd.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/cutils.h" #include "qemu/chardev_open.h" #include "pci.h" +#include "vfio-iommufd.h" static int iommufd_cdev_map (const VFIOContainerBase *bcontainer,hwaddr iova,ram_addr_t size,void *vaddr,bool readonly)
Signature · 1 line
2.49.0
PATCH v3 11/37 vfio: Introduce new files for VFIORegion definitions and declarations
In reply to Cédric Le GoaterGather all VFIORegion related declarations and definitions into their own files to reduce exposure of VFIO internals in "hw/vfio/vfio-common.h". They were introduced for 'vfio-platform' support in commits db0da029a185 ("vfio: Generalize region support") and a664477db8da ("hw/vfio/pci: Introduce VFIORegion").
To be noted that the 'vfio-platform' devices have been deprecated and will be removed in QEMU 10.2. Until then, make the declarations available externally for 'sysbus-fdt.c'.
--- hw/vfio/pci.h | 1 + hw/vfio/vfio-display.h | 1 + include/hw/vfio/vfio-common.h | 32 +-- include/hw/vfio/vfio-platform.h | 2 + include/hw/vfio/vfio-region.h | 47 ++++ hw/core/sysbus-fdt.c | 1 + hw/vfio/helpers.c | 363 ----------------------------- hw/vfio/platform.c | 1 + hw/vfio/region.c | 394 ++++++++++++++++++++++++++++++++ hw/vfio/meson.build | 1 + hw/vfio/trace-events | 16 +- 11 files changed, 458 insertions(+), 401 deletions(-) create mode 100644 include/hw/vfio/vfio-region.h create mode 100644 hw/vfio/region.c
hw/vfio/pci.h +1 -0
@@ -15,6 +15,7 @@#include "exec/memory.h" #include "hw/pci/pci_device.h" #include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-region.h" #include "qemu/event_notifier.h" #include "qemu/queue.h" #include "qemu/timer.h"
hw/vfio/vfio-display.h +1 -0
@@ -11,6 +11,7 @@#include "ui/console.h" #include "hw/display/ramfb.h" +#include "hw/vfio/vfio-region.h" typedef struct VFIODMABuf { QemuDmaBuf *buf;
include/hw/vfio/vfio-common.h +1 -31
@@ -39,25 +39,6 @@ enum {VFIO_DEVICE_TYPE_CCW =2 , VFIO_DEVICE_TYPE_AP = 3, }; - -typedef struct VFIOMmap { -MemoryRegion mem; -void *mmap; -off_t offset; -size_t size; -}VFIOMmap ; - -typedef struct VFIORegion { -struct VFIODevice *vbasedev; -off_t fd_offset;/* offset of region within device fd */ -MemoryRegion *mem;/* slow, read/write access */ -size_t size; -uint32_t flags;/* VFIO region flags (rd/wr/mmap) */ -uint32_t nr_mmaps; -VFIOMmap *mmaps; -uint8_t nr;/* cache the region number for debug */ -}VFIORegion ; -struct VFIOGroup ; typedef struct VFIOContainer {
@@ -168,17 +149,7 @@ void vfio_unmask_single_irqindex(VFIODevice *vbasedev, int index);void vfio_mask_single_irqindex (VFIODevice *vbasedev,int index);bool vfio_set_irq_signaling (VFIODevice *vbasedev,int index,int subindex,int action,int fd,Error **errp); -void vfio_region_write (void *opaque,hwaddr addr, -uint64_t data,unsigned size); -uint64_t vfio_region_read (void *opaque, -hwaddr addr,unsigned size); -int vfio_region_setup (Object *obj,VFIODevice *vbasedev,VFIORegion *region, -int index,const char *name); -int vfio_region_mmap (VFIORegion *region); -void vfio_region_mmaps_set_enabled (VFIORegion *region,bool enabled); -void vfio_region_unmap (VFIORegion *region); -void vfio_region_exit (VFIORegion *region); -void vfio_region_finalize (VFIORegion *region); +void vfio_reset_handler (void *opaque);struct vfio_device_info *vfio_get_device_info (int fd);bool vfio_device_is_mdev (VFIODevice *vbasedev);
@@ -194,7 +165,6 @@ int vfio_kvm_device_del_fd(int fd, Error **errp);bool vfio_cpr_register_container (VFIOContainerBase *bcontainer,Error **errp);void vfio_cpr_unregister_container (VFIOContainerBase *bcontainer); -extern const MemoryRegionOps vfio_region_ops; typedef QLIST_HEAD(VFIOGroupList, VFIOGroup) VFIOGroupList; typedef QLIST_HEAD(VFIODeviceList, VFIODevice) VFIODeviceList;extern VFIOGroupList vfio_group_list;
include/hw/vfio/vfio-platform.h +2 -0
@@ -47,6 +47,8 @@ typedef struct VFIOINTp {/* function type for user side eventfd handler */ typedef void (*eventfd_user_side_handler_t )(VFIOINTp *intp); +typedef struct VFIORegion VFIORegion ; +struct VFIOPlatformDevice {SysBusDevice sbdev;VFIODevice vbasedev;/* not a QOM object */
include/hw/vfio/vfio-region.h new file +47 -0
47 lines not on this page · raw message
hw/core/sysbus-fdt.c +1 -0
@@ -35,6 +35,7 @@#include "hw/vfio/vfio-platform.h" #include "hw/vfio/vfio-calxeda-xgmac.h" #include "hw/vfio/vfio-amd-xgbe.h" +#include "hw/vfio/vfio-region.h" #include "hw/display/ramfb.h" #include "hw/uefi/var-service-api.h" #include "hw/arm/fdt.h"
hw/vfio/helpers.c +0 -363
375 lines not on this page · raw message
hw/vfio/platform.c +1 -0
@@ -37,6 +37,7 @@#include "hw/platform-bus.h" #include "hw/qdev-properties.h" #include "system/kvm.h" +#include "hw/vfio/vfio-region.h" /* * Functions used whatever the injection method
hw/vfio/region.c new file +394 -0
394 lines not on this page · raw message
hw/vfio/meson.build +1 -0
@@ -23,6 +23,7 @@ system_ss.add(when: 'CONFIG_VFIO', if_true: files( 'migration.c', 'migration-multifd.c', 'cpr.c', + 'region.c', )) system_ss.add(when: ['CONFIG_VFIO', 'CONFIG_IOMMUFD'], if_true: files( 'iommufd.c',
hw/vfio/trace-events +9 -7
@@ -90,8 +90,6 @@ vfio_pci_igd_host_bridge_enabled(const char *name) "%s" vfio_pci_igd_lpc_bridge_enabled(const char *name) "%s" # common.c -vfio_region_write(const char *name, int index, uint64_t addr, uint64_t data, unsigned size) " (%s:region%d+0x%"PRIx64", 0x%"PRIx64 ", %d)" -vfio_region_read(char *name, int index, uint64_t addr, unsigned size, uint64_t data) " (%s:region%d+0x%"PRIx64", %d) = 0x%"PRIx64 vfio_iommu_map_notify(const char *op, uint64_t iova_start, uint64_t iova_end) "iommu %s @ 0x%"PRIx64" - 0x%"PRIx64 vfio_listener_region_skip(const char *name, uint64_t start, uint64_t end) "SKIPPING %s 0x%"PRIx64" - 0x%"PRIx64 vfio_spapr_group_attach(int groupfd, int tablefd) "Attached groupfd %d to liobn fd %d"
@@ -107,6 +105,15 @@ vfio_disconnect_container(int fd) "close container->fd=%d" vfio_put_group(int fd) "close group->fd=%d" vfio_get_device(const char * name, unsigned int flags, unsigned int num_regions, unsigned int num_irqs) "Device %s flags: %u, regions: %u, irqs: %u" vfio_put_base_device(int fd) "close vdev->fd=%d" +vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%08x" +vfio_legacy_dma_unmap_overflow_workaround(void) "" +vfio_get_dirty_bitmap(uint64_t iova, uint64_t size, uint64_t bitmap_size, uint64_t start, uint64_t dirty_pages) "iova=0x%"PRIx64" size= 0x%"PRIx64" bitmap_size=0x%"PRIx64" start=0x%"PRIx64" dirty_pages=%"PRIu64 +vfio_iommu_map_dirty_notify(uint64_t iova_start, uint64_t iova_end) "iommu dirty @ 0x%"PRIx64" - 0x%"PRIx64 +vfio_reset_handler(void) "" + +# region.c +vfio_region_write(const char *name, int index, uint64_t addr, uint64_t data, unsigned size) " (%s:region%d+0x%"PRIx64", 0x%"PRIx64 ", %d)" +vfio_region_read(char *name, int index, uint64_t addr, unsigned size, uint64_t data) " (%s:region%d+0x%"PRIx64", %d) = 0x%"PRIx64 vfio_region_setup(const char *dev, int index, const char *name, unsigned long flags, unsigned long offset, unsigned long size) "Device %s, region %d \"%s\", flags: 0x%lx, offset: 0x%lx, size: 0x%lx" vfio_region_mmap_fault(const char *name, int index, unsigned long offset, unsigned long size, int fault) "Region %s mmaps[%d], [0x%lx - 0x%lx], fault: %d" vfio_region_mmap(const char *name, unsigned long offset, unsigned long end) "Region %s [0x%lx - 0x%lx]"
@@ -116,11 +123,6 @@ vfio_region_mmaps_set_enabled(const char *name, bool enabled) "Region %s mmaps e vfio_region_unmap(const char *name, unsigned long offset, unsigned long end) "Region %s unmap [0x%lx - 0x%lx]" vfio_region_sparse_mmap_header(const char *name, int index, int nr_areas) "Device %s region %d: %d sparse mmap entries" vfio_region_sparse_mmap_entry(int i, unsigned long start, unsigned long end) "sparse entry %d [0x%lx - 0x%lx]" -vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%08x" -vfio_legacy_dma_unmap_overflow_workaround(void) "" -vfio_get_dirty_bitmap(uint64_t iova, uint64_t size, uint64_t bitmap_size, uint64_t start, uint64_t dirty_pages) "iova=0x%"PRIx64" size= 0x%"PRIx64" bitmap_size=0x%"PRIx64" start=0x%"PRIx64" dirty_pages=%"PRIu64 -vfio_iommu_map_dirty_notify(uint64_t iova_start, uint64_t iova_end) "iommu dirty @ 0x%"PRIx64" - 0x%"PRIx64 -vfio_reset_handler(void) "" # platform.c vfio_platform_realize(char *name, char *compat) "vfio device %s, compat = %s"
Signature · 1 line
2.49.0
PATCH v3 12/37 vfio: Introduce a new header file for VFIOcontainer declarations
In reply to Cédric Le GoaterGather all VFIOcontainer related declarations into "hw/vfio/vfio-container.h" to reduce exposure of VFIO internals in "hw/vfio/vfio-common.h". These declarations were initially introduced in commit 65501a745dba ("vfio: vfio-pci device assignment driver"). They are made available externally for PPC and s390x.
--- include/hw/vfio/vfio-common.h | 19 ----------------- include/hw/vfio/vfio-container.h | 36 ++++++++++++++++++++++++++++++++ hw/ppc/spapr_pci_vfio.c | 1 + hw/s390x/s390-pci-vfio.c | 2 +- hw/vfio/container.c | 1 + hw/vfio/spapr.c | 1 + 6 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 include/hw/vfio/vfio-container.h
include/hw/vfio/vfio-common.h +0 -19
@@ -39,16 +39,6 @@ enum {VFIO_DEVICE_TYPE_CCW =2 , VFIO_DEVICE_TYPE_AP = 3, }; -struct VFIOGroup ; - -typedef struct VFIOContainer { -VFIOContainerBase bcontainer; -int fd;/* /dev/vfio/vfio, empowered by the attached groups */ -unsigned iommu_type; - QLIST_HEAD(, VFIOGroup) group_list; -}VFIOContainer ; - -OBJECT_DECLARE_SIMPLE_TYPE (VFIOContainer,VFIO_IOMMU_LEGACY );typedef struct VFIODeviceOps VFIODeviceOps ;typedef struct VFIOMigration VFIOMigration ;
@@ -125,15 +115,6 @@ struct VFIODeviceOps {int (*vfio_load_config)(VFIODevice *vdev,QEMUFile *f); }; -typedef struct VFIOGroup { -int fd; -int groupid; -VFIOContainer *container; - QLIST_HEAD(, VFIODevice) device_list; -QLIST_ENTRY (VFIOGroup) next; -QLIST_ENTRY (VFIOGroup) container_next; -bool ram_block_discard_allowed; -}VFIOGroup ;#define TYPE_HOST_IOMMU_DEVICE_LEGACY_VFIO TYPE_HOST_IOMMU_DEVICE "-legacy-vfio"#define TYPE_HOST_IOMMU_DEVICE_IOMMUFD_VFIO \
include/hw/vfio/vfio-container.h new file +36 -0
@@ -0,0 +1,36 @@ +/* +* VFIO container +* +* Copyright Red Hat, Inc. 2025 +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#ifndef HW_VFIO_CONTAINER_H +#define HW_VFIO_CONTAINER_H + +#include "hw/vfio/vfio-container-base.h" + +typedef struct VFIOContainer VFIOContainer ; +typedef struct VFIODevice VFIODevice ; + +typedef struct VFIOGroup { +int fd; +int groupid; +VFIOContainer *container; + QLIST_HEAD(, VFIODevice) device_list; +QLIST_ENTRY (VFIOGroup) next; +QLIST_ENTRY (VFIOGroup) container_next; +bool ram_block_discard_allowed; +}VFIOGroup ; + +typedef struct VFIOContainer { +VFIOContainerBase bcontainer; +int fd;/* /dev/vfio/vfio, empowered by the attached groups */ +unsigned iommu_type; + QLIST_HEAD(, VFIOGroup) group_list; +}VFIOContainer ; + +OBJECT_DECLARE_SIMPLE_TYPE (VFIOContainer,VFIO_IOMMU_LEGACY ); + +#endif /* HW_VFIO_CONTAINER_H */
hw/ppc/spapr_pci_vfio.c +1 -0
@@ -25,6 +25,7 @@#include "hw/pci/msix.h" #include "hw/pci/pci_device.h" #include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-container.h" #include "qemu/error-report.h" #include CONFIG_DEVICES /* CONFIG_VFIO_PCI */
hw/s390x/s390-pci-vfio.c +1 -1
@@ -20,7 +20,7 @@#include "hw/s390x/s390-pci-clp.h" #include "hw/s390x/s390-pci-vfio.h" #include "hw/vfio/pci.h" -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-container.h" /* * Get the current DMA available count from vfio. Returns true if vfio is
hw/vfio/container.c +1 -0
@@ -32,6 +32,7 @@#include "trace.h" #include "qapi/error.h" #include "pci.h" +#include "hw/vfio/vfio-container.h" VFIOGroupList vfio_group_list =QLIST_HEAD_INITIALIZER (vfio_group_list);
hw/vfio/spapr.c +1 -0
@@ -16,6 +16,7 @@#include "exec/address-spaces.h" #include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-container.h" #include "hw/hw.h" #include "exec/ram_addr.h" #include "qemu/error-report.h"
Signature · 1 line
2.49.0
PATCH v3 13/37 vfio: Make vfio_group_list static
In reply to Cédric Le Goatervfio_group_list is only used in file "container.c".
--- include/hw/vfio/vfio-common.h | 2 -- hw/vfio/container.c | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-)
include/hw/vfio/vfio-common.h +0 -2
@@ -146,9 +146,7 @@ int vfio_kvm_device_del_fd(int fd, Error **errp);bool vfio_cpr_register_container (VFIOContainerBase *bcontainer,Error **errp);void vfio_cpr_unregister_container (VFIOContainerBase *bcontainer); -typedef QLIST_HEAD(VFIOGroupList, VFIOGroup) VFIOGroupList; typedef QLIST_HEAD(VFIODeviceList, VFIODevice) VFIODeviceList; -extern VFIOGroupList vfio_group_list;extern VFIODeviceList vfio_device_list;extern const MemoryListener vfio_memory_listener;extern int vfio_kvm_device_fd;
hw/vfio/container.c +2 -1
@@ -34,7 +34,8 @@#include "pci.h" #include "hw/vfio/vfio-container.h" -VFIOGroupList vfio_group_list = +typedef QLIST_HEAD(VFIOGroupList, VFIOGroup) VFIOGroupList; +static VFIOGroupList vfio_group_list =QLIST_HEAD_INITIALIZER (vfio_group_list);static int vfio_ram_block_discard_disable (VFIOContainer *container,bool state)
Signature · 1 line
2.49.0
PATCH v3 14/37 vfio: Move VFIOAddressSpace helpers into container-base.c
In reply to Cédric Le GoaterVFIOAddressSpace is a common object used by VFIOContainerBase which is declared in "hw/vfio/vfio-container-base.h". Move the VFIOAddressSpace related services into "container-base.c".
While at it, rename :
vfio_get_address_space -> vfio_address_space_get vfio_put_address_space -> vfio_address_space_put
to better reflect the namespace these routines belong to.
--- include/hw/vfio/vfio-common.h | 5 --- include/hw/vfio/vfio-container-base.h | 6 ++++ hw/ppc/spapr_pci_vfio.c | 5 ++- hw/vfio/common.c | 47 ------------------------- hw/vfio/container-base.c | 50 +++++++++++++++++++++++++++ hw/vfio/container.c | 6 ++-- hw/vfio/iommufd.c | 6 ++-- 7 files changed, 64 insertions(+), 61 deletions(-)
include/hw/vfio/vfio-common.h +0 -5
@@ -120,11 +120,6 @@ struct VFIODeviceOps {#define TYPE_HOST_IOMMU_DEVICE_IOMMUFD_VFIO \ TYPE_HOST_IOMMU_DEVICE_IOMMUFD "-vfio" -VFIOAddressSpace *vfio_get_address_space (AddressSpace *as); -void vfio_put_address_space (VFIOAddressSpace *space); -void vfio_address_space_insert (VFIOAddressSpace *space, -VFIOContainerBase *bcontainer); -void vfio_disable_irqindex (VFIODevice *vbasedev,int index);void vfio_unmask_single_irqindex (VFIODevice *vbasedev,int index);void vfio_mask_single_irqindex (VFIODevice *vbasedev,int index);
include/hw/vfio/vfio-container-base.h +6 -0
@@ -71,6 +71,11 @@ typedef struct VFIORamDiscardListener {QLIST_ENTRY (VFIORamDiscardListener) next; } VFIORamDiscardListener; +VFIOAddressSpace *vfio_address_space_get (AddressSpace *as); +void vfio_address_space_put (VFIOAddressSpace *space); +void vfio_address_space_insert (VFIOAddressSpace *space, +VFIOContainerBase *bcontainer); +int vfio_container_dma_map (VFIOContainerBase *bcontainer,hwaddr iova,ram_addr_t size,void *vaddr,bool readonly);
@@ -163,4 +168,5 @@ struct VFIOIOMMUClass { MemoryRegionSection *section); void (*release)(VFIOContainerBase *bcontainer); }; +#endif /* HW_VFIO_VFIO_CONTAINER_BASE_H */
hw/ppc/spapr_pci_vfio.c +2 -3
@@ -24,7 +24,6 @@#include "hw/pci-host/spapr.h" #include "hw/pci/msix.h" #include "hw/pci/pci_device.h" -#include "hw/vfio/vfio-common.h" #include "hw/vfio/vfio-container.h" #include "qemu/error-report.h" #include CONFIG_DEVICES /* CONFIG_VFIO_PCI */
@@ -86,7 +85,7 @@ static int vfio_eeh_container_op(VFIOContainer *container, uint32_t op)static VFIOContainer *vfio_eeh_as_container (AddressSpace *as) { -VFIOAddressSpace *space =vfio_get_address_space (as); +VFIOAddressSpace *space =vfio_address_space_get (as);VFIOContainerBase *bcontainer =NULL ;if (QLIST_EMPTY (&space->containers)) {
@@ -106,7 +105,7 @@ static VFIOContainer *vfio_eeh_as_container(AddressSpace *as) } out: -vfio_put_address_space (space); +vfio_address_space_put (space);return container_of (bcontainer, VFIOContainer, bcontainer); }
hw/vfio/common.c +0 -47
59 lines not on this page · raw message
hw/vfio/container-base.c +50 -0
56 lines not on this page · raw message
hw/vfio/container.c +3 -3
@@ -546,7 +546,7 @@ static bool vfio_connect_container(VFIOGroup *group, AddressSpace *as,VFIOAddressSpace *space;VFIOIOMMUClass *vioc; - space =vfio_get_address_space (as); + space =vfio_address_space_get (as);/* * VFIO is currently incompatible with discarding of RAM insofar as the
@@ -675,7 +675,7 @@ close_fd_exit:close (fd); put_space_exit: -vfio_put_address_space (space); +vfio_address_space_put (space);return false; }
@@ -714,7 +714,7 @@ static void vfio_disconnect_container(VFIOGroup *group)close (container->fd);object_unref (container); -vfio_put_address_space (space); +vfio_address_space_put (space); } }
hw/vfio/iommufd.c +3 -3
@@ -486,7 +486,7 @@ static bool iommufd_cdev_attach(const char *name, VFIODevice *vbasedev, goto err_connect_bind; } - space =vfio_get_address_space (as); + space =vfio_address_space_get (as);/* * The HostIOMMUDevice data from legacy backend is static and doesn't need
@@ -606,7 +606,7 @@ err_discard_disable: err_attach_container:iommufd_cdev_container_destroy (container); err_alloc_ioas: -vfio_put_address_space (space); +vfio_address_space_put (space);iommufd_cdev_unbind_and_disconnect (vbasedev); err_connect_bind:close (vbasedev->fd);
@@ -631,7 +631,7 @@ static void iommufd_cdev_detach(VFIODevice *vbasedev)vfio_cpr_unregister_container (bcontainer);iommufd_cdev_detach_container (vbasedev, container);iommufd_cdev_container_destroy (container); -vfio_put_address_space (space); +vfio_address_space_put (space);iommufd_cdev_unbind_and_disconnect (vbasedev);close (vbasedev->fd);
Signature · 1 line
2.49.0
PATCH v3 15/37 vfio: Move Host IOMMU type declarations into their respective files
In reply to Cédric Le GoaterThese definitions don't have any use outside of their respective submodules. There is no need to expose them externally. Keep them private.
--- include/hw/vfio/vfio-common.h | 5 ----- hw/vfio/container.c | 2 ++ hw/vfio/iommufd.c | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-)
include/hw/vfio/vfio-common.h +0 -5
@@ -115,11 +115,6 @@ struct VFIODeviceOps {int (*vfio_load_config)(VFIODevice *vdev,QEMUFile *f); }; - -#define TYPE_HOST_IOMMU_DEVICE_LEGACY_VFIO TYPE_HOST_IOMMU_DEVICE "-legacy-vfio" -#define TYPE_HOST_IOMMU_DEVICE_IOMMUFD_VFIO \ - TYPE_HOST_IOMMU_DEVICE_IOMMUFD "-vfio" -void vfio_disable_irqindex (VFIODevice *vbasedev,int index);void vfio_unmask_single_irqindex (VFIODevice *vbasedev,int index);void vfio_mask_single_irqindex (VFIODevice *vbasedev,int index);
hw/vfio/container.c +2 -0
@@ -34,6 +34,8 @@#include "pci.h" #include "hw/vfio/vfio-container.h" +#define TYPE_HOST_IOMMU_DEVICE_LEGACY_VFIO TYPE_HOST_IOMMU_DEVICE "-legacy-vfio" + typedef QLIST_HEAD(VFIOGroupList, VFIOGroup) VFIOGroupList;static VFIOGroupList vfio_group_list =QLIST_HEAD_INITIALIZER (vfio_group_list);
hw/vfio/iommufd.c +3 -0
@@ -27,6 +27,9 @@#include "pci.h" #include "vfio-iommufd.h" +#define TYPE_HOST_IOMMU_DEVICE_IOMMUFD_VFIO \ + TYPE_HOST_IOMMU_DEVICE_IOMMUFD "-vfio" +static int iommufd_cdev_map (const VFIOContainerBase *bcontainer,hwaddr iova,ram_addr_t size,void *vaddr,bool readonly) {
Signature · 1 line
2.49.0
PATCH v3 16/37 vfio: Introduce a new header file for helper services
In reply to Cédric Le GoaterGather all helper routine declarations into "vfio-helpers.h" to reduce exposure of VFIO internals in "hw/vfio/vfio-common.h".
--- hw/vfio/vfio-helpers.h | 26 ++++++++++++++++++++++++++ include/hw/vfio/vfio-common.h | 7 ------- hw/s390x/s390-pci-vfio.c | 1 + hw/vfio/common.c | 1 + hw/vfio/container.c | 1 + hw/vfio/helpers.c | 1 + hw/vfio/pci.c | 1 + hw/vfio/region.c | 1 + 8 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 hw/vfio/vfio-helpers.h
hw/vfio/vfio-helpers.h new file +26 -0
@@ -0,0 +1,26 @@ +/* +* VFIO helpers +* +* Copyright Red Hat, Inc. 2025 +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#ifndef HW_VFIO_VFIO_HELPERS_H +#define HW_VFIO_VFIO_HELPERS_H + +#ifdef CONFIG_LINUX +#include <linux/vfio.h> + +struct vfio_info_cap_header * +vfio_get_cap (void *ptr,uint32_t cap_offset,uint16_t id); +struct vfio_info_cap_header * +vfio_get_device_info_cap (struct vfio_device_info *info,uint16_t id); +struct vfio_info_cap_header * +vfio_get_region_info_cap (struct vfio_region_info *info,uint16_t id); + +#endif + +int vfio_bitmap_alloc (VFIOBitmap *vbmap,hwaddr size); + +#endif /* HW_VFIO_VFIO_HELPERS_H */
include/hw/vfio/vfio-common.h +0 -7
@@ -147,17 +147,10 @@ int vfio_get_region_info(VFIODevice *vbasedev, int index,int vfio_get_dev_region_info (VFIODevice *vbasedev,uint32_t type,uint32_t subtype,struct vfio_region_info **info);bool vfio_has_region_cap (VFIODevice *vbasedev,int region,uint16_t cap_type); -struct vfio_info_cap_header * -vfio_get_region_info_cap (struct vfio_region_info *info,uint16_t id);bool vfio_get_info_dma_avail (struct vfio_iommu_type1_info *info,unsigned int *avail); -struct vfio_info_cap_header * -vfio_get_device_info_cap (struct vfio_device_info *info,uint16_t id); -struct vfio_info_cap_header * -vfio_get_cap (void *ptr,uint32_t cap_offset,uint16_t id);#endif -int vfio_bitmap_alloc (VFIOBitmap *vbmap,hwaddr size);bool vfio_devices_all_dirty_tracking_started (const VFIOContainerBase *bcontainer);bool
hw/s390x/s390-pci-vfio.c +1 -0
@@ -21,6 +21,7 @@#include "hw/s390x/s390-pci-vfio.h" #include "hw/vfio/pci.h" #include "hw/vfio/vfio-container.h" +#include "hw/vfio/vfio-helpers.h" /* * Get the current DMA available count from vfio. Returns true if vfio is
hw/vfio/common.c +1 -0
@@ -45,6 +45,7 @@#include "system/tcg.h" #include "system/tpm.h" #include "vfio-migration-internal.h" +#include "vfio-helpers.h" VFIODeviceList vfio_device_list =QLIST_HEAD_INITIALIZER (vfio_device_list);
hw/vfio/container.c +1 -0
@@ -33,6 +33,7 @@#include "qapi/error.h" #include "pci.h" #include "hw/vfio/vfio-container.h" +#include "vfio-helpers.h" #define TYPE_HOST_IOMMU_DEVICE_LEGACY_VFIO TYPE_HOST_IOMMU_DEVICE "-legacy-vfio"
hw/vfio/helpers.c +1 -0
@@ -30,6 +30,7 @@#include "qemu/error-report.h" #include "qemu/units.h" #include "monitor/monitor.h" +#include "vfio-helpers.h" /* * Common VFIO interrupt disable
hw/vfio/pci.c +1 -0
@@ -45,6 +45,7 @@#include "migration/qemu-file.h" #include "system/iommufd.h" #include "vfio-migration-internal.h" +#include "vfio-helpers.h" #define TYPE_VFIO_PCI_NOHOTPLUG "vfio-pci-nohotplug"
hw/vfio/region.c +1 -0
@@ -29,6 +29,7 @@#include "qemu/error-report.h" #include "qemu/units.h" #include "monitor/monitor.h" +#include "vfio-helpers.h" /* * IO Port/MMIO - Beware of the endians, VFIO is always little endian
Signature · 1 line
2.49.0
PATCH v3 17/37 vfio: Move vfio_get_info_dma_avail() into helpers.c
In reply to Cédric Le Goatervfio_get_info_dma_avail() is a low level routine similar to the other routines extracting capabilities from 'struct vfio_iommu_type1_info'. It belongs to file "helpers.c".
--- hw/vfio/vfio-helpers.h | 5 ++++- include/hw/vfio/vfio-common.h | 2 -- hw/vfio/container.c | 31 ------------------------------- hw/vfio/helpers.c | 31 +++++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 34 deletions(-)
hw/vfio/vfio-helpers.h +4 -1
@@ -18,7 +18,10 @@ struct vfio_info_cap_header * vfio_get_device_info_cap(struct vfio_device_info *info, uint16_t id);struct vfio_info_cap_header *vfio_get_region_info_cap (struct vfio_region_info *info,uint16_t id); - +struct vfio_info_cap_header * +vfio_get_iommu_type1_info_cap (struct vfio_iommu_type1_info *info,uint16_t id); +bool vfio_get_info_dma_avail (struct vfio_iommu_type1_info *info, +unsigned int *avail);#endif int vfio_bitmap_alloc (VFIOBitmap *vbmap,hwaddr size);
include/hw/vfio/vfio-common.h +0 -2
@@ -147,8 +147,6 @@ int vfio_get_region_info(VFIODevice *vbasedev, int index,int vfio_get_dev_region_info (VFIODevice *vbasedev,uint32_t type,uint32_t subtype,struct vfio_region_info **info);bool vfio_has_region_cap (VFIODevice *vbasedev,int region,uint16_t cap_type); -bool vfio_get_info_dma_avail (struct vfio_iommu_type1_info *info, -unsigned int *avail);#endif bool vfio_devices_all_dirty_tracking_started(
hw/vfio/container.c +0 -31
@@ -278,37 +278,6 @@ static int vfio_legacy_query_dirty_bitmap(const VFIOContainerBase *bcontainer,return ret; } -static struct vfio_info_cap_header * -vfio_get_iommu_type1_info_cap (struct vfio_iommu_type1_info *info,uint16_t id) -{ -if (!(info->flags &VFIO_IOMMU_INFO_CAPS )) { -return NULL ; - } - -return vfio_get_cap ((void *)info, info->cap_offset, id); -} - -bool vfio_get_info_dma_avail (struct vfio_iommu_type1_info *info, -unsigned int *avail) -{ -struct vfio_info_cap_header *hdr; -struct vfio_iommu_type1_info_dma_avail *cap; - -/* If the capability cannot be found, assume no DMA limiting */ - hdr =vfio_get_iommu_type1_info_cap (info, -VFIO_IOMMU_TYPE1_INFO_DMA_AVAIL ); -if (!hdr) { -return false; - } - -if (avail !=NULL ) { - cap = (void *) hdr; - *avail = cap->avail; - } - -return true; -} -static bool vfio_get_info_iova_range (struct vfio_iommu_type1_info *info,VFIOContainerBase *bcontainer) {
hw/vfio/helpers.c +31 -0
@@ -222,6 +222,37 @@ retry:return 0 ; } +struct vfio_info_cap_header * +vfio_get_iommu_type1_info_cap (struct vfio_iommu_type1_info *info,uint16_t id) +{ +if (!(info->flags &VFIO_IOMMU_INFO_CAPS )) { +return NULL ; + } + +return vfio_get_cap ((void *)info, info->cap_offset, id); +} + +bool vfio_get_info_dma_avail (struct vfio_iommu_type1_info *info, +unsigned int *avail) +{ +struct vfio_info_cap_header *hdr; +struct vfio_iommu_type1_info_dma_avail *cap; + +/* If the capability cannot be found, assume no DMA limiting */ + hdr =vfio_get_iommu_type1_info_cap (info, +VFIO_IOMMU_TYPE1_INFO_DMA_AVAIL ); +if (!hdr) { +return false; + } + +if (avail !=NULL ) { + cap = (void *) hdr; + *avail = cap->avail; + } + +return true; +} +int vfio_get_dev_region_info (VFIODevice *vbasedev,uint32_t type,uint32_t subtype,struct vfio_region_info **info) {
Signature · 1 line
2.49.0
PATCH v3 18/37 vfio: Move vfio_kvm_device_add/del_fd() to helpers.c
In reply to Cédric Le Goatervfio_kvm_device_add/del_fd() are low level routines. Move them with the other helpers.
--- hw/vfio/vfio-helpers.h | 3 ++ include/hw/vfio/vfio-common.h | 3 -- hw/vfio/common.c | 58 ---------------------------------- hw/vfio/helpers.c | 59 +++++++++++++++++++++++++++++++++++ hw/vfio/iommufd.c | 1 + hw/vfio/meson.build | 2 +- 6 files changed, 64 insertions(+), 62 deletions(-)
hw/vfio/vfio-helpers.h +3 -0
@@ -26,4 +26,7 @@ bool vfio_get_info_dma_avail(struct vfio_iommu_type1_info *info,int vfio_bitmap_alloc (VFIOBitmap *vbmap,hwaddr size); +int vfio_kvm_device_add_fd (int fd,Error **errp); +int vfio_kvm_device_del_fd (int fd,Error **errp); +#endif /* HW_VFIO_VFIO_HELPERS_H */
include/hw/vfio/vfio-common.h +0 -3
@@ -130,9 +130,6 @@ bool vfio_attach_device(char *name, VFIODevice *vbasedev,void vfio_detach_device (VFIODevice *vbasedev);VFIODevice *vfio_get_vfio_device (Object *obj); -int vfio_kvm_device_add_fd (int fd,Error **errp); -int vfio_kvm_device_del_fd (int fd,Error **errp); -bool vfio_cpr_register_container (VFIOContainerBase *bcontainer,Error **errp);void vfio_cpr_unregister_container (VFIOContainerBase *bcontainer);
hw/vfio/common.c +0 -58
64 lines not on this page · raw message
hw/vfio/helpers.c +59 -0
71 lines not on this page · raw message
hw/vfio/iommufd.c +1 -0
@@ -26,6 +26,7 @@#include "qemu/chardev_open.h" #include "pci.h" #include "vfio-iommufd.h" +#include "vfio-helpers.h" #define TYPE_HOST_IOMMU_DEVICE_IOMMUFD_VFIO \ TYPE_HOST_IOMMU_DEVICE_IOMMUFD "-vfio"
hw/vfio/meson.build +1 -1
@@ -2,6 +2,7 @@ vfio_ss = ss.source_set() vfio_ss.add(files( 'common.c', 'container.c', + 'helpers.c', )) vfio_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr.c')) vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files(
@@ -18,7 +19,6 @@ specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) system_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) system_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) system_ss.add(when: 'CONFIG_VFIO', if_true: files( - 'helpers.c', 'container-base.c', 'migration.c', 'migration-multifd.c',
Signature · 1 line
2.49.0
PATCH v3 19/37 vfio: Move vfio_get_device_info() to helpers.c
In reply to Cédric Le Goatervfio_get_device_info() is a low level routine. Move it with the other helpers.
--- hw/vfio/vfio-helpers.h | 1 + include/hw/vfio/vfio-common.h | 1 - hw/vfio/common.c | 24 ------------------------ hw/vfio/helpers.c | 24 ++++++++++++++++++++++++ 4 files changed, 25 insertions(+), 25 deletions(-)
hw/vfio/vfio-helpers.h +1 -0
@@ -25,6 +25,7 @@ bool vfio_get_info_dma_avail(struct vfio_iommu_type1_info *info,#endif int vfio_bitmap_alloc (VFIOBitmap *vbmap,hwaddr size); +struct vfio_device_info *vfio_get_device_info (int fd);int vfio_kvm_device_add_fd (int fd,Error **errp);int vfio_kvm_device_del_fd (int fd,Error **errp);
include/hw/vfio/vfio-common.h +0 -1
@@ -122,7 +122,6 @@ bool vfio_set_irq_signaling(VFIODevice *vbasedev, int index, int subindex, int action, int fd, Error **errp);void vfio_reset_handler (void *opaque); -struct vfio_device_info *vfio_get_device_info (int fd);bool vfio_device_is_mdev (VFIODevice *vbasedev);bool vfio_device_hiod_realize (VFIODevice *vbasedev,Error **errp); bool vfio_attach_device(char *name, VFIODevice *vbasedev,
hw/vfio/common.c +0 -24
@@ -1334,30 +1334,6 @@ void vfio_reset_handler(void *opaque) } } -struct vfio_device_info *vfio_get_device_info (int fd) -{ -struct vfio_device_info *info; -uint32_t argsz =sizeof (*info); - - info =g_malloc0 (argsz); - -retry: - info->argsz = argsz; - -if (ioctl (fd,VFIO_DEVICE_GET_INFO , info)) { -g_free (info); -return NULL ; - } - -if (info->argsz > argsz) { - argsz = info->argsz; - info =g_realloc (info, argsz); - goto retry; - } - -return info; -} -bool vfio_attach_device (char *name,VFIODevice *vbasedev,AddressSpace *as,Error **errp) {
hw/vfio/helpers.c +24 -0
@@ -312,6 +312,30 @@ int vfio_kvm_device_del_fd(int fd, Error **errp)return 0 ; } +struct vfio_device_info *vfio_get_device_info (int fd) +{ +struct vfio_device_info *info; +uint32_t argsz =sizeof (*info); + + info =g_malloc0 (argsz); + +retry: + info->argsz = argsz; + +if (ioctl (fd,VFIO_DEVICE_GET_INFO , info)) { +g_free (info); +return NULL ; + } + +if (info->argsz > argsz) { + argsz = info->argsz; + info =g_realloc (info, argsz); + goto retry; + } + +return info; +} +int vfio_get_dev_region_info (VFIODevice *vbasedev,uint32_t type,uint32_t subtype,struct vfio_region_info **info) {
Signature · 1 line
2.49.0
PATCH v3 20/37 vfio: Introduce a new file for VFIODevice definitions
In reply to Cédric Le GoaterMove all VFIODevice related routines of "helpers.c" into a new "device.c" file.
--- hw/vfio/device.c | 330 +++++++++++++++++++++++++++++++++++++++++++ hw/vfio/helpers.c | 303 --------------------------------------- hw/vfio/meson.build | 1 + hw/vfio/trace-events | 4 +- 4 files changed, 334 insertions(+), 304 deletions(-) create mode 100644 hw/vfio/device.c
hw/vfio/device.c new file +330 -0
@@ -0,0 +1,330 @@ +/* +* VFIO device +* +* Copyright Red Hat, Inc. 2012 +* +* Authors: +* Alex Williamson <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2. See +* the COPYING file in the top-level directory. +* +* Based on qemu-kvm device-assignment: +* Adapted for KVM by Qumranet. +* Copyright (c) 2007, Neocleus, Alex Novik ([email protected]) +* Copyright (c) 2007, Neocleus, Guy Zana ([email protected]) +* Copyright (C) 2008, Qumranet, Amit Shah ([email protected]) +* Copyright (C) 2008, Red Hat, Amit Shah ([email protected]) +* Copyright (C) 2008, IBM, Muli Ben-Yehuda ([email protected]) +*/ + +#include "qemu/osdep.h" +#include <sys/ioctl.h> + +#include "hw/vfio/vfio-common.h" +#include "hw/vfio/pci.h" +#include "hw/hw.h" +#include "trace.h" +#include "qapi/error.h" +#include "qemu/error-report.h" +#include "qemu/units.h" +#include "monitor/monitor.h" +#include "vfio-helpers.h" + +/* +* Common VFIO interrupt disable +*/ +void vfio_disable_irqindex (VFIODevice *vbasedev,int index) +{ +struct vfio_irq_set irq_set = { + .argsz =sizeof (irq_set), + .flags =VFIO_IRQ_SET_DATA_NONE |VFIO_IRQ_SET_ACTION_TRIGGER , + .index = index, + .start =0 , + .count =0 , + }; + +ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , &irq_set); +} + +void vfio_unmask_single_irqindex (VFIODevice *vbasedev,int index) +{ +struct vfio_irq_set irq_set = { + .argsz =sizeof (irq_set), + .flags =VFIO_IRQ_SET_DATA_NONE |VFIO_IRQ_SET_ACTION_UNMASK , + .index = index, + .start =0 , + .count =1 , + }; + +ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , &irq_set); +} + +void vfio_mask_single_irqindex (VFIODevice *vbasedev,int index) +{ +struct vfio_irq_set irq_set = { + .argsz =sizeof (irq_set), + .flags =VFIO_IRQ_SET_DATA_NONE |VFIO_IRQ_SET_ACTION_MASK , + .index = index, + .start =0 , + .count =1 , + }; + +ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , &irq_set); +} + +static inline const char *action_to_str (int action) +{ +switch (action) { +case VFIO_IRQ_SET_ACTION_MASK : +return "MASK" ; +case VFIO_IRQ_SET_ACTION_UNMASK : +return "UNMASK" ; +case VFIO_IRQ_SET_ACTION_TRIGGER : +return "TRIGGER" ; +default : +return "UNKNOWN ACTION" ; + } +} + +static const char *index_to_str (VFIODevice *vbasedev,int index) +{ +if (vbasedev->type !=VFIO_DEVICE_TYPE_PCI ) { +return NULL ; + } + +switch (index) { +case VFIO_PCI_INTX_IRQ_INDEX : +return "INTX" ; +case VFIO_PCI_MSI_IRQ_INDEX : +return "MSI" ; +case VFIO_PCI_MSIX_IRQ_INDEX : +return "MSIX" ; +case VFIO_PCI_ERR_IRQ_INDEX : +return "ERR" ; +case VFIO_PCI_REQ_IRQ_INDEX : +return "REQ" ; +default : +return NULL ; + } +} + +bool vfio_set_irq_signaling (VFIODevice *vbasedev,int index,int subindex, +int action,int fd,Error **errp) +{ +ERRP_GUARD (); + g_autofree struct vfio_irq_set *irq_set = NULL; +int argsz; +const char *name; +int32_t *pfd; + + argsz =sizeof (*irq_set) +sizeof (*pfd); + + irq_set =g_malloc0 (argsz); + irq_set->argsz = argsz; + irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | action; + irq_set->index = index; + irq_set->start = subindex; + irq_set->count =1 ; + pfd = (int32_t *)&irq_set->data; + *pfd = fd; + +if (!ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , irq_set)) { +return true; + } + +error_setg_errno (errp, errno,"VFIO_DEVICE_SET_IRQS failure" ); + + name =index_to_str (vbasedev, index); +if (name) { +error_prepend (errp,"%s-%d: " , name, subindex); + }else { +error_prepend (errp,"index %d-%d: " , index, subindex); + } +error_prepend (errp, +"Failed to %s %s eventfd signaling for interrupt " , + fd <0 ?"tear down" :"set up" ,action_to_str (action)); +return false; +} + +int vfio_get_region_info (VFIODevice *vbasedev,int index, +struct vfio_region_info **info) +{ +size_t argsz =sizeof (struct vfio_region_info ); + + *info =g_malloc0 (argsz); + + (*info)->index = index; +retry: + (*info)->argsz = argsz; + +if (ioctl (vbasedev->fd,VFIO_DEVICE_GET_REGION_INFO , *info)) { +g_free (*info); + *info =NULL ; +return -errno; + } + +if ((*info)->argsz > argsz) { + argsz = (*info)->argsz; + *info =g_realloc (*info, argsz); + + goto retry; + } + +return 0 ; +} + +int vfio_get_dev_region_info (VFIODevice *vbasedev,uint32_t type, +uint32_t subtype,struct vfio_region_info **info) +{ +int i; + +for (i =0 ; i < vbasedev->num_regions; i++) { +struct vfio_info_cap_header *hdr; +struct vfio_region_info_cap_type *cap_type; + +if (vfio_get_region_info (vbasedev, i, info)) { +continue ; + } + + hdr =vfio_get_region_info_cap (*info,VFIO_REGION_INFO_CAP_TYPE ); +if (!hdr) { +g_free (*info); +continue ; + } + + cap_type = container_of(hdr, struct vfio_region_info_cap_type, header); + +trace_vfio_get_dev_region (vbasedev->name, i, + cap_type->type, cap_type->subtype); + +if (cap_type->type == type && cap_type->subtype == subtype) { +return 0 ; + } + +g_free (*info); + } + + *info =NULL ; +return -ENODEV ; +} + +bool vfio_has_region_cap (VFIODevice *vbasedev,int region,uint16_t cap_type) +{ + g_autofree struct vfio_region_info *info = NULL; +bool ret = false; + +if (!vfio_get_region_info (vbasedev, region, &info)) { +if (vfio_get_region_info_cap (info, cap_type)) { + ret = true; + } + } + +return ret; +} + +bool vfio_device_get_name (VFIODevice *vbasedev,Error **errp) +{ +ERRP_GUARD (); +struct stat st; + +if (vbasedev->fd <0 ) { +if (stat (vbasedev->sysfsdev, &st) <0 ) { +error_setg_errno (errp, errno,"no such host device" ); +error_prepend (errp,VFIO_MSG_PREFIX , vbasedev->sysfsdev); +return false; + } +/* User may specify a name, e.g: VFIO platform device */ +if (!vbasedev->name) { + vbasedev->name =g_path_get_basename (vbasedev->sysfsdev); + } + }else { +if (!vbasedev->iommufd) { +error_setg (errp,"Use FD passing only with iommufd backend" ); +return false; + } +/* +* Give a name with fd so any function printing out vbasedev->name +* will not break. +*/ +if (!vbasedev->name) { + vbasedev->name =g_strdup_printf ("VFIO_FD%d" , vbasedev->fd); + } + } + +return true; +} + +void vfio_device_set_fd (VFIODevice *vbasedev,const char *str,Error **errp) +{ +ERRP_GUARD (); +int fd =monitor_fd_param (monitor_cur (), str, errp); + +if (fd <0 ) { +error_prepend (errp,"Could not parse remote object fd %s:" , str); +return ; + } + vbasedev->fd = fd; +} + +void vfio_device_init (VFIODevice *vbasedev,int type,VFIODeviceOps *ops, +DeviceState *dev,bool ram_discard) +{ + vbasedev->type = type; + vbasedev->ops = ops; + vbasedev->dev = dev; + vbasedev->fd =-1 ; + + vbasedev->ram_block_discard_allowed = ram_discard; +} + +int vfio_device_get_aw_bits (VFIODevice *vdev) +{ +/* +* iova_ranges is a sorted list. For old kernels that support +* VFIO but not support query of iova ranges, iova_ranges is NULL, +* in this case HOST_IOMMU_DEVICE_CAP_AW_BITS_MAX(64) is returned. +*/ +GList *l =g_list_last (vdev->bcontainer->iova_ranges); + +if (l) { +Range *range = l->data; +return range_get_last_bit (range) +1 ; + } + +return HOST_IOMMU_DEVICE_CAP_AW_BITS_MAX ; +} + +bool vfio_device_is_mdev (VFIODevice *vbasedev) +{ + g_autofree char *subsys = NULL; + g_autofree char *tmp = NULL; + +if (!vbasedev->sysfsdev) { +return false; + } + + tmp =g_strdup_printf ("%s/subsystem" , vbasedev->sysfsdev); + subsys =realpath (tmp,NULL ); +return subsys && (strcmp (subsys,"/sys/bus/mdev" ) ==0 ); +} + +bool vfio_device_hiod_realize (VFIODevice *vbasedev,Error **errp) +{ +HostIOMMUDevice *hiod = vbasedev->hiod; + +if (!hiod) { +return true; + } + +return HOST_IOMMU_DEVICE_GET_CLASS (hiod)->realize (hiod, vbasedev, errp); +} + +VFIODevice *vfio_get_vfio_device (Object *obj) +{ +if (object_dynamic_cast (obj,TYPE_VFIO_PCI )) { +return &VFIO_PCI (obj)->vbasedev; + }else { +return NULL ; + } +}
hw/vfio/helpers.c +0 -303
322 lines not on this page · raw message
hw/vfio/meson.build +1 -0
@@ -20,6 +20,7 @@ system_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) system_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) system_ss.add(when: 'CONFIG_VFIO', if_true: files( 'container-base.c', + 'device.c', 'migration.c', 'migration-multifd.c', 'cpr.c',
hw/vfio/trace-events +3 -1
@@ -105,7 +105,6 @@ vfio_disconnect_container(int fd) "close container->fd=%d" vfio_put_group(int fd) "close group->fd=%d" vfio_get_device(const char * name, unsigned int flags, unsigned int num_regions, unsigned int num_irqs) "Device %s flags: %u, regions: %u, irqs: %u" vfio_put_base_device(int fd) "close vdev->fd=%d" -vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%08x" vfio_legacy_dma_unmap_overflow_workaround(void) "" vfio_get_dirty_bitmap(uint64_t iova, uint64_t size, uint64_t bitmap_size, uint64_t start, uint64_t dirty_pages) "iova=0x%"PRIx64" size= 0x%"PRIx64" bitmap_size=0x%"PRIx64" start=0x%"PRIx64" dirty_pages=%"PRIu64 vfio_iommu_map_dirty_notify(uint64_t iova_start, uint64_t iova_end) "iommu dirty @ 0x%"PRIx64" - 0x%"PRIx64
@@ -194,3 +193,6 @@ iommufd_cdev_fail_attach_existing_container(const char *msg) " %s" iommufd_cdev_alloc_ioas(int iommufd, int ioas_id) " [iommufd=%d] new IOMMUFD container with ioasid=%d" iommufd_cdev_device_info(char *name, int devfd, int num_irqs, int num_regions, int flags) " %s (%d) num_irqs=%d num_regions=%d flags=%d" iommufd_cdev_pci_hot_reset_dep_devices(int domain, int bus, int slot, int function, int dev_id) "\t%04x:%02x:%02x.%x devid %d" + +# device.c +vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%08x"
Signature · 1 line
2.49.0
PATCH v3 21/37 vfio: Introduce new files for CPR definitions and declarations
In reply to Cédric Le GoaterGather all CPR related declarations into "vfio-cpr.h" to reduce exposure of VFIO internals in "hw/vfio/vfio-common.h". These were introduced in commit d9fa4223b30a ("vfio: register container for cpr").
Order file list in meson.build while at it.
--- hw/vfio/vfio-cpr.h | 15 +++++++++++++++ include/hw/vfio/vfio-common.h | 3 --- hw/vfio/container.c | 1 + hw/vfio/cpr.c | 1 + hw/vfio/iommufd.c | 1 + hw/vfio/meson.build | 2 +- 6 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 hw/vfio/vfio-cpr.h
hw/vfio/vfio-cpr.h new file +15 -0
@@ -0,0 +1,15 @@ +/* +* VFIO CPR +* +* Copyright (c) 2025 Oracle and/or its affiliates. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#ifndef HW_VFIO_CPR_H +#define HW_VFIO_CPR_H + +bool vfio_cpr_register_container (VFIOContainerBase *bcontainer,Error **errp); +void vfio_cpr_unregister_container (VFIOContainerBase *bcontainer); + +#endif /* HW_VFIO_CPR_H */
include/hw/vfio/vfio-common.h +0 -3
@@ -129,9 +129,6 @@ bool vfio_attach_device(char *name, VFIODevice *vbasedev,void vfio_detach_device (VFIODevice *vbasedev);VFIODevice *vfio_get_vfio_device (Object *obj); -bool vfio_cpr_register_container (VFIOContainerBase *bcontainer,Error **errp); -void vfio_cpr_unregister_container (VFIOContainerBase *bcontainer); - typedef QLIST_HEAD(VFIODeviceList, VFIODevice) VFIODeviceList;extern VFIODeviceList vfio_device_list;extern const MemoryListener vfio_memory_listener;
hw/vfio/container.c +1 -0
@@ -34,6 +34,7 @@#include "pci.h" #include "hw/vfio/vfio-container.h" #include "vfio-helpers.h" +#include "vfio-cpr.h" #define TYPE_HOST_IOMMU_DEVICE_LEGACY_VFIO TYPE_HOST_IOMMU_DEVICE "-legacy-vfio"
hw/vfio/cpr.c +1 -0
@@ -10,6 +10,7 @@#include "migration/misc.h" #include "qapi/error.h" #include "system/runstate.h" +#include "vfio-cpr.h" static int vfio_cpr_reboot_notifier (NotifierWithReturn *notifier,MigrationEvent *e,Error **errp)
hw/vfio/iommufd.c +1 -0
@@ -27,6 +27,7 @@#include "pci.h" #include "vfio-iommufd.h" #include "vfio-helpers.h" +#include "vfio-cpr.h" #define TYPE_HOST_IOMMU_DEVICE_IOMMUFD_VFIO \ TYPE_HOST_IOMMU_DEVICE_IOMMUFD "-vfio"
hw/vfio/meson.build +1 -1
@@ -20,10 +20,10 @@ system_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) system_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) system_ss.add(when: 'CONFIG_VFIO', if_true: files( 'container-base.c', + 'cpr.c', 'device.c', 'migration.c', 'migration-multifd.c', - 'cpr.c', 'region.c', )) system_ss.add(when: ['CONFIG_VFIO', 'CONFIG_IOMMUFD'], if_true: files(
Signature · 1 line
2.49.0
PATCH v3 22/37 vfio: Move vfio_kvm_device_fd() into helpers.c
In reply to Cédric Le GoaterThe vfio_kvm_device_add/del_fd() routines opening the VFIO pseudo device are defined in "helpers.c". Move 'vfio_kvm_device_fd' definition there and its declaration into "vfio-helpers.h" to reduce exposure of VFIO internals in "hw/vfio/vfio-common.h".
--- hw/vfio/vfio-helpers.h | 2 ++ include/hw/vfio/vfio-common.h | 1 - hw/vfio/common.c | 11 ----------- hw/vfio/helpers.c | 11 +++++++++++ hw/vfio/spapr.c | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-)
hw/vfio/vfio-helpers.h +2 -0
@@ -12,6 +12,8 @@#ifdef CONFIG_LINUX #include <linux/vfio.h> +extern int vfio_kvm_device_fd; +struct vfio_info_cap_header *vfio_get_cap (void *ptr,uint32_t cap_offset,uint16_t id); struct vfio_info_cap_header *
include/hw/vfio/vfio-common.h +0 -1
@@ -132,7 +132,6 @@ VFIODevice *vfio_get_vfio_device(Object *obj); typedef QLIST_HEAD(VFIODeviceList, VFIODevice) VFIODeviceList;extern VFIODeviceList vfio_device_list;extern const MemoryListener vfio_memory_listener; -extern int vfio_kvm_device_fd;#ifdef CONFIG_LINUX int vfio_get_region_info(VFIODevice *vbasedev, int index,
hw/vfio/common.c +0 -11
@@ -50,17 +50,6 @@VFIODeviceList vfio_device_list =QLIST_HEAD_INITIALIZER (vfio_device_list); -#ifdef CONFIG_KVM -/* -* We have a single VFIO pseudo device per KVM VM. Once created it lives -* for the life of the VM. Closing the file descriptor only drops our -* reference to it and the device's reference to kvm. Therefore once -* initialized, this file descriptor is only released on QEMU exit and -* we'll re-use it should another vfio device be attached before then. -*/ -int vfio_kvm_device_fd =-1 ; -#endif -/* * Device state interfaces */
hw/vfio/helpers.c +11 -0
@@ -106,6 +106,17 @@ bool vfio_get_info_dma_avail(struct vfio_iommu_type1_info *info,return true; } +#ifdef CONFIG_KVM +/* +* We have a single VFIO pseudo device per KVM VM. Once created it lives +* for the life of the VM. Closing the file descriptor only drops our +* reference to it and the device's reference to kvm. Therefore once +* initialized, this file descriptor is only released on QEMU exit and +* we'll re-use it should another vfio device be attached before then. +*/ +int vfio_kvm_device_fd =-1 ; +#endif +int vfio_kvm_device_add_fd (int fd,Error **errp) {#ifdef CONFIG_KVM
hw/vfio/spapr.c +1 -1
@@ -15,13 +15,13 @@#include "system/hostmem.h" #include "exec/address-spaces.h" -#include "hw/vfio/vfio-common.h" #include "hw/vfio/vfio-container.h" #include "hw/hw.h" #include "exec/ram_addr.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "trace.h" +#include "vfio-helpers.h" typedef struct VFIOHostDMAWindow { hwaddr min_iova;
Signature · 1 line
2.49.0
PATCH v3 23/37 vfio: Move vfio_device_list into device.c
In reply to Cédric Le Goater'vfio_device_list' is VFIODevice related. Move its definitions into "device.c".
--- hw/vfio/common.c | 3 --- hw/vfio/device.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)
hw/vfio/common.c +0 -3
@@ -47,9 +47,6 @@#include "vfio-migration-internal.h" #include "vfio-helpers.h" -VFIODeviceList vfio_device_list = -QLIST_HEAD_INITIALIZER (vfio_device_list); -/* * Device state interfaces */
hw/vfio/device.c +3 -0
@@ -31,6 +31,9 @@#include "monitor/monitor.h" #include "vfio-helpers.h" +VFIODeviceList vfio_device_list = +QLIST_HEAD_INITIALIZER (vfio_device_list); +/* * Common VFIO interrupt disable */
Signature · 1 line
2.49.0
PATCH v3 24/37 vfio: Move vfio_de/attach_device() into device.c
In reply to Cédric Le GoaterThese routines are VFIODevice related. Move their definitions into "device.c".
--- hw/vfio/common.c | 37 ------------------------------------- hw/vfio/device.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 37 deletions(-)
hw/vfio/common.c +0 -37
@@ -1319,40 +1319,3 @@ void vfio_reset_handler(void *opaque) } } } - -bool vfio_attach_device (char *name,VFIODevice *vbasedev, -AddressSpace *as,Error **errp) -{ -const VFIOIOMMUClass *ops = -VFIO_IOMMU_CLASS (object_class_by_name (TYPE_VFIO_IOMMU_LEGACY )); -HostIOMMUDevice *hiod =NULL ; - -if (vbasedev->iommufd) { - ops =VFIO_IOMMU_CLASS (object_class_by_name (TYPE_VFIO_IOMMU_IOMMUFD )); - } - -assert (ops); - - -if (!vbasedev->mdev) { - hiod =HOST_IOMMU_DEVICE (object_new (ops->hiod_typename)); - vbasedev->hiod = hiod; - } - -if (!ops->attach_device (name, vbasedev, as, errp)) { -object_unref (hiod); - vbasedev->hiod =NULL ; -return false; - } - -return true; -} - -void vfio_detach_device (VFIODevice *vbasedev) -{ -if (!vbasedev->bcontainer) { -return ; - } -object_unref (vbasedev->hiod); -VFIO_IOMMU_GET_CLASS (vbasedev->bcontainer)->detach_device (vbasedev); -}
hw/vfio/device.c +37 -0
@@ -331,3 +331,40 @@ VFIODevice *vfio_get_vfio_device(Object *obj)return NULL ; } } + +bool vfio_attach_device (char *name,VFIODevice *vbasedev, +AddressSpace *as,Error **errp) +{ +const VFIOIOMMUClass *ops = +VFIO_IOMMU_CLASS (object_class_by_name (TYPE_VFIO_IOMMU_LEGACY )); +HostIOMMUDevice *hiod =NULL ; + +if (vbasedev->iommufd) { + ops =VFIO_IOMMU_CLASS (object_class_by_name (TYPE_VFIO_IOMMU_IOMMUFD )); + } + +assert (ops); + + +if (!vbasedev->mdev) { + hiod =HOST_IOMMU_DEVICE (object_new (ops->hiod_typename)); + vbasedev->hiod = hiod; + } + +if (!ops->attach_device (name, vbasedev, as, errp)) { +object_unref (hiod); + vbasedev->hiod =NULL ; +return false; + } + +return true; +} + +void vfio_detach_device (VFIODevice *vbasedev) +{ +if (!vbasedev->bcontainer) { +return ; + } +object_unref (vbasedev->hiod); +VFIO_IOMMU_GET_CLASS (vbasedev->bcontainer)->detach_device (vbasedev); +}
Signature · 1 line
2.49.0
PATCH v3 25/37 vfio: Move vfio_reset_handler() into device.c
In reply to Cédric Le GoaterPass-through devices of a VM are not necessarily in the same group and all groups/address_spaces need to be scanned when the machine is reset. Commit f16f39c3fc97 ("Implement PCI hot reset") introduced a VM reset handler for this purpose. Move it under device.c
Also reintroduce the comment which explained the context and was lost along the way.
--- hw/vfio/common.c | 18 ------------------ hw/vfio/device.c | 35 +++++++++++++++++++++++++++++++++++ hw/vfio/trace-events | 2 +- 3 files changed, 36 insertions(+), 19 deletions(-)
hw/vfio/common.c +0 -18
@@ -1301,21 +1301,3 @@ const MemoryListener vfio_memory_listener = { .log_global_stop = vfio_listener_log_global_stop, .log_sync = vfio_listener_log_sync, }; - -void vfio_reset_handler (void *opaque) -{ -VFIODevice *vbasedev; - -trace_vfio_reset_handler (); - QLIST_FOREACH(vbasedev, &vfio_device_list, global_next) { -if (vbasedev->dev->realized) { - vbasedev->ops->vfio_compute_needs_reset (vbasedev); - } - } - - QLIST_FOREACH(vbasedev, &vfio_device_list, global_next) { -if (vbasedev->dev->realized && vbasedev->needs_reset) { - vbasedev->ops->vfio_hot_reset_multi (vbasedev); - } - } -}
hw/vfio/device.c +35 -0
@@ -34,6 +34,41 @@VFIODeviceList vfio_device_list =QLIST_HEAD_INITIALIZER (vfio_device_list); +/* +* We want to differentiate hot reset of multiple in-use devices vs +* hot reset of a single in-use device. VFIO_DEVICE_RESET will already +* handle the case of doing hot resets when there is only a single +* device per bus. The in-use here refers to how many VFIODevices are +* affected. A hot reset that affects multiple devices, but only a +* single in-use device, means that we can call it from our bus +* ->reset() callback since the extent is effectively a single +* device. This allows us to make use of it in the hotplug path. When +* there are multiple in-use devices, we can only trigger the hot +* reset during a system reset and thus from our reset handler. We +* separate _one vs _multi here so that we don't overlap and do a +* double reset on the system reset path where both our reset handler +* and ->reset() callback are used. Calling _one() will only do a hot +* reset for the one in-use devices case, calling _multi() will do +* nothing if a _one() would have been sufficient. +*/ +void vfio_reset_handler (void *opaque) +{ +VFIODevice *vbasedev; + +trace_vfio_reset_handler (); + QLIST_FOREACH(vbasedev, &vfio_device_list, global_next) { +if (vbasedev->dev->realized) { + vbasedev->ops->vfio_compute_needs_reset (vbasedev); + } + } + + QLIST_FOREACH(vbasedev, &vfio_device_list, global_next) { +if (vbasedev->dev->realized && vbasedev->needs_reset) { + vbasedev->ops->vfio_hot_reset_multi (vbasedev); + } + } +} +/* * Common VFIO interrupt disable */
hw/vfio/trace-events +1 -1
@@ -108,7 +108,6 @@ vfio_put_base_device(int fd) "close vdev->fd=%d" vfio_legacy_dma_unmap_overflow_workaround(void) "" vfio_get_dirty_bitmap(uint64_t iova, uint64_t size, uint64_t bitmap_size, uint64_t start, uint64_t dirty_pages) "iova=0x%"PRIx64" size= 0x%"PRIx64" bitmap_size=0x%"PRIx64" start=0x%"PRIx64" dirty_pages=%"PRIu64 vfio_iommu_map_dirty_notify(uint64_t iova_start, uint64_t iova_end) "iommu dirty @ 0x%"PRIx64" - 0x%"PRIx64 -vfio_reset_handler(void) "" # region.c vfio_region_write(const char *name, int index, uint64_t addr, uint64_t data, unsigned size) " (%s:region%d+0x%"PRIx64", 0x%"PRIx64 ", %d)"
@@ -196,3 +195,4 @@ iommufd_cdev_pci_hot_reset_dep_devices(int domain, int bus, int slot, int functi # device.c vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%08x" +vfio_reset_handler(void) ""
Signature · 1 line
2.49.0
PATCH v3 26/37 vfio: Move dirty tracking related services into container-base.c
In reply to Cédric Le GoaterRoutines of common.c :
vfio_devices_all_dirty_tracking_started
vfio_devices_all_device_dirty_tracking
vfio_devices_query_dirty_bitmap
vfio_get_dirty_bitmap
are all related to dirty page tracking directly at the container level or at the container device level. Naming is a bit confusing. We will propose new names in the following changes.
--- include/hw/vfio/vfio-common.h | 9 -- include/hw/vfio/vfio-container-base.h | 7 ++ hw/vfio/common.c | 130 ------------------------ hw/vfio/container-base.c | 138 ++++++++++++++++++++++++++ hw/vfio/meson.build | 2 +- hw/vfio/trace-events | 4 +- 6 files changed, 149 insertions(+), 141 deletions(-)
include/hw/vfio/vfio-common.h +0 -9
@@ -141,15 +141,6 @@ int vfio_get_dev_region_info(VFIODevice *vbasedev, uint32_t type,bool vfio_has_region_cap (VFIODevice *vbasedev,int region,uint16_t cap_type);#endif -bool vfio_devices_all_dirty_tracking_started ( -const VFIOContainerBase *bcontainer); -bool -vfio_devices_all_device_dirty_tracking (const VFIOContainerBase *bcontainer); -int vfio_devices_query_dirty_bitmap (const VFIOContainerBase *bcontainer, -VFIOBitmap *vbmap,hwaddr iova,hwaddr size,Error **errp); -int vfio_get_dirty_bitmap (const VFIOContainerBase *bcontainer,uint64_t iova, -uint64_t size,ram_addr_t ram_addr,Error **errp); -/* Returns 0 on success, or a negative errno. */ bool vfio_device_get_name (VFIODevice *vbasedev,Error **errp);void vfio_device_set_fd (VFIODevice *vbasedev,const char *str,Error **errp);
include/hw/vfio/vfio-container-base.h +7 -0
@@ -91,6 +91,13 @@ int vfio_container_set_dirty_page_tracking(VFIOContainerBase *bcontainer, bool start, Error **errp);int vfio_container_query_dirty_bitmap (const VFIOContainerBase *bcontainer,VFIOBitmap *vbmap,hwaddr iova,hwaddr size,Error **errp); +bool vfio_devices_all_dirty_tracking_started (const VFIOContainerBase *bcontainer); +bool vfio_devices_all_device_dirty_tracking (const VFIOContainerBase *bcontainer); +int vfio_devices_query_dirty_bitmap (const VFIOContainerBase *bcontainer, +VFIOBitmap *vbmap,hwaddr iova,hwaddr size, +Error **errp); +int vfio_get_dirty_bitmap (const VFIOContainerBase *bcontainer,uint64_t iova, +uint64_t size,ram_addr_t ram_addr,Error **errp);GList *vfio_container_get_iova_ranges (const VFIOContainerBase *bcontainer);
hw/vfio/common.c +0 -130
148 lines not on this page · raw message
hw/vfio/container-base.c +138 -0
156 lines not on this page · raw message
hw/vfio/meson.build +1 -1
@@ -1,6 +1,7 @@ vfio_ss = ss.source_set() vfio_ss.add(files( 'common.c', + 'container-base.c', 'container.c', 'helpers.c', ))
@@ -19,7 +20,6 @@ specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss) system_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) system_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) system_ss.add(when: 'CONFIG_VFIO', if_true: files( - 'container-base.c', 'cpr.c', 'device.c', 'migration.c',
hw/vfio/trace-events +3 -1
@@ -106,9 +106,11 @@ vfio_put_group(int fd) "close group->fd=%d" vfio_get_device(const char * name, unsigned int flags, unsigned int num_regions, unsigned int num_irqs) "Device %s flags: %u, regions: %u, irqs: %u" vfio_put_base_device(int fd) "close vdev->fd=%d" vfio_legacy_dma_unmap_overflow_workaround(void) "" -vfio_get_dirty_bitmap(uint64_t iova, uint64_t size, uint64_t bitmap_size, uint64_t start, uint64_t dirty_pages) "iova=0x%"PRIx64" size= 0x%"PRIx64" bitmap_size=0x%"PRIx64" start=0x%"PRIx64" dirty_pages=%"PRIu64 vfio_iommu_map_dirty_notify(uint64_t iova_start, uint64_t iova_end) "iommu dirty @ 0x%"PRIx64" - 0x%"PRIx64 +# container-base.c +vfio_get_dirty_bitmap(uint64_t iova, uint64_t size, uint64_t bitmap_size, uint64_t start, uint64_t dirty_pages) "iova=0x%"PRIx64" size= 0x%"PRIx64" bitmap_size=0x%"PRIx64" start=0x%"PRIx64" dirty_pages=%"PRIu64 + # region.c vfio_region_write(const char *name, int index, uint64_t addr, uint64_t data, unsigned size) " (%s:region%d+0x%"PRIx64", 0x%"PRIx64 ", %d)" vfio_region_read(char *name, int index, uint64_t addr, unsigned size, uint64_t data) " (%s:region%d+0x%"PRIx64", %d) = 0x%"PRIx64
Signature · 1 line
2.49.0
PATCH v3 27/37 vfio: Make vfio_devices_query_dirty_bitmap() static
In reply to Cédric Le Goatervfio_devices_query_dirty_bitmap() is only used in "container-base.c". Also, rename to vfio_container_devices_query_dirty_bitmap() to reflect with the prefix 'vfio_container_devices_' that it simply loops over the container's device list.
--- include/hw/vfio/vfio-container-base.h | 3 --- hw/vfio/container-base.c | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-)
include/hw/vfio/vfio-container-base.h +0 -3
@@ -93,9 +93,6 @@ int vfio_container_query_dirty_bitmap(const VFIOContainerBase *bcontainer, VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp);bool vfio_devices_all_dirty_tracking_started (const VFIOContainerBase *bcontainer);bool vfio_devices_all_device_dirty_tracking (const VFIOContainerBase *bcontainer); -int vfio_devices_query_dirty_bitmap (const VFIOContainerBase *bcontainer, -VFIOBitmap *vbmap,hwaddr iova,hwaddr size, -Error **errp);int vfio_get_dirty_bitmap (const VFIOContainerBase *bcontainer,uint64_t iova,uint64_t size,ram_addr_t ram_addr,Error **errp);
hw/vfio/container-base.c +3 -3
@@ -214,7 +214,7 @@ static int vfio_device_dma_logging_report(VFIODevice *vbasedev, hwaddr iova,return 0 ; } -int vfio_devices_query_dirty_bitmap (const VFIOContainerBase *bcontainer, +static int vfio_container_devices_query_dirty_bitmap (const VFIOContainerBase *bcontainer,VFIOBitmap *vbmap,hwaddr iova,hwaddr size,Error **errp) {VFIODevice *vbasedev;
@@ -260,8 +260,8 @@ int vfio_get_dirty_bitmap(const VFIOContainerBase *bcontainer, uint64_t iova, }if (all_device_dirty_tracking) { - ret =vfio_devices_query_dirty_bitmap (bcontainer, &vbmap, iova, size, - errp); + ret =vfio_container_devices_query_dirty_bitmap (bcontainer, &vbmap, iova, size, + errp); }else { ret =vfio_container_query_dirty_bitmap (bcontainer, &vbmap, iova, size, errp);
Signature · 1 line
2.49.0
PATCH v3 28/37 vfio: Make vfio_container_query_dirty_bitmap() static
In reply to Cédric Le Goatervfio_container_query_dirty_bitmap() is only used in "container-base.c". Also, rename to vfio_container_iommu_query_dirty_bitmap() to reflect it is using the VFIO IOMMU backend device ->query_dirty_bitmap() handler.
--- include/hw/vfio/vfio-container-base.h | 2 -- hw/vfio/container-base.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 14 deletions(-)
include/hw/vfio/vfio-container-base.h +0 -2
@@ -89,8 +89,6 @@ void vfio_container_del_section_window(VFIOContainerBase *bcontainer, MemoryRegionSection *section);int vfio_container_set_dirty_page_tracking (VFIOContainerBase *bcontainer,bool start,Error **errp); -int vfio_container_query_dirty_bitmap (const VFIOContainerBase *bcontainer, -VFIOBitmap *vbmap,hwaddr iova,hwaddr size,Error **errp);bool vfio_devices_all_dirty_tracking_started (const VFIOContainerBase *bcontainer);bool vfio_devices_all_device_dirty_tracking (const VFIOContainerBase *bcontainer); int vfio_get_dirty_bitmap(const VFIOContainerBase *bcontainer, uint64_t iova,
hw/vfio/container-base.c +12 -12
@@ -141,16 +141,6 @@ int vfio_container_set_dirty_page_tracking(VFIOContainerBase *bcontainer,return ret; } -int vfio_container_query_dirty_bitmap (const VFIOContainerBase *bcontainer, -VFIOBitmap *vbmap,hwaddr iova,hwaddr size,Error **errp) -{ -VFIOIOMMUClass *vioc =VFIO_IOMMU_GET_CLASS (bcontainer); - -g_assert (vioc->query_dirty_bitmap); -return vioc->query_dirty_bitmap (bcontainer, vbmap, iova, size, - errp); -} -static bool vfio_devices_all_device_dirty_tracking_started (const VFIOContainerBase *bcontainer) {
@@ -214,6 +204,16 @@ static int vfio_device_dma_logging_report(VFIODevice *vbasedev, hwaddr iova,return 0 ; } +static int vfio_container_iommu_query_dirty_bitmap (const VFIOContainerBase *bcontainer, +VFIOBitmap *vbmap,hwaddr iova,hwaddr size,Error **errp) +{ +VFIOIOMMUClass *vioc =VFIO_IOMMU_GET_CLASS (bcontainer); + +g_assert (vioc->query_dirty_bitmap); +return vioc->query_dirty_bitmap (bcontainer, vbmap, iova, size, + errp); +} +static int vfio_container_devices_query_dirty_bitmap (const VFIOContainerBase *bcontainer,VFIOBitmap *vbmap,hwaddr iova,hwaddr size,Error **errp) {
@@ -263,8 +263,8 @@ int vfio_get_dirty_bitmap(const VFIOContainerBase *bcontainer, uint64_t iova, ret =vfio_container_devices_query_dirty_bitmap (bcontainer, &vbmap, iova, size, errp); }else { - ret =vfio_container_query_dirty_bitmap (bcontainer, &vbmap, iova, size, - errp); + ret =vfio_container_iommu_query_dirty_bitmap (bcontainer, &vbmap, iova, size, + errp); }if (ret) {
Signature · 1 line
2.49.0
PATCH v3 29/37 vfio: Rename vfio_devices_all_dirty_tracking_started()
In reply to Cédric Le GoaterAlso rename vfio_devices_all_device_dirty_tracking_started() while at it and use the prefix 'vfio_container_devices_' for routines simply looping over the container's device list.
--- include/hw/vfio/vfio-container-base.h | 3 ++- hw/vfio/common.c | 2 +- hw/vfio/container-base.c | 6 +++--- hw/vfio/container.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-)
include/hw/vfio/vfio-container-base.h +2 -1
@@ -89,7 +89,8 @@ void vfio_container_del_section_window(VFIOContainerBase *bcontainer, MemoryRegionSection *section);int vfio_container_set_dirty_page_tracking (VFIOContainerBase *bcontainer,bool start,Error **errp); -bool vfio_devices_all_dirty_tracking_started (const VFIOContainerBase *bcontainer); +bool vfio_container_dirty_tracking_is_started ( +const VFIOContainerBase *bcontainer);bool vfio_devices_all_device_dirty_tracking (const VFIOContainerBase *bcontainer);int vfio_get_dirty_bitmap (const VFIOContainerBase *bcontainer,uint64_t iova,uint64_t size,ram_addr_t ram_addr,Error **errp);
hw/vfio/common.c +1 -1
@@ -56,7 +56,7 @@ static bool vfio_log_sync_needed(const VFIOContainerBase *bcontainer) {VFIODevice *vbasedev; -if (!vfio_devices_all_dirty_tracking_started (bcontainer)) { +if (!vfio_container_dirty_tracking_is_started (bcontainer)) {return false; }
hw/vfio/container-base.c +3 -3
@@ -141,7 +141,7 @@ int vfio_container_set_dirty_page_tracking(VFIOContainerBase *bcontainer,return ret; } -static bool vfio_devices_all_device_dirty_tracking_started ( +static bool vfio_container_devices_dirty_tracking_is_started (const VFIOContainerBase *bcontainer) {VFIODevice *vbasedev;
@@ -155,10 +155,10 @@ static bool vfio_devices_all_device_dirty_tracking_started(return true; } -bool vfio_devices_all_dirty_tracking_started ( +bool vfio_container_dirty_tracking_is_started (const VFIOContainerBase *bcontainer) { -return vfio_devices_all_device_dirty_tracking_started (bcontainer) || +return vfio_container_devices_dirty_tracking_is_started (bcontainer) || bcontainer->dirty_pages_started; }
hw/vfio/container.c +1 -1
@@ -137,7 +137,7 @@ static int vfio_legacy_dma_unmap(const VFIOContainerBase *bcontainer,int ret;Error *local_err =NULL ; -if (iotlb &&vfio_devices_all_dirty_tracking_started (bcontainer)) { +if (iotlb &&vfio_container_dirty_tracking_is_started (bcontainer)) {if (!vfio_devices_all_device_dirty_tracking (bcontainer) && bcontainer->dirty_pages_supported) {return vfio_dma_unmap_bitmap (container, iova, size, iotlb);
Signature · 1 line
2.49.0
PATCH v3 30/37 vfio: Rename vfio_devices_all_device_dirty_tracking()
In reply to Cédric Le GoaterUse the prefix 'vfio_container_devices_' to reflect the routine simply loops over the container's device list.
--- include/hw/vfio/vfio-container-base.h | 3 ++- hw/vfio/common.c | 4 ++-- hw/vfio/container-base.c | 5 +++-- hw/vfio/container.c | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-)
include/hw/vfio/vfio-container-base.h +2 -1
@@ -91,7 +91,8 @@ int vfio_container_set_dirty_page_tracking(VFIOContainerBase *bcontainer, bool start, Error **errp);bool vfio_container_dirty_tracking_is_started (const VFIOContainerBase *bcontainer); -bool vfio_devices_all_device_dirty_tracking (const VFIOContainerBase *bcontainer); +bool vfio_container_devices_dirty_tracking_is_supported ( +const VFIOContainerBase *bcontainer);int vfio_get_dirty_bitmap (const VFIOContainerBase *bcontainer,uint64_t iova,uint64_t size,ram_addr_t ram_addr,Error **errp);
hw/vfio/common.c +2 -2
@@ -936,7 +936,7 @@ static bool vfio_listener_log_global_start(MemoryListener *listener, listener);bool ret; -if (vfio_devices_all_device_dirty_tracking (bcontainer)) { +if (vfio_container_devices_dirty_tracking_is_supported (bcontainer)) { ret =vfio_devices_dma_logging_start (bcontainer, errp); }else { ret =vfio_container_set_dirty_page_tracking (bcontainer, true, errp) ==0 ;
@@ -955,7 +955,7 @@ static void vfio_listener_log_global_stop(MemoryListener *listener)Error *local_err =NULL ;int ret =0 ; -if (vfio_devices_all_device_dirty_tracking (bcontainer)) { +if (vfio_container_devices_dirty_tracking_is_supported (bcontainer)) {vfio_devices_dma_logging_stop (bcontainer); }else { ret = vfio_container_set_dirty_page_tracking(bcontainer, false,
hw/vfio/container-base.c +3 -2
@@ -162,7 +162,8 @@ bool vfio_container_dirty_tracking_is_started( bcontainer->dirty_pages_started; } -bool vfio_devices_all_device_dirty_tracking (const VFIOContainerBase *bcontainer) +bool vfio_container_devices_dirty_tracking_is_supported ( +const VFIOContainerBase *bcontainer) {VFIODevice *vbasedev;
@@ -240,7 +241,7 @@ int vfio_get_dirty_bitmap(const VFIOContainerBase *bcontainer, uint64_t iova, uint64_t size, ram_addr_t ram_addr, Error **errp) { bool all_device_dirty_tracking = -vfio_devices_all_device_dirty_tracking (bcontainer); +vfio_container_devices_dirty_tracking_is_supported (bcontainer);uint64_t dirty_pages;VFIOBitmap vbmap;int ret;
hw/vfio/container.c +1 -1
@@ -138,7 +138,7 @@ static int vfio_legacy_dma_unmap(const VFIOContainerBase *bcontainer,Error *local_err =NULL ;if (iotlb &&vfio_container_dirty_tracking_is_started (bcontainer)) { -if (!vfio_devices_all_device_dirty_tracking (bcontainer) && +if (!vfio_container_devices_dirty_tracking_is_supported (bcontainer) && bcontainer->dirty_pages_supported) {return vfio_dma_unmap_bitmap (container, iova, size, iotlb); }
Signature · 1 line
2.49.0
PATCH v3 31/37 vfio: Rename vfio_get_dirty_bitmap()
In reply to Cédric Le GoaterRename to vfio_container_query_dirty_bitmap() to be consistent with the VFIO container routine naming scheme.
--- include/hw/vfio/vfio-container-base.h | 4 ++-- hw/vfio/common.c | 6 +++--- hw/vfio/container-base.c | 5 +++-- hw/vfio/container.c | 2 +- hw/vfio/trace-events | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-)
include/hw/vfio/vfio-container-base.h +2 -2
@@ -93,8 +93,8 @@ bool vfio_container_dirty_tracking_is_started( const VFIOContainerBase *bcontainer);bool vfio_container_devices_dirty_tracking_is_supported (const VFIOContainerBase *bcontainer); -int vfio_get_dirty_bitmap (const VFIOContainerBase *bcontainer,uint64_t iova, -uint64_t size,ram_addr_t ram_addr,Error **errp); +int vfio_container_query_dirty_bitmap (const VFIOContainerBase *bcontainer, +uint64_t iova,uint64_t size,ram_addr_t ram_addr,Error **errp);GList *vfio_container_get_iova_ranges (const VFIOContainerBase *bcontainer);
hw/vfio/common.c +3 -3
@@ -1003,7 +1003,7 @@ static void vfio_iommu_map_dirty_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb) goto out_unlock; } - ret =vfio_get_dirty_bitmap (bcontainer, iova, iotlb->addr_mask +1 , + ret =vfio_container_query_dirty_bitmap (bcontainer, iova, iotlb->addr_mask +1 , translated_addr, &local_err);if (ret) { error_prepend(&local_err,
@@ -1040,7 +1040,7 @@ static int vfio_ram_discard_get_dirty_bitmap(MemoryRegionSection *section,* Sync the whole mapped region (spanning multiple individual mappings) * in one go. */ - ret =vfio_get_dirty_bitmap (vrdl->bcontainer, iova, size, ram_addr, + ret =vfio_container_query_dirty_bitmap (vrdl->bcontainer, iova, size, ram_addr, &local_err);if (ret) {error_report_err (local_err);
@@ -1134,7 +1134,7 @@ static int vfio_sync_dirty_bitmap(VFIOContainerBase *bcontainer, ram_addr =memory_region_get_ram_addr (section->mr) + section->offset_within_region; -return vfio_get_dirty_bitmap (bcontainer, +return vfio_container_query_dirty_bitmap (bcontainer,REAL_HOST_PAGE_ALIGN (section->offset_within_address_space),int128_get64 (section->size), ram_addr, errp); }
hw/vfio/container-base.c +3 -2
@@ -237,7 +237,7 @@ static int vfio_container_devices_query_dirty_bitmap(const VFIOContainerBase *bcreturn 0 ; } -int vfio_get_dirty_bitmap (const VFIOContainerBase *bcontainer,uint64_t iova, +int vfio_container_query_dirty_bitmap (const VFIOContainerBase *bcontainer,uint64_t iova,uint64_t size,ram_addr_t ram_addr,Error **errp) { bool all_device_dirty_tracking =
@@ -275,7 +275,8 @@ int vfio_get_dirty_bitmap(const VFIOContainerBase *bcontainer, uint64_t iova, dirty_pages =cpu_physical_memory_set_dirty_lebitmap (vbmap.bitmap, ram_addr, vbmap.pages); -trace_vfio_get_dirty_bitmap (iova, size, vbmap.size, ram_addr, dirty_pages); +trace_vfio_container_query_dirty_bitmap (iova, size, vbmap.size, ram_addr, + dirty_pages); out:g_free (vbmap.bitmap);
hw/vfio/container.c +1 -1
@@ -169,7 +169,7 @@ static int vfio_legacy_dma_unmap(const VFIOContainerBase *bcontainer, }if (need_dirty_sync) { - ret =vfio_get_dirty_bitmap (bcontainer, iova, size, + ret =vfio_container_query_dirty_bitmap (bcontainer, iova, size, iotlb->translated_addr, &local_err);if (ret) {error_report_err (local_err);
hw/vfio/trace-events +1 -1
@@ -109,7 +109,7 @@ vfio_legacy_dma_unmap_overflow_workaround(void) "" vfio_iommu_map_dirty_notify(uint64_t iova_start, uint64_t iova_end) "iommu dirty @ 0x%"PRIx64" - 0x%"PRIx64 # container-base.c -vfio_get_dirty_bitmap(uint64_t iova, uint64_t size, uint64_t bitmap_size, uint64_t start, uint64_t dirty_pages) "iova=0x%"PRIx64" size= 0x%"PRIx64" bitmap_size=0x%"PRIx64" start=0x%"PRIx64" dirty_pages=%"PRIu64 +vfio_container_query_dirty_bitmap(uint64_t iova, uint64_t size, uint64_t bitmap_size, uint64_t start, uint64_t dirty_pages) "iova=0x%"PRIx64" size= 0x%"PRIx64" bitmap_size=0x%"PRIx64" start=0x%"PRIx64" dirty_pages=%"PRIu64 # region.c vfio_region_write(const char *name, int index, uint64_t addr, uint64_t data, unsigned size) " (%s:region%d+0x%"PRIx64", 0x%"PRIx64 ", %d)"
Signature · 1 line
2.49.0
PATCH v3 32/37 vfio: Introduce new files for VFIO MemoryListener
In reply to Cédric Le GoaterFile "common.c" has been emptied of most of its definitions by the previous changes and the only definitions left are related to the VFIO MemoryListener handlers. Rename it to "listener.c" and introduce its associated "vfio-listener.h" header file for the declarations.
Cleanup a little the includes while at it.
---
hw/vfio/vfio-listener.h | 14 ++++++++++++++
include/hw/vfio/vfio-common.h | 1 -
hw/vfio/container.c | 1 +
hw/vfio/iommufd.c | 1 +
hw/vfio/{common.c => listener.c} | 0
hw/vfio/meson.build | 2 +-
hw/vfio/trace-events | 2 +-
7 files changed, 18 insertions(+), 3 deletions(-)
create mode 100644 hw/vfio/vfio-listener.h
rename hw/vfio/{common.c => listener.c} (100%)hw/vfio/vfio-listener.h new file +14 -0
@@ -0,0 +1,14 @@ +/* +* VFIO MemoryListener services +* +* Copyright Red Hat, Inc. 2025 +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#ifndef HW_VFIO_VFIO_LISTENER_H +#define HW_VFIO_VFIO_LISTENER_H + +extern const MemoryListener vfio_memory_listener; + +#endif /* HW_VFIO_VFIO_LISTENER_H */
include/hw/vfio/vfio-common.h +0 -1
@@ -131,7 +131,6 @@ VFIODevice *vfio_get_vfio_device(Object *obj); typedef QLIST_HEAD(VFIODeviceList, VFIODevice) VFIODeviceList;extern VFIODeviceList vfio_device_list; -extern const MemoryListener vfio_memory_listener;#ifdef CONFIG_LINUX int vfio_get_region_info(VFIODevice *vbasedev, int index,
hw/vfio/container.c +1 -0
@@ -35,6 +35,7 @@#include "hw/vfio/vfio-container.h" #include "vfio-helpers.h" #include "vfio-cpr.h" +#include "vfio-listener.h" #define TYPE_HOST_IOMMU_DEVICE_LEGACY_VFIO TYPE_HOST_IOMMU_DEVICE "-legacy-vfio"
hw/vfio/iommufd.c +1 -0
@@ -28,6 +28,7 @@#include "vfio-iommufd.h" #include "vfio-helpers.h" #include "vfio-cpr.h" +#include "vfio-listener.h" #define TYPE_HOST_IOMMU_DEVICE_IOMMUFD_VFIO \ TYPE_HOST_IOMMU_DEVICE_IOMMUFD "-vfio"
hw/vfio/listener.c renamed from hw/vfio/common.c +0 -0
hw/vfio/meson.build +1 -1
@@ -1,6 +1,6 @@ vfio_ss = ss.source_set() vfio_ss.add(files( - 'common.c', + 'listener.c', 'container-base.c', 'container.c', 'helpers.c',
hw/vfio/trace-events +1 -1
@@ -89,7 +89,7 @@ vfio_pci_igd_bdsm_enabled(const char *name, int size) "%s %dMB" vfio_pci_igd_host_bridge_enabled(const char *name) "%s" vfio_pci_igd_lpc_bridge_enabled(const char *name) "%s" -# common.c +# listener.c vfio_iommu_map_notify(const char *op, uint64_t iova_start, uint64_t iova_end) "iommu %s @ 0x%"PRIx64" - 0x%"PRIx64 vfio_listener_region_skip(const char *name, uint64_t start, uint64_t end) "SKIPPING %s 0x%"PRIx64" - 0x%"PRIx64 vfio_spapr_group_attach(int groupfd, int tablefd) "Attached groupfd %d to liobn fd %d"
Signature · 1 line
2.49.0
PATCH v3 33/37 vfio: Rename RAM discard related services
In reply to Cédric Le GoaterRename some routines to better reflect the namespace they belong to.
--- hw/vfio/listener.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
hw/vfio/listener.c +6 -6
@@ -243,7 +243,7 @@ static int vfio_ram_discard_notify_populate(RamDiscardListener *rdl,return 0 ; } -static void vfio_register_ram_discard_listener (VFIOContainerBase *bcontainer, +static void vfio_ram_discard_register_listener (VFIOContainerBase *bcontainer,MemoryRegionSection *section) {RamDiscardManager *rdm =memory_region_get_ram_discard_manager (section->mr);
@@ -318,7 +318,7 @@ static void vfio_register_ram_discard_listener(VFIOContainerBase *bcontainer, } } -static void vfio_unregister_ram_discard_listener (VFIOContainerBase *bcontainer, +static void vfio_ram_discard_unregister_listener (VFIOContainerBase *bcontainer,MemoryRegionSection *section) {RamDiscardManager *rdm =memory_region_get_ram_discard_manager (section->mr);
@@ -505,7 +505,7 @@ static void vfio_listener_region_add(MemoryListener *listener,* about changes. */ if (memory_region_has_ram_discard_manager (section->mr)) { -vfio_register_ram_discard_listener (bcontainer, section); +vfio_ram_discard_register_listener (bcontainer, section);return ; }
@@ -628,7 +628,7 @@ static void vfio_listener_region_del(MemoryListener *listener, pgmask = (1ULL <<ctz64 (bcontainer->pgsizes)) -1 ; try_unmap = !((iova & pgmask) || (int128_get64 (llsize) & pgmask)); }else if (memory_region_has_ram_discard_manager (section->mr)) { -vfio_unregister_ram_discard_listener (bcontainer, section); +vfio_ram_discard_unregister_listener (bcontainer, section);/* Unregistering will trigger an unmap. */ try_unmap = false; }
@@ -1025,7 +1025,7 @@ out: } } -static int vfio_ram_discard_get_dirty_bitmap (MemoryRegionSection *section, +static int vfio_ram_discard_query_dirty_bitmap (MemoryRegionSection *section,void *opaque) {const hwaddr size =int128_get64 (section->size);
@@ -1072,7 +1072,7 @@ vfio_sync_ram_discard_listener_dirty_bitmap(VFIOContainerBase *bcontainer,* which correspond to populated parts. Replay all populated parts. */ return ram_discard_manager_replay_populated (rdm, section, - vfio_ram_discard_get_dirty_bitmap, + vfio_ram_discard_query_dirty_bitmap, &vrdl); }
Signature · 1 line
2.49.0
PATCH v3 34/37 vfio: Introduce vfio_listener_un/register() routines
In reply to Cédric Le GoaterThis hides the MemoryListener implementation and makes the code common to both IOMMU backends, legacy and IOMMUFD.
--- hw/vfio/vfio-listener.h | 3 ++- hw/vfio/container.c | 11 +++-------- hw/vfio/iommufd.c | 9 ++------- hw/vfio/listener.c | 22 +++++++++++++++++++++- 4 files changed, 28 insertions(+), 17 deletions(-)
hw/vfio/vfio-listener.h +2 -1
@@ -9,6 +9,7 @@#ifndef HW_VFIO_VFIO_LISTENER_H #define HW_VFIO_VFIO_LISTENER_H -extern const MemoryListener vfio_memory_listener; +bool vfio_listener_register (VFIOContainerBase *bcontainer,Error **errp); +void vfio_listener_unregister (VFIOContainerBase *bcontainer);#endif /* HW_VFIO_VFIO_LISTENER_H */
hw/vfio/container.c +3 -8
@@ -616,12 +616,7 @@ static bool vfio_connect_container(VFIOGroup *group, AddressSpace *as, group->container = container;QLIST_INSERT_HEAD (&container->group_list, group, container_next); - bcontainer->listener = vfio_memory_listener; -memory_listener_register (&bcontainer->listener, bcontainer->space->as); - -if (bcontainer->error) { -error_propagate_prepend (errp, bcontainer->error, -"memory listener initialization failed: " ); +if (!vfio_listener_register (bcontainer, errp)) { goto listener_release_exit; }
@@ -631,7 +626,7 @@ static bool vfio_connect_container(VFIOGroup *group, AddressSpace *as, listener_release_exit:QLIST_REMOVE (group, container_next);vfio_kvm_device_del_group (group); -memory_listener_unregister (&bcontainer->listener); +vfio_listener_unregister (bcontainer);if (vioc->release) { vioc->release (bcontainer); }
@@ -669,7 +664,7 @@ static void vfio_disconnect_container(VFIOGroup *group)* group. */ if (QLIST_EMPTY (&container->group_list)) { -memory_listener_unregister (&bcontainer->listener); +vfio_listener_unregister (bcontainer);if (vioc->release) { vioc->release (bcontainer); }
hw/vfio/iommufd.c +2 -7
@@ -410,7 +410,7 @@ static void iommufd_cdev_container_destroy(VFIOIOMMUFDContainer *container)if (!QLIST_EMPTY (&bcontainer->device_list)) {return ; } -memory_listener_unregister (&bcontainer->listener); +vfio_listener_unregister (bcontainer);iommufd_backend_free_id (container->be, container->ioas_id);object_unref (container); }
@@ -562,12 +562,7 @@ static bool iommufd_cdev_attach(const char *name, VFIODevice *vbasedev, bcontainer->pgsizes =qemu_real_host_page_size (); } - bcontainer->listener = vfio_memory_listener; -memory_listener_register (&bcontainer->listener, bcontainer->space->as); - -if (bcontainer->error) { -error_propagate_prepend (errp, bcontainer->error, -"memory listener initialization failed: " ); +if (!vfio_listener_register (bcontainer, errp)) { goto err_listener_register; }
hw/vfio/listener.c +21 -1
@@ -46,6 +46,7 @@#include "system/tpm.h" #include "vfio-migration-internal.h" #include "vfio-helpers.h" +#include "vfio-listener.h" /* * Device state interfaces
@@ -1163,7 +1164,7 @@ static void vfio_listener_log_sync(MemoryListener *listener, } } -const MemoryListener vfio_memory_listener = { +static const MemoryListener vfio_memory_listener = { .name ="vfio" , .region_add = vfio_listener_region_add, .region_del = vfio_listener_region_del,
@@ -1171,3 +1172,22 @@ const MemoryListener vfio_memory_listener = { .log_global_stop = vfio_listener_log_global_stop, .log_sync = vfio_listener_log_sync, }; + +bool vfio_listener_register (VFIOContainerBase *bcontainer,Error **errp) +{ + bcontainer->listener = vfio_memory_listener; +memory_listener_register (&bcontainer->listener, bcontainer->space->as); + +if (bcontainer->error) { +error_propagate_prepend (errp, bcontainer->error, +"memory listener initialization failed: " ); +return false; + } + +return true; +} + +void vfio_listener_unregister (VFIOContainerBase *bcontainer) +{ +memory_listener_unregister (&bcontainer->listener); +}
Signature · 1 line
2.49.0
PATCH v3 35/37 vfio: Rename vfio-common.h to vfio-device.h
In reply to Cédric Le Goater"hw/vfio/vfio-common.h" has been emptied of most of its declarations by the previous changes and the only declarations left are related to VFIODevice. Rename it to "hw/vfio/vfio-device.h" and make the necessary adjustments.
---
hw/vfio/migration-multifd.h | 2 +-
hw/vfio/pci.h | 2 +-
include/hw/s390x/vfio-ccw.h | 2 +-
include/hw/vfio/{vfio-common.h => vfio-device.h} | 2 +-
include/hw/vfio/vfio-platform.h | 2 +-
backends/iommufd.c | 2 +-
hw/vfio/ap.c | 2 +-
hw/vfio/ccw.c | 2 +-
hw/vfio/container-base.c | 2 +-
hw/vfio/container.c | 2 +-
hw/vfio/cpr.c | 2 +-
hw/vfio/device.c | 2 +-
hw/vfio/helpers.c | 2 +-
hw/vfio/iommufd.c | 2 +-
hw/vfio/listener.c | 2 +-
hw/vfio/migration-multifd.c | 2 +-
hw/vfio/migration.c | 2 +-
hw/vfio/region.c | 4 ++--
18 files changed, 19 insertions(+), 19 deletions(-)
rename include/hw/vfio/{vfio-common.h => vfio-device.h} (98%)hw/vfio/migration-multifd.h +1 -1
@@ -12,7 +12,7 @@#ifndef HW_VFIO_MIGRATION_MULTIFD_H #define HW_VFIO_MIGRATION_MULTIFD_H -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-device.h" bool vfio_multifd_setup (VFIODevice *vbasedev,bool alloc_multifd,Error **errp);void vfio_multifd_cleanup (VFIODevice *vbasedev);
hw/vfio/pci.h +1 -1
@@ -14,7 +14,7 @@#include "exec/memory.h" #include "hw/pci/pci_device.h" -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-device.h" #include "hw/vfio/vfio-region.h" #include "qemu/event_notifier.h" #include "qemu/queue.h"
include/hw/s390x/vfio-ccw.h +1 -1
@@ -14,7 +14,7 @@#ifndef HW_VFIO_CCW_H #define HW_VFIO_CCW_H -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-device.h" #include "hw/s390x/s390-ccw.h" #include "hw/s390x/ccw-device.h" #include "qom/object.h"
include/hw/vfio/vfio-device.h renamed from include/hw/vfio/vfio-common.h +1 -1
@@ -1,5 +1,5 @@/* -* common header for vfio based device assignment support +* VFIO Device interface * * Copyright Red Hat, Inc. 2012 *
include/hw/vfio/vfio-platform.h +1 -1
@@ -17,7 +17,7 @@#define HW_VFIO_VFIO_PLATFORM_H #include "hw/sysbus.h" -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-device.h" #include "qemu/event_notifier.h" #include "qemu/queue.h" #include "qom/object.h"
backends/iommufd.c +1 -1
@@ -18,7 +18,7 @@#include "qemu/error-report.h" #include "monitor/monitor.h" #include "trace.h" -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-device.h" #include <sys/ioctl.h> #include <linux/iommufd.h>
hw/vfio/ap.c +1 -1
@@ -15,7 +15,7 @@#include <linux/vfio.h> #include <sys/ioctl.h> #include "qapi/error.h" -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-device.h" #include "system/iommufd.h" #include "hw/s390x/ap-device.h" #include "qemu/error-report.h"
hw/vfio/ccw.c +1 -1
@@ -21,7 +21,7 @@#include <sys/ioctl.h> #include "qapi/error.h" -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-device.h" #include "system/iommufd.h" #include "hw/s390x/s390-ccw.h" #include "hw/s390x/vfio-ccw.h"
hw/vfio/container-base.c +1 -1
@@ -19,7 +19,7 @@#include "qapi/error.h" #include "qemu/error-report.h" #include "hw/vfio/vfio-container-base.h" -#include "hw/vfio/vfio-common.h" /* vfio_reset_handler */ +#include "hw/vfio/vfio-device.h" /* vfio_reset_handler */ #include "system/reset.h" #include "vfio-helpers.h"
hw/vfio/container.c +1 -1
@@ -22,7 +22,7 @@#include <sys/ioctl.h> #include <linux/vfio.h> -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-device.h" #include "exec/address-spaces.h" #include "exec/memory.h" #include "exec/ram_addr.h"
hw/vfio/cpr.c +1 -1
@@ -6,7 +6,7 @@*/ #include "qemu/osdep.h" -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-device.h" #include "migration/misc.h" #include "qapi/error.h" #include "system/runstate.h"
hw/vfio/device.c +1 -1
@@ -21,7 +21,7 @@#include "qemu/osdep.h" #include <sys/ioctl.h> -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-device.h" #include "hw/vfio/pci.h" #include "hw/hw.h" #include "trace.h"
hw/vfio/helpers.c +1 -1
@@ -23,7 +23,7 @@#include <sys/ioctl.h> #include "system/kvm.h" -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-device.h" #include "hw/hw.h" #include "qapi/error.h" #include "vfio-helpers.h"
hw/vfio/iommufd.c +1 -1
@@ -15,7 +15,7 @@#include <linux/vfio.h> #include <linux/iommufd.h> -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-device.h" #include "qemu/error-report.h" #include "trace.h" #include "qapi/error.h"
hw/vfio/listener.c +1 -1
@@ -25,7 +25,7 @@#endif #include <linux/vfio.h> -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-device.h" #include "hw/vfio/pci.h" #include "exec/address-spaces.h" #include "exec/memory.h"
hw/vfio/migration-multifd.c +1 -1
@@ -10,7 +10,7 @@*/ #include "qemu/osdep.h" -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-device.h" #include "migration/misc.h" #include "qapi/error.h" #include "qemu/bswap.h"
hw/vfio/migration.c +1 -1
@@ -16,7 +16,7 @@#include <sys/ioctl.h> #include "system/runstate.h" -#include "hw/vfio/vfio-common.h" +#include "hw/vfio/vfio-device.h" #include "hw/vfio/vfio-migration.h" #include "migration/misc.h" #include "migration/savevm.h"
hw/vfio/region.c +2 -2
@@ -21,8 +21,8 @@#include "qemu/osdep.h" #include <sys/ioctl.h> -#include "hw/vfio/vfio-common.h" -#include "hw/vfio/pci.h" +#include "hw/vfio/vfio-region.h" +#include "hw/vfio/vfio-device.h" #include "hw/hw.h" #include "trace.h" #include "qapi/error.h"
Signature · 1 line
2.49.0
PATCH v3 36/37 vfio: Rename VFIODevice related services
In reply to Cédric Le GoaterRename these routines :
vfio_disable_irqindex -> vfio_device_irq_disable
vfio_unmask_single_irqindex -> vfio_device_irq_unmask
vfio_mask_single_irqindex -> vfio_device_irq_mask vfio_set_irq_signaling -> vfio_device_irq_set_signaling vfio_attach_device -> vfio_device_attach vfio_detach_device -> vfio_device_detach vfio_get_region_info -> vfio_device_get_region_info vfio_get_dev_region_info -> vfio_device_get_region_info_type vfio_has_region_cap -> vfio_device_has_region_cap vfio_reset_handler -> vfio_device_reset_hander
to better reflect the namespace they belong to.
--- include/hw/vfio/vfio-device.h | 26 +++++++------- hw/vfio/ap.c | 12 +++---- hw/vfio/ccw.c | 28 +++++++-------- hw/vfio/container-base.c | 6 ++-- hw/vfio/container.c | 6 ++-- hw/vfio/device.c | 36 +++++++++---------- hw/vfio/display.c | 8 ++--- hw/vfio/igd.c | 10 +++--- hw/vfio/pci.c | 68 +++++++++++++++++------------------ hw/vfio/platform.c | 14 ++++---- hw/vfio/region.c | 2 +- hw/vfio/trace-events | 8 ++--- 12 files changed, 112 insertions(+), 112 deletions(-)
include/hw/vfio/vfio-device.h +13 -13
@@ -115,29 +115,29 @@ struct VFIODeviceOps {int (*vfio_load_config)(VFIODevice *vdev,QEMUFile *f); }; -void vfio_disable_irqindex (VFIODevice *vbasedev,int index); -void vfio_unmask_single_irqindex (VFIODevice *vbasedev,int index); -void vfio_mask_single_irqindex (VFIODevice *vbasedev,int index); -bool vfio_set_irq_signaling (VFIODevice *vbasedev,int index,int subindex, -int action,int fd,Error **errp); +void vfio_device_irq_disable (VFIODevice *vbasedev,int index); +void vfio_device_irq_unmask (VFIODevice *vbasedev,int index); +void vfio_device_irq_mask (VFIODevice *vbasedev,int index); +bool vfio_device_irq_set_signaling (VFIODevice *vbasedev,int index,int subindex, +int action,int fd,Error **errp); -void vfio_reset_handler (void *opaque); +void vfio_device_reset_handler (void *opaque);bool vfio_device_is_mdev (VFIODevice *vbasedev);bool vfio_device_hiod_realize (VFIODevice *vbasedev,Error **errp); -bool vfio_attach_device (char *name,VFIODevice *vbasedev, +bool vfio_device_attach (char *name,VFIODevice *vbasedev,AddressSpace *as,Error **errp); -void vfio_detach_device (VFIODevice *vbasedev); +void vfio_device_detach (VFIODevice *vbasedev);VFIODevice *vfio_get_vfio_device (Object *obj); typedef QLIST_HEAD(VFIODeviceList, VFIODevice) VFIODeviceList;extern VFIODeviceList vfio_device_list;#ifdef CONFIG_LINUX -int vfio_get_region_info (VFIODevice *vbasedev,int index, -struct vfio_region_info **info); -int vfio_get_dev_region_info (VFIODevice *vbasedev,uint32_t type, -uint32_t subtype,struct vfio_region_info **info); -bool vfio_has_region_cap (VFIODevice *vbasedev,int region,uint16_t cap_type); +int vfio_device_get_region_info (VFIODevice *vbasedev,int index, +struct vfio_region_info **info); +int vfio_device_get_region_info_type (VFIODevice *vbasedev,uint32_t type, +uint32_t subtype,struct vfio_region_info **info); +bool vfio_device_has_region_cap (VFIODevice *vbasedev,int region,uint16_t cap_type);#endif /* Returns 0 on success, or a negative errno. */
hw/vfio/ap.c +6 -6
@@ -117,8 +117,8 @@ static bool vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, fd =event_notifier_get_fd (notifier);qemu_set_fd_handler (fd, fd_read,NULL , vapdev); -if (!vfio_set_irq_signaling (vdev, irq,0 ,VFIO_IRQ_SET_ACTION_TRIGGER , fd, - errp)) { +if (!vfio_device_irq_set_signaling (vdev, irq,0 ,VFIO_IRQ_SET_ACTION_TRIGGER , fd, + errp)) {qemu_set_fd_handler (fd,NULL ,NULL , vapdev);event_notifier_cleanup (notifier); }
@@ -141,8 +141,8 @@ static void vfio_ap_unregister_irq_notifier(VFIOAPDevice *vapdev,return ; } -if (!vfio_set_irq_signaling (&vapdev->vdev, irq,0 , -VFIO_IRQ_SET_ACTION_TRIGGER ,-1 , &err)) { +if (!vfio_device_irq_set_signaling (&vapdev->vdev, irq,0 , +VFIO_IRQ_SET_ACTION_TRIGGER ,-1 , &err)) {warn_reportf_err (err,VFIO_MSG_PREFIX , vapdev->vdev.name); }
@@ -162,7 +162,7 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp)return ; } -if (!vfio_attach_device (vbasedev->name, vbasedev, +if (!vfio_device_attach (vbasedev->name, vbasedev, &address_space_memory, errp)) { goto error; }
@@ -187,7 +187,7 @@ static void vfio_ap_unrealize(DeviceState *dev)VFIOAPDevice *vapdev =VFIO_AP_DEVICE (dev);vfio_ap_unregister_irq_notifier (vapdev,VFIO_AP_REQ_IRQ_INDEX ); -vfio_detach_device (&vapdev->vdev); +vfio_device_detach (&vapdev->vdev);g_free (vapdev->vdev.name); }
hw/vfio/ccw.c +14 -14
@@ -426,8 +426,8 @@ static bool vfio_ccw_register_irq_notifier(VFIOCCWDevice *vcdev, fd =event_notifier_get_fd (notifier);qemu_set_fd_handler (fd, fd_read,NULL , vcdev); -if (!vfio_set_irq_signaling (vdev, irq,0 , -VFIO_IRQ_SET_ACTION_TRIGGER , fd, errp)) { +if (!vfio_device_irq_set_signaling (vdev, irq,0 , +VFIO_IRQ_SET_ACTION_TRIGGER , fd, errp)) {qemu_set_fd_handler (fd,NULL ,NULL , vcdev);event_notifier_cleanup (notifier); }
@@ -456,8 +456,8 @@ static void vfio_ccw_unregister_irq_notifier(VFIOCCWDevice *vcdev,return ; } -if (!vfio_set_irq_signaling (&vcdev->vdev, irq,0 , -VFIO_IRQ_SET_ACTION_TRIGGER ,-1 , &err)) { +if (!vfio_device_irq_set_signaling (&vcdev->vdev, irq,0 , +VFIO_IRQ_SET_ACTION_TRIGGER ,-1 , &err)) {warn_reportf_err (err,VFIO_MSG_PREFIX , vcdev->vdev.name); }
@@ -488,7 +488,7 @@ static bool vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp)return false; } - ret =vfio_get_region_info (vdev,VFIO_CCW_CONFIG_REGION_INDEX , &info); + ret =vfio_device_get_region_info (vdev,VFIO_CCW_CONFIG_REGION_INDEX , &info);if (ret) {error_setg_errno (errp, -ret,"vfio: Error getting config info" );return false;
@@ -505,8 +505,8 @@ static bool vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp)g_free (info);/* check for the optional async command region */ - ret =vfio_get_dev_region_info (vdev,VFIO_REGION_TYPE_CCW , -VFIO_REGION_SUBTYPE_CCW_ASYNC_CMD , &info); + ret =vfio_device_get_region_info_type (vdev,VFIO_REGION_TYPE_CCW , +VFIO_REGION_SUBTYPE_CCW_ASYNC_CMD , &info);if (!ret) { vcdev->async_cmd_region_size = info->size;if (sizeof (*vcdev->async_cmd_region) != vcdev->async_cmd_region_size) {
@@ -518,8 +518,8 @@ static bool vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp)g_free (info); } - ret =vfio_get_dev_region_info (vdev,VFIO_REGION_TYPE_CCW , -VFIO_REGION_SUBTYPE_CCW_SCHIB , &info); + ret =vfio_device_get_region_info_type (vdev,VFIO_REGION_TYPE_CCW , +VFIO_REGION_SUBTYPE_CCW_SCHIB , &info);if (!ret) { vcdev->schib_region_size = info->size;if (sizeof (*vcdev->schib_region) != vcdev->schib_region_size) {
@@ -531,8 +531,8 @@ static bool vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp)g_free (info); } - ret =vfio_get_dev_region_info (vdev,VFIO_REGION_TYPE_CCW , -VFIO_REGION_SUBTYPE_CCW_CRW , &info); + ret =vfio_device_get_region_info_type (vdev,VFIO_REGION_TYPE_CCW , +VFIO_REGION_SUBTYPE_CCW_CRW , &info);if (!ret) { vcdev->crw_region_size = info->size;
@@ -583,7 +583,7 @@ static void vfio_ccw_realize(DeviceState *dev, Error **errp) goto out_unrealize; } -if (!vfio_attach_device (cdev->mdevid, vbasedev, +if (!vfio_device_attach (cdev->mdevid, vbasedev, &address_space_memory, errp)) { goto out_attach_dev_err; }
@@ -620,7 +620,7 @@ out_irq_notifier_err: out_io_notifier_err:vfio_ccw_put_region (vcdev); out_region_err: -vfio_detach_device (vbasedev); +vfio_device_detach (vbasedev); out_attach_dev_err:g_free (vbasedev->name); out_unrealize:
@@ -639,7 +639,7 @@ static void vfio_ccw_unrealize(DeviceState *dev)vfio_ccw_unregister_irq_notifier (vcdev,VFIO_CCW_CRW_IRQ_INDEX );vfio_ccw_unregister_irq_notifier (vcdev,VFIO_CCW_IO_IRQ_INDEX );vfio_ccw_put_region (vcdev); -vfio_detach_device (&vcdev->vdev); +vfio_device_detach (&vcdev->vdev);g_free (vcdev->vdev.name);if (cdc->unrealize) {
hw/vfio/container-base.c +3 -3
@@ -19,7 +19,7 @@#include "qapi/error.h" #include "qemu/error-report.h" #include "hw/vfio/vfio-container-base.h" -#include "hw/vfio/vfio-device.h" /* vfio_reset_handler */ +#include "hw/vfio/vfio-device.h" /* vfio_device_reset_handler */ #include "system/reset.h" #include "vfio-helpers.h"
@@ -44,7 +44,7 @@ VFIOAddressSpace *vfio_address_space_get(AddressSpace *as)QLIST_INIT (&space->containers);if (QLIST_EMPTY (&vfio_address_spaces)) { -qemu_register_reset (vfio_reset_handler,NULL ); +qemu_register_reset (vfio_device_reset_handler,NULL ); }QLIST_INSERT_HEAD (&vfio_address_spaces, space, list);
@@ -62,7 +62,7 @@ void vfio_address_space_put(VFIOAddressSpace *space)g_free (space);if (QLIST_EMPTY (&vfio_address_spaces)) { -qemu_unregister_reset (vfio_reset_handler,NULL ); +qemu_unregister_reset (vfio_device_reset_handler,NULL ); } }
hw/vfio/container.c +3 -3
@@ -865,7 +865,7 @@ static int vfio_device_groupid(VFIODevice *vbasedev, Error **errp) }/* -* vfio_attach_device: attach a device to a security context +* vfio_device_attach: attach a device to a security context * @name and @vbasedev->name are likely to be different depending * on the type of the device, hence the need for passing @name */
@@ -881,7 +881,7 @@ static bool vfio_legacy_attach_device(const char *name, VFIODevice *vbasedev,return false; } -trace_vfio_attach_device (vbasedev->name, groupid); +trace_vfio_device_attach (vbasedev->name, groupid);if (!vfio_device_hiod_realize (vbasedev, errp)) {return false;
@@ -919,7 +919,7 @@ static void vfio_legacy_detach_device(VFIODevice *vbasedev)QLIST_REMOVE (vbasedev, global_next);QLIST_REMOVE (vbasedev, container_next); vbasedev->bcontainer =NULL ; -trace_vfio_detach_device (vbasedev->name, group->groupid); +trace_vfio_device_detach (vbasedev->name, group->groupid);vfio_put_base_device (vbasedev);vfio_put_group (group); }
hw/vfio/device.c +18 -18
@@ -51,11 +51,11 @@ VFIODeviceList vfio_device_list =* reset for the one in-use devices case, calling _multi() will do * nothing if a _one() would have been sufficient. */ -void vfio_reset_handler (void *opaque) +void vfio_device_reset_handler (void *opaque) {VFIODevice *vbasedev; -trace_vfio_reset_handler (); +trace_vfio_device_reset_handler (); QLIST_FOREACH(vbasedev, &vfio_device_list, global_next) {if (vbasedev->dev->realized) { vbasedev->ops->vfio_compute_needs_reset (vbasedev);
@@ -72,7 +72,7 @@ void vfio_reset_handler(void *opaque)/* * Common VFIO interrupt disable */ -void vfio_disable_irqindex (VFIODevice *vbasedev,int index) +void vfio_device_irq_disable (VFIODevice *vbasedev,int index) {struct vfio_irq_set irq_set = { .argsz =sizeof (irq_set),
@@ -85,7 +85,7 @@ void vfio_disable_irqindex(VFIODevice *vbasedev, int index)ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , &irq_set); } -void vfio_unmask_single_irqindex (VFIODevice *vbasedev,int index) +void vfio_device_irq_unmask (VFIODevice *vbasedev,int index) {struct vfio_irq_set irq_set = { .argsz =sizeof (irq_set),
@@ -98,7 +98,7 @@ void vfio_unmask_single_irqindex(VFIODevice *vbasedev, int index)ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , &irq_set); } -void vfio_mask_single_irqindex (VFIODevice *vbasedev,int index) +void vfio_device_irq_mask (VFIODevice *vbasedev,int index) {struct vfio_irq_set irq_set = { .argsz =sizeof (irq_set),
@@ -147,8 +147,8 @@ static const char *index_to_str(VFIODevice *vbasedev, int index) } } -bool vfio_set_irq_signaling (VFIODevice *vbasedev,int index,int subindex, -int action,int fd,Error **errp) +bool vfio_device_irq_set_signaling (VFIODevice *vbasedev,int index,int subindex, +int action,int fd,Error **errp) {ERRP_GUARD (); g_autofree struct vfio_irq_set *irq_set = NULL;
@@ -185,8 +185,8 @@ bool vfio_set_irq_signaling(VFIODevice *vbasedev, int index, int subindex,return false; } -int vfio_get_region_info (VFIODevice *vbasedev,int index, -struct vfio_region_info **info) +int vfio_device_get_region_info (VFIODevice *vbasedev,int index, +struct vfio_region_info **info) {size_t argsz =sizeof (struct vfio_region_info );
@@ -212,8 +212,8 @@ retry:return 0 ; } -int vfio_get_dev_region_info (VFIODevice *vbasedev,uint32_t type, -uint32_t subtype,struct vfio_region_info **info) +int vfio_device_get_region_info_type (VFIODevice *vbasedev,uint32_t type, +uint32_t subtype,struct vfio_region_info **info) {int i;
@@ -221,7 +221,7 @@ int vfio_get_dev_region_info(VFIODevice *vbasedev, uint32_t type,struct vfio_info_cap_header *hdr;struct vfio_region_info_cap_type *cap_type; -if (vfio_get_region_info (vbasedev, i, info)) { +if (vfio_device_get_region_info (vbasedev, i, info)) {continue ; }
@@ -233,8 +233,8 @@ int vfio_get_dev_region_info(VFIODevice *vbasedev, uint32_t type, cap_type = container_of(hdr, struct vfio_region_info_cap_type, header); -trace_vfio_get_dev_region (vbasedev->name, i, - cap_type->type, cap_type->subtype); +trace_vfio_device_get_region_info_type (vbasedev->name, i, + cap_type->type, cap_type->subtype);if (cap_type->type == type && cap_type->subtype == subtype) {return 0 ;
@@ -247,12 +247,12 @@ int vfio_get_dev_region_info(VFIODevice *vbasedev, uint32_t type,return -ENODEV ; } -bool vfio_has_region_cap (VFIODevice *vbasedev,int region,uint16_t cap_type) +bool vfio_device_has_region_cap (VFIODevice *vbasedev,int region,uint16_t cap_type) { g_autofree struct vfio_region_info *info = NULL;bool ret = false; -if (!vfio_get_region_info (vbasedev, region, &info)) { +if (!vfio_device_get_region_info (vbasedev, region, &info)) {if (vfio_get_region_info_cap (info, cap_type)) { ret = true; }
@@ -367,7 +367,7 @@ VFIODevice *vfio_get_vfio_device(Object *obj) } } -bool vfio_attach_device (char *name,VFIODevice *vbasedev, +bool vfio_device_attach (char *name,VFIODevice *vbasedev,AddressSpace *as,Error **errp) { const VFIOIOMMUClass *ops =
@@ -395,7 +395,7 @@ bool vfio_attach_device(char *name, VFIODevice *vbasedev,return true; } -void vfio_detach_device (VFIODevice *vbasedev) +void vfio_device_detach (VFIODevice *vbasedev) {if (!vbasedev->bcontainer) {return ;
hw/vfio/display.c +4 -4
@@ -130,10 +130,10 @@ static bool vfio_display_edid_init(VFIOPCIDevice *vdev, Error **errp)int fd = vdev->vbasedev.fd;int ret; - ret =vfio_get_dev_region_info (&vdev->vbasedev, -VFIO_REGION_TYPE_GFX , -VFIO_REGION_SUBTYPE_GFX_EDID , - &dpy->edid_info); + ret =vfio_device_get_region_info_type (&vdev->vbasedev, +VFIO_REGION_TYPE_GFX , +VFIO_REGION_SUBTYPE_GFX_EDID , + &dpy->edid_info);if (ret) {/* Failed to get GFX edid info, allow to go through without edid. */ return true;
hw/vfio/igd.c +5 -5
@@ -200,7 +200,7 @@ static bool vfio_pci_igd_setup_opregion(VFIOPCIDevice *vdev, Error **errp)return false; } - ret =vfio_get_dev_region_info (&vdev->vbasedev, + ret =vfio_device_get_region_info_type (&vdev->vbasedev,VFIO_REGION_TYPE_PCI_VENDOR_TYPE |PCI_VENDOR_ID_INTEL ,VFIO_REGION_SUBTYPE_INTEL_IGD_OPREGION , &opregion);if (ret) {
@@ -385,7 +385,7 @@ static bool vfio_pci_igd_setup_lpc_bridge(VFIOPCIDevice *vdev, Error **errp)* Check whether we have all the vfio device specific regions to * support LPC quirk (added in Linux v4.6). */ - ret =vfio_get_dev_region_info (&vdev->vbasedev, + ret =vfio_device_get_region_info_type (&vdev->vbasedev,VFIO_REGION_TYPE_PCI_VENDOR_TYPE |PCI_VENDOR_ID_INTEL ,VFIO_REGION_SUBTYPE_INTEL_IGD_LPC_CFG , &lpc);if (ret) {
@@ -393,7 +393,7 @@ static bool vfio_pci_igd_setup_lpc_bridge(VFIOPCIDevice *vdev, Error **errp)return false; } - ret =vfio_get_dev_region_info (&vdev->vbasedev, + ret =vfio_device_get_region_info_type (&vdev->vbasedev,VFIO_REGION_TYPE_PCI_VENDOR_TYPE |PCI_VENDOR_ID_INTEL ,VFIO_REGION_SUBTYPE_INTEL_IGD_HOST_CFG , &host);if (ret) {
@@ -542,8 +542,8 @@ static bool vfio_pci_igd_config_quirk(VFIOPCIDevice *vdev, Error **errp)* there's no ROM, there's no point in setting up this quirk. * NB. We only seem to get BIOS ROMs, so UEFI VM would need CSM support. */ - ret =vfio_get_region_info (&vdev->vbasedev, -VFIO_PCI_ROM_REGION_INDEX , &rom); + ret =vfio_device_get_region_info (&vdev->vbasedev, +VFIO_PCI_ROM_REGION_INDEX , &rom);if ((ret || !rom->size) && !vdev->pdev.romfile) {error_setg (&err,"Device has no ROM" ); goto error;
hw/vfio/pci.c +34 -34
210 lines not on this page · raw message
hw/vfio/platform.c +7 -7
@@ -119,8 +119,8 @@ static int vfio_set_trigger_eventfd(VFIOINTp *intp,qemu_set_fd_handler (fd, (IOHandler *)handler,NULL , intp); -if (!vfio_set_irq_signaling (vbasedev, intp->pin,0 , -VFIO_IRQ_SET_ACTION_TRIGGER , fd, &err)) { +if (!vfio_device_irq_set_signaling (vbasedev, intp->pin,0 , +VFIO_IRQ_SET_ACTION_TRIGGER , fd, &err)) {error_reportf_err (err,VFIO_MSG_PREFIX , vbasedev->name);qemu_set_fd_handler (fd,NULL ,NULL ,NULL );return -EINVAL ;
@@ -301,7 +301,7 @@ static void vfio_platform_eoi(VFIODevice *vbasedev)if (vfio_irq_is_automasked (intp)) {/* unmasks the physical level-sensitive IRQ */ -vfio_unmask_single_irqindex (vbasedev, intp->pin); +vfio_device_irq_unmask (vbasedev, intp->pin); }/* a single IRQ can be active at a time */
@@ -357,8 +357,8 @@ static int vfio_set_resample_eventfd(VFIOINTp *intp)Error *err =NULL ;qemu_set_fd_handler (fd,NULL ,NULL ,NULL ); -if (!vfio_set_irq_signaling (vbasedev, intp->pin,0 , -VFIO_IRQ_SET_ACTION_UNMASK , fd, &err)) { +if (!vfio_device_irq_set_signaling (vbasedev, intp->pin,0 , +VFIO_IRQ_SET_ACTION_UNMASK , fd, &err)) {error_reportf_err (err,VFIO_MSG_PREFIX , vbasedev->name);return -EINVAL ; }
@@ -547,7 +547,7 @@ static bool vfio_base_device_init(VFIODevice *vbasedev, Error **errp)return false; } -if (!vfio_attach_device (vbasedev->name, vbasedev, +if (!vfio_device_attach (vbasedev->name, vbasedev, &address_space_memory, errp)) {return false; }
@@ -556,7 +556,7 @@ static bool vfio_base_device_init(VFIODevice *vbasedev, Error **errp)return true; } -vfio_detach_device (vbasedev); +vfio_device_detach (vbasedev);return false; }
hw/vfio/region.c +1 -1
@@ -185,7 +185,7 @@ int vfio_region_setup(Object *obj, VFIODevice *vbasedev, VFIORegion *region, g_autofree struct vfio_region_info *info = NULL;int ret; - ret =vfio_get_region_info (vbasedev, index, &info); + ret =vfio_device_get_region_info (vbasedev, index, &info);if (ret) {return ret; }
hw/vfio/trace-events +4 -4
@@ -37,8 +37,6 @@ vfio_pci_hot_reset_dep_devices(int domain, int bus, int slot, int function, int vfio_pci_hot_reset_result(const char *name, const char *result) "%s hot reset: %s" vfio_populate_device_config(const char *name, unsigned long size, unsigned long offset, unsigned long flags) "Device '%s' config: size: 0x%lx, offset: 0x%lx, flags: 0x%lx" vfio_populate_device_get_irq_info_failure(const char *errstr) "VFIO_DEVICE_GET_IRQ_INFO failure: %s" -vfio_attach_device(const char *name, int group_id) " (%s) group %d" -vfio_detach_device(const char *name, int group_id) " (%s) group %d" vfio_mdev(const char *name, bool is_mdev) " (%s) is_mdev %d" vfio_add_ext_cap_dropped(const char *name, uint16_t cap, uint16_t offset) "%s 0x%x@0x%x" vfio_pci_reset(const char *name) " (%s)"
@@ -196,5 +194,7 @@ iommufd_cdev_device_info(char *name, int devfd, int num_irqs, int num_regions, i iommufd_cdev_pci_hot_reset_dep_devices(int domain, int bus, int slot, int function, int dev_id) "\t%04x:%02x:%02x.%x devid %d" # device.c -vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%08x" -vfio_reset_handler(void) "" +vfio_device_get_region_info_type(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%08x" +vfio_device_reset_handler(void) "" +vfio_device_attach(const char *name, int group_id) " (%s) group %d" +vfio_device_detach(const char *name, int group_id) " (%s) group %d"
Signature · 1 line
2.49.0
PATCH v3 37/37 vfio: Rename VFIOContainer related services
In reply to Cédric Le GoaterRename these routines :
vfio_put_group -> vfio_group_put vfio_get_group -> vfio_group_get vfio_kvm_device_del_group -> vfio_group_del_kvm_device vfio_kvm_device_add_group -> vfio_group_add_kvm_device vfio_get_device -> vfio_device_get vfio_put_base_device -> vfio_device_put vfio_device_groupid -> vfio_device_get_groupid vfio_connect_container -> vfio_container_connect vfio_disconnect_container -> vfio_container_disconnect
to better reflect the namespace they belong to.
--- hw/vfio/container.c | 52 ++++++++++++++++++++++---------------------- hw/vfio/trace-events | 12 +++++----- 2 files changed, 33 insertions(+), 31 deletions(-)
hw/vfio/container.c +26 -26
@@ -306,7 +306,7 @@ static bool vfio_get_info_iova_range(struct vfio_iommu_type1_info *info,return true; } -static void vfio_kvm_device_add_group (VFIOGroup *group) +static void vfio_group_add_kvm_device (VFIOGroup *group) {Error *err =NULL ;
@@ -315,7 +315,7 @@ static void vfio_kvm_device_add_group(VFIOGroup *group) } } -static void vfio_kvm_device_del_group (VFIOGroup *group) +static void vfio_group_del_kvm_device (VFIOGroup *group) {Error *err =NULL ;
@@ -511,7 +511,7 @@ static bool vfio_legacy_setup(VFIOContainerBase *bcontainer, Error **errp)return true; } -static bool vfio_connect_container (VFIOGroup *group,AddressSpace *as, +static bool vfio_container_connect (VFIOGroup *group,AddressSpace *as,Error **errp) {VFIOContainer *container;
@@ -569,7 +569,7 @@ static bool vfio_connect_container(VFIOGroup *group, AddressSpace *as, } group->container = container;QLIST_INSERT_HEAD (&container->group_list, group, container_next); -vfio_kvm_device_add_group (group); +vfio_group_add_kvm_device (group);return true; } }
@@ -609,7 +609,7 @@ static bool vfio_connect_container(VFIOGroup *group, AddressSpace *as, goto enable_discards_exit; } -vfio_kvm_device_add_group (group); +vfio_group_add_kvm_device (group);vfio_address_space_insert (space, bcontainer);
@@ -625,7 +625,7 @@ static bool vfio_connect_container(VFIOGroup *group, AddressSpace *as,return true; listener_release_exit:QLIST_REMOVE (group, container_next); -vfio_kvm_device_del_group (group); +vfio_group_del_kvm_device (group);vfio_listener_unregister (bcontainer);if (vioc->release) { vioc->release (bcontainer);
@@ -649,7 +649,7 @@ put_space_exit:return false; } -static void vfio_disconnect_container (VFIOGroup *group) +static void vfio_container_disconnect (VFIOGroup *group) {VFIOContainer *container = group->container;VFIOContainerBase *bcontainer = &container->bcontainer;
@@ -678,7 +678,7 @@ static void vfio_disconnect_container(VFIOGroup *group)if (QLIST_EMPTY (&container->group_list)) {VFIOAddressSpace *space = bcontainer->space; -trace_vfio_disconnect_container (container->fd); +trace_vfio_container_disconnect (container->fd);vfio_cpr_unregister_container (bcontainer);close (container->fd);object_unref (container);
@@ -687,7 +687,7 @@ static void vfio_disconnect_container(VFIOGroup *group) } } -static VFIOGroup *vfio_get_group (int groupid,AddressSpace *as,Error **errp) +static VFIOGroup *vfio_group_get (int groupid,AddressSpace *as,Error **errp) {ERRP_GUARD ();VFIOGroup *group;
@@ -731,7 +731,7 @@ static VFIOGroup *vfio_get_group(int groupid, AddressSpace *as, Error **errp) group->groupid = groupid;QLIST_INIT (&group->device_list); -if (!vfio_connect_container (group, as, errp)) { +if (!vfio_container_connect (group, as, errp)) {error_prepend (errp,"failed to setup container for group %d: " , groupid); goto close_fd_exit;
@@ -750,7 +750,7 @@ free_group_exit:return NULL ; } -static void vfio_put_group (VFIOGroup *group) +static void vfio_group_put (VFIOGroup *group) {if (!group || !QLIST_EMPTY (&group->device_list)) {return ;
@@ -759,15 +759,15 @@ static void vfio_put_group(VFIOGroup *group)if (!group->ram_block_discard_allowed) {vfio_ram_block_discard_disable (group->container, false); } -vfio_kvm_device_del_group (group); -vfio_disconnect_container (group); +vfio_group_del_kvm_device (group); +vfio_container_disconnect (group);QLIST_REMOVE (group, next); -trace_vfio_put_group (group->fd); +trace_vfio_group_put (group->fd);close (group->fd);g_free (group); } -static bool vfio_get_device (VFIOGroup *group,const char *name, +static bool vfio_device_get (VFIOGroup *group,const char *name,VFIODevice *vbasedev,Error **errp) { g_autofree struct vfio_device_info *info = NULL;
@@ -819,25 +819,25 @@ static bool vfio_get_device(VFIOGroup *group, const char *name, vbasedev->num_regions = info->num_regions; vbasedev->flags = info->flags; -trace_vfio_get_device (name, info->flags, info->num_regions, info->num_irqs); +trace_vfio_device_get (name, info->flags, info->num_regions, info->num_irqs); vbasedev->reset_works = !!(info->flags &VFIO_DEVICE_FLAGS_RESET );return true; } -static void vfio_put_base_device (VFIODevice *vbasedev) +static void vfio_device_put (VFIODevice *vbasedev) {if (!vbasedev->group) {return ; }QLIST_REMOVE (vbasedev, next); vbasedev->group =NULL ; -trace_vfio_put_base_device (vbasedev->fd); +trace_vfio_device_put (vbasedev->fd);close (vbasedev->fd); } -static int vfio_device_groupid (VFIODevice *vbasedev,Error **errp) +static int vfio_device_get_groupid (VFIODevice *vbasedev,Error **errp) {char *tmp, group_path[PATH_MAX ]; g_autofree char *group_name = NULL;
@@ -872,7 +872,7 @@ static int vfio_device_groupid(VFIODevice *vbasedev, Error **errp)static bool vfio_legacy_attach_device (const char *name,VFIODevice *vbasedev,AddressSpace *as,Error **errp) { -int groupid =vfio_device_groupid (vbasedev, errp); +int groupid =vfio_device_get_groupid (vbasedev, errp);VFIODevice *vbasedev_iter;VFIOGroup *group;VFIOContainerBase *bcontainer;
@@ -887,7 +887,7 @@ static bool vfio_legacy_attach_device(const char *name, VFIODevice *vbasedev,return false; } - group =vfio_get_group (groupid, as, errp); + group =vfio_group_get (groupid, as, errp);if (!group) {return false; }
@@ -895,12 +895,12 @@ static bool vfio_legacy_attach_device(const char *name, VFIODevice *vbasedev, QLIST_FOREACH(vbasedev_iter, &group->device_list, next) {if (strcmp (vbasedev_iter->name, vbasedev->name) ==0 ) {error_setg (errp,"device is already attached" ); -vfio_put_group (group); +vfio_group_put (group);return false; } } -if (!vfio_get_device (group, name, vbasedev, errp)) { -vfio_put_group (group); +if (!vfio_device_get (group, name, vbasedev, errp)) { +vfio_group_put (group);return false; }
@@ -920,8 +920,8 @@ static void vfio_legacy_detach_device(VFIODevice *vbasedev)QLIST_REMOVE (vbasedev, container_next); vbasedev->bcontainer =NULL ;trace_vfio_device_detach (vbasedev->name, group->groupid); -vfio_put_base_device (vbasedev); -vfio_put_group (group); +vfio_device_put (vbasedev); +vfio_group_put (group); }static int vfio_legacy_pci_hot_reset (VFIODevice *vbasedev,bool single)
hw/vfio/trace-events +7 -5
@@ -99,16 +99,18 @@ vfio_listener_region_add_no_dma_map(const char *name, uint64_t iova, uint64_t si vfio_listener_region_del(uint64_t start, uint64_t end) "region_del 0x%"PRIx64" - 0x%"PRIx64 vfio_device_dirty_tracking_update(uint64_t start, uint64_t end, uint64_t min, uint64_t max) "section 0x%"PRIx64" - 0x%"PRIx64" -> update [0x%"PRIx64" - 0x%"PRIx64"]" vfio_device_dirty_tracking_start(int nr_ranges, uint64_t min32, uint64_t max32, uint64_t min64, uint64_t max64, uint64_t minpci, uint64_t maxpci) "nr_ranges %d 32:[0x%"PRIx64" - 0x%"PRIx64"], 64:[0x%"PRIx64" - 0x%"PRIx64"], pci64:[0x%"PRIx64" - 0x%"PRIx64"]" -vfio_disconnect_container(int fd) "close container->fd=%d" -vfio_put_group(int fd) "close group->fd=%d" -vfio_get_device(const char * name, unsigned int flags, unsigned int num_regions, unsigned int num_irqs) "Device %s flags: %u, regions: %u, irqs: %u" -vfio_put_base_device(int fd) "close vdev->fd=%d" -vfio_legacy_dma_unmap_overflow_workaround(void) "" vfio_iommu_map_dirty_notify(uint64_t iova_start, uint64_t iova_end) "iommu dirty @ 0x%"PRIx64" - 0x%"PRIx64 # container-base.c vfio_container_query_dirty_bitmap(uint64_t iova, uint64_t size, uint64_t bitmap_size, uint64_t start, uint64_t dirty_pages) "iova=0x%"PRIx64" size= 0x%"PRIx64" bitmap_size=0x%"PRIx64" start=0x%"PRIx64" dirty_pages=%"PRIu64 +# container.c +vfio_container_disconnect(int fd) "close container->fd=%d" +vfio_group_put(int fd) "close group->fd=%d" +vfio_device_get(const char * name, unsigned int flags, unsigned int num_regions, unsigned int num_irqs) "Device %s flags: %u, regions: %u, irqs: %u" +vfio_device_put(int fd) "close vdev->fd=%d" +vfio_legacy_dma_unmap_overflow_workaround(void) "" + # region.c vfio_region_write(const char *name, int index, uint64_t addr, uint64_t data, unsigned size) " (%s:region%d+0x%"PRIx64", 0x%"PRIx64 ", %d)" vfio_region_read(char *name, int index, uint64_t addr, unsigned size, uint64_t data) " (%s:region%d+0x%"PRIx64", %d) = 0x%"PRIx64
Signature · 1 line
2.49.0
Quoted 77 lines · Cédric Le Goater
Hello,
Several large extensions were merged in VFIO recently: migration support with dirty tracking, support for different host IOMMU backend devices, multifd support, etc. This adds up to the previous
extensions: vfio-platform, AP, CCW. The result is that VFIO is now a subsystem of over +16,000 lines of code :QEMU 2.0 : 3988 total ... QEMU 10.0 : 16607 totalOrganization is weak, naming inconsistent, the
vfio-common.hheader file andcommon.care quite messy. It's time to address the technical debt before adding new features.This proposal reorganizes some of the VFIO files to isolate features, introduces new files and renames services to better reflect the namespace they belong to. This is code reshuffling and there are no intentional functional changes. If more could be done, please propose ! Timing seems right.
I have taken care to preserve all existing copyright notices in the file headers. I have added one on behalf of my current employer for newly created files. However, original authors may wish to include their own notices as well. If so, please respond to the patch, and I will update the patch in the next spin or before applying.
Here is a (short) list requiring your attention :
*
include/hw/vfio/vfio-migration.h
*hw/vfio/vfio-migration-internal.h
Kirti Wankhede and Avihai Horon, NVIDIA*
hw/vfio/vfio-iommufd.h
Joao Martins and Yi Liu, Oracle and Intel*
include/hw/vfio/vfio-region.h
*hw/vfio/region.c
Eric Auger, may be we could reduce the list ?I think the remaining new files are correctly covered but I am human, so please review and let me know.
I hope we can merge this when the QEMU 10.1 cycle starts and then address the two large series waiting : live update and vfio-user.
What next in terms of cleanups :
-
container.cis quite messy
- the pci* files need some love too (add vfio- prefix ?)
- improve overall documentation, structs and routines documentation would be great
- isolate all the low level routines (kvm ioctls) intohelpers.cto improve build ?
- improve build to reduce the number of files built per targethttps://lore.kernel.org/qemu-devel/[email protected]- continue the never ending quest of adding 'Error **' parameters, Look for
migration_file_set_error, in MemoryListener handlers :
vfio_listener_region_addvfio_listener_log_global_stopvfio_listener_log_sync
and in callback routines for IOMMU notifiers :
vfio_iommu_map_notify
vfio_iommu_map_dirty_notify
memory_region_iommu_replay()would be a start.
- remove vfio-platform (start of QEMU 10.2 cycle ~ September 2025)Thanks,
C.
Changes in v3:
Quoted 9 lines
- Fixed commit log typos
- Removedhw/vfio/vfio-migration.hinclude fromhw/vfio/migration-multifd.c
- Addedhw/vfio/vfio-region.hinclude inhw/vfio/pci.h
- Adjusted Copyright inhw/vfio/vfio-cpr.h
- Renamedvfio_container_vioc_query_dirty_bitmap()tovfio_container_iommu_query_dirty_bitmap()
- Improvedhw/vfio/vfio-device.hheader description
- Fixed code alignment when renaming VFIODevice related services
I plan to send a PR soon after 10.0 is released (this week) and then start working on merging the vfio-user proposal, at least on the prereq patches.
Thanks,
C.
Quoted 185 lines · Cédric Le Goater
Hello,
Several large extensions were merged in VFIO recently: migration support with dirty tracking, support for different host IOMMU backend devices, multifd support, etc. This adds up to the previous
extensions: vfio-platform, AP, CCW. The result is that VFIO is now a subsystem of over +16,000 lines of code :QEMU 2.0 : 3988 total ... QEMU 10.0 : 16607 totalOrganization is weak, naming inconsistent, the
vfio-common.hheader file andcommon.care quite messy. It's time to address the technical debt before adding new features.This proposal reorganizes some of the VFIO files to isolate features, introduces new files and renames services to better reflect the namespace they belong to. This is code reshuffling and there are no intentional functional changes. If more could be done, please propose ! Timing seems right.
I have taken care to preserve all existing copyright notices in the file headers. I have added one on behalf of my current employer for newly created files. However, original authors may wish to include their own notices as well. If so, please respond to the patch, and I will update the patch in the next spin or before applying.
Here is a (short) list requiring your attention :
*
include/hw/vfio/vfio-migration.h
*hw/vfio/vfio-migration-internal.h
Kirti Wankhede and Avihai Horon, NVIDIA*
hw/vfio/vfio-iommufd.h
Joao Martins and Yi Liu, Oracle and Intel*
include/hw/vfio/vfio-region.h
*hw/vfio/region.c
Eric Auger, may be we could reduce the list ?I think the remaining new files are correctly covered but I am human, so please review and let me know.
I hope we can merge this when the QEMU 10.1 cycle starts and then address the two large series waiting : live update and vfio-user.
What next in terms of cleanups :
-
container.cis quite messy
- the pci* files need some love too (add vfio- prefix ?)
- improve overall documentation, structs and routines documentation would be great
- isolate all the low level routines (kvm ioctls) intohelpers.cto improve build ?
- improve build to reduce the number of files built per targethttps://lore.kernel.org/qemu-devel/[email protected]- continue the never ending quest of adding 'Error **' parameters, Look for
migration_file_set_error, in MemoryListener handlers :
vfio_listener_region_addvfio_listener_log_global_stopvfio_listener_log_sync
and in callback routines for IOMMU notifiers :
vfio_iommu_map_notify
vfio_iommu_map_dirty_notify
memory_region_iommu_replay()would be a start.
- remove vfio-platform (start of QEMU 10.2 cycle ~ September 2025)Thanks,
C.
Changes in v3:
- Fixed commit log typos
- Removedhw/vfio/vfio-migration.hinclude fromhw/vfio/migration-multifd.c
- Addedhw/vfio/vfio-region.hinclude inhw/vfio/pci.h
- Adjusted Copyright inhw/vfio/vfio-cpr.h
- Renamedvfio_container_vioc_query_dirty_bitmap()tovfio_container_iommu_query_dirty_bitmap()
- Improvedhw/vfio/vfio-device.hheader description
- Fixed code alignment when renaming VFIODevice related servicesChanges in v2:
- Dropped
vfio_migration_set_error()https://lore.kernel.org/qemu-devel/[email protected]/- Dropped R-b trailers on patches which were modified too much (context changes are ok)
- Improved commit logs of patches adding new files
- Fixed top comment in header files
- Used a 'vfio_migration_' prefix instead of 'vfio_mig_'
- Madevfio_migration_add_bytes_transferred()internal
- Added extra patch for vfio_device_state_is_running/precopy()
- Movedvfio_reset_handler()indevice.c
- Moved "dirty tracking" related services intocontainer-base.cand improved naming
- Introduced listener.* files instead of dirty-tracking.*
- Introduced vfio_listener_un/register() routinesCédric Le Goater (37):
vfio: Movevfio_mig_active()intomigration.c
vfio: Renamevfio_reset_bytes_transferred()
vfio: Introduce a new header file for external migration services
vfio: Make vfio_un/block_multiple_devices_migration() static
vfio: Makevfio_viommu_preset()static
vfio: Introduce a new header file for internal migration services
vfio: Move vfio_device_state_is_running/precopy() intomigration.c
vfio: Introduce a new header file for VFIOdisplay declarations
vfio: Move VFIOHostDMAWindow definition intospapr.c
vfio: Introduce a new header file for VFIOIOMMUFD declarations
vfio: Introduce new files for VFIORegion definitions and declarations
vfio: Introduce a new header file for VFIOcontainer declarations
vfio: Makevfio_group_liststatic
vfio: Move VFIOAddressSpace helpers intocontainer-base.c
vfio: Move Host IOMMU type declarations into their respective files
vfio: Introduce a new header file for helper services
vfio: Movevfio_get_info_dma_avail()intohelpers.c
vfio: Move vfio_kvm_device_add/del_fd() tohelpers.c
vfio: Movevfio_get_device_info()tohelpers.c
vfio: Introduce a new file for VFIODevice definitions
vfio: Introduce new files for CPR definitions and declarations
vfio: Movevfio_kvm_device_fd()intohelpers.c
vfio: Movevfio_device_listintodevice.c
vfio: Move vfio_de/attach_device() intodevice.c
vfio: Movevfio_reset_handler()intodevice.c
vfio: Move dirty tracking related services intocontainer-base.c
vfio: Makevfio_devices_query_dirty_bitmap()static
vfio: Makevfio_container_query_dirty_bitmap()static
vfio: Renamevfio_devices_all_dirty_tracking_started()
vfio: Renamevfio_devices_all_device_dirty_tracking()
vfio: Renamevfio_get_dirty_bitmap()
vfio: Introduce new files for VFIO MemoryListener
vfio: Rename RAM discard related services
vfio: Introduce vfio_listener_un/register() routines
vfio: Renamevfio-common.htovfio-device.h
vfio: Rename VFIODevice related services
vfio: Rename VFIOContainer related serviceshw/vfio/migration-multifd.h | 2 +- hw/vfio/pci.h | 4 +- hw/vfio/vfio-cpr.h | 15 + hw/vfio/vfio-display.h | 42 ++ hw/vfio/vfio-helpers.h | 35 ++ hw/vfio/vfio-iommufd.h | 34 ++ hw/vfio/vfio-listener.h | 15 + hw/vfio/vfio-migration-internal.h | 74 +++ include/hw/s390x/vfio-ccw.h | 2 +- include/hw/vfio/vfio-common.h | 346 ------------- include/hw/vfio/vfio-container-base.h | 12 +- include/hw/vfio/vfio-container.h | 36 ++ include/hw/vfio/vfio-device.h | 149 ++++++ include/hw/vfio/vfio-migration.h | 16 + include/hw/vfio/vfio-platform.h | 4 +- include/hw/vfio/vfio-region.h | 47 ++ backends/iommufd.c | 2 +- hw/core/sysbus-fdt.c | 1 + hw/ppc/spapr_pci_vfio.c | 6 +- hw/s390x/s390-pci-vfio.c | 3 +- hw/vfio/ap.c | 14 +- hw/vfio/ccw.c | 30 +- hw/vfio/container-base.c | 192 ++++++- hw/vfio/container.c | 123 ++--- hw/vfio/cpr.c | 3 +- hw/vfio/device.c | 405 +++++++++++++++ hw/vfio/display.c | 10 +- hw/vfio/helpers.c | 702 +++----------------------- hw/vfio/igd.c | 10 +- hw/vfio/iommufd.c | 24 +- hw/vfio/{common.c => listener.c} | 455 +---------------- hw/vfio/migration-multifd.c | 7 +- hw/vfio/migration.c | 111 +++- hw/vfio/pci.c | 70 +-- hw/vfio/platform.c | 15 +- hw/vfio/region.c | 395 +++++++++++++++ hw/vfio/spapr.c | 10 +- migration/target.c | 8 +- hw/vfio/meson.build | 10 +- hw/vfio/trace-events | 36 +- 40 files changed, 1875 insertions(+), 1600 deletions(-)
Quoted 15 lines
create mode 100644
hw/vfio/vfio-cpr.hcreate mode 100644hw/vfio/vfio-display.hcreate mode 100644hw/vfio/vfio-helpers.hcreate mode 100644hw/vfio/vfio-iommufd.hcreate mode 100644hw/vfio/vfio-listener.hcreate mode 100644hw/vfio/vfio-migration-internal.hdelete mode 100644include/hw/vfio/vfio-common.hcreate mode 100644include/hw/vfio/vfio-container.hcreate mode 100644include/hw/vfio/vfio-device.hcreate mode 100644include/hw/vfio/vfio-migration.hcreate mode 100644include/hw/vfio/vfio-region.hcreate mode 100644hw/vfio/device.c
renamehw/vfio/{common.c=>listener.c} (76%) create mode 100644hw/vfio/region.c
Rebased on HEAD and applied to vfio-next.
Thanks,
C.