From: Chris Wilson <chris@chris-wilson.co.uk> To: intel-gfx@lists.freedesktop.org Cc: igt-dev@lists.freedesktop.org Subject: [PATCH i-g-t 2/2] igt/drv_module_reload: Revamp fault-injection Date: Wed, 11 Jul 2018 09:46:19 +0100 [thread overview] Message-ID: <20180711084619.27634-2-chris@chris-wilson.co.uk> (raw) In-Reply-To: <20180711084619.27634-1-chris@chris-wilson.co.uk> The current method of checking for a failed module load is flawed, as we only report the error on probing it is not being reported back by modprobe. So we have to dig inside the module_parameters while the module is still loaded to discover the error. v2: Expect i915.inject_load_failure to be zero on success v3: Do a full i915 unload to ensure fbdev is unbound in cases where it managed to bind itself before failure injection. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Michał Winiarski <michal.winiarski@intel.com> Cc: Imre Deak <imre.deak@intel.com> Reviewed-by: Michał Winiarski <michal.winiarski@intel.com> --- tests/drv_module_reload.c | 50 +++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/tests/drv_module_reload.c b/tests/drv_module_reload.c index 3046d8227..34f55eab1 100644 --- a/tests/drv_module_reload.c +++ b/tests/drv_module_reload.c @@ -234,6 +234,43 @@ reload(const char *opts_i915) return err; } +static int open_parameters(const char *module_name) +{ + char path[256]; + + snprintf(path, sizeof(path), "/sys/module/%s/parameters", module_name); + return open(path, O_RDONLY); +} + +static int +inject_fault(const char *module_name, const char *opt, int fault) +{ + char buf[1024]; + int dir; + + igt_assert(fault > 0); + snprintf(buf, sizeof(buf), "%s=%d", opt, fault); + + if (igt_kmod_load(module_name, buf)) { + igt_warn("Failed to load module '%s' with options '%s'\n", + module_name, buf); + return 1; + } + + dir = open_parameters(module_name); + igt_sysfs_scanf(dir, opt, "%d", &fault); + close(dir); + + igt_debug("Loaded '%s %s', result=%d\n", module_name, buf, fault); + + if (strcmp(module_name, "i915")) /* XXX better ideas! */ + igt_kmod_unload(module_name, 0); + else + igt_i915_driver_unload(); + + return fault; +} + static void gem_sanitycheck(void) { @@ -320,12 +357,15 @@ igt_main igt_assert_eq(reload("disable_display=1"), 0); igt_subtest("basic-reload-inject") { - char buf[64]; int i = 0; - do { - snprintf(buf, sizeof(buf), - "inject_load_failure=%d", ++i); - } while (reload(buf)); + + igt_i915_driver_unload(); + + while (inject_fault("i915", "inject_load_failure", ++i) == 0) + ; + + /* We expect to hit at least one fault! */ + igt_assert(i > 1); } igt_fixture { -- 2.18.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Chris Wilson <chris@chris-wilson.co.uk> To: intel-gfx@lists.freedesktop.org Cc: igt-dev@lists.freedesktop.org Subject: [igt-dev] [PATCH i-g-t 2/2] igt/drv_module_reload: Revamp fault-injection Date: Wed, 11 Jul 2018 09:46:19 +0100 [thread overview] Message-ID: <20180711084619.27634-2-chris@chris-wilson.co.uk> (raw) In-Reply-To: <20180711084619.27634-1-chris@chris-wilson.co.uk> The current method of checking for a failed module load is flawed, as we only report the error on probing it is not being reported back by modprobe. So we have to dig inside the module_parameters while the module is still loaded to discover the error. v2: Expect i915.inject_load_failure to be zero on success v3: Do a full i915 unload to ensure fbdev is unbound in cases where it managed to bind itself before failure injection. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Michał Winiarski <michal.winiarski@intel.com> Cc: Imre Deak <imre.deak@intel.com> Reviewed-by: Michał Winiarski <michal.winiarski@intel.com> --- tests/drv_module_reload.c | 50 +++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/tests/drv_module_reload.c b/tests/drv_module_reload.c index 3046d8227..34f55eab1 100644 --- a/tests/drv_module_reload.c +++ b/tests/drv_module_reload.c @@ -234,6 +234,43 @@ reload(const char *opts_i915) return err; } +static int open_parameters(const char *module_name) +{ + char path[256]; + + snprintf(path, sizeof(path), "/sys/module/%s/parameters", module_name); + return open(path, O_RDONLY); +} + +static int +inject_fault(const char *module_name, const char *opt, int fault) +{ + char buf[1024]; + int dir; + + igt_assert(fault > 0); + snprintf(buf, sizeof(buf), "%s=%d", opt, fault); + + if (igt_kmod_load(module_name, buf)) { + igt_warn("Failed to load module '%s' with options '%s'\n", + module_name, buf); + return 1; + } + + dir = open_parameters(module_name); + igt_sysfs_scanf(dir, opt, "%d", &fault); + close(dir); + + igt_debug("Loaded '%s %s', result=%d\n", module_name, buf, fault); + + if (strcmp(module_name, "i915")) /* XXX better ideas! */ + igt_kmod_unload(module_name, 0); + else + igt_i915_driver_unload(); + + return fault; +} + static void gem_sanitycheck(void) { @@ -320,12 +357,15 @@ igt_main igt_assert_eq(reload("disable_display=1"), 0); igt_subtest("basic-reload-inject") { - char buf[64]; int i = 0; - do { - snprintf(buf, sizeof(buf), - "inject_load_failure=%d", ++i); - } while (reload(buf)); + + igt_i915_driver_unload(); + + while (inject_fault("i915", "inject_load_failure", ++i) == 0) + ; + + /* We expect to hit at least one fault! */ + igt_assert(i > 1); } igt_fixture { -- 2.18.0 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2018-07-11 8:46 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-11 8:46 [PATCH i-g-t 1/2] lib/kmod: Fail if the module is already loaded Chris Wilson 2018-07-11 8:46 ` [igt-dev] " Chris Wilson 2018-07-11 8:46 ` Chris Wilson [this message] 2018-07-11 8:46 ` [igt-dev] [PATCH i-g-t 2/2] igt/drv_module_reload: Revamp fault-injection Chris Wilson 2018-07-11 8:58 ` [PATCH i-g-t 1/2] lib/kmod: Fail if the module is already loaded Michał Winiarski 2018-07-11 8:58 ` [igt-dev] [Intel-gfx] " Michał Winiarski 2018-07-11 9:14 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/2] " Patchwork 2018-07-11 9:30 ` Chris Wilson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180711084619.27634-2-chris@chris-wilson.co.uk \ --to=chris@chris-wilson.co.uk \ --cc=igt-dev@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.