Commit c50a5de2 authored by Nicolin Chen's avatar Nicolin Chen Committed by Jason Gunthorpe
Browse files

iommufd/viommu: Explicitly define vdev->virt_id 

The "id" is too general to get its meaning easily. Rename it explicitly to
"virt_id" and update the kdocs for readability. No functional changes.

Link: https://patch.msgid.link/r/1fac22d645e6ee555675726faf3798a68315b044.1752126748.git.nicolinc@nvidia.com


Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarPranjal Shrivastava <praan@google.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Signed-off-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent fca02263

drivers/iommu/iommufd/driver.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ int iommufd_viommu_get_vdev_id(struct iommufd_viommu *viommu, 
	xa_lock(&viommu->vdevs);

	xa_for_each(&viommu->vdevs, index, vdev) {

		if (vdev->dev == dev) {

			*vdev_id = vdev->id;

			*vdev_id = vdev->virt_id;

			rc = 0;

			break;

		}

drivers/iommu/iommufd/iommufd_private.h

+6 −1
Original line number Diff line number Diff line
@@ -634,7 +634,12 @@ struct iommufd_vdevice { 
	struct iommufd_object obj;

	struct iommufd_viommu *viommu;

	struct device *dev;

	u64 id; /* per-vIOMMU virtual ID */



	/*

	 * Virtual device ID per vIOMMU, e.g. vSID of ARM SMMUv3, vDeviceID of

	 * AMD IOMMU, and vRID of Intel VT-d

	 */

	u64 virt_id;

};



#ifdef CONFIG_IOMMUFD_TEST

drivers/iommu/iommufd/viommu.c

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ void iommufd_vdevice_destroy(struct iommufd_object *obj) 
	struct iommufd_viommu *viommu = vdev->viommu;



	/* xa_cmpxchg is okay to fail if alloc failed xa_cmpxchg previously */

	xa_cmpxchg(&viommu->vdevs, vdev->id, vdev, NULL, GFP_KERNEL);

	xa_cmpxchg(&viommu->vdevs, vdev->virt_id, vdev, NULL, GFP_KERNEL);

	refcount_dec(&viommu->obj.users);

	put_device(vdev->dev);

}
@@ -150,7 +150,7 @@ int iommufd_vdevice_alloc_ioctl(struct iommufd_ucmd *ucmd) 
		goto out_put_idev;

	}



	vdev->id = virt_id;

	vdev->virt_id = virt_id;

	vdev->dev = idev->dev;

	get_device(idev->dev);

	vdev->viommu = viommu;