* [PATCH] drm/i915/ttm: fix large buffer population trucation
@ 2021-12-10 19:50 Robert Beckett
2021-12-13 13:02 ` Matthew Auld
0 siblings, 1 reply; 3+ messages in thread
From: Robert Beckett @ 2021-12-10 19:50 UTC (permalink / raw)
To: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, Tvrtko Ursulin,
David Airlie, Daniel Vetter, Matthew Auld, Thomas Hellström,
Oak Zeng
Cc: Robert Beckett, intel-gfx, linux-kernel, dri-devel
ttm->num_pages is uint32_t which was causing very large buffers to
only populate a truncated size.
This fixes gem_create@create-clear igt test on large memory systems.
Fixes: 7ae034590cea ("drm/i915/ttm: add tt shmem backend")
Signed-off-by: Robert Beckett <bob.beckett@collabora.com>
---
drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index 218a9b3037c7..923cc7ad8d70 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@ -166,7 +166,7 @@ static int i915_ttm_tt_shmem_populate(struct ttm_device *bdev,
struct intel_memory_region *mr = i915->mm.regions[INTEL_MEMORY_SYSTEM];
struct i915_ttm_tt *i915_tt = container_of(ttm, typeof(*i915_tt), ttm);
const unsigned int max_segment = i915_sg_segment_size();
- const size_t size = ttm->num_pages << PAGE_SHIFT;
+ const size_t size = (size_t)ttm->num_pages << PAGE_SHIFT;
struct file *filp = i915_tt->filp;
struct sgt_iter sgt_iter;
struct sg_table *st;
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915/ttm: fix large buffer population trucation
2021-12-10 19:50 [PATCH] drm/i915/ttm: fix large buffer population trucation Robert Beckett
@ 2021-12-13 13:02 ` Matthew Auld
2021-12-14 14:52 ` [Intel-gfx] " Matthew Auld
0 siblings, 1 reply; 3+ messages in thread
From: Matthew Auld @ 2021-12-13 13:02 UTC (permalink / raw)
To: Robert Beckett, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
Tvrtko Ursulin, David Airlie, Daniel Vetter,
Thomas Hellström, Oak Zeng
Cc: intel-gfx, linux-kernel, dri-devel
On 10/12/2021 19:50, Robert Beckett wrote:
> ttm->num_pages is uint32_t which was causing very large buffers to
> only populate a truncated size.
>
> This fixes gem_create@create-clear igt test on large memory systems.
>
> Fixes: 7ae034590cea ("drm/i915/ttm: add tt shmem backend")
> Signed-off-by: Robert Beckett <bob.beckett@collabora.com>
Nice catch,
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> index 218a9b3037c7..923cc7ad8d70 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> @@ -166,7 +166,7 @@ static int i915_ttm_tt_shmem_populate(struct ttm_device *bdev,
> struct intel_memory_region *mr = i915->mm.regions[INTEL_MEMORY_SYSTEM];
> struct i915_ttm_tt *i915_tt = container_of(ttm, typeof(*i915_tt), ttm);
> const unsigned int max_segment = i915_sg_segment_size();
> - const size_t size = ttm->num_pages << PAGE_SHIFT;
> + const size_t size = (size_t)ttm->num_pages << PAGE_SHIFT;
> struct file *filp = i915_tt->filp;
> struct sgt_iter sgt_iter;
> struct sg_table *st;
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/ttm: fix large buffer population trucation
2021-12-13 13:02 ` Matthew Auld
@ 2021-12-14 14:52 ` Matthew Auld
0 siblings, 0 replies; 3+ messages in thread
From: Matthew Auld @ 2021-12-14 14:52 UTC (permalink / raw)
To: Matthew Auld
Cc: Robert Beckett, Tvrtko Ursulin, ML dri-devel,
Thomas Hellström, David Airlie, Intel Graphics Development,
kernel list, Oak Zeng, Rodrigo Vivi
On Mon, 13 Dec 2021 at 13:03, Matthew Auld <matthew.auld@intel.com> wrote:
>
> On 10/12/2021 19:50, Robert Beckett wrote:
> > ttm->num_pages is uint32_t which was causing very large buffers to
> > only populate a truncated size.
> >
> > This fixes gem_create@create-clear igt test on large memory systems.
> >
> > Fixes: 7ae034590cea ("drm/i915/ttm: add tt shmem backend")
> > Signed-off-by: Robert Beckett <bob.beckett@collabora.com>
>
> Nice catch,
> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Pushed to drm-intel-gt-next. Thanks again for the fix.
>
> > ---
> > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > index 218a9b3037c7..923cc7ad8d70 100644
> > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > @@ -166,7 +166,7 @@ static int i915_ttm_tt_shmem_populate(struct ttm_device *bdev,
> > struct intel_memory_region *mr = i915->mm.regions[INTEL_MEMORY_SYSTEM];
> > struct i915_ttm_tt *i915_tt = container_of(ttm, typeof(*i915_tt), ttm);
> > const unsigned int max_segment = i915_sg_segment_size();
> > - const size_t size = ttm->num_pages << PAGE_SHIFT;
> > + const size_t size = (size_t)ttm->num_pages << PAGE_SHIFT;
> > struct file *filp = i915_tt->filp;
> > struct sgt_iter sgt_iter;
> > struct sg_table *st;
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-14 14:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-10 19:50 [PATCH] drm/i915/ttm: fix large buffer population trucation Robert Beckett
2021-12-13 13:02 ` Matthew Auld
2021-12-14 14:52 ` [Intel-gfx] " Matthew Auld
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).