Same for the two wrappers and their call sites.
Suggested-by: Shameer Kolothum Thodi <skolothumtho@nvidia.com>
Suggested-by: Nicolin Chen <nicolinc@nvidia.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
---
include/system/iommufd.h | 16 +++++++++++-----
backends/iommufd.c | 9 +++++----
hw/arm/smmuv3-accel.c | 12 ++++++++----
hw/i386/intel_iommu_accel.c | 8 +++++---
hw/vfio/iommufd.c | 10 +++++-----
5 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/include/system/iommufd.h b/include/system/iommufd.h
index 80d72469a9..80c8423654 100644
--- a/include/system/iommufd.h
+++ b/include/system/iommufd.h
@@ -124,14 +124,16 @@ struct HostIOMMUDeviceIOMMUFDClass {
*
* @idev: host IOMMU device backed by IOMMUFD backend.
*
+ * @pasid: pasid of host IOMMU device.
+ *
* @hwpt_id: ID of IOMMUFD hardware page table.
*
* @errp: pass an Error out when attachment fails.
*
* Returns: true on success, false on failure.
*/
- bool (*attach_hwpt)(HostIOMMUDeviceIOMMUFD *idev, uint32_t hwpt_id,
- Error **errp);
+ bool (*attach_hwpt)(HostIOMMUDeviceIOMMUFD *idev, uint32_t pasid,
+ uint32_t hwpt_id, Error **errp);
/**
* @detach_hwpt: detach host IOMMU device from IOMMUFD hardware page table.
* VFIO and VDPA device can have different implementation.
@@ -140,15 +142,19 @@ struct HostIOMMUDeviceIOMMUFDClass {
*
* @idev: host IOMMU device backed by IOMMUFD backend.
*
+ * @pasid: pasid of host IOMMU device.
+ *
* @errp: pass an Error out when attachment fails.
*
* Returns: true on success, false on failure.
*/
- bool (*detach_hwpt)(HostIOMMUDeviceIOMMUFD *idev, Error **errp);
+ bool (*detach_hwpt)(HostIOMMUDeviceIOMMUFD *idev, uint32_t pasid,
+ Error **errp);
};
bool host_iommu_device_iommufd_attach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
- uint32_t hwpt_id, Error **errp);
-bool host_iommu_device_iommufd_detach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
+ uint32_t pasid, uint32_t hwpt_id,
Error **errp);
+bool host_iommu_device_iommufd_detach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
+ uint32_t pasid, Error **errp);
#endif
diff --git a/backends/iommufd.c b/backends/iommufd.c
index 13822df82f..153edf4f79 100644
--- a/backends/iommufd.c
+++ b/backends/iommufd.c
@@ -505,23 +505,24 @@ bool iommufd_backend_alloc_vdev(IOMMUFDBackend *be, uint32_t dev_id,
}
bool host_iommu_device_iommufd_attach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
- uint32_t hwpt_id, Error **errp)
+ uint32_t pasid, uint32_t hwpt_id,
+ Error **errp)
{
HostIOMMUDeviceIOMMUFDClass *idevc =
HOST_IOMMU_DEVICE_IOMMUFD_GET_CLASS(idev);
g_assert(idevc->attach_hwpt);
- return idevc->attach_hwpt(idev, hwpt_id, errp);
+ return idevc->attach_hwpt(idev, pasid, hwpt_id, errp);
}
bool host_iommu_device_iommufd_detach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
- Error **errp)
+ uint32_t pasid, Error **errp)
{
HostIOMMUDeviceIOMMUFDClass *idevc =
HOST_IOMMU_DEVICE_IOMMUFD_GET_CLASS(idev);
g_assert(idevc->detach_hwpt);
- return idevc->detach_hwpt(idev, errp);
+ return idevc->detach_hwpt(idev, pasid, errp);
}
static int hiod_iommufd_get_cap(HostIOMMUDevice *hiod, int cap, Error **errp)
diff --git a/hw/arm/smmuv3-accel.c b/hw/arm/smmuv3-accel.c
index f5cd4df336..6b04344959 100644
--- a/hw/arm/smmuv3-accel.c
+++ b/hw/arm/smmuv3-accel.c
@@ -294,7 +294,8 @@ bool smmuv3_accel_install_ste(SMMUv3State *s, SMMUDevice *sdev, int sid,
return false;
}
- if (!host_iommu_device_iommufd_attach_hwpt(idev, hwpt_id, errp)) {
+ if (!host_iommu_device_iommufd_attach_hwpt(idev, IOMMU_NO_PASID, hwpt_id,
+ errp)) {
if (s1_hwpt) {
iommufd_backend_free_id(idev->iommufd, s1_hwpt->hwpt_id);
g_free(s1_hwpt);
@@ -436,7 +437,8 @@ smmuv3_accel_alloc_viommu(SMMUv3State *s, HostIOMMUDeviceIOMMUFD *idev,
/* Attach a HWPT based on SMMUv3 GBPA.ABORT value */
hwpt_id = smmuv3_accel_gbpa_hwpt(s, accel);
- if (!host_iommu_device_iommufd_attach_hwpt(idev, hwpt_id, errp)) {
+ if (!host_iommu_device_iommufd_attach_hwpt(idev, IOMMU_NO_PASID, hwpt_id,
+ errp)) {
goto free_bypass_hwpt;
}
accel->viommu = viommu;
@@ -524,7 +526,8 @@ static void smmuv3_accel_unset_iommu_device(PCIBus *bus, void *opaque,
idev = accel_dev->idev;
accel = accel_dev->s_accel;
/* Re-attach the default s2 hwpt id */
- if (!host_iommu_device_iommufd_attach_hwpt(idev, idev->hwpt_id, NULL)) {
+ if (!host_iommu_device_iommufd_attach_hwpt(idev, IOMMU_NO_PASID,
+ idev->hwpt_id, NULL)) {
error_report("Unable to attach the default HW pagetable: idev devid "
"0x%x", idev->devid);
}
@@ -720,7 +723,8 @@ bool smmuv3_accel_attach_gbpa_hwpt(SMMUv3State *s, Error **errp)
hwpt_id = smmuv3_accel_gbpa_hwpt(s, accel);
QLIST_FOREACH(accel_dev, &accel->device_list, next) {
- if (!host_iommu_device_iommufd_attach_hwpt(accel_dev->idev, hwpt_id,
+ if (!host_iommu_device_iommufd_attach_hwpt(accel_dev->idev,
+ IOMMU_NO_PASID, hwpt_id,
&local_err)) {
error_append_hint(&local_err, "Failed to attach GBPA hwpt %u for "
"idev devid %u", hwpt_id, accel_dev->idev->devid);
diff --git a/hw/i386/intel_iommu_accel.c b/hw/i386/intel_iommu_accel.c
index 67d54849f2..45c08c8f6f 100644
--- a/hw/i386/intel_iommu_accel.c
+++ b/hw/i386/intel_iommu_accel.c
@@ -121,7 +121,8 @@ static bool vtd_device_attach_iommufd(VTDHostIOMMUDevice *vtd_hiod,
}
}
- ret = host_iommu_device_iommufd_attach_hwpt(idev, hwpt_id, errp);
+ ret = host_iommu_device_iommufd_attach_hwpt(idev, IOMMU_NO_PASID, hwpt_id,
+ errp);
trace_vtd_device_attach_hwpt(idev->devid, vtd_as->pasid, hwpt_id, ret);
if (ret) {
/* Destroy old fs_hwpt if it's a replacement */
@@ -145,7 +146,7 @@ static bool vtd_device_detach_iommufd(VTDHostIOMMUDevice *vtd_hiod,
bool ret;
if (s->dmar_enabled && s->root_scalable) {
- ret = host_iommu_device_iommufd_detach_hwpt(idev, errp);
+ ret = host_iommu_device_iommufd_detach_hwpt(idev, IOMMU_NO_PASID, errp);
trace_vtd_device_detach_hwpt(idev->devid, pasid, ret);
} else {
/*
@@ -153,7 +154,8 @@ static bool vtd_device_detach_iommufd(VTDHostIOMMUDevice *vtd_hiod,
* we fallback to the default HWPT which contains shadow page table.
* So guest DMA could still work.
*/
- ret = host_iommu_device_iommufd_attach_hwpt(idev, idev->hwpt_id, errp);
+ ret = host_iommu_device_iommufd_attach_hwpt(idev, IOMMU_NO_PASID,
+ idev->hwpt_id, errp);
trace_vtd_device_reattach_def_hwpt(idev->devid, pasid, idev->hwpt_id,
ret);
}
diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
index b4c5e81b1d..005f97fe25 100644
--- a/hw/vfio/iommufd.c
+++ b/hw/vfio/iommufd.c
@@ -924,21 +924,21 @@ static void vfio_iommu_iommufd_class_init(ObjectClass *klass, const void *data)
static bool
host_iommu_device_iommufd_vfio_attach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
- uint32_t hwpt_id, Error **errp)
+ uint32_t pasid, uint32_t hwpt_id,
+ Error **errp)
{
VFIODevice *vbasedev = HOST_IOMMU_DEVICE(idev)->agent;
- return !iommufd_cdev_pasid_attach_ioas_hwpt(vbasedev, IOMMU_NO_PASID,
- hwpt_id, errp);
+ return !iommufd_cdev_pasid_attach_ioas_hwpt(vbasedev, pasid, hwpt_id, errp);
}
static bool
host_iommu_device_iommufd_vfio_detach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
- Error **errp)
+ uint32_t pasid, Error **errp)
{
VFIODevice *vbasedev = HOST_IOMMU_DEVICE(idev)->agent;
- return iommufd_cdev_pasid_detach_ioas_hwpt(vbasedev, IOMMU_NO_PASID, errp);
+ return iommufd_cdev_pasid_detach_ioas_hwpt(vbasedev, pasid, errp);
}
static bool hiod_iommufd_vfio_realize(HostIOMMUDevice *hiod, void *opaque,
--
2.47.3On 3/6/26 11:43, Zhenzhong Duan wrote:
> Same for the two wrappers and their call sites.
>
> Suggested-by: Shameer Kolothum Thodi <skolothumtho@nvidia.com>
> Suggested-by: Nicolin Chen <nicolinc@nvidia.com>
> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
> ---
> include/system/iommufd.h | 16 +++++++++++-----
> backends/iommufd.c | 9 +++++----
> hw/arm/smmuv3-accel.c | 12 ++++++++----
> hw/i386/intel_iommu_accel.c | 8 +++++---
> hw/vfio/iommufd.c | 10 +++++-----
> 5 files changed, 34 insertions(+), 21 deletions(-)
>
> diff --git a/include/system/iommufd.h b/include/system/iommufd.h
> index 80d72469a9..80c8423654 100644
> --- a/include/system/iommufd.h
> +++ b/include/system/iommufd.h
> @@ -124,14 +124,16 @@ struct HostIOMMUDeviceIOMMUFDClass {
> *
> * @idev: host IOMMU device backed by IOMMUFD backend.
> *
> + * @pasid: pasid of host IOMMU device.
this comment is a bit misleading although I know what you mean. Perhaps
"pasid of AS" or "target pasid of attach". Other parts LGTM.
Yi Liu <yi.l.liu@intel.com>
> + *
> * @hwpt_id: ID of IOMMUFD hardware page table.
> *
> * @errp: pass an Error out when attachment fails.
> *
> * Returns: true on success, false on failure.
> */
> - bool (*attach_hwpt)(HostIOMMUDeviceIOMMUFD *idev, uint32_t hwpt_id,
> - Error **errp);
> + bool (*attach_hwpt)(HostIOMMUDeviceIOMMUFD *idev, uint32_t pasid,
> + uint32_t hwpt_id, Error **errp);
> /**
> * @detach_hwpt: detach host IOMMU device from IOMMUFD hardware page table.
> * VFIO and VDPA device can have different implementation.
> @@ -140,15 +142,19 @@ struct HostIOMMUDeviceIOMMUFDClass {
> *
> * @idev: host IOMMU device backed by IOMMUFD backend.
> *
> + * @pasid: pasid of host IOMMU device.
> + *
> * @errp: pass an Error out when attachment fails.
> *
> * Returns: true on success, false on failure.
> */
> - bool (*detach_hwpt)(HostIOMMUDeviceIOMMUFD *idev, Error **errp);
> + bool (*detach_hwpt)(HostIOMMUDeviceIOMMUFD *idev, uint32_t pasid,
> + Error **errp);
> };
>
> bool host_iommu_device_iommufd_attach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
> - uint32_t hwpt_id, Error **errp);
> -bool host_iommu_device_iommufd_detach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
> + uint32_t pasid, uint32_t hwpt_id,
> Error **errp);
> +bool host_iommu_device_iommufd_detach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
> + uint32_t pasid, Error **errp);
> #endif
> diff --git a/backends/iommufd.c b/backends/iommufd.c
> index 13822df82f..153edf4f79 100644
> --- a/backends/iommufd.c
> +++ b/backends/iommufd.c
> @@ -505,23 +505,24 @@ bool iommufd_backend_alloc_vdev(IOMMUFDBackend *be, uint32_t dev_id,
> }
>
> bool host_iommu_device_iommufd_attach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
> - uint32_t hwpt_id, Error **errp)
> + uint32_t pasid, uint32_t hwpt_id,
> + Error **errp)
> {
> HostIOMMUDeviceIOMMUFDClass *idevc =
> HOST_IOMMU_DEVICE_IOMMUFD_GET_CLASS(idev);
>
> g_assert(idevc->attach_hwpt);
> - return idevc->attach_hwpt(idev, hwpt_id, errp);
> + return idevc->attach_hwpt(idev, pasid, hwpt_id, errp);
> }
>
> bool host_iommu_device_iommufd_detach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
> - Error **errp)
> + uint32_t pasid, Error **errp)
> {
> HostIOMMUDeviceIOMMUFDClass *idevc =
> HOST_IOMMU_DEVICE_IOMMUFD_GET_CLASS(idev);
>
> g_assert(idevc->detach_hwpt);
> - return idevc->detach_hwpt(idev, errp);
> + return idevc->detach_hwpt(idev, pasid, errp);
> }
>
> static int hiod_iommufd_get_cap(HostIOMMUDevice *hiod, int cap, Error **errp)
> diff --git a/hw/arm/smmuv3-accel.c b/hw/arm/smmuv3-accel.c
> index f5cd4df336..6b04344959 100644
> --- a/hw/arm/smmuv3-accel.c
> +++ b/hw/arm/smmuv3-accel.c
> @@ -294,7 +294,8 @@ bool smmuv3_accel_install_ste(SMMUv3State *s, SMMUDevice *sdev, int sid,
> return false;
> }
>
> - if (!host_iommu_device_iommufd_attach_hwpt(idev, hwpt_id, errp)) {
> + if (!host_iommu_device_iommufd_attach_hwpt(idev, IOMMU_NO_PASID, hwpt_id,
> + errp)) {
> if (s1_hwpt) {
> iommufd_backend_free_id(idev->iommufd, s1_hwpt->hwpt_id);
> g_free(s1_hwpt);
> @@ -436,7 +437,8 @@ smmuv3_accel_alloc_viommu(SMMUv3State *s, HostIOMMUDeviceIOMMUFD *idev,
>
> /* Attach a HWPT based on SMMUv3 GBPA.ABORT value */
> hwpt_id = smmuv3_accel_gbpa_hwpt(s, accel);
> - if (!host_iommu_device_iommufd_attach_hwpt(idev, hwpt_id, errp)) {
> + if (!host_iommu_device_iommufd_attach_hwpt(idev, IOMMU_NO_PASID, hwpt_id,
> + errp)) {
> goto free_bypass_hwpt;
> }
> accel->viommu = viommu;
> @@ -524,7 +526,8 @@ static void smmuv3_accel_unset_iommu_device(PCIBus *bus, void *opaque,
> idev = accel_dev->idev;
> accel = accel_dev->s_accel;
> /* Re-attach the default s2 hwpt id */
> - if (!host_iommu_device_iommufd_attach_hwpt(idev, idev->hwpt_id, NULL)) {
> + if (!host_iommu_device_iommufd_attach_hwpt(idev, IOMMU_NO_PASID,
> + idev->hwpt_id, NULL)) {
> error_report("Unable to attach the default HW pagetable: idev devid "
> "0x%x", idev->devid);
> }
> @@ -720,7 +723,8 @@ bool smmuv3_accel_attach_gbpa_hwpt(SMMUv3State *s, Error **errp)
>
> hwpt_id = smmuv3_accel_gbpa_hwpt(s, accel);
> QLIST_FOREACH(accel_dev, &accel->device_list, next) {
> - if (!host_iommu_device_iommufd_attach_hwpt(accel_dev->idev, hwpt_id,
> + if (!host_iommu_device_iommufd_attach_hwpt(accel_dev->idev,
> + IOMMU_NO_PASID, hwpt_id,
> &local_err)) {
> error_append_hint(&local_err, "Failed to attach GBPA hwpt %u for "
> "idev devid %u", hwpt_id, accel_dev->idev->devid);
> diff --git a/hw/i386/intel_iommu_accel.c b/hw/i386/intel_iommu_accel.c
> index 67d54849f2..45c08c8f6f 100644
> --- a/hw/i386/intel_iommu_accel.c
> +++ b/hw/i386/intel_iommu_accel.c
> @@ -121,7 +121,8 @@ static bool vtd_device_attach_iommufd(VTDHostIOMMUDevice *vtd_hiod,
> }
> }
>
> - ret = host_iommu_device_iommufd_attach_hwpt(idev, hwpt_id, errp);
> + ret = host_iommu_device_iommufd_attach_hwpt(idev, IOMMU_NO_PASID, hwpt_id,
> + errp);
> trace_vtd_device_attach_hwpt(idev->devid, vtd_as->pasid, hwpt_id, ret);
> if (ret) {
> /* Destroy old fs_hwpt if it's a replacement */
> @@ -145,7 +146,7 @@ static bool vtd_device_detach_iommufd(VTDHostIOMMUDevice *vtd_hiod,
> bool ret;
>
> if (s->dmar_enabled && s->root_scalable) {
> - ret = host_iommu_device_iommufd_detach_hwpt(idev, errp);
> + ret = host_iommu_device_iommufd_detach_hwpt(idev, IOMMU_NO_PASID, errp);
> trace_vtd_device_detach_hwpt(idev->devid, pasid, ret);
> } else {
> /*
> @@ -153,7 +154,8 @@ static bool vtd_device_detach_iommufd(VTDHostIOMMUDevice *vtd_hiod,
> * we fallback to the default HWPT which contains shadow page table.
> * So guest DMA could still work.
> */
> - ret = host_iommu_device_iommufd_attach_hwpt(idev, idev->hwpt_id, errp);
> + ret = host_iommu_device_iommufd_attach_hwpt(idev, IOMMU_NO_PASID,
> + idev->hwpt_id, errp);
> trace_vtd_device_reattach_def_hwpt(idev->devid, pasid, idev->hwpt_id,
> ret);
> }
> diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
> index b4c5e81b1d..005f97fe25 100644
> --- a/hw/vfio/iommufd.c
> +++ b/hw/vfio/iommufd.c
> @@ -924,21 +924,21 @@ static void vfio_iommu_iommufd_class_init(ObjectClass *klass, const void *data)
>
> static bool
> host_iommu_device_iommufd_vfio_attach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
> - uint32_t hwpt_id, Error **errp)
> + uint32_t pasid, uint32_t hwpt_id,
> + Error **errp)
> {
> VFIODevice *vbasedev = HOST_IOMMU_DEVICE(idev)->agent;
>
> - return !iommufd_cdev_pasid_attach_ioas_hwpt(vbasedev, IOMMU_NO_PASID,
> - hwpt_id, errp);
> + return !iommufd_cdev_pasid_attach_ioas_hwpt(vbasedev, pasid, hwpt_id, errp);
> }
>
> static bool
> host_iommu_device_iommufd_vfio_detach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
> - Error **errp)
> + uint32_t pasid, Error **errp)
> {
> VFIODevice *vbasedev = HOST_IOMMU_DEVICE(idev)->agent;
>
> - return iommufd_cdev_pasid_detach_ioas_hwpt(vbasedev, IOMMU_NO_PASID, errp);
> + return iommufd_cdev_pasid_detach_ioas_hwpt(vbasedev, pasid, errp);
> }
>
> static bool hiod_iommufd_vfio_realize(HostIOMMUDevice *hiod, void *opaque,
>-----Original Message-----
>From: Liu, Yi L <yi.l.liu@intel.com>
>Subject: Re: [PATCH v1 02/13] iommufd: Extend attach/detach_hwpt callbacks to
>support pasid
>
>On 3/6/26 11:43, Zhenzhong Duan wrote:
>> Same for the two wrappers and their call sites.
>>
>> Suggested-by: Shameer Kolothum Thodi <skolothumtho@nvidia.com>
>> Suggested-by: Nicolin Chen <nicolinc@nvidia.com>
>> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
>> ---
>> include/system/iommufd.h | 16 +++++++++++-----
>> backends/iommufd.c | 9 +++++----
>> hw/arm/smmuv3-accel.c | 12 ++++++++----
>> hw/i386/intel_iommu_accel.c | 8 +++++---
>> hw/vfio/iommufd.c | 10 +++++-----
>> 5 files changed, 34 insertions(+), 21 deletions(-)
>>
>> diff --git a/include/system/iommufd.h b/include/system/iommufd.h
>> index 80d72469a9..80c8423654 100644
>> --- a/include/system/iommufd.h
>> +++ b/include/system/iommufd.h
>> @@ -124,14 +124,16 @@ struct HostIOMMUDeviceIOMMUFDClass {
>> *
>> * @idev: host IOMMU device backed by IOMMUFD backend.
>> *
>> + * @pasid: pasid of host IOMMU device.
>
>this comment is a bit misleading although I know what you mean. Perhaps
>"pasid of AS" or "target pasid of attach". Other parts LGTM.
Will use "target pasid of attach"
>
>Yi Liu <yi.l.liu@intel.com>
I guess you mean Reviewed-by: Yi Liu <yi.l.liu@intel.com>😊
Thanks
Zhenzhong
>
>> + *
>> * @hwpt_id: ID of IOMMUFD hardware page table.
>> *
>> * @errp: pass an Error out when attachment fails.
>> *
>> * Returns: true on success, false on failure.
>> */
>> - bool (*attach_hwpt)(HostIOMMUDeviceIOMMUFD *idev, uint32_t hwpt_id,
>> - Error **errp);
>> + bool (*attach_hwpt)(HostIOMMUDeviceIOMMUFD *idev, uint32_t pasid,
>> + uint32_t hwpt_id, Error **errp);
>> /**
>> * @detach_hwpt: detach host IOMMU device from IOMMUFD hardware
>page table.
>> * VFIO and VDPA device can have different implementation.
>> @@ -140,15 +142,19 @@ struct HostIOMMUDeviceIOMMUFDClass {
>> *
>> * @idev: host IOMMU device backed by IOMMUFD backend.
>> *
>> + * @pasid: pasid of host IOMMU device.
>> + *
>> * @errp: pass an Error out when attachment fails.
>> *
>> * Returns: true on success, false on failure.
>> */
>> - bool (*detach_hwpt)(HostIOMMUDeviceIOMMUFD *idev, Error **errp);
>> + bool (*detach_hwpt)(HostIOMMUDeviceIOMMUFD *idev, uint32_t pasid,
>> + Error **errp);
>> };
>>
>> bool
>host_iommu_device_iommufd_attach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
>> - uint32_t hwpt_id, Error **errp);
>> -bool
>host_iommu_device_iommufd_detach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
>> + uint32_t pasid, uint32_t hwpt_id,
>> Error **errp);
>> +bool
>host_iommu_device_iommufd_detach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
>> + uint32_t pasid, Error **errp);
>> #endif
>> diff --git a/backends/iommufd.c b/backends/iommufd.c
>> index 13822df82f..153edf4f79 100644
>> --- a/backends/iommufd.c
>> +++ b/backends/iommufd.c
>> @@ -505,23 +505,24 @@ bool
>iommufd_backend_alloc_vdev(IOMMUFDBackend *be, uint32_t dev_id,
>> }
>>
>> bool
>host_iommu_device_iommufd_attach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
>> - uint32_t hwpt_id, Error **errp)
>> + uint32_t pasid, uint32_t hwpt_id,
>> + Error **errp)
>> {
>> HostIOMMUDeviceIOMMUFDClass *idevc =
>> HOST_IOMMU_DEVICE_IOMMUFD_GET_CLASS(idev);
>>
>> g_assert(idevc->attach_hwpt);
>> - return idevc->attach_hwpt(idev, hwpt_id, errp);
>> + return idevc->attach_hwpt(idev, pasid, hwpt_id, errp);
>> }
>>
>> bool
>host_iommu_device_iommufd_detach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
>> - Error **errp)
>> + uint32_t pasid, Error **errp)
>> {
>> HostIOMMUDeviceIOMMUFDClass *idevc =
>> HOST_IOMMU_DEVICE_IOMMUFD_GET_CLASS(idev);
>>
>> g_assert(idevc->detach_hwpt);
>> - return idevc->detach_hwpt(idev, errp);
>> + return idevc->detach_hwpt(idev, pasid, errp);
>> }
>>
>> static int hiod_iommufd_get_cap(HostIOMMUDevice *hiod, int cap, Error
>**errp)
>> diff --git a/hw/arm/smmuv3-accel.c b/hw/arm/smmuv3-accel.c
>> index f5cd4df336..6b04344959 100644
>> --- a/hw/arm/smmuv3-accel.c
>> +++ b/hw/arm/smmuv3-accel.c
>> @@ -294,7 +294,8 @@ bool smmuv3_accel_install_ste(SMMUv3State *s,
>SMMUDevice *sdev, int sid,
>> return false;
>> }
>>
>> - if (!host_iommu_device_iommufd_attach_hwpt(idev, hwpt_id, errp)) {
>> + if (!host_iommu_device_iommufd_attach_hwpt(idev, IOMMU_NO_PASID,
>hwpt_id,
>> + errp)) {
>> if (s1_hwpt) {
>> iommufd_backend_free_id(idev->iommufd, s1_hwpt->hwpt_id);
>> g_free(s1_hwpt);
>> @@ -436,7 +437,8 @@ smmuv3_accel_alloc_viommu(SMMUv3State *s,
>HostIOMMUDeviceIOMMUFD *idev,
>>
>> /* Attach a HWPT based on SMMUv3 GBPA.ABORT value */
>> hwpt_id = smmuv3_accel_gbpa_hwpt(s, accel);
>> - if (!host_iommu_device_iommufd_attach_hwpt(idev, hwpt_id, errp)) {
>> + if (!host_iommu_device_iommufd_attach_hwpt(idev, IOMMU_NO_PASID,
>hwpt_id,
>> + errp)) {
>> goto free_bypass_hwpt;
>> }
>> accel->viommu = viommu;
>> @@ -524,7 +526,8 @@ static void smmuv3_accel_unset_iommu_device(PCIBus
>*bus, void *opaque,
>> idev = accel_dev->idev;
>> accel = accel_dev->s_accel;
>> /* Re-attach the default s2 hwpt id */
>> - if (!host_iommu_device_iommufd_attach_hwpt(idev, idev->hwpt_id, NULL)) {
>> + if (!host_iommu_device_iommufd_attach_hwpt(idev, IOMMU_NO_PASID,
>> + idev->hwpt_id, NULL)) {
>> error_report("Unable to attach the default HW pagetable: idev devid "
>> "0x%x", idev->devid);
>> }
>> @@ -720,7 +723,8 @@ bool smmuv3_accel_attach_gbpa_hwpt(SMMUv3State
>*s, Error **errp)
>>
>> hwpt_id = smmuv3_accel_gbpa_hwpt(s, accel);
>> QLIST_FOREACH(accel_dev, &accel->device_list, next) {
>> - if (!host_iommu_device_iommufd_attach_hwpt(accel_dev->idev, hwpt_id,
>> + if (!host_iommu_device_iommufd_attach_hwpt(accel_dev->idev,
>> + IOMMU_NO_PASID, hwpt_id,
>> &local_err)) {
>> error_append_hint(&local_err, "Failed to attach GBPA hwpt %u for "
>> "idev devid %u", hwpt_id, accel_dev->idev->devid);
>> diff --git a/hw/i386/intel_iommu_accel.c b/hw/i386/intel_iommu_accel.c
>> index 67d54849f2..45c08c8f6f 100644
>> --- a/hw/i386/intel_iommu_accel.c
>> +++ b/hw/i386/intel_iommu_accel.c
>> @@ -121,7 +121,8 @@ static bool
>vtd_device_attach_iommufd(VTDHostIOMMUDevice *vtd_hiod,
>> }
>> }
>>
>> - ret = host_iommu_device_iommufd_attach_hwpt(idev, hwpt_id, errp);
>> + ret = host_iommu_device_iommufd_attach_hwpt(idev, IOMMU_NO_PASID,
>hwpt_id,
>> + errp);
>> trace_vtd_device_attach_hwpt(idev->devid, vtd_as->pasid, hwpt_id, ret);
>> if (ret) {
>> /* Destroy old fs_hwpt if it's a replacement */
>> @@ -145,7 +146,7 @@ static bool
>vtd_device_detach_iommufd(VTDHostIOMMUDevice *vtd_hiod,
>> bool ret;
>>
>> if (s->dmar_enabled && s->root_scalable) {
>> - ret = host_iommu_device_iommufd_detach_hwpt(idev, errp);
>> + ret = host_iommu_device_iommufd_detach_hwpt(idev,
>IOMMU_NO_PASID, errp);
>> trace_vtd_device_detach_hwpt(idev->devid, pasid, ret);
>> } else {
>> /*
>> @@ -153,7 +154,8 @@ static bool
>vtd_device_detach_iommufd(VTDHostIOMMUDevice *vtd_hiod,
>> * we fallback to the default HWPT which contains shadow page table.
>> * So guest DMA could still work.
>> */
>> - ret = host_iommu_device_iommufd_attach_hwpt(idev, idev->hwpt_id,
>errp);
>> + ret = host_iommu_device_iommufd_attach_hwpt(idev,
>IOMMU_NO_PASID,
>> + idev->hwpt_id, errp);
>> trace_vtd_device_reattach_def_hwpt(idev->devid, pasid, idev->hwpt_id,
>> ret);
>> }
>> diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
>> index b4c5e81b1d..005f97fe25 100644
>> --- a/hw/vfio/iommufd.c
>> +++ b/hw/vfio/iommufd.c
>> @@ -924,21 +924,21 @@ static void
>vfio_iommu_iommufd_class_init(ObjectClass *klass, const void *data)
>>
>> static bool
>>
>host_iommu_device_iommufd_vfio_attach_hwpt(HostIOMMUDeviceIOMMUFD
>*idev,
>> - uint32_t hwpt_id, Error **errp)
>> + uint32_t pasid, uint32_t hwpt_id,
>> + Error **errp)
>> {
>> VFIODevice *vbasedev = HOST_IOMMU_DEVICE(idev)->agent;
>>
>> - return !iommufd_cdev_pasid_attach_ioas_hwpt(vbasedev,
>IOMMU_NO_PASID,
>> - hwpt_id, errp);
>> + return !iommufd_cdev_pasid_attach_ioas_hwpt(vbasedev, pasid, hwpt_id,
>errp);
>> }
>>
>> static bool
>>
>host_iommu_device_iommufd_vfio_detach_hwpt(HostIOMMUDeviceIOMMUFD
>*idev,
>> - Error **errp)
>> + uint32_t pasid, Error **errp)
>> {
>> VFIODevice *vbasedev = HOST_IOMMU_DEVICE(idev)->agent;
>>
>> - return iommufd_cdev_pasid_detach_ioas_hwpt(vbasedev,
>IOMMU_NO_PASID, errp);
>> + return iommufd_cdev_pasid_detach_ioas_hwpt(vbasedev, pasid, errp);
>> }
>>
>> static bool hiod_iommufd_vfio_realize(HostIOMMUDevice *hiod, void *opaque,
On 3/18/26 20:03, Yi Liu wrote:
> On 3/6/26 11:43, Zhenzhong Duan wrote:
>> Same for the two wrappers and their call sites.
>>
>> Suggested-by: Shameer Kolothum Thodi <skolothumtho@nvidia.com>
>> Suggested-by: Nicolin Chen <nicolinc@nvidia.com>
>> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
>> ---
>> include/system/iommufd.h | 16 +++++++++++-----
>> backends/iommufd.c | 9 +++++----
>> hw/arm/smmuv3-accel.c | 12 ++++++++----
>> hw/i386/intel_iommu_accel.c | 8 +++++---
>> hw/vfio/iommufd.c | 10 +++++-----
>> 5 files changed, 34 insertions(+), 21 deletions(-)
>>
>> diff --git a/include/system/iommufd.h b/include/system/iommufd.h
>> index 80d72469a9..80c8423654 100644
>> --- a/include/system/iommufd.h
>> +++ b/include/system/iommufd.h
>> @@ -124,14 +124,16 @@ struct HostIOMMUDeviceIOMMUFDClass {
>> *
>> * @idev: host IOMMU device backed by IOMMUFD backend.
>> *
>> + * @pasid: pasid of host IOMMU device.
>
> this comment is a bit misleading although I know what you mean. Perhaps
> "pasid of AS" or "target pasid of attach". Other parts LGTM.
>
Reviewed-by: Yi Liu <yi.l.liu@intel.com>
© 2016 - 2026 Red Hat, Inc.