Commit bd7a2826 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

iommufd: Add iommufd_ctx to iommufd_put_object() 

Will be used in the next patch.

Link: https://lore.kernel.org/r/1-v2-ca9e00171c5b+123-iommufd_syz4_jgg@nvidia.com/


Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 98594181

drivers/iommu/iommufd/device.c

+7 −7
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ iommufd_device_auto_get_domain(struct iommufd_device *idev, 
			continue;

		destroy_hwpt = (*do_attach)(idev, hwpt);

		if (IS_ERR(destroy_hwpt)) {

			iommufd_put_object(&hwpt->obj);

			iommufd_put_object(idev->ictx, &hwpt->obj);

			/*

			 * -EINVAL means the domain is incompatible with the

			 * device. Other error codes should propagate to
@@ -583,7 +583,7 @@ iommufd_device_auto_get_domain(struct iommufd_device *idev, 
			goto out_unlock;

		}

		*pt_id = hwpt->obj.id;

		iommufd_put_object(&hwpt->obj);

		iommufd_put_object(idev->ictx, &hwpt->obj);

		goto out_unlock;

	}
@@ -652,7 +652,7 @@ static int iommufd_device_change_pt(struct iommufd_device *idev, u32 *pt_id, 
		destroy_hwpt = ERR_PTR(-EINVAL);

		goto out_put_pt_obj;

	}

	iommufd_put_object(pt_obj);

	iommufd_put_object(idev->ictx, pt_obj);



	/* This destruction has to be after we unlock everything */

	if (destroy_hwpt)
@@ -660,7 +660,7 @@ static int iommufd_device_change_pt(struct iommufd_device *idev, u32 *pt_id, 
	return 0;



out_put_pt_obj:

	iommufd_put_object(pt_obj);

	iommufd_put_object(idev->ictx, pt_obj);

	return PTR_ERR(destroy_hwpt);

}
@@ -792,7 +792,7 @@ static int iommufd_access_change_ioas_id(struct iommufd_access *access, u32 id) 
	if (IS_ERR(ioas))

		return PTR_ERR(ioas);

	rc = iommufd_access_change_ioas(access, ioas);

	iommufd_put_object(&ioas->obj);

	iommufd_put_object(access->ictx, &ioas->obj);

	return rc;

}
@@ -941,7 +941,7 @@ void iommufd_access_notify_unmap(struct io_pagetable *iopt, unsigned long iova, 


		access->ops->unmap(access->data, iova, length);



		iommufd_put_object(&access->obj);

		iommufd_put_object(access->ictx, &access->obj);

		xa_lock(&ioas->iopt.access_list);

	}

	xa_unlock(&ioas->iopt.access_list);
@@ -1243,6 +1243,6 @@ int iommufd_get_hw_info(struct iommufd_ucmd *ucmd) 
out_free:

	kfree(data);

out_put:

	iommufd_put_object(&idev->obj);

	iommufd_put_object(ucmd->ictx, &idev->obj);

	return rc;

}

drivers/iommu/iommufd/hw_pagetable.c

+4 −4
Original line number Diff line number Diff line
@@ -318,9 +318,9 @@ int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd) 
	if (ioas)

		mutex_unlock(&ioas->mutex);

out_put_pt:

	iommufd_put_object(pt_obj);

	iommufd_put_object(ucmd->ictx, pt_obj);

out_put_idev:

	iommufd_put_object(&idev->obj);

	iommufd_put_object(ucmd->ictx, &idev->obj);

	return rc;

}
@@ -345,7 +345,7 @@ int iommufd_hwpt_set_dirty_tracking(struct iommufd_ucmd *ucmd) 
	rc = iopt_set_dirty_tracking(&ioas->iopt, hwpt_paging->common.domain,

				     enable);



	iommufd_put_object(&hwpt_paging->common.obj);

	iommufd_put_object(ucmd->ictx, &hwpt_paging->common.obj);

	return rc;

}
@@ -368,6 +368,6 @@ int iommufd_hwpt_get_dirty_bitmap(struct iommufd_ucmd *ucmd) 
	rc = iopt_read_and_clear_dirty_data(

		&ioas->iopt, hwpt_paging->common.domain, cmd->flags, cmd);



	iommufd_put_object(&hwpt_paging->common.obj);

	iommufd_put_object(ucmd->ictx, &hwpt_paging->common.obj);

	return rc;

}

drivers/iommu/iommufd/ioas.c

+7 −7
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ int iommufd_ioas_iova_ranges(struct iommufd_ucmd *ucmd) 
		rc = -EMSGSIZE;

out_put:

	up_read(&ioas->iopt.iova_rwsem);

	iommufd_put_object(&ioas->obj);

	iommufd_put_object(ucmd->ictx, &ioas->obj);

	return rc;

}
@@ -175,7 +175,7 @@ int iommufd_ioas_allow_iovas(struct iommufd_ucmd *ucmd) 
		interval_tree_remove(node, &allowed_iova);

		kfree(container_of(node, struct iopt_allowed, node));

	}

	iommufd_put_object(&ioas->obj);

	iommufd_put_object(ucmd->ictx, &ioas->obj);

	return rc;

}
@@ -228,7 +228,7 @@ int iommufd_ioas_map(struct iommufd_ucmd *ucmd) 
	cmd->iova = iova;

	rc = iommufd_ucmd_respond(ucmd, sizeof(*cmd));

