On 10/31/25 11:50 AM, Shameer Kolothum wrote:
> Modify get_cap() callback so that it can return cap via an output
> uint64_t param. And add support for generic iommu hw capability
> info and max_pasid_log2(pasid width).
>
> Signed-off-by: Shameer Kolothum <[email protected]>
> ---
> backends/iommufd.c | 18 +++++++++++++++---
> hw/i386/intel_iommu.c | 5 +++--
> hw/vfio/container-legacy.c | 8 ++++++--
> include/system/host_iommu_device.h | 14 ++++++++++----
> 4 files changed, 34 insertions(+), 11 deletions(-)
>
> diff --git a/backends/iommufd.c b/backends/iommufd.c
> index 6381f9664b..392f9cf2a8 100644
> --- a/backends/iommufd.c
> +++ b/backends/iommufd.c
> @@ -523,19 +523,31 @@ bool
> host_iommu_device_iommufd_detach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
> return idevc->detach_hwpt(idev, errp);
> }
>
> -static int hiod_iommufd_get_cap(HostIOMMUDevice *hiod, int cap, Error **errp)
> +static int hiod_iommufd_get_cap(HostIOMMUDevice *hiod, int cap,
s/cap/capid? to avoid confusion with actual cap value?
> + uint64_t *out_cap, Error **errp)
> {
> HostIOMMUDeviceCaps *caps = &hiod->caps;
>
> + g_assert(out_cap);
> +
> switch (cap) {
> case HOST_IOMMU_DEVICE_CAP_IOMMU_TYPE:
> - return caps->type;
> + *out_cap = caps->type;
> + break;
> case HOST_IOMMU_DEVICE_CAP_AW_BITS:
> - return vfio_device_get_aw_bits(hiod->agent);
> + *out_cap = vfio_device_get_aw_bits(hiod->agent);
> + break;
> + case HOST_IOMMU_DEVICE_CAP_GENERIC_HW:
> + *out_cap = caps->hw_caps;
> + break;
> + case HOST_IOMMU_DEVICE_CAP_MAX_PASID_LOG2:
> + *out_cap = caps->max_pasid_log2;
> + break;
> default:
> error_setg(errp, "%s: unsupported capability %x", hiod->name, cap);
> return -EINVAL;
> }
> + return 0;
> }
>
> static void hiod_iommufd_class_init(ObjectClass *oc, const void *data)
> diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
> index 6a168d5107..91d0d643ea 100644
> --- a/hw/i386/intel_iommu.c
> +++ b/hw/i386/intel_iommu.c
> @@ -4444,6 +4444,7 @@ static bool vtd_check_hiod(IntelIOMMUState *s,
> HostIOMMUDevice *hiod,
> Error **errp)
> {
> HostIOMMUDeviceClass *hiodc = HOST_IOMMU_DEVICE_GET_CLASS(hiod);
> + uint64_t out_cap;
> int ret;
>
> if (!hiodc->get_cap) {
> @@ -4452,11 +4453,11 @@ static bool vtd_check_hiod(IntelIOMMUState *s,
> HostIOMMUDevice *hiod,
> }
>
> /* Common checks */
> - ret = hiodc->get_cap(hiod, HOST_IOMMU_DEVICE_CAP_AW_BITS, errp);
> + ret = hiodc->get_cap(hiod, HOST_IOMMU_DEVICE_CAP_AW_BITS, &out_cap,
> errp);
> if (ret < 0) {
> return false;
> }
> - if (s->aw_bits > ret) {
> + if (s->aw_bits > out_cap) {
> error_setg(errp, "aw-bits %d > host aw-bits %d", s->aw_bits, ret);
you also need to replace ret and out_cap here and also use 0x%PRIx64
> return false;
> }
> diff --git a/hw/vfio/container-legacy.c b/hw/vfio/container-legacy.c
> index a3615d7b5d..ac8370bd4b 100644
> --- a/hw/vfio/container-legacy.c
> +++ b/hw/vfio/container-legacy.c
> @@ -1197,15 +1197,19 @@ static bool hiod_legacy_vfio_realize(HostIOMMUDevice
> *hiod, void *opaque,
> }
>
> static int hiod_legacy_vfio_get_cap(HostIOMMUDevice *hiod, int cap,
> - Error **errp)
> + uint64_t *out_cap, Error **errp)
> {
> + g_assert(out_cap);
> +
> switch (cap) {
> case HOST_IOMMU_DEVICE_CAP_AW_BITS:
> - return vfio_device_get_aw_bits(hiod->agent);
> + *out_cap = vfio_device_get_aw_bits(hiod->agent);
> + break;
> default:
> error_setg(errp, "%s: unsupported capability %x", hiod->name, cap);
> return -EINVAL;
> }
> + return 0;
> }
>
> static GList *
> diff --git a/include/system/host_iommu_device.h
> b/include/system/host_iommu_device.h
> index bfb2b60478..f89dbafd9e 100644
> --- a/include/system/host_iommu_device.h
> +++ b/include/system/host_iommu_device.h
> @@ -94,13 +94,15 @@ struct HostIOMMUDeviceClass {
> *
> * @cap: capability to check.
> *
> + * @out_cap: 0 if a @cap is unsupported or else 1 or some positive
> + * value for some special @cap, i.e., HOST_IOMMU_DEVICE_CAP_AW_BITS.
this does not match what is done in the impl. In case @cap is not
supported you do not zero it.
> + *
> * @errp: pass an Error out when fails to query capability.
> *
> - * Returns: <0 on failure, 0 if a @cap is unsupported, or else
> - * 1 or some positive value for some special @cap,
I would rather say the capability value
> - * i.e., HOST_IOMMU_DEVICE_CAP_AW_BITS.
> + * Returns: <0 on failure, 0 on success.
<0 if cap is not supported
> */
> - int (*get_cap)(HostIOMMUDevice *hiod, int cap, Error **errp);
> + int (*get_cap)(HostIOMMUDevice *hiod, int cap, uint64_t *out_cap,
> + Error **errp);
> /**
> * @get_iova_ranges: Return the list of usable iova_ranges along with
> * @hiod Host IOMMU device
> @@ -123,6 +125,10 @@ struct HostIOMMUDeviceClass {
> */
> #define HOST_IOMMU_DEVICE_CAP_IOMMU_TYPE 0
> #define HOST_IOMMU_DEVICE_CAP_AW_BITS 1
> +/* Generic IOMMU HW capability info */
> +#define HOST_IOMMU_DEVICE_CAP_GENERIC_HW 2
> +/* PASID width */
> +#define HOST_IOMMU_DEVICE_CAP_MAX_PASID_LOG2 3
>
> #define HOST_IOMMU_DEVICE_CAP_AW_BITS_MAX 64
> #endif
Eric
