Hi Janusz,
On 2025-10-07 at 13:38:28 +0200, Janusz Krzysztofik wrote:
> Each call to trigger_reset() results in GPU state dumped to stderr.
> Subtests that call trigger_reset() many times from a loop tend to exhaust
> per test disk space limit watched by igt_runner.  That results in
> incompletes reported instead of actual subtest results, and CI coverage
> unnecessarily reduced as a further consequence.  Stop dumping GPU state
> from those subtests.
> 
> Signed-off-by: Janusz Krzysztofik <[email protected]>

Reviewed-by: Kamil Konieczny <[email protected]>

> ---
>  tests/intel/gem_eio.c | 33 +++++++++++++++++----------------
>  1 file changed, 17 insertions(+), 16 deletions(-)
> 
> diff --git a/tests/intel/gem_eio.c b/tests/intel/gem_eio.c
> index cbbf78b932..54ae65155f 100644
> --- a/tests/intel/gem_eio.c
> +++ b/tests/intel/gem_eio.c
> @@ -139,7 +139,7 @@ static bool i915_reset_control(int fd, bool enable)
>       return igt_params_set(fd, "reset", "%d", enable);
>  }
>  
> -static void trigger_reset(int fd)
> +static void trigger_reset(int fd, bool dump)
>  {
>       struct timespec ts = { };
>  
> @@ -159,7 +159,8 @@ static void trigger_reset(int fd)
>       igt_kmsg(KMSG_DEBUG "Checking that the GPU recovered\n");
>       gem_test_all_engines(fd);
>  
> -     igt_debugfs_dump(fd, "i915_engine_info");
> +     if (dump)
> +             igt_debugfs_dump(fd, "i915_engine_info");
>       igt_drop_caches_set(fd, DROP_ACTIVE);
>  
>       /* We expect the health check to be quick! */
> @@ -199,7 +200,7 @@ static void test_throttle(int fd)
>  
>       igt_assert_eq(__gem_throttle(fd), -EIO);
>  
> -     trigger_reset(fd);
> +     trigger_reset(fd, true);
>  }
>  
>  static void test_create(int fd)
> @@ -208,7 +209,7 @@ static void test_create(int fd)
>  
>       gem_close(fd, gem_create(fd, 4096));
>  
> -     trigger_reset(fd);
> +     trigger_reset(fd, true);
>  }
>  
>  static void test_create_ext(int fd)
> @@ -233,7 +234,7 @@ static void test_create_ext(int fd)
>               gem_close(fd, handle);
>       }
>  
> -     trigger_reset(fd);
> +     trigger_reset(fd, true);
>  }
>  
>  static void test_context_create(int fd)
> @@ -246,7 +247,7 @@ static void test_context_create(int fd)
>  
>       igt_assert_eq(__gem_context_create(fd, &ctx), -EIO);
>  
> -     trigger_reset(fd);
> +     trigger_reset(fd, true);
>  }
>  
>  static void test_execbuf(int fd)
> @@ -269,7 +270,7 @@ static void test_execbuf(int fd)
>       igt_assert_eq(__gem_execbuf(fd, &execbuf), -EIO);
>       gem_close(fd, exec.handle);
>  
> -     trigger_reset(fd);
> +     trigger_reset(fd, true);
>  }
>  
>  static int __gem_wait(int fd, uint32_t handle, int64_t timeout)
> @@ -475,7 +476,7 @@ static void __test_banned(int fd)
>               /* Trigger a reset, making sure we are detected as guilty */
>               ahnd = get_reloc_ahnd(fd, 0);
>               hang = spin_sync(fd, ahnd, intel_ctx_0(fd), 0);
> -             trigger_reset(fd);
> +             trigger_reset(fd, false);
>               igt_spin_free(fd, hang);
>               put_ahnd(ahnd);
>  
> @@ -562,7 +563,7 @@ static void test_wait(int fd, unsigned int flags, 
> unsigned int wait)
>  
>       igt_require(i915_reset_control(fd, true));
>  
> -     trigger_reset(fd);
> +     trigger_reset(fd, true);
>       drm_close_driver(fd);
>  }
>  
> @@ -580,7 +581,7 @@ static void test_suspend(int fd, int state)
>       igt_system_suspend_autoresume(state, SUSPEND_TEST_DEVICES);
>  
>       igt_require(i915_reset_control(fd, true));
> -     trigger_reset(fd);
> +     trigger_reset(fd, true);
>       drm_close_driver(fd);
>  }
>  
> @@ -642,7 +643,7 @@ static void test_inflight(int fd, unsigned int wait)
>               put_ahnd(ahnd);
>  
>               igt_assert(i915_reset_control(fd, true));
> -             trigger_reset(fd);
> +             trigger_reset(fd, true);
>  
>               gem_close(fd, obj[1].handle);
>               drm_close_driver(fd);
> @@ -705,7 +706,7 @@ static void test_inflight_suspend(int fd)
>       put_ahnd(ahnd);
>  
>       igt_assert(i915_reset_control(fd, true));
> -     trigger_reset(fd);
> +     trigger_reset(fd, true);
>       drm_close_driver(fd);
>  }
>  
> @@ -791,7 +792,7 @@ static void test_inflight_contexts(int fd, unsigned int 
> wait)
>               put_ahnd(ahnd);
>  
>               igt_assert(i915_reset_control(fd, true));
> -             trigger_reset(fd);
> +             trigger_reset(fd, true);
>  
>               for (unsigned int n = 0; n < ARRAY_SIZE(ctx); n++)
>                       intel_ctx_destroy(fd, ctx[n]);
> @@ -851,7 +852,7 @@ static void test_inflight_external(int fd)
>       igt_spin_free(fd, hang);
>       put_ahnd(ahnd);
>       igt_assert(i915_reset_control(fd, true));
> -     trigger_reset(fd);
> +     trigger_reset(fd, true);
>       drm_close_driver(fd);
>  }
>  
> @@ -901,7 +902,7 @@ static void test_inflight_internal(int fd, unsigned int 
> wait)
>       put_ahnd(ahnd);
>  
>       igt_assert(i915_reset_control(fd, true));
> -     trigger_reset(fd);
> +     trigger_reset(fd, true);
>       drm_close_driver(fd);
>  }
>  
> @@ -959,7 +960,7 @@ static void reset_stress(int fd, uint64_t ahnd, const 
> intel_ctx_t *ctx0,
>  
>               /* Unwedge by forcing a reset. */
>               igt_assert(i915_reset_control(fd, true));
> -             trigger_reset(fd);
> +             trigger_reset(fd, false);
>  
>               gem_quiescent_gpu(fd);
>  
> -- 
> 2.51.0
> 

Reply via email to