Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e70d3d80 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/selftests: Mark up preemption tests for hang detection 



Use the igt_live_test framework for detecting whether an unwanted hang
occurred during test execution, and report failure if it does.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190321194031.20240-2-chris@chris-wilson.co.uk
parent d067994c

drivers/gpu/drm/i915/selftests/intel_lrc.c

+35 −3
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 




#include "../i915_selftest.h"

#include "../i915_selftest.h"

#include "igt_flush_test.h"

#include "igt_flush_test.h"

#include "igt_live_test.h"

#include "igt_spinner.h"

#include "igt_spinner.h"

#include "i915_random.h"

#include "i915_random.h"
@@ -113,11 +114,17 @@ static int live_preempt(void *arg) 
		I915_USER_PRIORITY(I915_CONTEXT_MIN_USER_PRIORITY);

		I915_USER_PRIORITY(I915_CONTEXT_MIN_USER_PRIORITY);





	for_each_engine(engine, i915, id) {

	for_each_engine(engine, i915, id) {

		struct igt_live_test t;

		struct i915_request *rq;

		struct i915_request *rq;





		if (!intel_engine_has_preemption(engine))

		if (!intel_engine_has_preemption(engine))

			continue;

			continue;





		if (igt_live_test_begin(&t, i915, __func__, engine->name)) {

			err = -EIO;

			goto err_ctx_lo;

		}



		rq = igt_spinner_create_request(&spin_lo, ctx_lo, engine,

		rq = igt_spinner_create_request(&spin_lo, ctx_lo, engine,

						MI_ARB_CHECK);

						MI_ARB_CHECK);

		if (IS_ERR(rq)) {

		if (IS_ERR(rq)) {
@@ -153,7 +160,8 @@ static int live_preempt(void *arg) 




		igt_spinner_end(&spin_hi);

		igt_spinner_end(&spin_hi);

		igt_spinner_end(&spin_lo);

		igt_spinner_end(&spin_lo);

		if (igt_flush_test(i915, I915_WAIT_LOCKED)) {



		if (igt_live_test_end(&t)) {

			err = -EIO;

			err = -EIO;

			goto err_ctx_lo;

			goto err_ctx_lo;

		}

		}
@@ -207,11 +215,17 @@ static int live_late_preempt(void *arg) 
		goto err_ctx_hi;

		goto err_ctx_hi;





	for_each_engine(engine, i915, id) {

	for_each_engine(engine, i915, id) {

		struct igt_live_test t;

		struct i915_request *rq;

		struct i915_request *rq;





		if (!intel_engine_has_preemption(engine))

		if (!intel_engine_has_preemption(engine))

			continue;

			continue;





		if (igt_live_test_begin(&t, i915, __func__, engine->name)) {

			err = -EIO;

			goto err_ctx_lo;

		}



		rq = igt_spinner_create_request(&spin_lo, ctx_lo, engine,

		rq = igt_spinner_create_request(&spin_lo, ctx_lo, engine,

						MI_ARB_CHECK);

						MI_ARB_CHECK);

		if (IS_ERR(rq)) {

		if (IS_ERR(rq)) {
@@ -250,7 +264,8 @@ static int live_late_preempt(void *arg) 




		igt_spinner_end(&spin_hi);

		igt_spinner_end(&spin_hi);

		igt_spinner_end(&spin_lo);

		igt_spinner_end(&spin_lo);

		if (igt_flush_test(i915, I915_WAIT_LOCKED)) {



		if (igt_live_test_end(&t)) {

			err = -EIO;

			err = -EIO;

			goto err_ctx_lo;

			goto err_ctx_lo;

		}

		}
@@ -615,6 +630,7 @@ static int live_chain_preempt(void *arg) 
		struct i915_sched_attr attr = {

		struct i915_sched_attr attr = {

			.priority = I915_USER_PRIORITY(I915_PRIORITY_MAX),

			.priority = I915_USER_PRIORITY(I915_PRIORITY_MAX),

		};

		};

		struct igt_live_test t;

		struct i915_request *rq;

		struct i915_request *rq;

		int ring_size, count, i;

		int ring_size, count, i;
@@ -641,6 +657,11 @@ static int live_chain_preempt(void *arg) 
			goto err_wedged;

			goto err_wedged;

		}

		}





		if (igt_live_test_begin(&t, i915, __func__, engine->name)) {

			err = -EIO;

			goto err_wedged;

		}



		for_each_prime_number_from(count, 1, ring_size) {

		for_each_prime_number_from(count, 1, ring_size) {

			rq = igt_spinner_create_request(&hi.spin,

			rq = igt_spinner_create_request(&hi.spin,

							hi.ctx, engine,

							hi.ctx, engine,
@@ -699,6 +720,11 @@ static int live_chain_preempt(void *arg) 
				goto err_wedged;

				goto err_wedged;

			}

			}

		}

		}



		if (igt_live_test_end(&t)) {

			err = -EIO;

			goto err_wedged;

		}

	}

	}





	err = 0;

	err = 0;
@@ -1022,6 +1048,7 @@ static int live_preempt_smoke(void *arg) 
	};

	};

	const unsigned int phase[] = { 0, BATCH };

	const unsigned int phase[] = { 0, BATCH };

	intel_wakeref_t wakeref;

	intel_wakeref_t wakeref;

	struct igt_live_test t;

	int err = -ENOMEM;

	int err = -ENOMEM;

	u32 *cs;

	u32 *cs;

	int n;

	int n;
@@ -1055,6 +1082,11 @@ static int live_preempt_smoke(void *arg) 
	i915_gem_object_flush_map(smoke.batch);

	i915_gem_object_flush_map(smoke.batch);

	i915_gem_object_unpin_map(smoke.batch);

	i915_gem_object_unpin_map(smoke.batch);





	if (igt_live_test_begin(&t, smoke.i915, __func__, "all")) {

		err = -EIO;

		goto err_batch;

	}



	for (n = 0; n < smoke.ncontext; n++) {

	for (n = 0; n < smoke.ncontext; n++) {

		smoke.contexts[n] = kernel_context(smoke.i915);

		smoke.contexts[n] = kernel_context(smoke.i915);

		if (!smoke.contexts[n])

		if (!smoke.contexts[n])
@@ -1072,7 +1104,7 @@ static int live_preempt_smoke(void *arg) 
	}

	}





err_ctx:

err_ctx:

	if (igt_flush_test(smoke.i915, I915_WAIT_LOCKED))

	if (igt_live_test_end(&t))

		err = -EIO;

		err = -EIO;





	for (n = 0; n < smoke.ncontext; n++) {

	for (n = 0; n < smoke.ncontext; n++) {