Am 26.06.23 um 11:14 schrieb Thomas Hellström:

On eviction errors other than -EMULTIHOP we were leaking a resource. Fix.

v2:

• Avoid yet another goto (Andi Shyti)

Fixes: 403797925768 ("drm/ttm: Fix multihop assert on eviction.") Cc: Andrey Grodzovsky andrey.grodzovsky@amd.com Cc: Christian König christian.koenig@amd.com Cc: Christian Koenig christian.koenig@amd.com Cc: Huang Rui ray.huang@amd.com Cc: dri-devel@lists.freedesktop.org Cc: stable@vger.kernel.org # v5.15+ Signed-off-by: Thomas Hellström thomas.hellstrom@linux.intel.com Reviewed-by: Nirmoy Das nirmoy.das@intel.com #v1

Reviewed-by: Christian König christian.koenig@amd.com

---

drivers/gpu/drm/ttm/ttm_bo.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 615d30c4262d..c0e3bbd21d3d 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -458,18 +458,18 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, goto out; } -bounce:

• ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop);
• if (ret == -EMULTIHOP) {

• do {

• ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop);
  

• if (ret != -EMULTIHOP)
  

• 	break;
  

• ret = ttm_bo_bounce_temp_buffer(bo, &evict_mem, ctx, &hop);

• if (ret) {
  

• 	if (ret != -ERESTARTSYS && ret != -EINTR)
  

• 		pr_err("Buffer eviction failed\n");
  

• 	ttm_resource_free(bo, &evict_mem);
  

• 	goto out;
  

• }
  

• /* try and move to final place now. */
  

• goto bounce;
  

• } while (!ret);
• if (ret) {

• ttm_resource_free(bo, &evict_mem);
  

• if (ret != -ERESTARTSYS && ret != -EINTR)
  

• 	pr_err("Buffer eviction failed\n");
  

  } out: return ret;