| Message ID | 20220603093830.1529520-6-gwan-gyeong.mun@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fixes integer overflow or integer truncation issues in page lookups, ttm place configuration and scatterlist creation | expand |
Hi Gwan-gyeong, On 6/3/2022 11:38 AM, Gwan-gyeong Mun wrote: > 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> > Testcase: igt@gem_create@create-massive > Closes:https://gitlab.freedesktop.org/drm/intel/-/issues/4991 This "Closes" tag should move to the last patch as you are removing the |GEM_WARN_ON() from there.| |The series is ||Reviewed-by: Nirmoy Das <nirmoy.das@intel.com> once Jani's concern is | |addressed and this series can go as it is.| | | |Thanks,| |Nirmoy | || || > --- > 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 8231a6fc5437..f162e2492cd3 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > @@ -1243,6 +1243,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); >
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c index 8231a6fc5437..f162e2492cd3 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c @@ -1243,6 +1243,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);
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> Testcase: igt@gem_create@create-massive Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/4991 --- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 11 +++++++++++ 1 file changed, 11 insertions(+)