All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: intel-xe@lists.freedesktop.org
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
	"Christian König" <ckoenig.leichtzumerken@gmail.com>,
	intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
	stable@vger.kernel.org, dri-devel@lists.freedesktop.org,
	"Christian König" <christian.koenig@amd.com>
Subject: [PATCH 4/4] drm/ttm: Don't leak a resource on swapout move error
Date: Thu, 22 Jun 2023 12:14:12 +0200	[thread overview]
Message-ID: <20230622101412.78426-5-thomas.hellstrom@linux.intel.com> (raw)
In-Reply-To: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com>

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@amd.com>
Cc: "Christian König" <ckoenig.leichtzumerken@gmail.com>
Cc: dri-devel@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v5.14+
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
 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 89530f2a027f..d737ddd7f4c0 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;
 		}
 	}
-- 
2.40.1


WARNING: multiple messages have this Message-ID (diff)
From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: intel-xe@lists.freedesktop.org
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
	"Christian König" <ckoenig.leichtzumerken@gmail.com>,
	intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
	stable@vger.kernel.org, dri-devel@lists.freedesktop.org,
	"Christian König" <christian.koenig@amd.com>
Subject: [Intel-gfx] [PATCH 4/4] drm/ttm: Don't leak a resource on swapout move error
Date: Thu, 22 Jun 2023 12:14:12 +0200	[thread overview]
Message-ID: <20230622101412.78426-5-thomas.hellstrom@linux.intel.com> (raw)
In-Reply-To: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com>

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@amd.com>
Cc: "Christian König" <ckoenig.leichtzumerken@gmail.com>
Cc: dri-devel@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v5.14+
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
 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 89530f2a027f..d737ddd7f4c0 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;
 		}
 	}
-- 
2.40.1


WARNING: multiple messages have this Message-ID (diff)
From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: intel-xe@lists.freedesktop.org
Cc: "Christian König" <ckoenig.leichtzumerken@gmail.com>,
	intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
	stable@vger.kernel.org, dri-devel@lists.freedesktop.org,
	"Christian König" <christian.koenig@amd.com>
Subject: [Intel-xe] [PATCH 4/4] drm/ttm: Don't leak a resource on swapout move error
Date: Thu, 22 Jun 2023 12:14:12 +0200	[thread overview]
Message-ID: <20230622101412.78426-5-thomas.hellstrom@linux.intel.com> (raw)
In-Reply-To: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com>

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@amd.com>
Cc: "Christian König" <ckoenig.leichtzumerken@gmail.com>
Cc: dri-devel@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v5.14+
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
 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 89530f2a027f..d737ddd7f4c0 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;
 		}
 	}
-- 
2.40.1


WARNING: multiple messages have this Message-ID (diff)
From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: intel-xe@lists.freedesktop.org
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
	"Christian König" <christian.koenig@amd.com>,
	"Christian König" <ckoenig.leichtzumerken@gmail.com>,
	dri-devel@lists.freedesktop.org, stable@vger.kernel.org,
	intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] drm/ttm: Don't leak a resource on swapout move error
Date: Thu, 22 Jun 2023 12:14:12 +0200	[thread overview]
Message-ID: <20230622101412.78426-5-thomas.hellstrom@linux.intel.com> (raw)
In-Reply-To: <20230622101412.78426-1-thomas.hellstrom@linux.intel.com>

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@amd.com>
Cc: "Christian König" <ckoenig.leichtzumerken@gmail.com>
Cc: dri-devel@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v5.14+
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
 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 89530f2a027f..d737ddd7f4c0 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;
 		}
 	}
