Commit e8188c46 authored Jun 26, 2023 by Thomas Hellström

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



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

v2:
- Avoid yet another goto (Andi Shyti)

Fixes: 40379792 ("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: Andi Shyti <andi.shyti@linux.intel.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230626091450.14757-4-thomas.hellstrom@linux.intel.com

parent 7aa83fbd

drivers/gpu/drm/ttm/ttm_bo.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -458,18 +458,18 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo,
		goto out;
		}

		bounce:
		do {
		ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop);
		if (ret == -EMULTIHOP) {
		if (ret != -EMULTIHOP)
		break;

		ret = ttm_bo_bounce_temp_buffer(bo, &evict_mem, ctx, &hop);
		} while (!ret);

		if (ret) {
		ttm_resource_free(bo, &evict_mem);
		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;
		}
		out:
		return ret;