From: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> To: intel-gfx@lists.freedesktop.org Cc: thomas.hellstrom@linux.intel.com, jani.nikula@intel.com, dri-devel@lists.freedesktop.org, chris@chris-wilson.co.uk, airlied@linux.ie, matthew.auld@intel.com, nirmoy.das@intel.com Subject: [PATCH v2 6/7] drm/i915: Use error code as -E2BIG when the size of gem ttm object is too large Date: Tue, 5 Jul 2022 15:24:54 +0300 [thread overview] Message-ID: <20220705122455.3866745-7-gwan-gyeong.mun@intel.com> (raw) In-Reply-To: <20220705122455.3866745-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. Signed-off-by: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Matthew Auld <matthew.auld@intel.com> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> Reviewed-by: Nirmoy Das <nirmoy.das@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 d579524663b3..271f64b7e4f1 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c @@ -1249,6 +1249,17 @@ int __i915_gem_ttm_object_init(struct intel_memory_region *mem, 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.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> To: intel-gfx@lists.freedesktop.org Cc: thomas.hellstrom@linux.intel.com, jani.nikula@intel.com, dri-devel@lists.freedesktop.org, chris@chris-wilson.co.uk, airlied@linux.ie, matthew.auld@intel.com, nirmoy.das@intel.com Subject: [Intel-gfx] [PATCH v2 6/7] drm/i915: Use error code as -E2BIG when the size of gem ttm object is too large Date: Tue, 5 Jul 2022 15:24:54 +0300 [thread overview] Message-ID: <20220705122455.3866745-7-gwan-gyeong.mun@intel.com> (raw) In-Reply-To: <20220705122455.3866745-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. Signed-off-by: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Matthew Auld <matthew.auld@intel.com> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> Reviewed-by: Nirmoy Das <nirmoy.das@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 d579524663b3..271f64b7e4f1 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c @@ -1249,6 +1249,17 @@ int __i915_gem_ttm_object_init(struct intel_memory_region *mem, 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.34.1
next prev parent reply other threads:[~2022-07-05 12:25 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-07-05 12:24 [PATCH v2 0/7] Fixes integer overflow or integer truncation issues in page lookups, ttm place configuration and scatterlist creation Gwan-gyeong Mun 2022-07-05 12:24 ` [Intel-gfx] " Gwan-gyeong Mun 2022-07-05 12:24 ` [PATCH v2 1/7] drm: Move and add a few utility macros into drm util header Gwan-gyeong Mun 2022-07-05 12:24 ` [Intel-gfx] " Gwan-gyeong Mun 2022-07-05 14:23 ` Mauro Carvalho Chehab 2022-07-05 14:23 ` Mauro Carvalho Chehab 2022-07-06 15:04 ` Gwan-gyeong Mun 2022-07-06 15:04 ` [Intel-gfx] " Gwan-gyeong Mun 2022-07-06 17:05 ` Mauro Carvalho Chehab 2022-07-06 17:05 ` Mauro Carvalho Chehab 2022-07-12 10:50 ` Gwan-gyeong Mun 2022-07-12 10:50 ` [Intel-gfx] " Gwan-gyeong Mun 2022-07-05 12:24 ` [PATCH v2 2/7] drm/i915/gem: Typecheck page lookups Gwan-gyeong Mun 2022-07-05 12:24 ` [Intel-gfx] " Gwan-gyeong Mun 2022-07-05 14:35 ` Mauro Carvalho Chehab 2022-07-05 14:35 ` Mauro Carvalho Chehab 2022-07-06 16:33 ` Gwan-gyeong Mun 2022-07-06 16:33 ` [Intel-gfx] " Gwan-gyeong Mun 2022-07-06 17:10 ` Mauro Carvalho Chehab 2022-07-06 17:10 ` [Intel-gfx] " Mauro Carvalho Chehab 2022-07-12 10:29 ` Gwan-gyeong Mun 2022-07-12 10:29 ` [Intel-gfx] " Gwan-gyeong Mun 2022-07-05 12:24 ` [PATCH v2 3/7] drm/i915: Check for integer truncation on scatterlist creation Gwan-gyeong Mun 2022-07-05 12:24 ` [Intel-gfx] " Gwan-gyeong Mun 2022-07-05 14:48 ` Mauro Carvalho Chehab 2022-07-05 14:48 ` [Intel-gfx] " Mauro Carvalho Chehab 2022-07-05 12:24 ` [PATCH v2 4/7] drm/i915: Check for integer truncation on the configuration of ttm place Gwan-gyeong Mun 2022-07-05 12:24 ` [Intel-gfx] " Gwan-gyeong Mun 2022-07-05 14:44 ` Mauro Carvalho Chehab 2022-07-05 14:44 ` [Intel-gfx] " Mauro Carvalho Chehab 2022-07-05 12:24 ` [PATCH v2 5/7] drm/i915: Check if the size is too big while creating shmem file Gwan-gyeong Mun 2022-07-05 12:24 ` [Intel-gfx] " Gwan-gyeong Mun 2022-07-05 14:50 ` Mauro Carvalho Chehab 2022-07-05 14:50 ` [Intel-gfx] " Mauro Carvalho Chehab 2022-07-05 12:24 ` Gwan-gyeong Mun [this message] 2022-07-05 12:24 ` [Intel-gfx] [PATCH v2 6/7] drm/i915: Use error code as -E2BIG when the size of gem ttm object is too large Gwan-gyeong Mun 2022-07-05 14:50 ` Mauro Carvalho Chehab 2022-07-05 14:50 ` [Intel-gfx] " Mauro Carvalho Chehab 2022-07-05 12:24 ` [PATCH v2 7/7] drm/i915: Remove truncation warning for large objects Gwan-gyeong Mun 2022-07-05 12:24 ` [Intel-gfx] " Gwan-gyeong Mun 2022-07-05 14:51 ` Mauro Carvalho Chehab 2022-07-05 14:51 ` [Intel-gfx] " Mauro Carvalho Chehab 2022-07-05 14:54 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Fixes integer overflow or integer truncation issues in page lookups, ttm place configuration and scatterlist creation (rev3) Patchwork 2022-07-05 15:13 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-07-05 18:44 ` [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=20220705122455.3866745-7-gwan-gyeong.mun@intel.com \ --to=gwan-gyeong.mun@intel.com \ --cc=airlied@linux.ie \ --cc=chris@chris-wilson.co.uk \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@intel.com \ --cc=matthew.auld@intel.com \ --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: 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.