On Mon, Jan 27, 2020 at 12:18:16PM +0000, Chris Wilson wrote:
> We [will] expose various per-engine scheduling controls. One of which,
> 'preempt_timeout_ms', defines how we wait for a preemption request to be
> honoured by the currently executing context. If it fails to relieve the
> GPU within the required timeout, the engine is reset and the miscreant
> forcibly evicted.
>
> Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
> ---
> lib/i915/gem_context.c | 41 ++++
> lib/i915/gem_context.h | 2 +
> lib/i915/gem_engine_topology.c | 48 +++++
> lib/i915/gem_engine_topology.h | 3 +
> tests/Makefile.sources | 3 +
> tests/i915/sysfs_preempt_timeout.c | 309 +++++++++++++++++++++++++++++
> tests/meson.build | 1 +
> 7 files changed, 407 insertions(+)
> create mode 100644 tests/i915/sysfs_preempt_timeout.c
>
> diff --git a/lib/i915/gem_context.c b/lib/i915/gem_context.c
> index 0b6a554df..fc874a187 100644
> --- a/lib/i915/gem_context.c
> +++ b/lib/i915/gem_context.c
> @@ -462,3 +462,44 @@ bool gem_context_has_engine(int fd, uint32_t ctx,
> uint64_t engine)
>
> return __gem_execbuf(fd, &execbuf) == -ENOENT;
> }
> +
> +static int create_ext_ioctl(int i915,
> + struct drm_i915_gem_context_create_ext *arg)
> +{
> + int err;
> +
> + err = 0;
> + if (igt_ioctl(i915, DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT, arg)) {
> + err = -errno;
> + igt_assume(err);
> + }
> +
> + errno = 0;
> + return err;
> +}
> +
> +uint32_t gem_context_create_for_engine(int i915, unsigned int class,
> unsigned int inst)
> +{
> + I915_DEFINE_CONTEXT_PARAM_ENGINES(engines, 1) = {
> + .engines = { { .engine_class = class, .engine_instance = inst }
> }
> + };
> + struct drm_i915_gem_context_create_ext_setparam p_engines = {
> + .base = {
> + .name = I915_CONTEXT_CREATE_EXT_SETPARAM,
> + .next_extension = 0, /* end of chain */
> + },
> + .param = {
> + .param = I915_CONTEXT_PARAM_ENGINES,
> + .value = to_user_pointer(&engines),
> + .size = sizeof(engines),
> + },
> + };
> + struct drm_i915_gem_context_create_ext create = {
> + .flags = I915_CONTEXT_CREATE_FLAGS_USE_EXTENSIONS,
> + .extensions = to_user_pointer(&p_engines),
> + };
> +
> + igt_assert_eq(create_ext_ioctl(i915, &create), 0);
> + igt_assert_neq(create.ctx_id, 0);
> + return create.ctx_id;
> +}
> diff --git a/lib/i915/gem_context.h b/lib/i915/gem_context.h
> index cf2ba33fe..ded75bb9c 100644
> --- a/lib/i915/gem_context.h
> +++ b/lib/i915/gem_context.h
> @@ -34,6 +34,8 @@ int __gem_context_create(int fd, uint32_t *ctx_id);
> void gem_context_destroy(int fd, uint32_t ctx_id);
> int __gem_context_destroy(int fd, uint32_t ctx_id);
>
> +uint32_t gem_context_create_for_engine(int fd, unsigned int class, unsigned
> int inst);
> +
> int __gem_context_clone(int i915,
> uint32_t src, unsigned int share,
> unsigned int flags,
> diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c
> index 058983123..81faf3c15 100644
> --- a/lib/i915/gem_engine_topology.c
> +++ b/lib/i915/gem_engine_topology.c
> @@ -22,6 +22,8 @@
> */
>
> #include <fcntl.h>
> +#include <sys/stat.h>
> +#include <sys/syscall.h>
> #include <unistd.h>
>
> #include "drmtest.h"
> @@ -415,3 +417,49 @@ uint32_t gem_engine_mmio_base(int i915, const char
> *engine)
>
> return mmio;
> }
> +
> +void dyn_sysfs_engines(int i915, int engines, const char *file,
> + void (*test)(int, int))
> +{
> + char buf[512];
> + int len;
> +
> + lseek(engines, 0, SEEK_SET);
> + while ((len = syscall(SYS_getdents64, engines, buf, sizeof(buf))) > 0) {
> + void *ptr = buf;
> +
> + while (len) {
> + struct linux_dirent64 {
> + ino64_t d_ino;
> + off64_t d_off;
> + unsigned short d_reclen;
> + unsigned char d_type;
> + char d_name[];
> + } *de = ptr;
> + char *name;
> + int engine;
> +
> + ptr += de->d_reclen;
> + len -= de->d_reclen;
> +
> + engine = openat(engines, de->d_name, O_RDONLY);
> + name = igt_sysfs_get(engine, "name");
> + if (!name) {
> + close(engine);
> + continue;
> + }
> +
> + igt_dynamic(name) {
> + if (file) {
> + struct stat st;
> +
> + igt_require(fstatat(engine, file, &st,
> 0) == 0);
> + }
> +
> + test(i915, engine);
> + }
> +
> + close(engine);
> + }
> + }
> +}
> diff --git a/lib/i915/gem_engine_topology.h b/lib/i915/gem_engine_topology.h
> index 7a2e21f66..456c806f5 100644
> --- a/lib/i915/gem_engine_topology.h
> +++ b/lib/i915/gem_engine_topology.h
> @@ -77,4 +77,7 @@ int gem_engine_property_scanf(int i915, const char *engine,
> const char *attr,
> const char *fmt, ...);
> uint32_t gem_engine_mmio_base(int i915, const char *engine);
>
> +void dyn_sysfs_engines(int i915, int engines, const char *file,
> + void (*test)(int i915, int engine));
> +
> #endif /* GEM_ENGINE_TOPOLOGY_H */
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index 7c5693457..fc9e04e97 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -102,6 +102,9 @@ TESTS_progs = \
> vgem_slow \
> $(NULL)
>
> +TESTS_progs += sysfs_preempt_timeout
> +sysfs_preempt_timeout_SOURCES = i915/sysfs_preempt_timeout
Your .c dropped off.
--
Petri Latvala
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