-- 
2.40.1


  parent reply	other threads:[~2023-06-22 10:21 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-22 10:14 [PATCH 0/4] drm/ttm: Fixes around resources and bulk moves Thomas Hellström
2023-06-22 10:14 ` [Intel-xe] " Thomas Hellström
2023-06-22 10:14 ` [Intel-gfx] " Thomas Hellström
2023-06-22 10:14 ` Thomas Hellström
2023-06-22 10:14 ` [Intel-gfx] [PATCH 1/4] drm/ttm: Fix ttm_lru_bulk_move_pos_tail() Thomas Hellström
2023-06-22 10:14   ` Thomas Hellström
2023-06-22 10:14   ` Thomas Hellström
2023-06-22 10:14   ` [Intel-xe] " Thomas Hellström
2023-06-22 12:26   ` [Intel-gfx] " Nirmoy Das
2023-06-22 12:26     ` [Intel-xe] " Nirmoy Das
2023-06-22 12:26     ` Nirmoy Das
2023-06-22 12:26   ` Christian König
2023-06-22 12:26     ` [Intel-xe] " Christian König
2023-06-22 12:26     ` [Intel-gfx] " Christian König
2023-06-22 12:26     ` Christian König
2023-06-22 10:14 ` [PATCH 2/4] drm/ttm: Don't shadow the operation context Thomas Hellström
2023-06-22 10:14   ` [Intel-xe] " Thomas Hellström
2023-06-22 10:14   ` [Intel-gfx] " Thomas Hellström
2023-06-22 10:14   ` Thomas Hellström
2023-06-22 10:14 ` [PATCH 3/4] drm/ttm: Don't leak a resource on eviction error Thomas Hellström
2023-06-22 10:14   ` [Intel-xe] " Thomas Hellström
2023-06-22 10:14   ` [Intel-gfx] " Thomas Hellström
2023-06-22 10:14   ` Thomas Hellström
2023-06-22 12:25   ` Nirmoy Das
2023-06-22 12:25     ` [Intel-xe] " Nirmoy Das
2023-06-22 12:25     ` [Intel-gfx] " Nirmoy Das
2023-06-22 13:55   ` Andi Shyti
2023-06-22 13:55     ` [Intel-xe] " Andi Shyti
2023-06-22 13:55     ` Andi Shyti
2023-06-22 14:08     ` Thomas Hellström
2023-06-22 14:08       ` [Intel-xe] " Thomas Hellström
2023-06-22 14:08       ` Thomas Hellström
2023-06-22 14:48       ` Christian König
2023-06-22 14:48         ` [Intel-xe] " Christian König
2023-06-22 14:48         ` Christian König
2023-06-22 17:03         ` Thomas Hellström
2023-06-22 17:03           ` [Intel-xe] " Thomas Hellström
2023-06-22 17:03           ` Thomas Hellström
2023-06-23  7:48           ` Andi Shyti
2023-06-23  7:48             ` [Intel-xe] " Andi Shyti
2023-06-23  7:48             ` Andi Shyti
2023-06-23  7:48             ` Andi Shyti
2023-06-22 10:14 ` Thomas Hellström [this message]
2023-06-22 10:14   ` [PATCH 4/4] drm/ttm: Don't leak a resource on swapout move error Thomas Hellström
2023-06-22 10:14   ` [Intel-xe] " Thomas Hellström
2023-06-22 10:14   ` [Intel-gfx] " Thomas Hellström
2023-06-22 12:25   ` Nirmoy Das
2023-06-22 12:25     ` [Intel-xe] " Nirmoy Das
2023-06-22 12:25     ` [Intel-gfx] " Nirmoy Das
2023-06-22 12:25     ` Nirmoy Das
2023-06-22 13:56   ` [Intel-gfx] " Andi Shyti
2023-06-22 13:56     ` [Intel-xe] " Andi Shyti
2023-06-22 13:56     ` Andi Shyti
2023-06-22 10:23 ` [Intel-xe] ✓ CI.Patch_applied: success for drm/ttm: Fixes around resources and bulk moves Patchwork
2023-06-22 10:23 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-06-22 10:25 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-06-22 10:28 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-06-22 10:29 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-06-22 10:30 ` [Intel-xe] ✗ CI.checksparse: warning " Patchwork
2023-06-22 11:15 ` [Intel-xe] ○ CI.BAT: info " Patchwork
2023-06-22 17:04 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230622101412.78426-5-thomas.hellstrom@linux.intel.com \
    --to=thomas.hellstrom@linux.intel.com \
    --cc=christian.koenig@amd.com \
    --cc=ckoenig.leichtzumerken@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.