drm/i915: properly sanity check batch_start_offset
Subsystems (3)
PATCH v3 1/1 drm/i915: properly sanity check batch_start_offset
Check the edge case where batch_start_offset sits exactly on the batch size.
v2: add new range_overflows variant to capture the special case where the size is permitted to be zero, like with batch_len.
v3: other way around. the common case is the exclusive one which should just be >=, with that we then just need to convert the three odd ball cases that don't apply to use the new inclusive _end version.
Testcase: igt/gem_exec_params/invalid-batch-start-offset
--- drivers/gpu/drm/i915/display/intel_fbc.c | 12 ++++++------ drivers/gpu/drm/i915/gt/intel_rc6.c | 8 ++++---- drivers/gpu/drm/i915/i915_utils.h | 14 +++++++++++++- 3 files changed, 23 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/display/intel_fbc.c +6 -6
@@ -509,12 +509,12 @@ static int intel_fbc_alloc_cfb(struct drm_i915_private *dev_priv, fbc->compressed_llb = compressed_llb; -GEM_BUG_ON (range_overflows_t (u64, dev_priv->dsm.start, - fbc->compressed_fb.start, -U32_MAX )); -GEM_BUG_ON (range_overflows_t (u64, dev_priv->dsm.start, - fbc->compressed_llb->start, -U32_MAX )); +GEM_BUG_ON (range_overflows_end_t (u64, dev_priv->dsm.start, + fbc->compressed_fb.start, +U32_MAX )); +GEM_BUG_ON (range_overflows_end_t (u64, dev_priv->dsm.start, + fbc->compressed_llb->start, +U32_MAX ));intel_de_write (dev_priv,FBC_CFB_BASE , dev_priv->dsm.start + fbc->compressed_fb.start); intel_de_write(dev_priv, FBC_LL_BASE,
drivers/gpu/drm/i915/gt/intel_rc6.c +4 -4
@@ -320,10 +320,10 @@ static int vlv_rc6_init(struct intel_rc6 *rc6)return PTR_ERR (pctx); } -GEM_BUG_ON (range_overflows_t (u64, - i915->dsm.start, - pctx->stolen->start, -U32_MAX )); +GEM_BUG_ON (range_overflows_end_t (u64, + i915->dsm.start, + pctx->stolen->start, +U32_MAX )); pctx_paddr = i915->dsm.start + pctx->stolen->start;intel_uncore_write (uncore,VLV_PCBR , pctx_paddr);
drivers/gpu/drm/i915/i915_utils.h +13 -1
@@ -102,12 +102,24 @@ bool i915_error_injected(void);typeof (max) max__ = (max); \ (void )(&start__ == &size__); \ (void )(&start__ == &max__); \ - start__ > max__ || size__ > max__ - start__; \ + start__ >= max__ || size__ > max__ - start__; \ })#define range_overflows_t (type, start, size, max) \ range_overflows((type)(start), (type)(size), (type)(max)) +#define range_overflows_end (start, size, max) ({ \ + typeof(start) start__ = (start); \ + typeof(size) size__ = (size); \ + typeof(max) max__ = (max); \ + (void)(&start__ == &size__); \ + (void)(&start__ == &max__); \ + start__ > max__ || size__ > max__ - start__; \ +}) + +#define range_overflows_end_t (type, start, size, max) \ + range_overflows_end((type)(start), (type)(size), (type)(max)) +/* Note we don't consider signbits :| */ #define overflows_type (x,T ) \ (sizeof(x) > sizeof(T) && (x) >> BITS_PER_TYPE(T))
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.DOCS: warning for drm/i915: properly sanity check batch_start_offset (rev3)
== Series Details ==
== Series Details ==
Series: drm/i915: properly sanity check batch_start_offset (rev3)
URL : https://patchwork.freedesktop.org/series/74287/
State : warning
== Summary ==
$ make htmldocs 2>&1 > /dev/null | grep i915 ./drivers/gpu/drm/i915/display/intel_dpll_mgr.h:285: warning: Function parameter or member 'get_freq' not described in 'intel_shared_dpll_funcs'
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: properly sanity check batch_start_offset (rev3)
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: drm/i915: properly sanity check batch_start_offset (rev3)
URL : https://patchwork.freedesktop.org/series/74287/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8080 -> Patchwork_16857
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_16857 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_16857, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16857/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_16857:
### IGT changes ###
#### Possible regressions ####
* igt@runner@aborted:
- fi-hsw-peppy: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16857/fi-hsw-peppy/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* {igt@i915_selftest@live@ring_submission}:
- fi-hsw-peppy: [PASS][2] -> [INCOMPLETE][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8080/fi-hsw-peppy/igt@i915_selftest@live@ring_submission.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16857/fi-hsw-peppy/igt@i915_selftest@live@ring_submission.html
Known issues
------------
Here are the changes found in Patchwork_16857 that come from known issues:
### IGT changes ###
#### Warnings ####
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][4] ([fdo#111096] / [i915#323]) -> [FAIL][5] ([fdo#111407])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8080/fi-kbl-7500u/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16857/fi-kbl-7500u/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
[i915#323]: https://gitlab.freedesktop.org/drm/intel/issues/323
Participating hosts (47 -> 38)
------------------------------
Additional (3): fi-kbl-7560u fi-ivb-3770 fi-snb-2520m
Missing (12): fi-hsw-4200u fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-bwr-2160 fi-ctg-p8600 fi-kbl-x1275 fi-bsw-kefka fi-tgl-y fi-byt-clapper fi-bsw-nick fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8080 -> Patchwork_16857
CI-20190529: 20190529
CI_DRM_8080: d122b6eaf8f3999f69ddd9cfde05cc0775e0e68e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5495: 22df72de8affcec22d9f354bb6148d77f60cc580 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16857: 6cf293eddb7782075741dead5b40957d991d2400 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
6cf293eddb77 drm/i915: properly sanity check batch_start_offset
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16857/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx