Patch "drm/ttm: Don't leak a resource on eviction error" has been added to the 5.15-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drm/ttm: Don't leak a resource on eviction error

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-ttm-don-t-leak-a-resource-on-eviction-error.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit cb49f8d791c2603eb5da6e5bbdbf36dcc53d37d3
Author: Thomas Hellström <thomas.hellstrom@xxxxxxxxxxxxxxx>
Date:   Mon Jun 26 11:14:49 2023 +0200

    drm/ttm: Don't leak a resource on eviction error
    
    [ Upstream commit e8188c461ee015ba0b9ab2fc82dbd5ebca5a5532 ]
    
    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@xxxxxxx>
    Cc: Christian König <christian.koenig@xxxxxxx>
    Cc: Christian Koenig <christian.koenig@xxxxxxx>
    Cc: Huang Rui <ray.huang@xxxxxxx>
    Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
    Cc: <stable@xxxxxxxxxxxxxxx> # v5.15+
    Signed-off-by: Thomas Hellström <thomas.hellstrom@xxxxxxxxxxxxxxx>
    Reviewed-by: Nirmoy Das <nirmoy.das@xxxxxxxxx> #v1
    Reviewed-by: Andi Shyti <andi.shyti@xxxxxxxxxxxxxxx>
    Reviewed-by: Christian König <christian.koenig@xxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20230626091450.14757-4-thomas.hellstrom@xxxxxxxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index cf390ab636978..6080f4b5c450c 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -552,18 +552,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;