[igt-dev] [PATCH i-g-t] i915/gem_exec_reuse: stop the hang detector afterwards

[igt-dev] [PATCH i-g-t] i915/gem_exec_reuse: stop the hang detector afterwards

[Chris Wilson]

Take responsibility for the state we create, and in particular remember
to kill our child process (the hang detector) before exiting.

Reported-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 tests/i915/gem_exec_reuse.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/i915/gem_exec_reuse.c b/tests/i915/gem_exec_reuse.c
index df220be7b..44946528f 100644
--- a/tests/i915/gem_exec_reuse.c
+++ b/tests/i915/gem_exec_reuse.c
@@ -116,7 +116,7 @@ static unsigned int max_nfd(void)
 
 igt_main
 {
-	struct noop no;
+	struct noop no = { .fd = -1 };
 	unsigned engines[16];
 	unsigned nengine;
 	unsigned n;
@@ -213,4 +213,7 @@ igt_main
 		for (n = 0; n < ncontexts; n++)
 			gem_context_destroy(no.fd, contexts[n]);
 	}
+
+	igt_fixture
+		igt_stop_hang_detector(no.fd);
 }
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✗ Fi.CI.BAT: failure for i915/gem_exec_reuse: stop the hang detector afterwards

[Patchwork]

== Series Details ==

Series: i915/gem_exec_reuse: stop the hang detector afterwards
URL   : https://patchwork.freedesktop.org/series/56506/
State : failure

== Summary ==

IGT patchset build failed on latest successful build
08cdb644686629dcf968c6cc00e054ed5f5aae6a lib/tests: Drop automake support

[244/463] Linking target tests/gem_caching.
[245/463] Linking target tests/gem_concurrent_blit.
[246/463] Linking target tests/gem_close_race.
[247/463] Linking target tests/gem_non_secure_batch.
[248/463] Linking target tests/gem_cpu_reloc.
[249/463] Linking target tests/gem_cs_prefetch.
[250/463] Linking target tests/gem_create.
[251/463] Linking target tests/gem_cs_tlb.
[252/463] Linking target tests/gem_ctx_create.
[253/463] Linking target tests/gem_ctx_bad_destroy.
[254/463] Linking target tests/gem_ctx_isolation.
[255/463] Linking target tests/gem_ctx_exec.
[256/463] Linking target tests/gem_ctx_thrash.
[257/463] Linking target tests/gem_ctx_param.
[258/463] Linking target tests/gem_ctx_switch.
[259/463] Linking target tests/gem_double_irq_loop.
[260/463] Linking target tests/gem_exec_alignment.
[261/463] Linking target tests/gem_evict_everything.
[262/463] Linking target tests/gem_evict_alignment.
[263/463] Linking target tests/gem_exec_await.
[264/463] Linking target tests/gem_exec_async.
[265/463] Linking target tests/gem_exec_bad_domains.
[266/463] Linking target tests/gem_exec_big.
[267/463] Linking target tests/gem_exec_basic.
[268/463] Linking target tests/gem_exec_capture.
[269/463] Linking target tests/gem_exec_blt.
[270/463] Linking target tests/gem_exec_faulting_reloc.
[271/463] Linking target tests/gem_exec_create.
[272/463] Linking target tests/gem_exec_fence.
[273/463] Linking target tests/gem_exec_flush.
[274/463] Linking target tests/gem_exec_gttfill.
[275/463] Linking target tests/gem_exec_latency.
[276/463] Linking target tests/gem_exec_lut_handle.
[277/463] Linking target tests/gem_exec_parallel.
[278/463] Linking target tests/gem_exec_nop.
[279/463] Linking target tests/gem_exec_parse.
[280/463] Linking target tests/gem_exec_params.
[281/463] Compiling C object 'tests/gem_exec_reuse@exe/i915_gem_exec_reuse.c.o'.
FAILED: tests/gem_exec_reuse@exe/i915_gem_exec_reuse.c.o 
ccache cc  -Itests/gem_exec_reuse@exe -Itests -I../tests -I. -I../ -I../lib/stubs/syscalls -Ilib -I../lib -I../include/drm-uapi -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/opt/igt/include -I/opt/igt/include/libdrm -I/usr/include/x86_64-linux-gnu -I/usr/include -I/usr/include/libdrm -I/usr/include/libdrm/nouveau -I/home/cidrm/kernel_headers/include -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O0 -g -D_GNU_SOURCE -include config.h -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -pthread -MD -MQ 'tests/gem_exec_reuse@exe/i915_gem_exec_reuse.c.o' -MF 'tests/gem_exec_reuse@exe/i915_gem_exec_reuse.c.o.d' -o 'tests/gem_exec_reuse@exe/i915_gem_exec_reuse.c.o' -c ../tests/i915/gem_exec_reuse.c
../tests/i915/gem_exec_reuse.c: In function ‘__real_main117’:
../tests/i915/gem_exec_reuse.c:218:3: error: too many arguments to function ‘igt_stop_hang_detector’
   igt_stop_hang_detector(no.fd);
   ^~~~~~~~~~~~~~~~~~~~~~
In file included from ../lib/igt.h:30:0,
                 from ../tests/i915/gem_exec_reuse.c:27:
../lib/igt_aux.h:53:6: note: declared here
 void igt_stop_hang_detector(void);
      ^~~~~~~~~~~~~~~~~~~~~~
ninja: build stopped: subcommand failed.

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t] i915/gem_exec_reuse: stop the hang detector afterwards

[Antonio Argenziano]

On 11/02/19 09:52, Chris Wilson wrote:
> Take responsibility for the state we create, and in particular remember
> to kill our child process (the hang detector) before exiting.
> 
> Reported-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>   tests/i915/gem_exec_reuse.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/i915/gem_exec_reuse.c b/tests/i915/gem_exec_reuse.c
> index df220be7b..44946528f 100644
> --- a/tests/i915/gem_exec_reuse.c
> +++ b/tests/i915/gem_exec_reuse.c
> @@ -116,7 +116,7 @@ static unsigned int max_nfd(void)
>   
>   igt_main
>   {
> -	struct noop no;
> +	struct noop no = { .fd = -1 };
>   	unsigned engines[16];
>   	unsigned nengine;
>   	unsigned n;
> @@ -213,4 +213,7 @@ igt_main
>   		for (n = 0; n < ncontexts; n++)
>   			gem_context_destroy(no.fd, contexts[n]);
>   	}
> +
> +	igt_fixture
> +		igt_stop_hang_detector(no.fd);

This doesn't take an fd... incoming changes to the lib?

Still makes sense, with fix,

Reviewed-by: Antonio Argenziano <antonio.argenziano@intel.com>

>   }
> 
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev