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
Subject: [Intel-xe] [CI 3/4] drm/xe/bo: Gracefully handle errors from ttm_bo_move_accel_cleanup().
Date: Mon, 26 Jun 2023 15:58:23 +0200	[thread overview]
Message-ID: <20230626135824.21984-3-thomas.hellstrom@linux.intel.com> (raw)
In-Reply-To: <20230626135824.21984-1-thomas.hellstrom@linux.intel.com>

The function ttm_bo_move_accel_cleanup() attempts to help pipeline a
move, and in doing so, needs memory allocations which may fail.

Rather than failing in a state where the new resource may freed while
accessed by the copy engine, sync uninterruptible and do a failsafe
cleanup.

v2:
- Don't try to attach the signaled fence on ttm_bo_move_accel_cleanup()
  error.

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230619152222.11733-5-thomas.hellstrom@linux.intel.com
---
 drivers/gpu/drm/xe/xe_bo.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index 2c19c051562d..9444130c11e3 100644
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -700,6 +700,11 @@ static int xe_bo_move(struct ttm_buffer_object *ttm_bo, bool evict,
 		if (!move_lacks_source) {
 			ret = ttm_bo_move_accel_cleanup(ttm_bo, fence, evict,
 							true, new_mem);
+			if (ret) {
+				dma_fence_wait(fence, false);
+				ttm_bo_move_null(ttm_bo, new_mem);
+				ret = 0;
+			}
 		} else {
 			/*
 			 * ttm_bo_move_accel_cleanup() may blow up if
-- 
2.40.1


  parent reply	other threads:[~2023-06-26 13:58 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-26 13:58 [Intel-xe] [CI 1/4] drm/xe/bo: Fix swapin when moving to VRAM Thomas Hellström
2023-06-26 13:58 ` [Intel-xe] [CI 2/4] drm/xe/bo: Avoid creating a system resource when allocating a fresh VRAM bo Thomas Hellström
2023-06-26 13:58 ` Thomas Hellström [this message]
2023-06-26 13:58 ` [Intel-xe] [CI 4/4] drm/xe/bo: Evict VRAM to TT rather than to system Thomas Hellström
2023-06-26 14:00 ` [Intel-xe] ✓ CI.Patch_applied: success for series starting with [CI,1/4] drm/xe/bo: Fix swapin when moving to VRAM Patchwork
2023-06-26 14:00 ` [Intel-xe] ✓ CI.checkpatch: " Patchwork
2023-06-26 14:02 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-06-26 14:05 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-06-26 14:06 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-06-26 14:07 ` [Intel-xe] ✓ CI.checksparse: " Patchwork
2023-06-26 14:47 ` [Intel-xe] ○ CI.BAT: info " 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=20230626135824.21984-3-thomas.hellstrom@linux.intel.com \
    --to=thomas.hellstrom@linux.intel.com \
    --cc=intel-xe@lists.freedesktop.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.