out_put:

	iommufd_put_object(&ioas->obj);

	iommufd_put_object(ucmd->ictx, &ioas->obj);

	return rc;

}
@@ -258,7 +258,7 @@ int iommufd_ioas_copy(struct iommufd_ucmd *ucmd) 
		return PTR_ERR(src_ioas);

	rc = iopt_get_pages(&src_ioas->iopt, cmd->src_iova, cmd->length,

			    &pages_list);

	iommufd_put_object(&src_ioas->obj);

	iommufd_put_object(ucmd->ictx, &src_ioas->obj);

	if (rc)

		return rc;
@@ -279,7 +279,7 @@ int iommufd_ioas_copy(struct iommufd_ucmd *ucmd) 
	cmd->dst_iova = iova;

	rc = iommufd_ucmd_respond(ucmd, sizeof(*cmd));

out_put_dst:

	iommufd_put_object(&dst_ioas->obj);

	iommufd_put_object(ucmd->ictx, &dst_ioas->obj);

out_pages:

	iopt_free_pages_list(&pages_list);

	return rc;
@@ -315,7 +315,7 @@ int iommufd_ioas_unmap(struct iommufd_ucmd *ucmd) 
	rc = iommufd_ucmd_respond(ucmd, sizeof(*cmd));



out_put:

	iommufd_put_object(&ioas->obj);

	iommufd_put_object(ucmd->ictx, &ioas->obj);

	return rc;

}
@@ -393,6 +393,6 @@ int iommufd_ioas_option(struct iommufd_ucmd *ucmd) 
		rc = -EOPNOTSUPP;

	}



	iommufd_put_object(&ioas->obj);

	iommufd_put_object(ucmd->ictx, &ioas->obj);

	return rc;

}

drivers/iommu/iommufd/iommufd_private.h

+2 −1
Original line number Diff line number Diff line
@@ -154,7 +154,8 @@ static inline bool iommufd_lock_obj(struct iommufd_object *obj) 


struct iommufd_object *iommufd_get_object(struct iommufd_ctx *ictx, u32 id,

					  enum iommufd_object_type type);

static inline void iommufd_put_object(struct iommufd_object *obj)

static inline void iommufd_put_object(struct iommufd_ctx *ictx,

				      struct iommufd_object *obj)

{

	refcount_dec(&obj->users);

	up_read(&obj->destroy_rwsem);

drivers/iommu/iommufd/selftest.c

+7 −7
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void iommufd_test_syz_conv_iova_id(struct iommufd_ucmd *ucmd, 
	if (IS_ERR(ioas))

		return;

	*iova = iommufd_test_syz_conv_iova(&ioas->iopt, iova);

	iommufd_put_object(&ioas->obj);

	iommufd_put_object(ucmd->ictx, &ioas->obj);

}



struct mock_iommu_domain {
@@ -500,7 +500,7 @@ get_md_pagetable(struct iommufd_ucmd *ucmd, u32 mockpt_id, 
		return hwpt;

	if (hwpt->domain->type != IOMMU_DOMAIN_UNMANAGED ||

	    hwpt->domain->ops != mock_ops.default_domain_ops) {

		iommufd_put_object(&hwpt->obj);

		iommufd_put_object(ucmd->ictx, &hwpt->obj);

		return ERR_PTR(-EINVAL);

	}

	*mock = container_of(hwpt->domain, struct mock_iommu_domain, domain);
@@ -518,7 +518,7 @@ get_md_pagetable_nested(struct iommufd_ucmd *ucmd, u32 mockpt_id, 
		return hwpt;

	if (hwpt->domain->type != IOMMU_DOMAIN_NESTED ||

	    hwpt->domain->ops != &domain_nested_ops) {

		iommufd_put_object(&hwpt->obj);

		iommufd_put_object(ucmd->ictx, &hwpt->obj);

		return ERR_PTR(-EINVAL);

	}

	*mock_nested = container_of(hwpt->domain,
@@ -681,7 +681,7 @@ static int iommufd_test_mock_domain_replace(struct iommufd_ucmd *ucmd, 
	rc = iommufd_ucmd_respond(ucmd, sizeof(*cmd));



out_dev_obj:

	iommufd_put_object(dev_obj);

	iommufd_put_object(ucmd->ictx, dev_obj);

	return rc;

}
@@ -699,7 +699,7 @@ static int iommufd_test_add_reserved(struct iommufd_ucmd *ucmd, 
	down_write(&ioas->iopt.iova_rwsem);

	rc = iopt_reserve_iova(&ioas->iopt, start, start + length - 1, NULL);

	up_write(&ioas->iopt.iova_rwsem);

	iommufd_put_object(&ioas->obj);

	iommufd_put_object(ucmd->ictx, &ioas->obj);

	return rc;

}
@@ -754,7 +754,7 @@ static int iommufd_test_md_check_pa(struct iommufd_ucmd *ucmd, 
	rc = 0;



out_put:

	iommufd_put_object(&hwpt->obj);

	iommufd_put_object(ucmd->ictx, &hwpt->obj);

	return rc;

}
@@ -1233,7 +1233,7 @@ static int iommufd_test_dirty(struct iommufd_ucmd *ucmd, unsigned int mockpt_id, 
out_free:

	kvfree(tmp);

out_put:

	iommufd_put_object(&hwpt->obj);

	iommufd_put_object(ucmd->ictx, &hwpt->obj);

	return rc;

}