SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vfio/{iommufd,container}: Remove caps::aw_bits

Browse Source 
Remove caps::aw_bits which requires the bcontainer::iova_ranges being
initialized after device is actually attached. Instead defer that to
.get_cap() and call vfio_device_get_aw_bits() directly.

This is in preparation for HostIOMMUDevice::realize() being called early
during attach_device().

Suggested-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
This commit is contained in:
Joao Martins 2024-07-22 22:13:19 +01:00 committed by Cédric Le Goater
parent 5b1e96e654
commit 6c63532642
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backends/iommufd.c
View File

@ -18,6 +18,7 @@
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "trace.h" #include "trace.h"
#include "hw/vfio/vfio-common.h"
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <linux/iommufd.h> #include <linux/iommufd.h>
@ -269,7 +270,7 @@ static int hiod_iommufd_get_cap(HostIOMMUDevice *hiod, int cap, Error **errp)
case HOST_IOMMU_DEVICE_CAP_IOMMU_TYPE: case HOST_IOMMU_DEVICE_CAP_IOMMU_TYPE:
return caps->type; return caps->type;
case HOST_IOMMU_DEVICE_CAP_AW_BITS: case HOST_IOMMU_DEVICE_CAP_AW_BITS:
return caps->aw_bits; return vfio_device_get_aw_bits(hiod->agent);
default: default:
error_setg(errp, "%s: unsupported capability %x", hiod->name, cap); error_setg(errp, "%s: unsupported capability %x", hiod->name, cap);
return -EINVAL; return -EINVAL;

5
hw/vfio/container.c
View File

@ -1141,7 +1141,6 @@ static bool hiod_legacy_vfio_realize(HostIOMMUDevice *hiod, void *opaque,
VFIODevice *vdev = opaque; VFIODevice *vdev = opaque;
hiod->name = g_strdup(vdev->name); hiod->name = g_strdup(vdev->name);
hiod->caps.aw_bits = vfio_device_get_aw_bits(vdev);
hiod->agent = opaque; hiod->agent = opaque;
return true; return true;
@ -1150,11 +1149,9 @@ static bool hiod_legacy_vfio_realize(HostIOMMUDevice *hiod, void *opaque,
static int hiod_legacy_vfio_get_cap(HostIOMMUDevice *hiod, int cap, static int hiod_legacy_vfio_get_cap(HostIOMMUDevice *hiod, int cap,
Error **errp) Error **errp)
{ {
HostIOMMUDeviceCaps *caps = &hiod->caps;
switch (cap) { switch (cap) {
case HOST_IOMMU_DEVICE_CAP_AW_BITS: case HOST_IOMMU_DEVICE_CAP_AW_BITS:
return caps->aw_bits; return vfio_device_get_aw_bits(hiod->agent);
default: default:
error_setg(errp, "%s: unsupported capability %x", hiod->name, cap); error_setg(errp, "%s: unsupported capability %x", hiod->name, cap);
return -EINVAL; return -EINVAL;

1
hw/vfio/iommufd.c
View File

@ -725,7 +725,6 @@ static bool hiod_iommufd_vfio_realize(HostIOMMUDevice *hiod, void *opaque,
hiod->name = g_strdup(vdev->name); hiod->name = g_strdup(vdev->name);
caps->type = type; caps->type = type;
caps->aw_bits = vfio_device_get_aw_bits(vdev);
return true; return true;
} }

3
include/sysemu/host_iommu_device.h
View File

@ -19,12 +19,9 @@
* struct HostIOMMUDeviceCaps - Define host IOMMU device capabilities. * struct HostIOMMUDeviceCaps - Define host IOMMU device capabilities.
* *
* @type: host platform IOMMU type. * @type: host platform IOMMU type.
*
* @aw_bits: host IOMMU address width. 0xff if no limitation.
*/ */
typedef struct HostIOMMUDeviceCaps { typedef struct HostIOMMUDeviceCaps {
uint32_t type; uint32_t type;
uint8_t aw_bits;
} HostIOMMUDeviceCaps; } HostIOMMUDeviceCaps;
#define TYPE_HOST_IOMMU_DEVICE "host-iommu-device" #define TYPE_HOST_IOMMU_DEVICE "host-iommu-device"