drm/i915/selftests: Report ENOMEM clearly for an allocation failure
Subsystems (2)
PATCH 1/1 drm/i915/selftests: Report ENOMEM clearly for an allocation failure
If we can not run the drunk_hole test because we couldn't allocate the memory for the permutation array (even after we tried trimming the size), report a clear ENOMEM. Similary, if we are asked to operate on a hole too small for ourselves, make it skip quietly.
v2: Avoid malloc(0) since that returns ZERO_SIZE_PTR not NULL.
v3: Fixup similar construction for lowlevel_hole
--- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 36 +++++++++++++++++++-------- 1 file changed, 26 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +26 -10
@@ -216,13 +216,21 @@ static int lowlevel_hole(struct drm_i915_private *i915, hole_size = (hole_end - hole_start) >> size;if (hole_size >KMALLOC_MAX_SIZE /sizeof (u32)) hole_size =KMALLOC_MAX_SIZE /sizeof (u32); - count = hole_size; + count = hole_size /2 ; +if (!count) { +pr_debug ("%s: hole is too small [%llx - %llx] >> %d: %lld\n" , + __func__, hole_start, hole_end, size, hole_size); +break ; + } +do { - count >>=1 ; order =i915_random_order (count, &prng); - }while (!order && count); -if (!order) -break ; +if (order) +break ; + }while (count >>=1 ); +if (!count) +return -ENOMEM ; +GEM_BUG_ON (!order);GEM_BUG_ON (count *BIT_ULL (size) > vm->total);GEM_BUG_ON (hole_start + count *BIT_ULL (size) > hole_end);
@@ -704,13 +712,21 @@ static int drunk_hole(struct drm_i915_private *i915, hole_size = (hole_end - hole_start) >> size;if (hole_size >KMALLOC_MAX_SIZE /sizeof (u32)) hole_size =KMALLOC_MAX_SIZE /sizeof (u32); - count = hole_size; + count = hole_size /2 ; +if (!count) { +pr_debug ("%s: hole is too small [%llx - %llx] >> %d: %lld\n" , + __func__, hole_start, hole_end, size, hole_size); +break ; + } +do { - count >>=1 ; order =i915_random_order (count, &prng); - }while (!order && count); -if (!order) -break ; +if (order) +break ; + }while (count >>=1 ); +if (!count) +return -ENOMEM ; +GEM_BUG_ON (!order);/* Ignore allocation failures (i.e. don't report them as * a test failure) as we are purposefully allocating very
Signature · 6 lines
2.15.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 5 lines · Chris Wilson
If we can not run the
drunk_holetest because we couldn't allocate the memory for the permutation array (even after we tried trimming the size), report a clear ENOMEM. Similary, if we are asked to operate on a hole too small for ourselves, make it skip quietly.
Quoted 7 lines
v2: Avoid malloc(0) since that returns
ZERO_SIZE_PTRnot NULL.
v3: Fixup similar construction forlowlevel_holeSigned-off-by Chris Wilson <[email protected]>Cc Matthew Auld <[email protected]>Cc Mika Kuoppala <[email protected]>
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 22 lines · Chris Wilson
If we can not run the
drunk_holetest because we couldn't allocate the memory for the permutation array (even after we tried trimming the size), report a clear ENOMEM. Similary, if we are asked to operate on a hole too small for ourselves, make it skip quietly.v2: Avoid malloc(0) since that returns
ZERO_SIZE_PTRnot NULL.
v3: Fixup similar construction forlowlevel_holeSigned-off-by Chris Wilson <[email protected]>Cc Matthew Auld <[email protected]>Cc Mika Kuoppala <[email protected]>Reviewed-by Matthew Auld <[email protected]> #v1--- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 36 +++++++++++++++++++-------- 1 file changed, 26 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +0
-0
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int lowlevel_hole(struct drm_i915_private *i915, · line 219
Quoted 5 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +1
-1@@ -216,13 +216,21 @@ static int lowlevel_hole(struct drm_i915_private *i915, hole_size = (hole_end - hole_start) >> size;if (hole_size >KMALLOC_MAX_SIZE /sizeof (u32)) hole_size =KMALLOC_MAX_SIZE /sizeof (u32); - count = hole_size; + count = hole_size /2 ;
Oh wait, we need div_u64(), or maybe just hole_size >> 1...
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/selftests: Report ENOMEM clearly for an allocation failure (rev2)
In reply to Chris Wilson== Series Details ==
== Series Details ==
Series: drm/i915/selftests: Report ENOMEM clearly for an allocation failure (rev2)
URL : https://patchwork.freedesktop.org/series/33994/
State : success
== Summary ==
Series 33994v2 drm/i915/selftests: Report ENOMEM clearly for an allocation failure
https://patchwork.freedesktop.org/api/1.0/series/33994/revisions/2/mbox/
Test chamelium:
Subgroup dp-crc-fast:
fail -> PASS (fi-kbl-7500u) fdo#103163fdo#103163 https://bugs.freedesktop.org/show_bug.cgi?id=103163
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:443s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:458s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:381s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:531s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:279s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:508s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:510s fi-byt-j1900 total:289 pass:254 dwarn:0 dfail:0 fail:0 skip:35 time:499s fi-byt-n2820 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:490s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:430s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:266s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:540s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:431s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:442s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:433s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:483s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:465s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:487s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:536s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:479s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:540s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:575s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:456s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:544s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:567s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:521s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:495s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:460s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:563s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:425s Blacklisted hosts: fi-cfl-s2 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:615s fi-glk-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:492s
ed17259c4b681ddc178c14368f1a3db512016989 drm-tip: 2017y-11m-17d-12h-03m-24s UTC integration manifest 4f00ec50a95b drm/i915/selftests: Report ENOMEM clearly for an allocation failure
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7174/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 1/1 drm/i915/selftests: Report ENOMEM clearly for an allocation failure
In reply to Chris WilsonIf we can not run the drunk_hole test because we couldn't allocate the memory for the permutation array (even after we tried trimming the size), report a clear ENOMEM. Similary, if we are asked to operate on a hole too small for ourselves, make it skip quietly.
v2: Avoid malloc(0) since that returns ZERO_SIZE_PTR not NULL.
v3: Fixup similar construction for lowlevel_hole
v4: Use u64 >> 1 to avoid 64b div.
--- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 36 +++++++++++++++++++-------- 1 file changed, 26 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +26 -10
@@ -216,13 +216,21 @@ static int lowlevel_hole(struct drm_i915_private *i915, hole_size = (hole_end - hole_start) >> size;if (hole_size >KMALLOC_MAX_SIZE /sizeof (u32)) hole_size =KMALLOC_MAX_SIZE /sizeof (u32); - count = hole_size; + count = hole_size >>1 ; +if (!count) { +pr_debug ("%s: hole is too small [%llx - %llx] >> %d: %lld\n" , + __func__, hole_start, hole_end, size, hole_size); +break ; + } +do { - count >>=1 ; order =i915_random_order (count, &prng); - }while (!order && count); -if (!order) -break ; +if (order) +break ; + }while (count >>=1 ); +if (!count) +return -ENOMEM ; +GEM_BUG_ON (!order);GEM_BUG_ON (count *BIT_ULL (size) > vm->total);GEM_BUG_ON (hole_start + count *BIT_ULL (size) > hole_end);
@@ -704,13 +712,21 @@ static int drunk_hole(struct drm_i915_private *i915, hole_size = (hole_end - hole_start) >> size;if (hole_size >KMALLOC_MAX_SIZE /sizeof (u32)) hole_size =KMALLOC_MAX_SIZE /sizeof (u32); - count = hole_size; + count = hole_size >>1 ; +if (!count) { +pr_debug ("%s: hole is too small [%llx - %llx] >> %d: %lld\n" , + __func__, hole_start, hole_end, size, hole_size); +break ; + } +do { - count >>=1 ; order =i915_random_order (count, &prng); - }while (!order && count); -if (!order) -break ; +if (order) +break ; + }while (count >>=1 ); +if (!count) +return -ENOMEM ; +GEM_BUG_ON (!order);/* Ignore allocation failures (i.e. don't report them as * a test failure) as we are purposefully allocating very
Signature · 6 lines
2.15.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/selftests: Report ENOMEM clearly for an allocation failure (rev2)
In reply to Chris Wilson== Series Details ==
== Series Details ==
Series: drm/i915/selftests: Report ENOMEM clearly for an allocation failure (rev2)
URL : https://patchwork.freedesktop.org/series/33994/
State : success
== Summary ==
Test kms_busy:
Subgroup extended-modeset-hang-newfb-with-reset-render-a:
skip -> PASS (shard-hsw) fdo#102249
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-primscrn-pri-shrfb-draw-mmap-gtt:
skip -> PASS (shard-hsw) fdo#103167
Subgroup fbc-1p-offscren-pri-shrfb-draw-blt:
fail -> PASS (shard-snb) fdo#101623
Test kms_atomic_transition:
Subgroup 1x-modeset-transitions-fencing:
skip -> PASS (shard-hsw)
Test kms_plane:
Subgroup plane-position-hole-pipe-a-planes:
skip -> PASS (shard-hsw)fdo#102249 https://bugs.freedesktop.org/show_bug.cgi?id=102249
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
shard-hsw total:2585 pass:1473 dwarn:2 dfail:1 fail:10 skip:1099 time:9501s shard-snb total:2585 pass:1261 dwarn:1 dfail:1 fail:11 skip:1311 time:7973s Blacklisted hosts: shard-apl total:2585 pass:1624 dwarn:1 dfail:1 fail:23 skip:936 time:13424s shard-kbl total:2565 pass:1702 dwarn:4 dfail:0 fail:24 skip:834 time:10499s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7174/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/selftests: Report ENOMEM clearly for an allocation failure (rev3)
In reply to Chris Wilson== Series Details ==
== Series Details ==
Series: drm/i915/selftests: Report ENOMEM clearly for an allocation failure (rev3)
URL : https://patchwork.freedesktop.org/series/33994/
State : success
== Summary ==
Series 33994v3 drm/i915/selftests: Report ENOMEM clearly for an allocation failure
https://patchwork.freedesktop.org/api/1.0/series/33994/revisions/3/mbox/
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:444s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:455s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:384s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:538s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:283s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:505s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:505s fi-byt-j1900 total:289 pass:254 dwarn:0 dfail:0 fail:0 skip:35 time:501s fi-byt-n2820 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:501s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:431s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:269s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:541s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:433s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:439s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:427s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:470s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:463s fi-kbl-7500u total:289 pass:263 dwarn:1 dfail:0 fail:1 skip:24 time:476s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:529s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:472s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:534s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:577s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:453s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:549s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:566s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:523s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:491s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:573s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:426s Blacklisted hosts: fi-cfl-s2 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:617s fi-glk-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:490s
fi-skl-gvtdvm failed to collect. IGT log at Patchwork_7177/fi-skl-gvtdvm/igt.log
ed17259c4b681ddc178c14368f1a3db512016989 drm-tip: 2017y-11m-17d-12h-03m-24s UTC integration manifest 4d66c66f8292 drm/i915/selftests: Report ENOMEM clearly for an allocation failure
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7177/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/selftests: Report ENOMEM clearly for an allocation failure (rev3)
In reply to Chris Wilson== Series Details ==
== Series Details ==
Series: drm/i915/selftests: Report ENOMEM clearly for an allocation failure (rev3)
URL : https://patchwork.freedesktop.org/series/33994/
State : success
== Summary ==
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-primscrn-shrfb-pgflip-blt:
pass -> SKIP (shard-snb) fdo#101623
Subgroup fbc-1p-primscrn-pri-shrfb-draw-mmap-gtt:
skip -> PASS (shard-hsw) fdo#103167
Test kms_flip:
Subgroup dpms-vs-vblank-race-interruptible:
pass -> FAIL (shard-hsw) fdo#103060
Subgroup plain-flip-fb-recreate-interruptible:
pass -> FAIL (shard-hsw) fdo#100368
Test kms_busy:
Subgroup extended-modeset-hang-newfb-with-reset-render-a:
skip -> PASS (shard-hsw) fdo#102249
Test kms_atomic_transition:
Subgroup 1x-modeset-transitions-fencing:
skip -> PASS (shard-hsw)
Test kms_plane:
Subgroup plane-position-hole-pipe-a-planes:
skip -> PASS (shard-hsw)
Test drv_module_reload:
Subgroup basic-reload-inject:
dmesg-warn -> PASS (shard-hsw) fdo#102707 +1fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102249 https://bugs.freedesktop.org/show_bug.cgi?id=102249
fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707
shard-hsw total:2585 pass:1471 dwarn:2 dfail:1 fail:12 skip:1099 time:9394s shard-snb total:2585 pass:1259 dwarn:1 dfail:1 fail:12 skip:1312 time:8105s Blacklisted hosts: shard-apl total:2585 pass:1625 dwarn:1 dfail:1 fail:22 skip:936 time:13448s shard-kbl total:2565 pass:1695 dwarn:8 dfail:3 fail:24 skip:834 time:10521s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7177/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✓ Fi.CI.IGT: success for drm/i915/selftests: Report ENOMEM clearly for an allocation failure (rev3)
Quoting Patchwork (2017-11-17 18:37:16)
Quoted 9 lines
== Series Details ==
Series: drm/i915/selftests: Report ENOMEM clearly for an allocation failure (rev3)
URL : https://patchwork.freedesktop.org/series/33994/
State : success== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7177/shards.html
Success! Thanks,
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx