Skip to contentSkip to conversation

tests/kms_vblank: Fix spurious test failure.

PATCH In review Maarten Lankhorst 3 participants 6 messages Feb 2, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/kms_vblank: Fix spurious test failure.

igt_system_suspend_autoresume() calls igt_require(), which isn't allowed to be called from a forked child. Run subtests directly from the test body, except when a forked test is requested.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104783

---
 tests/kms_vblank.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
tests/kms_vblank.c +8 -5
index 5df2da7b038c..c94e67f41976 100644
@@ -113,8 +113,6 @@ static int wait_vblank(int fd, union drm_wait_vblank *vbl)
 
 static void run_test(data_t *data, void (*testfunc)(data_t *, int, int))
 {
-	int nchildren =
-		data->flags & FORKED ? sysconf(_SC_NPROCESSORS_ONLN) : 1;
 	igt_display_t *display = &data->display;
 	igt_output_t *output = data->output;
 	int fd = display->drm_fd;
@@ -143,9 +141,14 @@ static void run_test(data_t *data, void (*testfunc)(data_t *, int, int))
 		igt_assert_eq(wait_vblank(fd, &vbl), 0);
 	}
 
-	igt_fork(child, nchildren)
-		testfunc(data, fd, nchildren);
-	igt_waitchildren();
+	if (data->flags & FORKED) {
+		int nchildren = sysconf(_SC_NPROCESSORS_ONLN);
+
+		igt_fork(child, nchildren)
+			testfunc(data, fd, nchildren);
+		igt_waitchildren();
+	} else
+		testfunc(data, fd, 1);
 
 	if (data->flags & BUSY) {
 		struct drm_event_vblank buf;
Signature · 6 lines
2.15.1

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

[igt-dev] ✗ Fi.CI.BAT: failure for tests/kms_vblank: Fix spurious test failure.

== Series Details ==

== Series Details ==

Series: tests/kms_vblank: Fix spurious test failure.
URL : https://patchwork.freedesktop.org/series/37542/
State : failure

== Summary ==

IGT patchset build failed on latest successful build a20a69e25a18ec63236633b804d89cc0c0cea259 overlay: fix invalid pointer access

  CCLD     kms_invalid_dotclock
  CCLD     kms_legacy_colorkey
  CCLD     kms_mmap_write_crc
  CCLD     kms_mmio_vs_cs_flip
  CCLD     kms_panel_fitting
  CCLD     kms_pipe_b_c_ivb
  CCLD     kms_pipe_crc_basic
  CCLD     kms_plane
  CCLD     kms_plane_lowres
  CCLD     kms_plane_multiple
  CCLD     kms_plane_scaling
  CCLD     kms_properties
  CCLD     kms_psr_sink_crc
  CCLD     kms_pwrite_crc
  CCLD     kms_rmfb
  CCLD     kms_rotation_crc
  CCLD     kms_setmode
  CCLD     kms_sink_crc_basic
  CCLD     kms_sysfs_edid_timing
  CCLD     kms_tv_load_detect
  CCLD     kms_universal_plane
  CC       kms_vblank.o
In file included from ./../lib/intel_batchbuffer.h:8:0,
                 from ./../lib/drmtest.h:39,
                 from ./../lib/igt.h:27,
                 from kms_vblank.c:29:
kms_vblank.c: In function ‘run_test’:
kms_vblank.c:128:29: error: ‘nchildren’ undeclared (first use in this function)
    igt_output_name(output), nchildren);
                             ^
./../lib/igt_core.h:803:62: note: in definition of macro ‘igt_info’
 #define igt_info(f...) igt_log(IGT_LOG_DOMAIN, IGT_LOG_INFO, f)
                                                              ^
kms_vblank.c:128:29: note: each undeclared identifier is reported only once for each function it appears in
    igt_output_name(output), nchildren);
                             ^
./../lib/igt_core.h:803:62: note: in definition of macro ‘igt_info’
 #define igt_info(f...) igt_log(IGT_LOG_DOMAIN, IGT_LOG_INFO, f)
                                                              ^
kms_vblank.c:145:7: warning: declaration of ‘nchildren’ shadows previous non-variable [-Wshadow]
   int nchildren = sysconf(_SC_NPROCESSORS_ONLN);
       ^~~~~~~~~

Makefile:3903: recipe for target 'kms_vblank.o' failed make[3]: *** [kms_vblank.o] Error 1 Makefile:4304: recipe for target 'all-recursive' failed make[2]: *** [all-recursive] Error 1 Makefile:532: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 Makefile:464: recipe for target 'all' failed
make: *** [all] Error 2

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

Reviewed-by on v1 1/1
#2 lore raw
In reply to Maarten Lankhorst

Quoting Maarten Lankhorst (2018-02-02 11:41:16)

Quoted 6 lines

igt_system_suspend_autoresume() calls igt_require(), which isn't allowed to be called from a forked child. Run subtests directly from the test body, except when a forked test is requested.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104783

Easier than lifting all the requires,

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

#3 lore raw

PATCH 1/1 tests/kms_vblank: Fix spurious test failure.

igt_system_suspend_autoresume() calls igt_require(), which isn't allowed to be called from a forked child. Run subtests directly from the test body, except when a forked test is requested.

Changes since v1:
- Fixed to actually compile..

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104783

---
 tests/kms_vblank.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
tests/kms_vblank.c +12 -7
index 5df2da7b038c..2bee49de55eb 100644
@@ -113,8 +113,6 @@ static int wait_vblank(int fd, union drm_wait_vblank *vbl)
 
 static void run_test(data_t *data, void (*testfunc)(data_t *, int, int))
 {
-	int nchildren =
-		data->flags & FORKED ? sysconf(_SC_NPROCESSORS_ONLN) : 1;
 	igt_display_t *display = &data->display;
 	igt_output_t *output = data->output;
 	int fd = display->drm_fd;
@@ -125,9 +123,9 @@ static void run_test(data_t *data, void (*testfunc)(data_t *, int, int))
 	if (data->flags & RPM)
 		igt_require(igt_setup_runtime_pm());
 
-	igt_info("Beginning %s on pipe %s, connector %s (%d threads)\n",
+	igt_info("Beginning %s on pipe %s, connector %s\n",
 		 igt_subtest_name(), kmstest_pipe_name(data->pipe),
-		 igt_output_name(output), nchildren);
+		 igt_output_name(output));
 
 	if (!(data->flags & NOHANG))
 		hang = igt_hang_ring(fd, I915_EXEC_DEFAULT);
@@ -143,9 +141,16 @@ static void run_test(data_t *data, void (*testfunc)(data_t *, int, int))
 		igt_assert_eq(wait_vblank(fd, &vbl), 0);
 	}
 
-	igt_fork(child, nchildren)
-		testfunc(data, fd, nchildren);
-	igt_waitchildren();
+	if (data->flags & FORKED) {
+		int nchildren = sysconf(_SC_NPROCESSORS_ONLN);
+
+		igt_debug("Spawning %d threads\n", nchildren);
+
+		igt_fork(child, nchildren)
+			testfunc(data, fd, nchildren);
+		igt_waitchildren();
+	} else
+		testfunc(data, fd, 1);
 
 	if (data->flags & BUSY) {
 		struct drm_event_vblank buf;
Signature · 6 lines
2.15.1

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

[igt-dev] ✓ Fi.CI.BAT: success for tests/kms_vblank: Fix spurious test failure. (rev2)

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: tests/kms_vblank: Fix spurious test failure. (rev2)
URL : https://patchwork.freedesktop.org/series/37542/
State : success

== Summary ==

IGT patchset tested on top of latest successful build a20a69e25a18ec63236633b804d89cc0c0cea259 overlay: fix invalid pointer access

with latest DRM-Tip kernel build CI_DRM_3716
e1b21c16bfaf drm-tip: 2018y-02m-02d-08h-21m-34s UTC integration manifest

No testlist changes.

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:419s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:427s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:372s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:491s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:283s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:483s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:470s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:459s
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:561s
fi-elk-e7500     total:288  pass:229  dwarn:0   dfail:0   fail:0   skip:59  time:415s
fi-gdg-551       total:288  pass:179  dwarn:0   dfail:0   fail:1   skip:108 time:280s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:512s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:390s
fi-hsw-4770r     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:398s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:418s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:456s
fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:416s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:460s
fi-kbl-7560u     total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:498s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:454s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:498s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:583s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:429s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:511s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:531s
fi-skl-6700k2    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:486s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:478s
fi-skl-guc       total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:413s
fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:430s
fi-snb-2520m     total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:530s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:397s

Blacklisted hosts:
fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:467s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_855/issues.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#5 lore raw

[igt-dev] ✓ Fi.CI.IGT: success for tests/kms_vblank: Fix spurious test failure. (rev2)

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: tests/kms_vblank: Fix spurious test failure. (rev2)
URL : https://patchwork.freedesktop.org/series/37542/
State : success

== Summary ==

Test kms_vblank:

        Subgroup pipe-a-ts-continuation-suspend:
                fail       -> PASS       (shard-hsw) fdo#104783
Test kms_atomic_transition:
        Subgroup plane-all-transition:
                skip       -> PASS       (shard-snb)
Test gem_eio:
        Subgroup in-flight:
                fail       -> PASS       (shard-hsw) fdo#104676
Test drv_selftest:
        Subgroup live_gtt:
                pass       -> INCOMPLETE (shard-apl) fdo#103927
Test perf:
        Subgroup blocking:
                fail       -> PASS       (shard-hsw) fdo#102252
Test kms_plane:
        Subgroup plane-panning-bottom-right-suspend-pipe-a-planes:
                pass       -> DMESG-WARN (shard-snb) fdo#102365

fdo#104783 https://bugs.freedesktop.org/show_bug.cgi?id=104783
fdo#104676 https://bugs.freedesktop.org/show_bug.cgi?id=104676
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#102365 https://bugs.freedesktop.org/show_bug.cgi?id=102365

shard-apl        total:2814 pass:1726 dwarn:1   dfail:0   fail:22  skip:1064 time:12107s
shard-hsw        total:2836 pass:1734 dwarn:1   dfail:0   fail:10  skip:1090 time:11677s
shard-snb        total:2836 pass:1327 dwarn:2   dfail:0   fail:10  skip:1497 time:6517s

Blacklisted hosts:
shard-kbl total:2782 pass:1830 dwarn:1 dfail:0 fail:22 skip:927 time:9217s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_855/shards.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev