From: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: thomas.hellstrom@linux.intel.com, andrzej.hajda@intel.com,
jani.nikula@intel.com, chris@chris-wilson.co.uk,
matthew.auld@intel.com, mchehab@kernel.org, nirmoy.das@intel.com
Subject: [Intel-gfx] [PATCH v14 6/7] drm/i915: Use error code as -E2BIG when the size of gem ttm object is too large
Date: Wed, 2 Nov 2022 16:54:01 +0200 [thread overview]
Message-ID: <20221102145402.617336-7-gwan-gyeong.mun@intel.com> (raw)
In-Reply-To: <20221102145402.617336-1-gwan-gyeong.mun@intel.com>
The ttm_bo_init_reserved() functions returns -ENOSPC if the size is too big
to add vma. The direct function that returns -ENOSPC is drm_mm_insert_node_in_range().
To handle the same error as other code returning -E2BIG when the size is
too large, it converts return value to -E2BIG.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
---
drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index 598188f85f3c..65952d923e9f 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@ -1305,6 +1305,17 @@ int __i915_gem_ttm_object_init(struct intel_memory_region *mem,
ret = ttm_bo_init_reserved(&i915->bdev, i915_gem_to_ttm(obj), bo_type,
&i915_sys_placement, page_size >> PAGE_SHIFT,
&ctx, NULL, NULL, i915_ttm_bo_destroy);
+
+ /*
+ * XXX: The ttm_bo_init_reserved() functions returns -ENOSPC if the size
+ * is too big to add vma. The direct function that returns -ENOSPC is
+ * drm_mm_insert_node_in_range(). To handle the same error as other code
+ * that returns -E2BIG when the size is too large, it converts -ENOSPC to
+ * -E2BIG.
+ */
+ if (size >> PAGE_SHIFT > INT_MAX && ret == -ENOSPC)
+ ret = -E2BIG;
+
if (ret)
return i915_ttm_err_to_gem(ret);
--
2.37.1
next prev parent reply other threads:[~2022-11-02 14:56 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-02 14:53 [Intel-gfx] [PATCH v14 0/7] Fixes integer overflow or integer truncation issues in page lookups, ttm place configuration and scatterlist creation Gwan-gyeong Mun
2022-11-02 14:53 ` [Intel-gfx] [PATCH v14 1/7] overflow: Introduce overflows_type() and castable_to_type() Gwan-gyeong Mun
2022-11-03 9:48 ` Gwan-gyeong Mun
2022-11-02 14:53 ` [Intel-gfx] [PATCH v14 2/7] drm/i915/gem: Typecheck page lookups Gwan-gyeong Mun
2022-11-02 14:53 ` [Intel-gfx] [PATCH v14 3/7] drm/i915: Check for integer truncation on scatterlist creation Gwan-gyeong Mun
2022-11-03 10:30 ` Gwan-gyeong Mun
2022-11-03 10:51 ` Jani Nikula
2022-11-02 14:53 ` [Intel-gfx] [PATCH v14 4/7] drm/i915: Check for integer truncation on the configuration of ttm place Gwan-gyeong Mun
2022-11-02 14:54 ` [Intel-gfx] [PATCH v14 5/7] drm/i915: Check if the size is too big while creating shmem file Gwan-gyeong Mun
2022-11-02 14:54 ` Gwan-gyeong Mun [this message]
2022-11-02 14:54 ` [Intel-gfx] [PATCH v14 7/7] drm/i915: Remove truncation warning for large objects Gwan-gyeong Mun
2022-11-02 16:21 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Fixes integer overflow or integer truncation issues in page lookups, ttm place configuration and scatterlist creation Patchwork
2022-11-02 16:21 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-11-02 16:43 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-11-02 20:56 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2022-11-03 6:46 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Fixes integer overflow or integer truncation issues in page lookups, ttm place configuration and scatterlist creation (rev2) Patchwork
2022-11-03 7:07 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2022-11-03 10:22 ` Gwan-gyeong Mun
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=20221102145402.617336-7-gwan-gyeong.mun@intel.com \
--to=gwan-gyeong.mun@intel.com \
--cc=andrzej.hajda@intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=matthew.auld@intel.com \
--cc=mchehab@kernel.org \
--cc=nirmoy.das@intel.com \
--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