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 v2 11/15] drm/i915/selftests: handle allocation failures
Date: Thu, 10 Feb 2022 12:13:09 +0000 [thread overview]
Message-ID: <20220210121313.701004-12-matthew.auld@intel.com> (raw)
In-Reply-To: <20220210121313.701004-1-matthew.auld@intel.com>
If we have to contend with non-mappable LMEM, then we need to ensure the
object fits within the mappable portion, like in the selftests, where we
later try to CPU access the pages. However if it can't then we need to
gracefully handle this, without throwing an error.
Also it looks like TTM will return -ENOMEM, in ttm_bo_mem_space() after
exhausting all possible placements.
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 2 +-
drivers/gpu/drm/i915/selftests/intel_memory_region.c | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
index 42db9cd30978..3caa178bbd07 100644
--- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
+++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
@@ -1344,7 +1344,7 @@ static int igt_ppgtt_smoke_huge(void *arg)
err = i915_gem_object_pin_pages_unlocked(obj);
if (err) {
- if (err == -ENXIO || err == -E2BIG) {
+ if (err == -ENXIO || err == -E2BIG || err == -ENOMEM) {
i915_gem_object_put(obj);
size >>= 1;
goto try_again;
diff --git a/drivers/gpu/drm/i915/selftests/intel_memory_region.c b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
index 56dec9723601..ba32893e0873 100644
--- a/drivers/gpu/drm/i915/selftests/intel_memory_region.c
+++ b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
@@ -822,8 +822,14 @@ static int igt_lmem_create_with_ps(void *arg)
i915_gem_object_lock(obj, NULL);
err = i915_gem_object_pin_pages(obj);
- if (err)
+ if (err) {
+ if (err == -ENXIO || err == -E2BIG || err == -ENOMEM) {
+ pr_info("%s not enough lmem for ps(%u) err=%d\n",
+ __func__, ps, err);
+ err = 0;
+ }
goto out_put;
+ }
daddr = i915_gem_object_get_dma_address(obj, 0);
if (!IS_ALIGNED(daddr, ps)) {
--
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: [PATCH v2 11/15] drm/i915/selftests: handle allocation failures
Date: Thu, 10 Feb 2022 12:13:09 +0000 [thread overview]
Message-ID: <20220210121313.701004-12-matthew.auld@intel.com> (raw)
In-Reply-To: <20220210121313.701004-1-matthew.auld@intel.com>
If we have to contend with non-mappable LMEM, then we need to ensure the
object fits within the mappable portion, like in the selftests, where we
later try to CPU access the pages. However if it can't then we need to
gracefully handle this, without throwing an error.
Also it looks like TTM will return -ENOMEM, in ttm_bo_mem_space() after
exhausting all possible placements.
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 2 +-
drivers/gpu/drm/i915/selftests/intel_memory_region.c | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
index 42db9cd30978..3caa178bbd07 100644
--- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
+++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
@@ -1344,7 +1344,7 @@ static int igt_ppgtt_smoke_huge(void *arg)
err = i915_gem_object_pin_pages_unlocked(obj);
if (err) {
- if (err == -ENXIO || err == -E2BIG) {
+ if (err == -ENXIO || err == -E2BIG || err == -ENOMEM) {
i915_gem_object_put(obj);
size >>= 1;
goto try_again;
diff --git a/drivers/gpu/drm/i915/selftests/intel_memory_region.c b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
index 56dec9723601..ba32893e0873 100644
--- a/drivers/gpu/drm/i915/selftests/intel_memory_region.c
+++ b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
@@ -822,8 +822,14 @@ static int igt_lmem_create_with_ps(void *arg)
i915_gem_object_lock(obj, NULL);
err = i915_gem_object_pin_pages(obj);
- if (err)
+ if (err) {
+ if (err == -ENXIO || err == -E2BIG || err == -ENOMEM) {
+ pr_info("%s not enough lmem for ps(%u) err=%d\n",
+ __func__, ps, err);
+ err = 0;
+ }
goto out_put;
+ }
daddr = i915_gem_object_get_dma_address(obj, 0);
if (!IS_ALIGNED(daddr, ps)) {
--
2.34.1
next prev parent reply other threads:[~2022-02-10 12:17 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-10 12:12 [Intel-gfx] [PATCH v2 00/15] Initial support for small BAR recovery Matthew Auld
2022-02-10 12:12 ` Matthew Auld
2022-02-10 12:12 ` [Intel-gfx] [PATCH v2 01/15] drm/i915: add io_size plumbing Matthew Auld
2022-02-10 12:12 ` Matthew Auld
2022-02-10 12:13 ` [Intel-gfx] [PATCH v2 02/15] drm/i915/ttm: require mappable by default Matthew Auld
2022-02-10 12:13 ` Matthew Auld
2022-02-11 9:20 ` [Intel-gfx] " Thomas Hellström
2022-02-11 9:20 ` Thomas Hellström
2022-02-10 12:13 ` [Intel-gfx] [PATCH v2 03/15] drm/i915: add I915_BO_ALLOC_GPU_ONLY Matthew Auld
2022-02-10 12:13 ` Matthew Auld
2022-02-11 9:23 ` [Intel-gfx] " Thomas Hellström
2022-02-11 9:23 ` Thomas Hellström
2022-02-10 12:13 ` [Intel-gfx] [PATCH v2 04/15] drm/i915/buddy: track available visible size Matthew Auld
2022-02-10 12:13 ` Matthew Auld
2022-02-11 9:25 ` [Intel-gfx] " Thomas Hellström
2022-02-11 9:25 ` Thomas Hellström
2022-02-10 12:13 ` [Intel-gfx] [PATCH v2 05/15] drm/i915/buddy: adjust res->start Matthew Auld
2022-02-10 12:13 ` Matthew Auld
2022-02-10 12:13 ` [Intel-gfx] [PATCH v2 06/15] drm/i915/buddy: tweak 2big check Matthew Auld
2022-02-10 12:13 ` Matthew Auld
2022-02-10 12:13 ` [Intel-gfx] [PATCH v2 07/15] drm/i915/selftests: mock test io_size Matthew Auld
2022-02-10 12:13 ` Matthew Auld
2022-02-10 12:13 ` [Intel-gfx] [PATCH v2 08/15] drm/i915/ttm: make eviction mappable aware Matthew Auld
2022-02-10 12:13 ` Matthew Auld
2022-02-10 12:13 ` [Intel-gfx] [PATCH v2 09/15] drm/i915/ttm: mappable migration on fault Matthew Auld
2022-02-10 12:13 ` Matthew Auld
2022-02-10 12:13 ` [Intel-gfx] [PATCH v2 10/15] drm/i915/selftests: exercise mmap migration Matthew Auld
2022-02-10 12:13 ` Matthew Auld
2022-02-11 9:36 ` [Intel-gfx] " Thomas Hellström
2022-02-11 9:36 ` Thomas Hellström
2022-02-10 12:13 ` Matthew Auld [this message]
2022-02-10 12:13 ` [PATCH v2 11/15] drm/i915/selftests: handle allocation failures Matthew Auld
2022-02-11 9:37 ` [Intel-gfx] " Thomas Hellström
2022-02-11 9:37 ` Thomas Hellström
2022-02-10 12:13 ` [Intel-gfx] [PATCH v2 12/15] drm/i915/create: apply ALLOC_GPU_ONLY by default Matthew Auld
2022-02-10 12:13 ` Matthew Auld
2022-02-11 9:49 ` [Intel-gfx] " Thomas Hellström
2022-02-11 9:49 ` Thomas Hellström
2022-02-11 9:52 ` [Intel-gfx] " Matthew Auld
2022-02-11 9:55 ` Thomas Hellström
2022-02-11 10:00 ` Matthew Auld
2022-02-11 10:14 ` Thomas Hellström
2022-02-10 12:13 ` [Intel-gfx] [PATCH v2 13/15] drm/i915/uapi: add NEEDS_CPU_ACCESS hint Matthew Auld
2022-02-10 12:13 ` Matthew Auld
2022-02-11 9:59 ` [Intel-gfx] " Thomas Hellström
2022-02-11 9:59 ` Thomas Hellström
2022-02-10 12:13 ` [Intel-gfx] [PATCH v2 14/15] drm/i915/uapi: forbid ALLOC_GPU_ONLY for error capture Matthew Auld
2022-02-10 12:13 ` Matthew Auld
2022-02-11 10:06 ` [Intel-gfx] " Thomas Hellström
2022-02-11 10:06 ` Thomas Hellström
2022-02-10 12:13 ` [Intel-gfx] [PATCH v2 15/15] drm/i915/lmem: don't treat small BAR as an error Matthew Auld
2022-02-10 12:13 ` Matthew Auld
2022-02-11 10:08 ` [Intel-gfx] " Thomas Hellström
2022-02-11 10:08 ` Thomas Hellström
2022-02-10 14:40 ` [Intel-gfx] [PATCH v2 00/15] Initial support for small BAR recovery Das, Nirmoy
2022-02-10 15:24 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Initial support for small BAR recovery (rev3) 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=20220210121313.701004-12-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: 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.