lib/i915: Assert mmap size alignment
From: Tvrtko Ursulin <[email protected]>
Fishing for fails...
/*
mmap(2) mandates size is page aligned so check this in our wrappers. */
--- lib/i915/gem_mman.c | 4 ++++ lib/igt_fb.c | 14 ++++++++------ tests/kms_psr.c | 8 ++++---- 3 files changed, 16 insertions(+), 10 deletions(-)
lib/i915/gem_mman.c +4 -0
@@ -57,6 +57,8 @@ void *__gem_mmap__gtt(int fd, uint32_t handle, uint64_t size, unsigned prot)struct drm_i915_gem_mmap_gtt mmap_arg;void *ptr; +igt_assert (!(size &4095 )); +memset (&mmap_arg,0 ,sizeof (mmap_arg)); mmap_arg.handle = handle;if (igt_ioctl (fd,DRM_IOCTL_I915_GEM_MMAP_GTT , &mmap_arg))
@@ -162,6 +164,8 @@ static void {struct drm_i915_gem_mmap arg; +igt_assert (!(size &4095 )); +memset (&arg,0 ,sizeof (arg)); arg.handle = handle; arg.offset = offset;
lib/igt_fb.c +8 -6
@@ -1494,7 +1494,7 @@ static void free_linear_mapping(struct fb_blit_upload *blit)struct igt_fb *fb = blit->fb;struct fb_blit_linear *linear = &blit->linear; -gem_munmap (linear->map, linear->fb.size); +gem_munmap (linear->map,ALIGN (linear->fb.size,4096 ));gem_set_domain (fd, linear->fb.gem_handle,I915_GEM_DOMAIN_GTT ,0 );
@@ -1544,7 +1544,8 @@ static void setup_linear_mapping(int fd, struct igt_fb *fb, struct fb_blit_linea/* Setup cairo context */ linear->map =gem_mmap__cpu (fd, linear->fb.gem_handle, -0 , linear->fb.size,PROT_READ |PROT_WRITE ); +0 ,ALIGN (linear->fb.size,4096 ), +PROT_READ |PROT_WRITE ); }static void create_cairo_surface__blit (int fd,struct igt_fb *fb)
@@ -1588,7 +1589,7 @@ int igt_dirty_fb(int fd, struct igt_fb *fb)static void unmap_bo (struct igt_fb *fb,void *ptr) { -gem_munmap (ptr, fb->size); +gem_munmap (ptr,ALIGN (fb->size,4096 ));if (fb->is_dumb)igt_dirty_fb (fb->fd, fb);
@@ -1604,6 +1605,7 @@ static void destroy_cairo_surface__gtt(void *arg)static void *map_bo (int fd,struct igt_fb *fb) { +size_t size =ALIGN (fb->size,4096 );void *ptr;if (is_i915_device (fd))
@@ -1611,13 +1613,13 @@ static void *map_bo(int fd, struct igt_fb *fb) I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT);if (fb->is_dumb) - ptr =kmstest_dumb_map_buffer (fd, fb->gem_handle, fb->size, + ptr =kmstest_dumb_map_buffer (fd, fb->gem_handle, size,PROT_READ |PROT_WRITE );else if (is_i915_device (fd)) - ptr =gem_mmap__gtt (fd, fb->gem_handle, fb->size, + ptr =gem_mmap__gtt (fd, fb->gem_handle, size,PROT_READ |PROT_WRITE );else if (is_vc4_device (fd)) - ptr =igt_vc4_mmap_bo (fd, fb->gem_handle, fb->size, + ptr =igt_vc4_mmap_bo (fd, fb->gem_handle, size,PROT_READ |PROT_WRITE );else igt_assert (false);
tests/kms_psr.c +4 -4
@@ -270,8 +270,8 @@ static void run_test(data_t *data) expected ="GREEN" ;break ;case MMAP_GTT : - ptr =gem_mmap__gtt (data->drm_fd, handle, data->mod_size, -PROT_WRITE ); + ptr =gem_mmap__gtt (data->drm_fd, handle, +ALIGN (data->mod_size,4096 ),PROT_WRITE );gem_set_domain (data->drm_fd, handle,I915_GEM_DOMAIN_GTT ,I915_GEM_DOMAIN_GTT );memset (ptr,0xcc , data->mod_size);
@@ -279,8 +279,8 @@ static void run_test(data_t *data) expected ="BLACK or TRANSPARENT mark on top of plane in test" ;break ;case MMAP_CPU : - ptr =gem_mmap__cpu (data->drm_fd, handle,0 , data->mod_size, -PROT_WRITE ); + ptr =gem_mmap__cpu (data->drm_fd, handle,0 , +ALIGN (data->mod_size,4096 ),PROT_WRITE );gem_set_domain (data->drm_fd, handle,I915_GEM_DOMAIN_CPU ,I915_GEM_DOMAIN_CPU );memset (ptr,0 , data->mod_size);
Signature · 6 lines
2.19.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.BAT: success for lib/i915: Assert mmap size alignment (rev3)
== Series Details ==
== Series Details ==
Series: lib/i915: Assert mmap size alignment (rev3)
URL : https://patchwork.freedesktop.org/series/57396/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5693 -> IGTPW_2547
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/57396/revisions/3/mbox/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_2547:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@i915_selftest@live_active:
- {fi-icl-y}: PASS -> INCOMPLETE
Known issues
------------
Here are the changes found in IGTPW_2547 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_basic@gtt-bsd2:
- fi-byt-clapper: NOTRUN -> SKIP [fdo#109271] +57
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: PASS -> INCOMPLETE [fdo#107718]
* igt@gem_workarounds@basic-read:
- fi-snb-2600: NOTRUN -> SKIP [fdo#109271] +57
* igt@kms_busy@basic-flip-b:
- fi-gdg-551: PASS -> FAIL [fdo#103182]
* igt@kms_busy@basic-flip-c:
- fi-byt-clapper: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
- fi-snb-2600: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
* igt@kms_chamelium@hdmi-edid-read:
- fi-hsw-peppy: NOTRUN -> SKIP [fdo#109271] +46
* igt@kms_chamelium@vga-edid-read:
- fi-skl-6600u: NOTRUN -> SKIP [fdo#109271] +41
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: NOTRUN -> DMESG-FAIL [fdo#102614] / [fdo#107814]
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
- fi-byt-clapper: NOTRUN -> FAIL [fdo#103191] / [fdo#107362]
* igt@prime_vgem@basic-fence-flip:
- fi-ilk-650: PASS -> FAIL [fdo#104008]
* igt@runner@aborted:
- fi-bxt-dsi: NOTRUN -> FAIL [fdo#109516]
#### Possible fixes ####
* igt@i915_selftest@live_execlists:
- fi-apl-guc: INCOMPLETE [fdo#103927] / [fdo#109720] -> PASS
* igt@kms_busy@basic-flip-a:
- fi-gdg-551: FAIL [fdo#103182] -> PASS
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7567u: WARN [fdo#109380] -> PASS
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-c:
- fi-kbl-7567u: SKIP [fdo#109271] -> PASS +33
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104008]: https://bugs.freedesktop.org/show_bug.cgi?id=104008
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107814]: https://bugs.freedesktop.org/show_bug.cgi?id=107814
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109380]: https://bugs.freedesktop.org/show_bug.cgi?id=109380
[fdo#109516]: https://bugs.freedesktop.org/show_bug.cgi?id=109516
[fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720
Participating hosts (42 -> 40)
------------------------------
Additional (5): fi-bxt-dsi fi-hsw-peppy fi-byt-clapper fi-skl-6600u fi-snb-2600
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-snb-2520m fi-pnv-d510 fi-bdw-samus
Build changes
-------------
* IGT: IGT_4869 -> IGTPW_2547
CI_DRM_5693: 87cb56b5fae5e4a1cb77539a9834348605630773 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2547: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2547/
IGT_4869: a958d3f60b7718151fd0bafcdd1e4874262f51b8 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2547/
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✗ Fi.CI.IGT: failure for lib/i915: Assert mmap size alignment (rev3)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: lib/i915: Assert mmap size alignment (rev3)
URL : https://patchwork.freedesktop.org/series/57396/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_5693_full -> IGTPW_2547_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with IGTPW_2547_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in IGTPW_2547_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/57396/revisions/3/mbox/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_2547_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_ccs@pipe-a-bad-aux-stride:
- shard-glk: PASS -> FAIL +1
- shard-apl: PASS -> FAIL +1
- shard-kbl: PASS -> FAIL +1Known issues
------------
Here are the changes found in IGTPW_2547_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_parse@basic-allocation:
- shard-glk: NOTRUN -> SKIP [fdo#109271] +20
* igt@gen3_render_tiledy_blits:
- shard-kbl: NOTRUN -> SKIP [fdo#109271] +20
* igt@kms_atomic_transition@plane-all-modeset-transition-fencing:
- shard-kbl: PASS -> INCOMPLETE [fdo#103665]
* igt@kms_busy@extended-modeset-hang-newfb-render-a:
- shard-hsw: PASS -> DMESG-WARN [fdo#107956]
- shard-snb: PASS -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a:
- shard-kbl: PASS -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b:
- shard-glk: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-modeset-hang-oldfb-render-e:
- shard-glk: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
* igt@kms_color@pipe-c-legacy-gamma:
- shard-glk: PASS -> FAIL [fdo#104782]
* igt@kms_cursor_crc@cursor-128x128-onscreen:
- shard-apl: NOTRUN -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-128x128-suspend:
- shard-apl: PASS -> FAIL [fdo#103191] / [fdo#103232] +1
- shard-kbl: PASS -> FAIL [fdo#103191] / [fdo#103232]
* igt@kms_cursor_crc@cursor-256x85-onscreen:
- shard-apl: PASS -> FAIL [fdo#103232] +2
* igt@kms_flip@2x-modeset-vs-vblank-race:
- shard-glk: PASS -> FAIL [fdo#103060]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render:
- shard-apl: PASS -> FAIL [fdo#103167]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-mmap-cpu:
- shard-glk: PASS -> FAIL [fdo#103167] +1
* igt@kms_plane@plane-position-covered-pipe-a-planes:
- shard-glk: PASS -> FAIL [fdo#103166] +1
* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-apl: PASS -> FAIL [fdo#103166]
* igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
- shard-apl: NOTRUN -> FAIL [fdo#108145] +1
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max:
- shard-apl: PASS -> FAIL [fdo#108145]
- shard-kbl: NOTRUN -> FAIL [fdo#108145]
* igt@kms_universal_plane@disable-primary-vs-flip-pipe-d:
- shard-kbl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +2
- shard-apl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +2
* igt@kms_vblank@pipe-a-ts-continuation-modeset:
- shard-apl: PASS -> FAIL [fdo#104894]
* igt@prime_busy@before-bsd2:
- shard-apl: NOTRUN -> SKIP [fdo#109271] +29
#### Possible fixes ####
* igt@kms_busy@extended-modeset-hang-newfb-render-b:
- shard-snb: DMESG-WARN [fdo#107956] -> PASS
* igt@kms_busy@extended-modeset-hang-newfb-render-c:
- shard-hsw: DMESG-WARN [fdo#107956] -> PASS +1
- shard-kbl: DMESG-WARN [fdo#107956] -> PASS +1
* igt@kms_ccs@pipe-a-crc-sprite-planes-basic:
- shard-apl: FAIL [fdo#106510] / [fdo#108145] -> PASS +1
* igt@kms_color@pipe-b-legacy-gamma:
- shard-apl: FAIL [fdo#104782] -> PASS
* igt@kms_cursor_crc@cursor-256x85-random:
- shard-apl: FAIL [fdo#103232] -> PASS +5
* igt@kms_cursor_crc@cursor-256x85-sliding:
- shard-kbl: FAIL [fdo#103232] -> PASS +5
* igt@kms_flip@modeset-vs-vblank-race-interruptible:
- shard-apl: INCOMPLETE [fdo#103927] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-cpu:
- shard-apl: FAIL [fdo#103167] -> PASS +5
- shard-kbl: FAIL [fdo#103167] -> PASS +1
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen:
- shard-glk: FAIL [fdo#103167] -> PASS +4
* igt@kms_frontbuffer_tracking@fbc-1p-rte:
- shard-glk: FAIL [fdo#103167] / [fdo#105682] -> PASS
- shard-kbl: FAIL [fdo#103167] / [fdo#105682] -> PASS
- shard-apl: FAIL [fdo#103167] / [fdo#105682] -> PASS * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-kbl: INCOMPLETE [fdo#103665] -> PASS
* igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
- shard-glk: FAIL [fdo#103166] -> PASS +3
- shard-apl: FAIL [fdo#103166] -> PASS +4
- shard-kbl: FAIL [fdo#103166] -> PASS +1 * igt@kms_rotation_crc@multiplane-rotation-cropping-bottom:
- shard-kbl: DMESG-FAIL [fdo#105763] -> PASS
* igt@kms_rotation_crc@multiplane-rotation-cropping-top:
- shard-kbl: FAIL [fdo#109016] -> PASS
* igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend:
- shard-apl: FAIL [fdo#104894] -> PASS
- shard-kbl: FAIL [fdo#104894] -> PASS +1
[fdo#103060]: https://bugs.freedesktop.org/show_bug.cgi?id=103060
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#104894]: https://bugs.freedesktop.org/show_bug.cgi?id=104894
[fdo#105682]: https://bugs.freedesktop.org/show_bug.cgi?id=105682
[fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763
[fdo#106510]: https://bugs.freedesktop.org/show_bug.cgi?id=106510
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109016]: https://bugs.freedesktop.org/show_bug.cgi?id=109016
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
Participating hosts (7 -> 5)
------------------------------
Missing (2): shard-skl shard-iclb
Build changes
-------------
* IGT: IGT_4869 -> IGTPW_2547
* Piglit: piglit_4509 -> None
CI_DRM_5693: 87cb56b5fae5e4a1cb77539a9834348605630773 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2547: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2547/
IGT_4869: a958d3f60b7718151fd0bafcdd1e4874262f51b8 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2547/
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev