From: Matthew Auld <matthew.auld@intel.com> To: intel-gfx@lists.freedesktop.org Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, dri-devel@lists.freedesktop.org Subject: [PATCH 18/20] drm/i915/uapi: forbid ALLOC_TOPDOWN for error capture Date: Wed, 26 Jan 2022 15:21:53 +0000 [thread overview] Message-ID: <20220126152155.3070602-19-matthew.auld@intel.com> (raw) In-Reply-To: <20220126152155.3070602-1-matthew.auld@intel.com> On platforms where there might be non-mappable LMEM, force userspace to mark the buffers with the correct hint. When dumping the BO contents during capture we need CPU access. Note this only applies to buffers that can be placed in LMEM, and also doesn't impact DG1. Signed-off-by: Matthew Auld <matthew.auld@intel.com> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 498b458fd784..3c8083852620 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -1965,7 +1965,7 @@ eb_find_first_request_added(struct i915_execbuffer *eb) #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR) /* Stage with GFP_KERNEL allocations before we enter the signaling critical path */ -static void eb_capture_stage(struct i915_execbuffer *eb) +static int eb_capture_stage(struct i915_execbuffer *eb) { const unsigned int count = eb->buffer_count; unsigned int i = count, j; @@ -1978,6 +1978,9 @@ static void eb_capture_stage(struct i915_execbuffer *eb) if (!(flags & EXEC_OBJECT_CAPTURE)) continue; + if (vma->obj->flags & I915_BO_ALLOC_TOPDOWN) + return -EINVAL; + for_each_batch_create_order(eb, j) { struct i915_capture_list *capture; @@ -1990,6 +1993,8 @@ static void eb_capture_stage(struct i915_execbuffer *eb) eb->capture_lists[j] = capture; } } + + return 0; } /* Commit once we're in the critical path */ @@ -3418,7 +3423,9 @@ i915_gem_do_execbuffer(struct drm_device *dev, } ww_acquire_done(&eb.ww.ctx); - eb_capture_stage(&eb); + err = eb_capture_stage(&eb); + if (err) + goto err_vma; out_fence = eb_requests_create(&eb, in_fence, out_fence_fd); if (IS_ERR(out_fence)) { -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Auld <matthew.auld@intel.com> To: intel-gfx@lists.freedesktop.org Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 18/20] drm/i915/uapi: forbid ALLOC_TOPDOWN for error capture Date: Wed, 26 Jan 2022 15:21:53 +0000 [thread overview] Message-ID: <20220126152155.3070602-19-matthew.auld@intel.com> (raw) In-Reply-To: <20220126152155.3070602-1-matthew.auld@intel.com> On platforms where there might be non-mappable LMEM, force userspace to mark the buffers with the correct hint. When dumping the BO contents during capture we need CPU access. Note this only applies to buffers that can be placed in LMEM, and also doesn't impact DG1. Signed-off-by: Matthew Auld <matthew.auld@intel.com> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 498b458fd784..3c8083852620 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -1965,7 +1965,7 @@ eb_find_first_request_added(struct i915_execbuffer *eb) #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR) /* Stage with GFP_KERNEL allocations before we enter the signaling critical path */ -static void eb_capture_stage(struct i915_execbuffer *eb) +static int eb_capture_stage(struct i915_execbuffer *eb) { const unsigned int count = eb->buffer_count; unsigned int i = count, j; @@ -1978,6 +1978,9 @@ static void eb_capture_stage(struct i915_execbuffer *eb) if (!(flags & EXEC_OBJECT_CAPTURE)) continue; + if (vma->obj->flags & I915_BO_ALLOC_TOPDOWN) + return -EINVAL; + for_each_batch_create_order(eb, j) { struct i915_capture_list *capture; @@ -1990,6 +1993,8 @@ static void eb_capture_stage(struct i915_execbuffer *eb) eb->capture_lists[j] = capture; } } + + return 0; } /* Commit once we're in the critical path */ @@ -3418,7 +3423,9 @@ i915_gem_do_execbuffer(struct drm_device *dev, } ww_acquire_done(&eb.ww.ctx); - eb_capture_stage(&eb); + err = eb_capture_stage(&eb); + if (err) + goto err_vma; out_fence = eb_requests_create(&eb, in_fence, out_fence_fd); if (IS_ERR(out_fence)) { -- 2.34.1
next prev parent reply other threads:[~2022-01-26 15:23 UTC|newest] Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-26 15:21 [PATCH 00/20] Initial support for small BAR recovery Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 01/20] drm: improve drm_buddy_alloc function Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-26 18:03 ` Jani Nikula 2022-01-26 15:21 ` [PATCH 02/20] drm: implement top-down allocation method Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-26 18:42 ` Robert Beckett 2022-01-26 15:21 ` [PATCH 03/20] drm: implement a method to free unused pages Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 04/20] drm/i915: add io_size plumbing Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-31 15:14 ` Thomas Hellström 2022-01-31 15:14 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` [PATCH 05/20] drm/i915/ttm: require mappable by default Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 06/20] drm/i915: add I915_BO_ALLOC_TOPDOWN Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-31 15:28 ` Thomas Hellström 2022-01-31 15:28 ` [Intel-gfx] " Thomas Hellström 2022-01-31 15:49 ` Matthew Auld 2022-01-31 15:49 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 07/20] drm/i915/buddy: track available visible size Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-31 16:12 ` Thomas Hellström 2022-01-31 16:12 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` [PATCH 08/20] drm/i915/buddy: adjust res->start Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-02-01 10:38 ` Thomas Hellström 2022-02-01 10:38 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` [PATCH 09/20] drm/i915/buddy: tweak 2big check Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-02-01 10:39 ` Thomas Hellström 2022-02-01 10:39 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` [Intel-gfx] [PATCH 10/20] drm/i915/selftests: mock test io_size Matthew Auld 2022-01-26 15:21 ` Matthew Auld 2022-02-02 10:24 ` Thomas Hellström 2022-02-02 10:24 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` [PATCH 11/20] drm/i915/ttm: tweak priority hint selection Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-02-02 13:34 ` Thomas Hellström 2022-02-02 13:34 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` [Intel-gfx] [PATCH 12/20] drm/i915/ttm: make eviction mappable aware Matthew Auld 2022-01-26 15:21 ` Matthew Auld 2022-02-02 13:41 ` Thomas Hellström 2022-02-02 13:41 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` [PATCH 13/20] drm/i915/ttm: mappable migration on fault Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-02-03 7:59 ` Thomas Hellström 2022-02-03 7:59 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` [Intel-gfx] [PATCH 14/20] drm/i915/selftests: exercise mmap migration Matthew Auld 2022-01-26 15:21 ` Matthew Auld 2022-02-03 9:01 ` Thomas Hellström 2022-02-03 9:01 ` [Intel-gfx] " Thomas Hellström 2022-02-03 9:12 ` Matthew Auld 2022-02-03 9:12 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 15/20] drm/i915/selftests: handle allocation failures Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-02-03 9:05 ` Thomas Hellström 2022-02-03 9:05 ` [Intel-gfx] " Thomas Hellström 2022-02-03 9:11 ` Matthew Auld 2022-02-03 9:11 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 16/20] drm/i915/create: apply ALLOC_TOPDOWN by default Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-02-03 9:17 ` Thomas Hellström 2022-02-03 9:17 ` [Intel-gfx] " Thomas Hellström 2022-02-03 9:32 ` Matthew Auld 2022-02-03 9:32 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 17/20] drm/i915/uapi: add NEEDS_CPU_ACCESS hint Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-02-03 9:28 ` Thomas Hellström 2022-02-03 9:28 ` [Intel-gfx] " Thomas Hellström 2022-02-03 11:38 ` Matthew Auld 2022-02-03 11:38 ` [Intel-gfx] " Matthew Auld 2022-02-03 13:29 ` Thomas Hellström 2022-02-03 13:29 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` Matthew Auld [this message] 2022-01-26 15:21 ` [Intel-gfx] [PATCH 18/20] drm/i915/uapi: forbid ALLOC_TOPDOWN for error capture Matthew Auld 2022-01-26 19:42 ` kernel test robot 2022-01-26 19:42 ` kernel test robot 2022-01-26 20:03 ` kernel test robot 2022-01-26 20:03 ` kernel test robot 2022-01-26 20:03 ` kernel test robot 2022-02-03 9:43 ` Thomas Hellström 2022-02-03 9:43 ` [Intel-gfx] " Thomas Hellström 2022-02-03 9:44 ` Matthew Auld 2022-02-03 9:44 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 19/20] drm/i915/lmem: don't treat small BAR as an error Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-02-03 9:48 ` Thomas Hellström 2022-02-03 9:48 ` [Intel-gfx] " Thomas Hellström 2022-02-03 11:18 ` Matthew Auld 2022-02-03 11:18 ` [Intel-gfx] " Matthew Auld 2022-02-03 13:56 ` Thomas Hellström 2022-02-03 13:56 ` [Intel-gfx] " Thomas Hellström 2022-02-03 14:09 ` Matthew Auld 2022-02-03 14:09 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 20/20] HAX: DG1 small BAR Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-26 21:07 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Initial support for small BAR recovery Patchwork 2022-01-26 21:08 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2022-01-26 21:41 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork 2022-01-27 16:27 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Initial support for small BAR recovery (rev2) Patchwork 2022-01-27 16:28 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2022-01-27 16:57 ` [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=20220126152155.3070602-19-matthew.auld@intel.com \ --to=matthew.auld@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=thomas.hellstrom@linux.intel.com \ /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: linkBe 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.