| Message ID | 20180606130916.20716-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jun 06, 2018 at 02:09:16PM +0100, Chris Wilson wrote: > 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. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Michał Winiarski <michal.winiarski@intel.com> > Cc: Imre Deak <imre.deak@intel.com> That also works. Reviewed-by: Michał Winiarski <michal.winiarski@intel.com> Should we push now? Or delay until we fix i915? -Michał > --- > tests/drv_module_reload.c | 48 +++++++++++++++++++++++++++++++++++---- > 1 file changed, 43 insertions(+), 5 deletions(-)
Quoting Michał Winiarski (2018-06-06 15:18:14) > On Wed, Jun 06, 2018 at 02:09:16PM +0100, Chris Wilson wrote: > > 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. > > > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > > Cc: Michał Winiarski <michal.winiarski@intel.com> > > Cc: Imre Deak <imre.deak@intel.com> > > That also works. > > Reviewed-by: Michał Winiarski <michal.winiarski@intel.com> > > Should we push now? Or delay until we fix i915? We wait a bit to fix i915. But the corresponding kernel patch should be clean to go (well hopefully v2!). -Chris
diff --git a/tests/drv_module_reload.c b/tests/drv_module_reload.c index 092982960..e6bc354b6 100644 --- a/tests/drv_module_reload.c +++ b/tests/drv_module_reload.c @@ -234,6 +234,41 @@ 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, err; + + 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; + } + + err = 1; + dir = open_parameters(module_name); + igt_sysfs_scanf(dir, opt, "%d", &err); + close(dir); + + igt_kmod_unload(module_name, 0); + + if (err < 0) + return err; + + return 0; +} + static void gem_sanitycheck(void) { @@ -323,12 +358,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 {
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. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Michał Winiarski <michal.winiarski@intel.com> Cc: Imre Deak <imre.deak@intel.com> --- tests/drv_module_reload.c | 48 +++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 5 deletions(-)