* [PATCH] drm/i915/ppgtt: Break loop in gen8_ppgtt_clear_range failure path
@ 2015-06-25 11:59 Michel Thierry
2015-06-25 15:39 ` Mika Kuoppala
0 siblings, 1 reply; 4+ messages in thread
From: Michel Thierry @ 2015-06-25 11:59 UTC (permalink / raw)
To: intel-gfx
If for some reason [1], the page directory/table does not exist, clear_range
would end up in an infinite while loop.
Introduced by commit 06fda602dbca ("drm/i915: Create page table allocators").
[1] This is already being addressed in one of Mika's patches:
http://mid.gmane.org/1432314314-23530-17-git-send-email-mika.kuoppala@intel.com
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reported-by: John Harrison <john.c.harrison@intel.com>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 2279e03..5dbe928 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -517,17 +517,17 @@ static void gen8_ppgtt_clear_range(struct i915_address_space *vm,
struct page *page_table;
if (WARN_ON(!ppgtt->pdp.page_directory[pdpe]))
- continue;
+ break;
pd = ppgtt->pdp.page_directory[pdpe];
if (WARN_ON(!pd->page_table[pde]))
- continue;
+ break;
pt = pd->page_table[pde];
if (WARN_ON(!pt->page))
- continue;
+ break;
page_table = pt->page;
--
2.4.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915/ppgtt: Break loop in gen8_ppgtt_clear_range failure path
2015-06-25 11:59 [PATCH] drm/i915/ppgtt: Break loop in gen8_ppgtt_clear_range failure path Michel Thierry
@ 2015-06-25 15:39 ` Mika Kuoppala
2015-06-25 16:04 ` Daniel Vetter
0 siblings, 1 reply; 4+ messages in thread
From: Mika Kuoppala @ 2015-06-25 15:39 UTC (permalink / raw)
To: Michel Thierry, intel-gfx
Michel Thierry <michel.thierry@intel.com> writes:
> If for some reason [1], the page directory/table does not exist, clear_range
> would end up in an infinite while loop.
>
> Introduced by commit 06fda602dbca ("drm/i915: Create page table allocators").
>
> [1] This is already being addressed in one of Mika's patches:
> http://mid.gmane.org/1432314314-23530-17-git-send-email-mika.kuoppala@intel.com
>
We need both.
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> Reported-by: John Harrison <john.c.harrison@intel.com>
> Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
> ---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index 2279e03..5dbe928 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -517,17 +517,17 @@ static void gen8_ppgtt_clear_range(struct i915_address_space *vm,
> struct page *page_table;
>
> if (WARN_ON(!ppgtt->pdp.page_directory[pdpe]))
> - continue;
> + break;
>
> pd = ppgtt->pdp.page_directory[pdpe];
>
> if (WARN_ON(!pd->page_table[pde]))
> - continue;
> + break;
>
> pt = pd->page_table[pde];
>
> if (WARN_ON(!pt->page))
> - continue;
> + break;
>
> page_table = pt->page;
>
> --
> 2.4.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915/ppgtt: Break loop in gen8_ppgtt_clear_range failure path
2015-06-25 15:39 ` Mika Kuoppala
@ 2015-06-25 16:04 ` Daniel Vetter
2015-06-26 10:38 ` Jani Nikula
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Vetter @ 2015-06-25 16:04 UTC (permalink / raw)
To: Mika Kuoppala; +Cc: intel-gfx
On Thu, Jun 25, 2015 at 06:39:30PM +0300, Mika Kuoppala wrote:
> Michel Thierry <michel.thierry@intel.com> writes:
>
> > If for some reason [1], the page directory/table does not exist, clear_range
> > would end up in an infinite while loop.
> >
> > Introduced by commit 06fda602dbca ("drm/i915: Create page table allocators").
> >
> > [1] This is already being addressed in one of Mika's patches:
> > http://mid.gmane.org/1432314314-23530-17-git-send-email-mika.kuoppala@intel.com
> >
>
> We need both.
>
> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> > Reported-by: John Harrison <john.c.harrison@intel.com>
> > Signed-off-by: Michel Thierry <michel.thierry@intel.com>
>
> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Since the offending commit is in 4.1 this is for Jani.
Cc: stable@vger.kernel.org
Cheers, Daniel
>
> > ---
> > drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> > index 2279e03..5dbe928 100644
> > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> > @@ -517,17 +517,17 @@ static void gen8_ppgtt_clear_range(struct i915_address_space *vm,
> > struct page *page_table;
> >
> > if (WARN_ON(!ppgtt->pdp.page_directory[pdpe]))
> > - continue;
> > + break;
> >
> > pd = ppgtt->pdp.page_directory[pdpe];
> >
> > if (WARN_ON(!pd->page_table[pde]))
> > - continue;
> > + break;
> >
> > pt = pd->page_table[pde];
> >
> > if (WARN_ON(!pt->page))
> > - continue;
> > + break;
> >
> > page_table = pt->page;
> >
> > --
> > 2.4.4
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915/ppgtt: Break loop in gen8_ppgtt_clear_range failure path
2015-06-25 16:04 ` Daniel Vetter
@ 2015-06-26 10:38 ` Jani Nikula
0 siblings, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2015-06-26 10:38 UTC (permalink / raw)
To: Daniel Vetter, Mika Kuoppala; +Cc: intel-gfx
On Thu, 25 Jun 2015, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Thu, Jun 25, 2015 at 06:39:30PM +0300, Mika Kuoppala wrote:
>> Michel Thierry <michel.thierry@intel.com> writes:
>>
>> > If for some reason [1], the page directory/table does not exist, clear_range
>> > would end up in an infinite while loop.
>> >
>> > Introduced by commit 06fda602dbca ("drm/i915: Create page table allocators").
>> >
>> > [1] This is already being addressed in one of Mika's patches:
>> > http://mid.gmane.org/1432314314-23530-17-git-send-email-mika.kuoppala@intel.com
>> >
>>
>> We need both.
>>
>> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
>> > Reported-by: John Harrison <john.c.harrison@intel.com>
>> > Signed-off-by: Michel Thierry <michel.thierry@intel.com>
>>
>> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
>
> Since the offending commit is in 4.1 this is for Jani.
>
> Cc: stable@vger.kernel.org
Pushed to drm-intel-next-fixes, thanks for the patch and review. Fingers
crossed, I hope I didn't screw up the conflict resolution for nightly...
BR,
Jani.
>
> Cheers, Daniel
>
>>
>> > ---
>> > drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +++---
>> > 1 file changed, 3 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
>> > index 2279e03..5dbe928 100644
>> > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
>> > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
>> > @@ -517,17 +517,17 @@ static void gen8_ppgtt_clear_range(struct i915_address_space *vm,
>> > struct page *page_table;
>> >
>> > if (WARN_ON(!ppgtt->pdp.page_directory[pdpe]))
>> > - continue;
>> > + break;
>> >
>> > pd = ppgtt->pdp.page_directory[pdpe];
>> >
>> > if (WARN_ON(!pd->page_table[pde]))
>> > - continue;
>> > + break;
>> >
>> > pt = pd->page_table[pde];
>> >
>> > if (WARN_ON(!pt->page))
>> > - continue;
>> > + break;
>> >
>> > page_table = pt->page;
>> >
>> > --
>> > 2.4.4
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-06-26 10:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-25 11:59 [PATCH] drm/i915/ppgtt: Break loop in gen8_ppgtt_clear_range failure path Michel Thierry
2015-06-25 15:39 ` Mika Kuoppala
2015-06-25 16:04 ` Daniel Vetter
2015-06-26 10:38 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox