public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
	"Daniel Vetter" <daniel.vetter@ffwll.ch>,
	"Kenneth Graunke" <kenneth@whitecape.org>,
	dri-devel@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 07/10] drm/i915/error: skip non-mappable pages
Date: Wed, 25 May 2022 19:43:34 +0100	[thread overview]
Message-ID: <20220525184337.491763-8-matthew.auld@intel.com> (raw)
In-Reply-To: <20220525184337.491763-1-matthew.auld@intel.com>

Skip capturing any lmem pages that can't be copied using the CPU. This
in now only best effort on platforms that have small BAR.

Testcase: igt@gem-exec-capture@capture-invisible
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Jon Bloomfield <jon.bloomfield@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Kenneth Graunke <kenneth@whitecape.org>
Cc: Akeem G Abodunrin <akeem.g.abodunrin@intel.com>
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 0512c66fa4f3..77df899123c2 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1116,11 +1116,15 @@ i915_vma_coredump_create(const struct intel_gt *gt,
 		dma_addr_t dma;
 
 		for_each_sgt_daddr(dma, iter, vma_res->bi.pages) {
+			dma_addr_t offset = dma - mem->region.start;
 			void __iomem *s;
 
-			s = io_mapping_map_wc(&mem->iomap,
-					      dma - mem->region.start,
-					      PAGE_SIZE);
+			if (offset + PAGE_SIZE > mem->io_size) {
+				ret = -EINVAL;
+				break;
+			}
+
+			s = io_mapping_map_wc(&mem->iomap, offset, PAGE_SIZE);
 			ret = compress_page(compress,
 					    (void __force *)s, dst,
 					    true);
-- 
2.34.3


  parent reply	other threads:[~2022-05-25 18:44 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-25 18:43 [Intel-gfx] [PATCH 00/10] small BAR uapi bits Matthew Auld
2022-05-25 18:43 ` [Intel-gfx] [PATCH 01/10] drm/doc: add rfc section for small BAR uapi Matthew Auld
2022-06-16 11:18   ` Thomas Hellström (Intel)
2022-05-25 18:43 ` [Intel-gfx] [PATCH 02/10] drm/i915/uapi: add probed_cpu_visible_size Matthew Auld
2022-06-01 12:36   ` Das, Nirmoy
2022-06-16 11:22   ` Thomas Hellström (Intel)
2022-05-25 18:43 ` [Intel-gfx] [PATCH 03/10] drm/i915/uapi: expose the avail tracking Matthew Auld
2022-05-26  2:44   ` kernel test robot
2022-05-26  7:58   ` Tvrtko Ursulin
2022-05-26  8:10     ` Matthew Auld
2022-05-26  8:33       ` Tvrtko Ursulin
2022-05-30 17:05         ` Matthew Auld
2022-05-25 18:43 ` [Intel-gfx] [PATCH 04/10] drm/i915: remove intel_memory_region avail Matthew Auld
2022-06-17 12:16   ` Thomas Hellström
2022-05-25 18:43 ` [Intel-gfx] [PATCH 05/10] drm/i915/uapi: apply ALLOC_GPU_ONLY by default Matthew Auld
2022-05-25 18:43 ` [Intel-gfx] [PATCH 06/10] drm/i915/uapi: add NEEDS_CPU_ACCESS hint Matthew Auld
2022-06-01 12:30   ` Das, Nirmoy
2022-06-17 14:30   ` Thomas Hellström (Intel)
2022-05-25 18:43 ` Matthew Auld [this message]
2022-06-01 12:30   ` [Intel-gfx] [PATCH 07/10] drm/i915/error: skip non-mappable pages Das, Nirmoy
2022-06-17 14:26   ` Thomas Hellström (Intel)
2022-05-25 18:43 ` [Intel-gfx] [PATCH 08/10] drm/i915/uapi: disable capturing objects on recoverable contexts Matthew Auld
2022-05-26  0:08   ` kernel test robot
2022-06-17 12:28   ` Thomas Hellström (Intel)
2022-05-25 18:43 ` [Intel-gfx] [PATCH 09/10] drm/i915: turn on small BAR support Matthew Auld
2022-06-17 12:33   ` Thomas Hellström
2022-06-21  8:38     ` Matthew Auld
2022-06-21  9:05       ` Das, Nirmoy
2022-06-21  9:34         ` Thomas Hellström
2022-05-25 18:43 ` [Intel-gfx] [PATCH 10/10] HAX: force small BAR on dg2 Matthew Auld
2022-05-25 19:25 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for small BAR uapi bits Patchwork
2022-05-25 19:25 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-05-25 20:16 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-05-26 10:58 ` [Intel-gfx] ✓ Fi.CI.IGT: " 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=20220525184337.491763-8-matthew.auld@intel.com \
    --to=matthew.auld@intel.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=kenneth@whitecape.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox