On Thu, Jan 13, 2022 at 11:59:43AM -0800, john.c.harri...@intel.com wrote:
> From: John Harrison <john.c.harri...@intel.com>
> 
> The global context used by all the subtests for causing hangs is
> marked as unbannable. However, some of the subtests set background
> spinners running on all engines using a freshly created context. If
> there is a test failure for any reason, all of those spinners can be
> killed off as hanging contexts. On systems with lots of engines, that
> can result in the test being banned from creating any new contexts.
> 
> So make the spinner contexts unbannable as well. That way if one
> subtest fails it won't necessarily bring down all subsequent subtests.
> 
> Signed-off-by: John Harrison <john.c.harri...@intel.com>
> ---
>  tests/i915/i915_hangman.c | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
> 
> diff --git a/tests/i915/i915_hangman.c b/tests/i915/i915_hangman.c
> index 9f7f8062c..567eb71ee 100644
> --- a/tests/i915/i915_hangman.c
> +++ b/tests/i915/i915_hangman.c
> @@ -284,6 +284,21 @@ static void test_error_state_capture(const intel_ctx_t 
> *ctx,
>       check_alive();
>  }
>  
> +static void context_unban(int fd, unsigned ctx)
> +{
> +     struct drm_i915_gem_context_param param = {
> +             .ctx_id = ctx,
> +             .param = I915_CONTEXT_PARAM_BANNABLE,

Looking at the kernel I don't see how I915_CONTEXT_PARAM_BANNABLE can
return -EINVAL unless it is protected context.

> +             .value = 0,
> +     };
> +
> +     if(__gem_context_set_param(fd, &param) == -EINVAL) {
> +             igt_assert_eq(param.value, 0);
> +             param.param = I915_CONTEXT_PARAM_BAN_PERIOD;

Also this always returns -EINVAL.

Probably can just go with:

gem_context_set_param on original parameters.

Matt

> +             gem_context_set_param(fd, &param);
> +     }
> +}
> +
>  static void
>  test_engine_hang(const intel_ctx_t *ctx,
>                const struct intel_execution_engine2 *e, unsigned int flags)
> @@ -307,6 +322,7 @@ test_engine_hang(const intel_ctx_t *ctx,
>       num_ctx = 0;
>       for_each_ctx_engine(device, ctx, other) {
>               local_ctx[num_ctx] = intel_ctx_create(device, &ctx->cfg);
> +             context_unban(device, local_ctx[num_ctx]->id);
>               ahndN = get_reloc_ahnd(device, local_ctx[num_ctx]->id);
>               spin = __igt_spin_new(device,
>                                     .ahnd = ahndN,
> -- 
> 2.25.1
> 

Reply via email to