All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Actually pass the reclaim gfp_t along to shmemfs!
@ 2017-03-22 22:34 Chris Wilson
  2017-03-23  7:29 ` Joonas Lahtinen
  2017-03-23  9:54 ` ✓ Fi.CI.BAT: success for " Patchwork
  0 siblings, 2 replies; 5+ messages in thread
From: Chris Wilson @ 2017-03-22 22:34 UTC (permalink / raw)
  To: intel-gfx; +Cc: Daniel Vetter

Words cannot describe the embarrassment at creating a new gfp_t relaim to
only prevent the oomkiller but allow direct|kswapd reclaim, and then not
use it in the shmem_read_mapping_page_gfp().

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 96fc76d44145..174c85618450 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2312,7 +2312,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
 			reclaim = mapping_gfp_constraint(mapping, 0);
 			reclaim |= __GFP_NORETRY; /* reclaim, but no oom */
 
-			page = shmem_read_mapping_page_gfp(mapping, i, gfp);
+			page = shmem_read_mapping_page_gfp(mapping, i, reclaim);
 			if (IS_ERR(page)) {
 				ret = PTR_ERR(page);
 				goto err_sg;
-- 
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] 5+ messages in thread
* Re: [PATCH] drm/i915: Actually pass the reclaim gfp_t along to shmemfs!
  2017-03-22 22:34 [PATCH] drm/i915: Actually pass the reclaim gfp_t along to shmemfs! Chris Wilson
@ 2017-03-23  7:29 ` Joonas Lahtinen
  2017-03-23 10:00   ` Chris Wilson
  2017-03-23  9:54 ` ✓ Fi.CI.BAT: success for " Patchwork
  1 sibling, 1 reply; 5+ messages in thread
From: Joonas Lahtinen @ 2017-03-23  7:29 UTC (permalink / raw)
  To: Chris Wilson, intel-gfx; +Cc: Daniel Vetter

On ke, 2017-03-22 at 22:34 +0000, Chris Wilson wrote:
> Words cannot describe the embarrassment at creating a new gfp_t relaim to
> only prevent the oomkiller but allow direct|kswapd reclaim, and then not
> use it in the shmem_read_mapping_page_gfp().
> 
> 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] 5+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Actually pass the reclaim gfp_t along to shmemfs!
  2017-03-22 22:34 [PATCH] drm/i915: Actually pass the reclaim gfp_t along to shmemfs! Chris Wilson
  2017-03-23  7:29 ` Joonas Lahtinen
@ 2017-03-23  9:54 ` Patchwork
  1 sibling, 0 replies; 5+ messages in thread
From: Patchwork @ 2017-03-23  9:54 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

== Series Details ==

Series: drm/i915: Actually pass the reclaim gfp_t along to shmemfs!
URL   : https://patchwork.freedesktop.org/series/21721/
State : success

== Summary ==

Series 21721v1 drm/i915: Actually pass the reclaim gfp_t along to shmemfs!
https://patchwork.freedesktop.org/api/1.0/series/21721/revisions/1/mbox/

Test gem_exec_flush:
        Subgroup basic-batch-kernel-default-uc:
                pass       -> FAIL       (fi-snb-2600) fdo#100007
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                fail       -> PASS       (fi-skl-6700k)

fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time: 459s
fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time: 463s
fi-bsw-n3050     total:278  pass:239  dwarn:0   dfail:0   fail:0   skip:39  time: 571s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time: 539s
fi-byt-j1900     total:278  pass:251  dwarn:0   dfail:0   fail:0   skip:27  time: 509s
fi-byt-n2820     total:278  pass:247  dwarn:0   dfail:0   fail:0   skip:31  time: 507s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time: 442s
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time: 435s
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time: 440s
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time: 525s
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time: 497s
fi-kbl-7500u     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time: 486s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time: 486s
fi-skl-6700hq    total:278  pass:261  dwarn:0   dfail:0   fail:0   skip:17  time: 606s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time: 495s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time: 520s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time: 468s
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time: 549s
fi-snb-2600      total:278  pass:248  dwarn:0   dfail:0   fail:1   skip:29  time: 423s

b1ecc49ac71e484430083e5b3b7cd75d4976a465 drm-tip: 2017y-03m-23d-07h-40m-49s UTC integration manifest
ff1cc80 drm/i915: Actually pass the reclaim gfp_t along to shmemfs!

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4270/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Actually pass the reclaim gfp_t along to shmemfs!
  2017-03-23  7:29 ` Joonas Lahtinen
@ 2017-03-23 10:00   ` Chris Wilson
  2017-03-23 12:37     ` Jani Nikula
  0 siblings, 1 reply; 5+ messages in thread
From: Chris Wilson @ 2017-03-23 10:00 UTC (permalink / raw)
  To: Joonas Lahtinen; +Cc: Daniel Vetter, intel-gfx

On Thu, Mar 23, 2017 at 09:29:47AM +0200, Joonas Lahtinen wrote:
> On ke, 2017-03-22 at 22:34 +0000, Chris Wilson wrote:
> > Words cannot describe the embarrassment at creating a new gfp_t relaim to
> > only prevent the oomkiller but allow direct|kswapd reclaim, and then not
> > use it in the shmem_read_mapping_page_gfp().
> > 
> > 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>

Thanks for not being smug, pushed.
-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] 5+ messages in thread
* Re: [PATCH] drm/i915: Actually pass the reclaim gfp_t along to shmemfs!
  2017-03-23 10:00   ` Chris Wilson
@ 2017-03-23 12:37     ` Jani Nikula
  0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2017-03-23 12:37 UTC (permalink / raw)
  To: Chris Wilson, Joonas Lahtinen; +Cc: Daniel Vetter, intel-gfx

On Thu, 23 Mar 2017, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Thu, Mar 23, 2017 at 09:29:47AM +0200, Joonas Lahtinen wrote:
>> On ke, 2017-03-22 at 22:34 +0000, Chris Wilson wrote:
>> > Words cannot describe the embarrassment at creating a new gfp_t relaim to
>> > only prevent the oomkiller but allow direct|kswapd reclaim, and then not
>> > use it in the shmem_read_mapping_page_gfp().
>> > 
>> > 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>
>
> Thanks for not being smug, pushed.

He can't afford to be, he reviewed the commit being fixed! ;)

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-03-23 12:37 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-22 22:34 [PATCH] drm/i915: Actually pass the reclaim gfp_t along to shmemfs! Chris Wilson
2017-03-23  7:29 ` Joonas Lahtinen
2017-03-23 10:00   ` Chris Wilson
2017-03-23 12:37     ` Jani Nikula
2017-03-23  9:54 ` ✓ Fi.CI.BAT: success for " Patchwork

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.