Skip to contentSkip to conversation

i915/gem_reset_stats: Call noop() with relevant params

PATCH In review [email protected] 3 participants 3 messages Dec 28, 2020 – Dec 29, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i915/gem_reset_stats: Call noop() with relevant params

From: Apoorva Singh <[email protected]>

- Modify to use noop function in test_ban() and test_ban_ctx() with relevant params after hang injection
- Add corresponding checks to verify return value of noop

Cc Chris Wilson <[email protected]>
Cc Melkaveri, Arjun <[email protected]>
---
 tests/i915/gem_reset_stats.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
tests/i915/gem_reset_stats.c +8 -8
index 4ba1ec8e..13f02ea8 100644
@@ -341,8 +341,8 @@ static void test_ban(const struct intel_execution_engine *e)
 	assert_reset_status(fd_bad, fd_bad, 0, RS_NO_ERROR);
 	assert_reset_status(fd_good, fd_good, 0, RS_NO_ERROR);
 
-	noop(fd_bad, 0, e);
-	noop(fd_good, 0, e);
+	igt_assert(noop(fd_bad, 0, e) > 0);
+	igt_assert(noop(fd_good, 0, e) > 0);
 
 	assert_reset_status(fd_bad, fd_bad, 0, RS_NO_ERROR);
 	assert_reset_status(fd_good, fd_good, 0, RS_NO_ERROR);
@@ -350,8 +350,8 @@ static void test_ban(const struct intel_execution_engine *e)
 	inject_hang(fd_bad, 0, e, BAN | ASYNC);
 	active_count++;
 
