Re: [PATCH v2 4/4] drm/ttm: Don't leak a resource on swapout move error

[Thomas Hellström]

Hi, Christian,

Will you take a look at 2/4 as well? Will you merge these?

Thanks,

Thomas


On 6/26/23 13:33, Christian König wrote:
> Am 26.06.23 um 11:14 schrieb Thomas Hellström:
> > If moving the bo to system for swapout failed, we were leaking
> > a resource. Fix.
> >
> > Fixes: bfa3357ef9ab ("drm/ttm: allocate resource object instead of 
> > embedding it v2")
> > Cc: Christian König <christian.koenig@xxxxxxx>
> > Cc: "Christian König" <ckoenig.leichtzumerken@xxxxxxxxx>
> > Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
> > Cc: <stable@xxxxxxxxxxxxxxx> # v5.14+
> > Signed-off-by: Thomas Hellström <thomas.hellstrom@xxxxxxxxxxxxxxx>
> > Reviewed-by: Nirmoy Das <nirmoy.das@xxxxxxxxx>
> > Reviewed-by: Andi Shyti <andi.shyti@xxxxxxxxxxxxxxx>
>
> Reviewed-by: Christian König <christian.koenig@xxxxxxx>
>
> > ---
> >   drivers/gpu/drm/ttm/ttm_bo.c | 1 +
> >   1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> > index c0e3bbd21d3d..d9a8f227f310 100644
> > --- a/drivers/gpu/drm/ttm/ttm_bo.c
> > +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> > @@ -1166,6 +1166,7 @@ int ttm_bo_swapout(struct ttm_buffer_object 
> > *bo, struct ttm_operation_ctx *ctx,
> >           ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop);
> >           if (unlikely(ret != 0)) {
> >               WARN(ret == -EMULTIHOP, "Unexpected multihop in swaput 
> > - likely driver bug.\n");
> > +            ttm_resource_free(bo, &evict_mem);
> >               goto out;
> >           }
> >       }