* [PATCH] drm/i915: Use the right mapping_gfp_mask for final shmem allocation
@ 2017-04-05 22:15 Chris Wilson
2017-04-05 22:34 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-04-06 11:55 ` [PATCH] " Joonas Lahtinen
0 siblings, 2 replies; 4+ messages in thread
From: Chris Wilson @ 2017-04-05 22:15 UTC (permalink / raw)
To: intel-gfx; +Cc: Daniel Vetter
Many sightings report the greater prevalence of allocation failures.
This is all due to the incorrect use of mapping_gfp_constraint(), so
remove it in favour of just querying the mapping_gfp_mask() which are
the exact gfp_t we wanted in the first place.
We still do expect a higher chance of reporting ENOMEM, as that is the
intention of using __GFP_NORETRY -- to fail rather than oom after having
reclaimed from our bo caches, and having done a direct|kswapd reclaim
pass.
Reported-by: Jason Ekstrand <jason.ekstrand@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100594
Fixes: 24f8e00a8a2e ("drm/i915: Prefer to report ENOMEM rather than incur the oom for gfx allocations")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/i915_gem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 5f911a25e99a..57f51f1dac69 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2314,7 +2314,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
* defer the oom here by reporting the ENOMEM back
* to userspace.
*/
- reclaim = mapping_gfp_constraint(mapping, 0);
+ reclaim = mapping_gfp_mask(mapping);
reclaim |= __GFP_NORETRY; /* reclaim, but no oom */
page = shmem_read_mapping_page_gfp(mapping, i, reclaim);
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread* ✓ Fi.CI.BAT: success for drm/i915: Use the right mapping_gfp_mask for final shmem allocation
2017-04-05 22:15 [PATCH] drm/i915: Use the right mapping_gfp_mask for final shmem allocation Chris Wilson
@ 2017-04-05 22:34 ` Patchwork
2017-04-06 11:55 ` [PATCH] " Joonas Lahtinen
1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2017-04-05 22:34 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Use the right mapping_gfp_mask for final shmem allocation
URL : https://patchwork.freedesktop.org/series/22554/
State : success
== Summary ==
Series 22554v1 drm/i915: Use the right mapping_gfp_mask for final shmem allocation
https://patchwork.freedesktop.org/api/1.0/series/22554/revisions/1/mbox/
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 427s
fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time: 423s
fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time: 569s
fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 506s
fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time: 552s
fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time: 488s
fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 479s
fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 412s
fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 417s
fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time: 423s
fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 478s
fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 471s
fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 455s
fi-kbl-7560u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 566s
fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 461s
fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time: 573s
fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 458s
fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 491s
fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time: 437s
fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 532s
fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time: 400s
39a0f48c8bc7c528cc705016dafa08a9dedfd36b drm-tip: 2017y-04m-05d-13h-22m-47s UTC integration manifest
2648b12 drm/i915: Use the right mapping_gfp_mask for final shmem allocation
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4416/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Use the right mapping_gfp_mask for final shmem allocation
2017-04-05 22:15 [PATCH] drm/i915: Use the right mapping_gfp_mask for final shmem allocation Chris Wilson
2017-04-05 22:34 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2017-04-06 11:55 ` Joonas Lahtinen
2017-04-06 12:10 ` Chris Wilson
1 sibling, 1 reply; 4+ messages in thread
From: Joonas Lahtinen @ 2017-04-06 11:55 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: Daniel Vetter
On ke, 2017-04-05 at 23:15 +0100, Chris Wilson wrote:
> Many sightings report the greater prevalence of allocation failures.
> This is all due to the incorrect use of mapping_gfp_constraint(), so
> remove it in favour of just querying the mapping_gfp_mask() which are
> the exact gfp_t we wanted in the first place.
>
> We still do expect a higher chance of reporting ENOMEM, as that is the
> intention of using __GFP_NORETRY -- to fail rather than oom after having
> reclaimed from our bo caches, and having done a direct|kswapd reclaim
> pass.
>
> Reported-by: Jason Ekstrand <jason.ekstrand@intel.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100594
> Fixes: 24f8e00a8a2e ("drm/i915: Prefer to report ENOMEM rather than incur the oom for gfx allocations")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Regards, Joonas
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: Use the right mapping_gfp_mask for final shmem allocation
2017-04-06 11:55 ` [PATCH] " Joonas Lahtinen
@ 2017-04-06 12:10 ` Chris Wilson
0 siblings, 0 replies; 4+ messages in thread
From: Chris Wilson @ 2017-04-06 12:10 UTC (permalink / raw)
To: Joonas Lahtinen; +Cc: Daniel Vetter, intel-gfx
On Thu, Apr 06, 2017 at 02:55:16PM +0300, Joonas Lahtinen wrote:
> On ke, 2017-04-05 at 23:15 +0100, Chris Wilson wrote:
> > Many sightings report the greater prevalence of allocation failures.
> > This is all due to the incorrect use of mapping_gfp_constraint(), so
> > remove it in favour of just querying the mapping_gfp_mask() which are
> > the exact gfp_t we wanted in the first place.
> >
> > We still do expect a higher chance of reporting ENOMEM, as that is the
> > intention of using __GFP_NORETRY -- to fail rather than oom after having
> > reclaimed from our bo caches, and having done a direct|kswapd reclaim
> > pass.
> >
> > Reported-by: Jason Ekstrand <jason.ekstrand@intel.com>
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100594
> > Fixes: 24f8e00a8a2e ("drm/i915: Prefer to report ENOMEM rather than incur the oom for gfx allocations")
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Pushed in shame,
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-04-06 12:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-05 22:15 [PATCH] drm/i915: Use the right mapping_gfp_mask for final shmem allocation Chris Wilson
2017-04-05 22:34 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-04-06 11:55 ` [PATCH] " Joonas Lahtinen
2017-04-06 12:10 ` Chris Wilson
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.