Skip to content

Commit a01e93e

Browse files
committed
accel/ivpu: Improve buffer object logging
- Fix missing alloc log when drm_gem_handle_create() fails in drm_vma_node_allow() and open callback is not called - Add ivpu_bo->ctx_id that enables to log the actual context id instead of using 0 as default - Add couple WARNs and errors so we can catch more memory corruption issues Fixes: 37dee2a ("accel/ivpu: Improve buffer object debug logs") Cc: [email protected] # v6.8+ Reviewed-by: Jeff Hugo <[email protected]> Reviewed-by: Lizhi Hou <[email protected]> Signed-off-by: Jacek Lawrynowicz <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 03bcbbb commit a01e93e

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

drivers/accel/ivpu/ivpu_gem.c

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static inline void ivpu_dbg_bo(struct ivpu_device *vdev, struct ivpu_bo *bo, con
2828
{
2929
ivpu_dbg(vdev, BO,
3030
"%6s: bo %8p vpu_addr %9llx size %8zu ctx %d has_pages %d dma_mapped %d mmu_mapped %d wc %d imported %d\n",
31-
action, bo, bo->vpu_addr, ivpu_bo_size(bo), bo->ctx ? bo->ctx->id : 0,
31+
action, bo, bo->vpu_addr, ivpu_bo_size(bo), bo->ctx_id,
3232
(bool)bo->base.pages, (bool)bo->base.sgt, bo->mmu_mapped, bo->base.map_wc,
3333
(bool)bo->base.base.import_attach);
3434
}
@@ -94,8 +94,6 @@ ivpu_bo_alloc_vpu_addr(struct ivpu_bo *bo, struct ivpu_mmu_context *ctx,
9494
ivpu_err(vdev, "Failed to add BO to context %u: %d\n", ctx->id, ret);
9595
}
9696

97-
ivpu_dbg_bo(vdev, bo, "alloc");
98-
9997
mutex_unlock(&bo->lock);
10098

10199
drm_dev_exit(idx);
@@ -215,7 +213,7 @@ struct drm_gem_object *ivpu_gem_prime_import(struct drm_device *dev,
215213
return ERR_PTR(ret);
216214
}
217215

218-
static struct ivpu_bo *ivpu_bo_alloc(struct ivpu_device *vdev, u64 size, u32 flags)
216+
static struct ivpu_bo *ivpu_bo_alloc(struct ivpu_device *vdev, u64 size, u32 flags, u32 ctx_id)
219217
{
220218
struct drm_gem_shmem_object *shmem;
221219
struct ivpu_bo *bo;
@@ -233,13 +231,16 @@ static struct ivpu_bo *ivpu_bo_alloc(struct ivpu_device *vdev, u64 size, u32 fla
233231
return ERR_CAST(shmem);
234232

235233
bo = to_ivpu_bo(&shmem->base);
234+
bo->ctx_id = ctx_id;
236235
bo->base.map_wc = flags & DRM_IVPU_BO_WC;
237236
bo->flags = flags;
238237

239238
mutex_lock(&vdev->bo_list_lock);
240239
list_add_tail(&bo->bo_list_node, &vdev->bo_list);
241240
mutex_unlock(&vdev->bo_list_lock);
242241

242+
ivpu_dbg_bo(vdev, bo, "alloc");
243+
243244
return bo;
244245
}
245246

@@ -278,8 +279,13 @@ static void ivpu_gem_bo_free(struct drm_gem_object *obj)
278279
mutex_unlock(&vdev->bo_list_lock);
279280

280281
drm_WARN_ON(&vdev->drm, !dma_resv_test_signaled(obj->resv, DMA_RESV_USAGE_READ));
282+
drm_WARN_ON(&vdev->drm, ivpu_bo_size(bo) == 0);
283+
drm_WARN_ON(&vdev->drm, bo->base.vaddr);
281284

282285
ivpu_bo_unbind_locked(bo);
286+
drm_WARN_ON(&vdev->drm, bo->mmu_mapped);
287+
drm_WARN_ON(&vdev->drm, bo->ctx);
288+
283289
mutex_destroy(&bo->lock);
284290

285291
drm_WARN_ON(obj->dev, bo->base.pages_use_count > 1);
@@ -314,15 +320,18 @@ int ivpu_bo_create_ioctl(struct drm_device *dev, void *data, struct drm_file *fi
314320
if (size == 0)
315321
return -EINVAL;
316322

317-
bo = ivpu_bo_alloc(vdev, size, args->flags);
323+
bo = ivpu_bo_alloc(vdev, size, args->flags, file_priv->ctx.id);
318324
if (IS_ERR(bo)) {
319325
ivpu_err(vdev, "Failed to allocate BO: %pe (ctx %u size %llu flags 0x%x)",
320326
bo, file_priv->ctx.id, args->size, args->flags);
321327
return PTR_ERR(bo);
322328
}
323329

324330
ret = drm_gem_handle_create(file, &bo->base.base, &args->handle);
325-
if (!ret)
331+
if (ret)
332+
ivpu_err(vdev, "Failed to create handle for BO: %pe (ctx %u size %llu flags 0x%x)",
333+
bo, file_priv->ctx.id, args->size, args->flags);
334+
else
326335
args->vpu_addr = bo->vpu_addr;
327336

328337
drm_gem_object_put(&bo->base.base);
@@ -345,7 +354,7 @@ ivpu_bo_create(struct ivpu_device *vdev, struct ivpu_mmu_context *ctx,
345354
drm_WARN_ON(&vdev->drm, !PAGE_ALIGNED(range->end));
346355
drm_WARN_ON(&vdev->drm, !PAGE_ALIGNED(size));
347356

348-
bo = ivpu_bo_alloc(vdev, size, flags);
357+
bo = ivpu_bo_alloc(vdev, size, flags, IVPU_GLOBAL_CONTEXT_MMU_SSID);
349358
if (IS_ERR(bo)) {
350359
ivpu_err(vdev, "Failed to allocate BO: %pe (vpu_addr 0x%llx size %llu flags 0x%x)",
351360
bo, range->start, size, flags);
@@ -452,7 +461,7 @@ static void ivpu_bo_print_info(struct ivpu_bo *bo, struct drm_printer *p)
452461
mutex_lock(&bo->lock);
453462

454463
drm_printf(p, "%-9p %-3u 0x%-12llx %-10lu 0x%-8x %-4u",
455-
bo, bo->ctx ? bo->ctx->id : 0, bo->vpu_addr, bo->base.base.size,
464+
bo, bo->ctx_id, bo->vpu_addr, bo->base.base.size,
456465
bo->flags, kref_read(&bo->base.base.refcount));
457466

458467
if (bo->base.pages)

drivers/accel/ivpu/ivpu_gem.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ struct ivpu_bo {
2121
u64 vpu_addr;
2222
u32 flags;
2323
u32 job_status; /* Valid only for command buffer */
24+
u32 ctx_id;
2425
bool mmu_mapped;
2526
};
2627

0 commit comments

Comments
 (0)