[Intel-gfx] [PATCH v3] drm/i915/selftests: Exercise context switching in parallel

2019-09-30 Thread Chris Wilson
We currently test context switching on each engine as a basic stress
test (just verifying that nothing explodes if we execute 2 requests from
different contexts sequentially). What we have not tested is what
happens if we try and do so on all available engines simultaneously,
putting our SW and the HW under the maximal stress.

v2: Clone the set of engines from the first context into the secondary
contexts.

Signed-off-by: Chris Wilson 
Cc: Mika Kuoppala 
Cc: Tvrtko Ursulin 
---
 .../drm/i915/gem/selftests/i915_gem_context.c | 238 ++
 1 file changed, 238 insertions(+)

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c 
b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
index dc25bcc3e372..c221ed53620f 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
@@ -156,6 +156,243 @@ static int live_nop_switch(void *arg)
return err;
 }
 
+struct parallel_switch {
+   struct task_struct *tsk;
+   struct intel_context *ce[2];
+};
+
+static int __live_parallel_switch1(void *data)
+{
+   struct parallel_switch *arg = data;
+   struct drm_i915_private *i915 = arg->ce[0]->engine->i915;
+   IGT_TIMEOUT(end_time);
+   unsigned long count;
+
+   count = 0;
+   do {
+   struct i915_request *rq;
+   int err;
+
+   mutex_lock(&i915->drm.struct_mutex);
+   rq = i915_request_create(arg->ce[0]);
+   if (IS_ERR(rq)) {
+   mutex_unlock(&i915->drm.struct_mutex);
+   return PTR_ERR(rq);
+   }
+
+   i915_request_add(rq);
+   mutex_unlock(&i915->drm.struct_mutex);
+
+   mutex_lock(&i915->drm.struct_mutex);
+   rq = i915_request_create(arg->ce[1]);
+   if (IS_ERR(rq)) {
+   mutex_unlock(&i915->drm.struct_mutex);
+   return PTR_ERR(rq);
+   }
+
+   i915_request_get(rq);
+   i915_request_add(rq);
+   mutex_unlock(&i915->drm.struct_mutex);
+
+   err = 0;
+   if (i915_request_wait(rq, 0, HZ / 5) < 0)
+   err = -ETIME;
+   i915_request_put(rq);
+   if (err)
+   return err;
+
+   count++;
+   } while (!__igt_timeout(end_time, NULL));
+
+   pr_info("%s: %lu switches (sync)\n", arg->ce[0]->engine->name, count);
+   return 0;
+}
+
+static int __live_parallel_switchN(void *data)
+{
+   struct parallel_switch *arg = data;
+   struct drm_i915_private *i915 = arg->ce[0]->engine->i915;
+   IGT_TIMEOUT(end_time);
+   unsigned long count;
+
+   count = 0;
+   do {
+   struct i915_request *rq;
+
+   mutex_lock(&i915->drm.struct_mutex);
+   rq = i915_request_create(arg->ce[0]);
+   if (IS_ERR(rq)) {
+   mutex_unlock(&i915->drm.struct_mutex);
+   return PTR_ERR(rq);
+   }
+
+   i915_request_add(rq);
+   mutex_unlock(&i915->drm.struct_mutex);
+
+   mutex_lock(&i915->drm.struct_mutex);
+   rq = i915_request_create(arg->ce[1]);
+   if (IS_ERR(rq)) {
+   mutex_unlock(&i915->drm.struct_mutex);
+   return PTR_ERR(rq);
+   }
+
+   i915_request_add(rq);
+   mutex_unlock(&i915->drm.struct_mutex);
+
+   count++;
+   } while (!__igt_timeout(end_time, NULL));
+
+   pr_info("%s: %lu switches (many)\n", arg->ce[0]->engine->name, count);
+   return 0;
+}
+
+static int live_parallel_switch(void *arg)
+{
+   struct drm_i915_private *i915 = arg;
+   static int (* const func[])(void *arg) = {
+   __live_parallel_switch1,
+   __live_parallel_switchN,
+   NULL,
+   };
+   struct i915_gem_engines *engines;
+   struct i915_gem_engines_iter it;
+   int (* const *fn)(void *arg);
+   struct parallel_switch *data;
+   struct i915_gem_context *ctx;
+   struct intel_context *ce;
+   struct drm_file *file;
+   int n, m, count;
+   int err = 0;
+
+   /*
+* Check we can process switches on all engines simultaneously.
+*/
+
+   if (!DRIVER_CAPS(i915)->has_logical_contexts)
+   return 0;
+
+   file = mock_file(i915);
+   if (IS_ERR(file))
+   return PTR_ERR(file);
+
+   mutex_lock(&i915->drm.struct_mutex);
+
+   ctx = live_context(i915, file);
+   if (IS_ERR(ctx)) {
+   err = PTR_ERR(ctx);
+   goto out_locked;
+   }
+
+   engines = i915_gem_context_lock_engines(ctx);
+   count = engines->num_engines;
+
+   data = kcalloc(count, sizeof(*data), GFP_KERNEL);
+   if (!data) {
+   i915_gem_context

Re: [Intel-gfx] [PATCH v3] drm/i915/selftests: Exercise context switching in parallel

2019-09-30 Thread Chris Wilson
Quoting Chris Wilson (2019-09-30 15:15:22)
> We currently test context switching on each engine as a basic stress
> test (just verifying that nothing explodes if we execute 2 requests from
> different contexts sequentially). What we have not tested is what
> happens if we try and do so on all available engines simultaneously,
> putting our SW and the HW under the maximal stress.
> 
> v2: Clone the set of engines from the first context into the secondary
> contexts.
> 
> Signed-off-by: Chris Wilson 
> Cc: Mika Kuoppala 
> Cc: Tvrtko Ursulin 
> ---

> +static int live_parallel_switch(void *arg)
> +{
> +   struct drm_i915_private *i915 = arg;
> +   static int (* const func[])(void *arg) = {
> +   __live_parallel_switch1,
> +   __live_parallel_switchN,
> +   NULL,
> +   };
> +   struct i915_gem_engines *engines;
> +   struct i915_gem_engines_iter it;
> +   int (* const *fn)(void *arg);
> +   struct parallel_switch *data;
> +   struct i915_gem_context *ctx;
> +   struct intel_context *ce;
> +   struct drm_file *file;
> +   int n, m, count;
> +   int err = 0;
> +
> +   /*
> +* Check we can process switches on all engines simultaneously.
> +*/
> +
> +   if (!DRIVER_CAPS(i915)->has_logical_contexts)
> +   return 0;
> +
> +   file = mock_file(i915);
> +   if (IS_ERR(file))
> +   return PTR_ERR(file);
> +
> +   mutex_lock(&i915->drm.struct_mutex);
> +
> +   ctx = live_context(i915, file);
> +   if (IS_ERR(ctx)) {
> +   err = PTR_ERR(ctx);
> +   goto out_locked;

This needs data = NULL to be safe.
...

> +   mutex_lock(&i915->drm.struct_mutex);
> +out_locked:
> +   for (n = 0; n < count; n++) {
> +   for (m = 0; m < ARRAY_SIZE(data->ce); m++) {
> +   if (!data[n].ce[m])
> +   continue;
> +
> +   intel_context_unpin(data[n].ce[m]);
> +   intel_context_put(data[n].ce[m]);
> +   }
> +   }
> +   mutex_unlock(&i915->drm.struct_mutex);
> +   kfree(data);
> +   mock_file_free(i915, file);
> +   return err;
> +}
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx