[Intel-gfx] [PATCH i-g-t] tests/i915/perf_pmu: Fix allow hang handling

[Intel-gfx] [PATCH i-g-t] tests/i915/perf_pmu: Fix allow hang handling

[Tvrtko Ursulin]

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Commit d7a74b959eea ("tests/i915/perf_pmu: Convert to intel_ctx_t (v3)")
broke the test when it is run in its entirety.

Correct context id needs to be used with igt_allow_hang to avoid context
ban preventing the test to run to completion.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: d7a74b959eea ("tests/i915/perf_pmu: Convert to intel_ctx_t (v3)")
Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
I haven't audited more tests apart from grep showing a lot of
igt_allow_hang with the default context so someone needs to go through
them and see if more are affected.
---
 tests/i915/perf_pmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/i915/perf_pmu.c b/tests/i915/perf_pmu.c
index 581da8483f0c..1665dc5e6317 100644
--- a/tests/i915/perf_pmu.c
+++ b/tests/i915/perf_pmu.c
@@ -2319,7 +2319,7 @@ igt_main
 	}
 
 	test_each_engine("busy-hang", fd, ctx, e) {
-		igt_hang_t hang = igt_allow_hang(fd, 0, 0);
+		igt_hang_t hang = igt_allow_hang(fd, ctx->id, 0);
 
 		single(fd, ctx, e, TEST_BUSY | FLAG_HANG);
 
-- 
2.32.0

Re: [Intel-gfx] [PATCH i-g-t] tests/i915/perf_pmu: Fix allow hang handling

[Dixit, Ashutosh]

On Thu, 06 Jan 2022 08:42:58 -0800, Tvrtko Ursulin wrote:
>
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Commit d7a74b959eea ("tests/i915/perf_pmu: Convert to intel_ctx_t (v3)")
> broke the test when it is run in its entirety.
>
> Correct context id needs to be used with igt_allow_hang to avoid context
> ban preventing the test to run to completion.

Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>

> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Fixes: d7a74b959eea ("tests/i915/perf_pmu: Convert to intel_ctx_t (v3)")
> Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
> I haven't audited more tests apart from grep showing a lot of
> igt_allow_hang with the default context so someone needs to go through
> them and see if more are affected.

Thanks, will do.

> ---
>  tests/i915/perf_pmu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/i915/perf_pmu.c b/tests/i915/perf_pmu.c
> index 581da8483f0c..1665dc5e6317 100644
> --- a/tests/i915/perf_pmu.c
> +++ b/tests/i915/perf_pmu.c
> @@ -2319,7 +2319,7 @@ igt_main
>	}
>
>	test_each_engine("busy-hang", fd, ctx, e) {
> -		igt_hang_t hang = igt_allow_hang(fd, 0, 0);
> +		igt_hang_t hang = igt_allow_hang(fd, ctx->id, 0);
>
>		single(fd, ctx, e, TEST_BUSY | FLAG_HANG);
>
> --
> 2.32.0
>