Skip to content

Commit 325de95

Browse files
yiliu1765jgunthorpe
authored andcommitted
iommu/iommufd: Pass iommufd_ctx pointer in iommufd_get_ioas()
No need to pass the iommufd_ucmd pointer. Link: https://lore.kernel.org/r/20230327093351.44505-2-yi.l.liu@intel.com Signed-off-by: Yi Liu <yi.l.liu@intel.com> Reviewed-by: Kevin Tian <kevin.tian@intel.com> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Tested-by: Nicolin Chen <nicolinc@nvidia.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
1 parent fe15c26 commit 325de95

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

drivers/iommu/iommufd/ioas.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ int iommufd_ioas_iova_ranges(struct iommufd_ucmd *ucmd)
7171
if (cmd->__reserved)
7272
return -EOPNOTSUPP;
7373

74-
ioas = iommufd_get_ioas(ucmd, cmd->ioas_id);
74+
ioas = iommufd_get_ioas(ucmd->ictx, cmd->ioas_id);
7575
if (IS_ERR(ioas))
7676
return PTR_ERR(ioas);
7777

@@ -151,7 +151,7 @@ int iommufd_ioas_allow_iovas(struct iommufd_ucmd *ucmd)
151151
if (cmd->__reserved)
152152
return -EOPNOTSUPP;
153153

154-
ioas = iommufd_get_ioas(ucmd, cmd->ioas_id);
154+
ioas = iommufd_get_ioas(ucmd->ictx, cmd->ioas_id);
155155
if (IS_ERR(ioas))
156156
return PTR_ERR(ioas);
157157
iopt = &ioas->iopt;
@@ -213,7 +213,7 @@ int iommufd_ioas_map(struct iommufd_ucmd *ucmd)
213213
if (cmd->iova >= ULONG_MAX || cmd->length >= ULONG_MAX)
214214
return -EOVERFLOW;
215215

216-
ioas = iommufd_get_ioas(ucmd, cmd->ioas_id);
216+
ioas = iommufd_get_ioas(ucmd->ictx, cmd->ioas_id);
217217
if (IS_ERR(ioas))
218218
return PTR_ERR(ioas);
219219

@@ -253,7 +253,7 @@ int iommufd_ioas_copy(struct iommufd_ucmd *ucmd)
253253
cmd->dst_iova >= ULONG_MAX)
254254
return -EOVERFLOW;
255255

256-
src_ioas = iommufd_get_ioas(ucmd, cmd->src_ioas_id);
256+
src_ioas = iommufd_get_ioas(ucmd->ictx, cmd->src_ioas_id);
257257
if (IS_ERR(src_ioas))
258258
return PTR_ERR(src_ioas);
259259
rc = iopt_get_pages(&src_ioas->iopt, cmd->src_iova, cmd->length,
@@ -262,7 +262,7 @@ int iommufd_ioas_copy(struct iommufd_ucmd *ucmd)
262262
if (rc)
263263
return rc;
264264

265-
dst_ioas = iommufd_get_ioas(ucmd, cmd->dst_ioas_id);
265+
dst_ioas = iommufd_get_ioas(ucmd->ictx, cmd->dst_ioas_id);
266266
if (IS_ERR(dst_ioas)) {
267267
rc = PTR_ERR(dst_ioas);
268268
goto out_pages;
@@ -292,7 +292,7 @@ int iommufd_ioas_unmap(struct iommufd_ucmd *ucmd)
292292
unsigned long unmapped = 0;
293293
int rc;
294294

295-
ioas = iommufd_get_ioas(ucmd, cmd->ioas_id);
295+
ioas = iommufd_get_ioas(ucmd->ictx, cmd->ioas_id);
296296
if (IS_ERR(ioas))
297297
return PTR_ERR(ioas);
298298

@@ -381,7 +381,7 @@ int iommufd_ioas_option(struct iommufd_ucmd *ucmd)
381381
if (cmd->__reserved)
382382
return -EOPNOTSUPP;
383383

384-
ioas = iommufd_get_ioas(ucmd, cmd->object_id);
384+
ioas = iommufd_get_ioas(ucmd->ictx, cmd->object_id);
385385
if (IS_ERR(ioas))
386386
return PTR_ERR(ioas);
387387

drivers/iommu/iommufd/iommufd_private.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,10 @@ struct iommufd_ioas {
211211
struct list_head hwpt_list;
212212
};
213213

214-
static inline struct iommufd_ioas *iommufd_get_ioas(struct iommufd_ucmd *ucmd,
214+
static inline struct iommufd_ioas *iommufd_get_ioas(struct iommufd_ctx *ictx,
215215
u32 id)
216216
{
217-
return container_of(iommufd_get_object(ucmd->ictx, id,
217+
return container_of(iommufd_get_object(ictx, id,
218218
IOMMUFD_OBJ_IOAS),
219219
struct iommufd_ioas, obj);
220220
}

drivers/iommu/iommufd/selftest.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void iommufd_test_syz_conv_iova_id(struct iommufd_ucmd *ucmd,
7575
return;
7676
*flags &= ~(u32)MOCK_FLAGS_ACCESS_SYZ;
7777

78-
ioas = iommufd_get_ioas(ucmd, ioas_id);
78+
ioas = iommufd_get_ioas(ucmd->ictx, ioas_id);
7979
if (IS_ERR(ioas))
8080
return;
8181
*iova = iommufd_test_syz_conv_iova(&ioas->iopt, iova);
@@ -279,7 +279,7 @@ static int iommufd_test_mock_domain(struct iommufd_ucmd *ucmd,
279279
struct iommufd_ioas *ioas;
280280
int rc;
281281

282-
ioas = iommufd_get_ioas(ucmd, cmd->id);
282+
ioas = iommufd_get_ioas(ucmd->ictx, cmd->id);
283283
if (IS_ERR(ioas))
284284
return PTR_ERR(ioas);
285285

@@ -322,7 +322,7 @@ static int iommufd_test_add_reserved(struct iommufd_ucmd *ucmd,
322322
struct iommufd_ioas *ioas;
323323
int rc;
324324

325-
ioas = iommufd_get_ioas(ucmd, mockpt_id);
325+
ioas = iommufd_get_ioas(ucmd->ictx, mockpt_id);
326326
if (IS_ERR(ioas))
327327
return PTR_ERR(ioas);
328328
down_write(&ioas->iopt.iova_rwsem);

drivers/iommu/iommufd/vfio_compat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ int iommufd_vfio_ioas(struct iommufd_ucmd *ucmd)
137137
return iommufd_ucmd_respond(ucmd, sizeof(*cmd));
138138

139139
case IOMMU_VFIO_IOAS_SET:
140-
ioas = iommufd_get_ioas(ucmd, cmd->ioas_id);
140+
ioas = iommufd_get_ioas(ucmd->ictx, cmd->ioas_id);
141141
if (IS_ERR(ioas))
142142
return PTR_ERR(ioas);
143143
xa_lock(&ucmd->ictx->objects);

0 commit comments

Comments
 (0)