-	noop(fd_good, 0, e);
-	noop(fd_good, 0, e);
+	igt_assert(noop(fd_bad, 0, e) > 0);
+	igt_assert(noop(fd_good, 0, e) > 0);
 
 	while (retry--) {
 		inject_hang(fd_bad, 0, e, BAN);
@@ -400,8 +400,8 @@ static void test_ban_ctx(const struct intel_execution_engine *e)
 	assert_reset_status(fd, fd, ctx_good, RS_NO_ERROR);
 	assert_reset_status(fd, fd, ctx_bad, RS_NO_ERROR);
 
-	noop(fd, ctx_bad, e);
-	noop(fd, ctx_good, e);
+	igt_assert(noop(fd, ctx_bad, e) > 0);
+	igt_assert(noop(fd, ctx_good, e) > 0);
 
 	assert_reset_status(fd, fd, ctx_good, RS_NO_ERROR);
 	assert_reset_status(fd, fd, ctx_bad, RS_NO_ERROR);
@@ -409,8 +409,8 @@ static void test_ban_ctx(const struct intel_execution_engine *e)
 	inject_hang(fd, ctx_bad, e, BAN | ASYNC);
 	active_count++;
 
-	noop(fd, ctx_good, e);
-	noop(fd, ctx_good, e);
+	igt_assert(noop(fd, ctx_bad, e) > 0);
+	igt_assert(noop(fd, ctx_good, e) > 0);
 
 	while (retry--) {
 		inject_hang(fd, ctx_bad, e, BAN);
Signature · 6 lines
2.25.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
#1 lore raw

Quoting [email protected] (2020-12-28 09:52:07)

tests/i915/gem_reset_stats.c static void test_ban(const struct intel_execution_engine *e) · line 354

Quoted 8 lines
tests/i915/gem_reset_stats.c +2 -2
@@ -350,8 +350,8 @@ static void test_ban(const struct intel_execution_engine *e)
        inject_hang(fd_bad, 0, e, BAN | ASYNC);
        active_count++;
 
-       noop(fd_good, 0, e);
-       noop(fd_good, 0, e);
+       igt_assert(noop(fd_bad, 0, e) > 0);
+       igt_assert(noop(fd_good, 0, e) > 0);

Why?

tests/i915/gem_reset_stats.c static void test_ban_ctx(const struct intel_execution_engine *e) · line 413

Quoted 12 lines
tests/i915/gem_reset_stats.c +2 -2
        while (retry--) {
                inject_hang(fd_bad, 0, e, BAN);
 
@@ -409,8 +409,8 @@ static void test_ban_ctx(const struct intel_execution_engine *e)
        inject_hang(fd, ctx_bad, e, BAN | ASYNC);
        active_count++;
 
-       noop(fd, ctx_good, e);
-       noop(fd, ctx_good, e);
+       igt_assert(noop(fd, ctx_bad, e) > 0);
+       igt_assert(noop(fd, ctx_good, e) > 0);

Why?

The change looks irrelevant. The bad fd/ctx have hangs inflight, pinging the good fd/ctx is verification for the later assertions. -Chris
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#2 lore raw

[igt-dev] ✓ Fi.CI.BAT: success for i915/gem_reset_stats: Call noop() with relevant params

In reply to [email protected]
== Series Details ==

== Series Details ==

Series: i915/gem_reset_stats: Call noop() with relevant params
URL : https://patchwork.freedesktop.org/series/85258/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_9528 -> IGTPW_5336
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5336/index.html

Known issues
------------

Here are the changes found in IGTPW_5336 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_mmap_gtt@basic:
- fi-tgl-y: NOTRUN -> [DMESG-WARN][1] ([i915#402]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5336/fi-tgl-y/igt@[email protected]

* igt@i915_selftest@live@execlists:
- fi-tgl-y: NOTRUN -> [INCOMPLETE][2] ([i915#2268])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5336/fi-tgl-y/igt@i915_selftest@[email protected]

* igt@i915_selftest@live@gt_lrc:
- fi-tgl-y: NOTRUN -> [DMESG-FAIL][3] ([i915#2373])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5336/fi-tgl-y/igt@i915_selftest@live@gt_lrc.html

* igt@i915_selftest@live@gt_pm:
- fi-tgl-y: NOTRUN -> [DMESG-FAIL][4] ([i915#1759])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5336/fi-tgl-y/igt@i915_selftest@live@gt_pm.html

* igt@kms_chamelium@dp-crc-fast:
- fi-skl-guc: NOTRUN -> [SKIP][5] ([fdo#109271] / [fdo#111827]) +8 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5336/fi-skl-guc/igt@[email protected]

* igt@kms_chamelium@vga-edid-read:
- fi-tgl-y: NOTRUN -> [SKIP][6] ([fdo#111827]) +8 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5336/fi-tgl-y/igt@[email protected]

* igt@kms_force_connector_basic@force-load-detect:
- fi-tgl-y: NOTRUN -> [SKIP][7] ([fdo#109285])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5336/fi-tgl-y/igt@[email protected]

* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-skl-guc: NOTRUN -> [SKIP][8] ([fdo#109271] / [i915#533])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5336/fi-skl-guc/igt@[email protected]

* igt@kms_psr@primary_mmap_gtt:
- fi-skl-guc: NOTRUN -> [SKIP][9] ([fdo#109271]) +25 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5336/fi-skl-guc/igt@kms_psr@primary_mmap_gtt.html

* igt@runner@aborted:
- fi-bdw-5557u: NOTRUN -> [FAIL][10] ([i915#2029])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5336/fi-bdw-5557u/igt@[email protected]

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1759]: https://gitlab.freedesktop.org/drm/intel/issues/1759
[i915#2029]: https://gitlab.freedesktop.org/drm/intel/issues/2029
[i915#2268]: https://gitlab.freedesktop.org/drm/intel/issues/2268
[i915#2373]: https://gitlab.freedesktop.org/drm/intel/issues/2373
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533

Participating hosts (38 -> 31)
------------------------------

Additional (2): fi-skl-guc fi-tgl-y
Missing (9): fi-byt-j1900 fi-bsw-cyan fi-cfl-8700k fi-apl-guc fi-kbl-7500u fi-dg1-1 fi-cfl-8109u fi-bsw-kefka fi-bdw-samus

Build changes
-------------

* CI: CI-20190529 -> None
* IGT: IGT_5925 -> IGTPW_5336

CI-20190529: 20190529
CI_DRM_9528: 2d13ca3bfcff24ed05e602511a3720d374e1413c @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_5336: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5336/index.html
IGT_5925: c8d6184a6185e02fc9f83e3cf3ef50b0a67d981d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5336/index.html

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev