Convert sh scripts to C variants.
v6 cover Convert sh scripts to C variants.
Latest changes reflect the latest modifications in tests/drv_module_reload_basic Added a new helper to list information about opened files by processes (mimicking behaviour of a less-featured lsof(8)) and displaying all loaded modules.
This series adds some library support to help converting sh scripts to C version. Based on that I've converted drv_module_reload_basic and kms_sysfs_edid_timing. Other tests should follow. drv_module_reload requires the most boilerplate code.
The reason for so many changes is the fact that some code got moved so other users can use it. Secondly wrappers around libkmod in lib/igt_kmod and procps in lib/igt_aux. Thirdly drv_module_reload has embedded tools/gem_info and tests/gem_exec_store in it, with minor modifications to allow running them as subtests. Finally, C is more verbose than sh.
Changes since v5:
- new helper in lib/igt_aux to display info about opened files by processes and a new function to show a list of loaded modules (Petri Latvala)
Changes since v4:
- rebased to include unbinding snd_hda_intel
- added igt_i915_driver_load/unload so it can used in lib/igt_gvt and tests/drv_module_reload (Cris Wilson)
- do not hard fail when loading/reloading in lib/igt_gvt (Chris Wilson)
- remove subgroups in tests/drv_module_reload (Chris Wilson)
- make tests/kms_sysfs_edid_timing intel-agnostic when searching for connectors and use igt_mean (Chris Wilson)
Changes since v3:
- lib/igt_kmod: added libkmod helpers into their own file. There seems to be another user for it: lib/igt_gvt. Fixed a issue with lib/igt_gvt while at it and converted to make use of lib/igt_kmod.
- lib/{igt_kmod, igt_aux}: Fixed gtk-doc documentation formatting (Daniel Vetter)
- tests/drv_module_reload: Re-worked reload() method by splitting into load() and unload() and asserting more.
- replaced SW_FINISH with SET_CACHEING in tests/drv_module_reload (Chris Wilson)
Changes since v2:
- lib/igt_aux: Addressed comments from Chris Wilson
- tests/drv_module_reload: Passed incorrectly boolean instead of uint as flags to igt_kmod_unload().
Changes since v1:
- lib/igt_aux: Addressed comments from Chris Wilson
- tests/drv_module_reload: Addressed comments from Chris Wilson and Petri Latvala
- tests/kms_sysfs_edid_timing: Addressed comments from Chris Wilson
- (Hopefully): Addressed comments from Jani Nikula.
Marius Vlad (4):
lib/{igt_sysfs,igt_aux}: Make available to other users kick_fbcon()
(unbind_fbcon()), and added helpers to lib/igt_aux, lib/igt_kmod.
lib/igt_gvt: Make use of libkmod helpers and fix reading gvt
parameter.
tests/drv_module_reload: Convert sh script to C version. tests/kms_sysfs_edid_timing: Convert sh to C version.
configure.ac | 2 + .../intel-gpu-tools/intel-gpu-tools-docs.xml | 1 + lib/Makefile.am | 2 + lib/Makefile.sources | 2 + lib/igt_aux.c | 237 +++++++++++++++ lib/igt_aux.h | 3 + lib/igt_gvt.c | 78 ++--- lib/igt_kmod.c | 317 ++++++++++++++++++++ lib/igt_kmod.h | 39 +++ lib/igt_sysfs.c | 106 +++++++ lib/igt_sysfs.h | 3 + tests/Makefile.am | 1 - tests/Makefile.sources | 4 +- tests/drv_module_reload.c | 332 +++++++++++++++++++++ tests/drv_module_reload_basic | 111 ------- tests/gem_alive.c | 35 --- tests/gvt_basic.c | 2 +- tests/intel-ci/fast-feedback.testlist | 4 +- tests/kms_sysfs_edid_timing | 25 -- tests/kms_sysfs_edid_timing.c | 96 ++++++ tools/Makefile.sources | 1 + tools/intel_gem_info.c | 35 +++ 22 files changed, 1201 insertions(+), 235 deletions(-) create mode 100644 lib/igt_kmod.c create mode 100644 lib/igt_kmod.h create mode 100644 tests/drv_module_reload.c delete mode 100755 tests/drv_module_reload_basic delete mode 100644 tests/gem_alive.c delete mode 100755 tests/kms_sysfs_edid_timing create mode 100644 tests/kms_sysfs_edid_timing.c create mode 100644 tools/intel_gem_info.c
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 1/4 lib/{igt_sysfs, igt_aux}: Make available to other users kick_fbcon() (unbind_fbcon()), and added helpers to lib/igt_aux, lib/igt_kmod.
lib/igt_aux: Added igt_pkill and igt_lsof helper.lib/igt_kmod: Added load/unload kmod helpers.
v6:
- include latest modifications from tests/drv_module_reload:
display all loaded modules and list information about opened files by processes (Petri Latvala)
v5:
- added igt_i915_driver_{load/unload}.
- added kick_snd_hda_intel() to match current
tests/drv_module_reload_basic and integrated into
igt_i915_driver_load/unload.
- added gtk-doc section for lib/igt_kmod
v4:
- decided to split libkmod helpers into their own file as there's another user lib/igt_gvt or tests/gvt_basic.
- fixed some gtk-doc documentation.
v3:
- return -errno (igt_pkill()) in case of failure (Cris Wilson)
- return bool for igt_kmod_is_loaded(), replaced strncasecmp with strncmp (Chris Wilson)
- use igt_debug() instead of igt_info() for igt_kmod_load()/ igt_kmod_unload() and return -err directly from libkmod (Chris Wilson)
v2:
- Renamed libkmod helpers (Chris Wilson)
- Removed SIGTERM/SIGKILL case where we repeatedly tried to terminate the
process: just call kill(2) once (Chris Wilson)
- Removed redundant check in igt_kmod_unload(), igt_module_in_use() (Chris Wilson)
- Pass flags to igt_kmod_unload() from the caller (Chris Wilson)
- Removed useless function igt_kill() which acts just as kill(2) (Chris Wilson)
--- configure.ac | 2 + .../intel-gpu-tools/intel-gpu-tools-docs.xml | 1 + lib/Makefile.am | 2 + lib/Makefile.sources | 2 + lib/igt_aux.c | 237 +++++++++++++++ lib/igt_aux.h | 3 + lib/igt_gvt.c | 43 +-- lib/igt_kmod.c | 317 +++++++++++++++++++++ lib/igt_kmod.h | 39 +++ lib/igt_sysfs.c | 106 +++++++ lib/igt_sysfs.h | 3 + 11 files changed, 714 insertions(+), 41 deletions(-) create mode 100644 lib/igt_kmod.c create mode 100644 lib/igt_kmod.h
configure.ac +2 -0
@@ -121,6 +121,8 @@ AC_SUBST(ASSEMBLER_WARN_CFLAGS) PKG_CHECK_MODULES(DRM, [libdrm]) PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) +PKG_CHECK_MODULES(KMOD, [libkmod]) +PKG_CHECK_MODULES(PROCPS, [libprocps]) case "$target_cpu" in x86*|i?86)
docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml +1 -0
@@ -22,6 +22,7 @@ <xi:include href="xml/igt_sysfs.xml"/> <xi:include href="xml/igt_draw.xml"/> <xi:include href="xml/igt_kms.xml"/> + <xi:include href="xml/igt_kmod.xml"/> <xi:include href="xml/igt_fb.xml"/> <xi:include href="xml/igt_aux.xml"/> <xi:include href="xml/igt_gt.xml"/>
lib/Makefile.am +2 -0
@@ -34,6 +34,8 @@ AM_CFLAGS += $(CAIRO_CFLAGS) libintel_tools_la_LIBADD = \ $(DRM_LIBS) \ $(PCIACCESS_LIBS) \ + $(PROCPS_LIBS) \ + $(KMOD_LIBS) \ $(CAIRO_LIBS) \ $(LIBUDEV_LIBS) \ $(LIBUNWIND_LIBS) \
lib/Makefile.sources +2 -0
@@ -77,6 +77,8 @@ lib_source_list = \ igt_pm.h \ uwildmat/uwildmat.h \ uwildmat/uwildmat.c \ + igt_kmod.c \ + igt_kmod.h \ $(NULL) .PHONY: version.h.tmp
lib/igt_aux.c +237 -0
255 lines not on this page · raw message
lib/igt_aux.h +3 -0
@@ -264,4 +264,7 @@ double igt_stop_siglatency(struct igt_mean *result);void igt_set_module_param (const char *name,const char *val);void igt_set_module_param_int (const char *name,int val); +int igt_pkill (int sig,const char *comm); +void igt_lsof (const char *dpath); +#endif /* IGT_AUX_H */
lib/igt_gvt.c +2 -41
57 lines not on this page · raw message
lib/igt_kmod.c new file +317 -0
317 lines not on this page · raw message
lib/igt_kmod.h new file +39 -0
@@ -0,0 +1,39 @@ +/* +* Copyright © 2016 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +*/ + +#ifndef IGT_KMOD_H +#define IGT_KMOD_H + +#include <libkmod.h> + +bool igt_kmod_is_loaded (const char *mod_name); +void igt_kmod_list_loaded (void ); + +int igt_kmod_load (const char *mod_name,const char *opts); +int igt_kmod_unload (const char *mod_name,unsigned int flags); + +int igt_i915_driver_load (const char *opts); +int igt_i915_driver_unload (void ); + + +#endif /* IGT_KMOD_H */
lib/igt_sysfs.c +106 -0
116 lines not on this page · raw message
lib/igt_sysfs.h +3 -0
@@ -43,4 +43,7 @@ bool igt_sysfs_set_u32(int dir, const char *attr, uint32_t value);bool igt_sysfs_get_boolean (int dir,const char *attr);bool igt_sysfs_set_boolean (int dir,const char *attr,bool value); +void kick_fbcon (bool enable); +void kick_snd_hda_intel (void ); +#endif /* __IGT_SYSFS_H__ */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t 1/4 v6] lib/{igt_sysfs, igt_aux}: Make available to other users kick_fbcon() (unbind_fbcon()), and added helpers to lib/igt_aux, lib/igt_kmod.
lib/igt_aux.c void igt_set_module_param_int(const char *name, int val) · line 1308
Quoted 10 lines · Marius Vlad
lib/igt_aux.c +10
-0+static void +igt_show_stat (proc_t *info,const char *fn) +{ +static int display =0 ; + +if (!display) { +igt_info ("%20.20s%11.11s%21.21s%11.11s%10.10s%22.22s%31.31s\n" , +"COMM" ,"PID" ,"Type" ,"UID" ,"GID" ,"Size" ,"Filename" ); + display++; + }
This is called by an exported igt_lsof(). Only showing the header for the first caller is a nuisance.
Quoted 40 lines
lib/igt_kmod.c new file +39
-0+ +__igt_show_stat (&(struct pinfo ) {.pid = info->tid, + .comm = info->cmd, fn }); +} + +int +igt_i915_driver_unload (void ) +{ +/* unbind vt */ +kick_fbcon (false); + +if (igt_kmod_is_loaded ("snd_hda_intel" )) { +igt_pkill (SIGTERM ,"alsactl" ); + +/* unbind snd_hda_intel */ +kick_snd_hda_intel (); + +if (igt_kmod_unload ("snd_hda_intel" ,0 )) { +igt_info ("Could not unload snd_hda_intel\n" ); +igt_kmod_list_loaded (); +igt_lsof ("/dev/snd" ); +return IGT_EXIT_FAILURE ; + } + } + +/* gen5 */ +if (igt_kmod_is_loaded ("intel_ips" )) { +igt_kmod_unload ("intel_ips" ,0 ); + } + +if (igt_kmod_is_loaded ("i915" )) { +if (igt_kmod_unload ("i915" ,0 )) { +igt_info ("Could not unload i915\n" ); +igt_kmod_list_loaded (); +return IGT_EXIT_SKIP ; + }else { +igt_info ("i915.ko has been unloaded!\n" ); + } + }
lib/igt_kmod.c line 309
Quoted 10 lines
lib/igt_kmod.c new file +10
-0+ +if (igt_kmod_is_loaded ("intel-gtt" )) { +igt_kmod_unload ("intel-gtt" ,0 ); + } + +igt_kmod_unload ("drm_kms_helper" ,0 ); +igt_kmod_unload ("drm" ,0 ); + +if (igt_kmod_is_loaded ("i915" )) { +igt_info ("WARNING: i915.ko still loaded!\n" );
igt_warn() perchance?
Quoted 8 lines
lib/igt_kmod.c new file +8
-0+return IGT_EXIT_FAILURE ; + }else { +igt_info ("module successfully unloaded\n" ); + } + + +return IGT_EXIT_SUCCESS ; +}
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 2/4 lib/igt_gvt: Make use of libkmod helpers and fix reading gvt parameter.
In reply to Marius Vladv2:
- use igt_sysfs_get_boolean() to get gvt status (Chris Wilson)
- do not hard-fail when i915 module could not be loaded/unloaded (Chris Wilson)
--- lib/igt_gvt.c | 37 ++++++++++++++++++------------------- tests/gvt_basic.c | 2 +- 2 files changed, 19 insertions(+), 20 deletions(-)
lib/igt_gvt.c +18 -19
@@ -24,35 +24,30 @@#include "igt.h" #include "igt_gvt.h" #include "igt_sysfs.h" +#include "igt_kmod.h" +#include <signal.h> #include <dirent.h> #include <unistd.h> #include <fcntl.h> static bool is_gvt_enabled (void ) { -FILE *file; -int value;bool enabled = false; +int dir, fd; - file =fopen ("/sys/module/i915/parameters/enable_gvt" ,"r" ); -if (!file) + fd =__drm_open_driver (DRIVER_INTEL ); + dir =igt_sysfs_open_parameters (fd); +if (dir <0 )return false; -if (fscanf (file,"%d" , &value) ==1 ) - enabled = value; -fclose (file); + enabled =igt_sysfs_get_boolean (dir,"enable_gvt" ); - errno =0 ; -return enabled; -} +close (dir); +close (fd); -static void unload_i915 (void ) -{ -kick_fbcon (false); -/* pkill alsact */ +return enabled; -igt_ignore_warn (system ("/sbin/modprobe -s -r i915" )); }bool igt_gvt_load_module (void )
@@ -60,8 +55,11 @@ bool igt_gvt_load_module(void)if (is_gvt_enabled ())return true; -unload_i915 (); -igt_ignore_warn (system ("/sbin/modprobe -s i915 enable_gvt=1" )); +if (igt_i915_driver_unload ()) +return false; + +if (igt_i915_driver_load ("enable_gvt=1" )) +return false;return is_gvt_enabled (); }
@@ -71,8 +69,9 @@ void igt_gvt_unload_module(void)if (!is_gvt_enabled ())return ; -unload_i915 (); -igt_ignore_warn (system ("/sbin/modprobe -s i915 enable_gvt=0" )); +igt_i915_driver_unload (); + +igt_i915_driver_load (NULL );igt_assert (!is_gvt_enabled ()); }
tests/gvt_basic.c +1 -1
@@ -32,7 +32,7 @@ igt_main igt_fixture {igt_require (igt_gvt_load_module ()); - fd =drm_open_driver (DRIVER_INTEL ); + fd =__drm_open_driver (DRIVER_INTEL ); }igt_subtest_f ("invalid-placeholder-test" );
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t 2/4 v6] lib/igt_gvt: Make use of libkmod helpers and fix reading gvt parameter.
Quoted 92 lines · Marius Vlad
v2:
- useigt_sysfs_get_boolean()to get gvt status (Chris Wilson)
- do not hard-fail when i915 module could not be loaded/unloaded (Chris Wilson)Signed-off-by Marius Vlad <[email protected]>--- lib/igt_gvt.c | 37 ++++++++++++++++++------------------- tests/gvt_basic.c | 2 +- 2 files changed, 19 insertions(+), 20 deletions(-)lib/igt_gvt.c +18
-19@@ -24,35 +24,30 @@#include "igt.h" #include "igt_gvt.h" #include "igt_sysfs.h" +#include "igt_kmod.h" +#include <signal.h> #include <dirent.h> #include <unistd.h> #include <fcntl.h> static bool is_gvt_enabled (void ) { -FILE *file; -int value;bool enabled = false; +int dir, fd; - file =fopen ("/sys/module/i915/parameters/enable_gvt" ,"r" ); -if (!file) + fd =__drm_open_driver (DRIVER_INTEL ); + dir =igt_sysfs_open_parameters (fd); +if (dir <0 )return false; -if (fscanf (file,"%d" , &value) ==1 ) - enabled = value; -fclose (file); + enabled =igt_sysfs_get_boolean (dir,"enable_gvt" ); - errno =0 ; -return enabled; -} +close (dir); +close (fd); -static void unload_i915 (void ) -{ -kick_fbcon (false); -/* pkill alsact */ +return enabled; -igt_ignore_warn (system ("/sbin/modprobe -s -r i915" )); }bool igt_gvt_load_module (void )@@ -60,8 +55,11 @@ bool igt_gvt_load_module(void)if (is_gvt_enabled ())return true; -unload_i915 (); -igt_ignore_warn (system ("/sbin/modprobe -s i915 enable_gvt=1" )); +if (igt_i915_driver_unload ()) +return false; + +if (igt_i915_driver_load ("enable_gvt=1" )) +return false;return is_gvt_enabled (); }@@ -71,8 +69,9 @@ void igt_gvt_unload_module(void)if (!is_gvt_enabled ())return ; -unload_i915 (); -igt_ignore_warn (system ("/sbin/modprobe -s i915 enable_gvt=0" )); +igt_i915_driver_unload (); + +igt_i915_driver_load (NULL );igt_assert (!is_gvt_enabled ()); }tests/gvt_basic.c +0
-0
tests/gvt_basic.c igt_main · line 35
Quoted 5 lines
tests/gvt_basic.c +1
-1@@ -32,7 +32,7 @@ igt_main igt_fixture {igt_require (igt_gvt_load_module ()); - fd =drm_open_driver (DRIVER_INTEL ); + fd =__drm_open_driver (DRIVER_INTEL );
I couldn't work out why this needed to switch to the non-checking, bare call to open_driver().
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t 2/4 v6] lib/igt_gvt: Make use of libkmod helpers and fix reading gvt parameter.
Quoted 94 lines · Chris Wilson
Quoted 93 lines · Marius Vlad
v2:
- useigt_sysfs_get_boolean()to get gvt status (Chris Wilson)
- do not hard-fail when i915 module could not be loaded/unloaded (Chris Wilson)Signed-off-by Marius Vlad <[email protected]>--- lib/igt_gvt.c | 37 ++++++++++++++++++------------------- tests/gvt_basic.c | 2 +- 2 files changed, 19 insertions(+), 20 deletions(-)lib/igt_gvt.c +18
-19@@ -24,35 +24,30 @@#include "igt.h" #include "igt_gvt.h" #include "igt_sysfs.h" +#include "igt_kmod.h" +#include <signal.h> #include <dirent.h> #include <unistd.h> #include <fcntl.h> static bool is_gvt_enabled (void ) { -FILE *file; -int value;bool enabled = false; +int dir, fd; - file =fopen ("/sys/module/i915/parameters/enable_gvt" ,"r" ); -if (!file) + fd =__drm_open_driver (DRIVER_INTEL ); + dir =igt_sysfs_open_parameters (fd); +if (dir <0 )return false; -if (fscanf (file,"%d" , &value) ==1 ) - enabled = value; -fclose (file); + enabled =igt_sysfs_get_boolean (dir,"enable_gvt" ); - errno =0 ; -return enabled; -} +close (dir); +close (fd); -static void unload_i915 (void ) -{ -kick_fbcon (false); -/* pkill alsact */ +return enabled; -igt_ignore_warn (system ("/sbin/modprobe -s -r i915" )); }bool igt_gvt_load_module (void )@@ -60,8 +55,11 @@ bool igt_gvt_load_module(void)if (is_gvt_enabled ())return true; -unload_i915 (); -igt_ignore_warn (system ("/sbin/modprobe -s i915 enable_gvt=1" )); +if (igt_i915_driver_unload ()) +return false; + +if (igt_i915_driver_load ("enable_gvt=1" )) +return false;return is_gvt_enabled (); }@@ -71,8 +69,9 @@ void igt_gvt_unload_module(void)if (!is_gvt_enabled ())return ; -unload_i915 (); -igt_ignore_warn (system ("/sbin/modprobe -s i915 enable_gvt=0" )); +igt_i915_driver_unload (); + +igt_i915_driver_load (NULL );igt_assert (!is_gvt_enabled ()); }tests/gvt_basic.c +0
-0@@ -32,7 +32,7 @@ igt_main
Quoted 7 lines
tests/gvt_basic.c igt_main · line 35
Quoted 4 lines
tests/gvt_basic.c +1
-1igt_fixture {igt_require (igt_gvt_load_module ()); - fd =drm_open_driver (DRIVER_INTEL ); + fd =__drm_open_driver (DRIVER_INTEL );I couldn't work out why this needed to switch to the non-checking, bare call to
open_driver().
The last fixture unloads (actually reloads with enable_gvt=0) the driver and will fail to do so due the stray fd in drm_open_driver():
at_exit_drm_fd = __drm_open_driver(chipset);
which is closed atexit by the quiescent_gpu_at_exit().
Maybe I should document this in lib/igt_kmod that __drm_open_driver() is required when reloading/unloading the driver.
There's also igt_set_module_param() which should allow setting parameters dynamically without the need of reloading but I don't know if there's support for that.
Quoted 4 lines
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t 2/4 v6] lib/igt_gvt: Make use of libkmod helpers and fix reading gvt parameter.
Quoted 106 lines · Marius Vlad
Quoted 94 lines · Chris Wilson
Quoted 93 lines · Marius Vlad
v2:
- useigt_sysfs_get_boolean()to get gvt status (Chris Wilson)
- do not hard-fail when i915 module could not be loaded/unloaded (Chris Wilson)Signed-off-by Marius Vlad <[email protected]>--- lib/igt_gvt.c | 37 ++++++++++++++++++------------------- tests/gvt_basic.c | 2 +- 2 files changed, 19 insertions(+), 20 deletions(-)lib/igt_gvt.c +18
-19@@ -24,35 +24,30 @@#include "igt.h" #include "igt_gvt.h" #include "igt_sysfs.h" +#include "igt_kmod.h" +#include <signal.h> #include <dirent.h> #include <unistd.h> #include <fcntl.h> static bool is_gvt_enabled (void ) { -FILE *file; -int value;bool enabled = false; +int dir, fd; - file =fopen ("/sys/module/i915/parameters/enable_gvt" ,"r" ); -if (!file) + fd =__drm_open_driver (DRIVER_INTEL ); + dir =igt_sysfs_open_parameters (fd); +if (dir <0 )return false; -if (fscanf (file,"%d" , &value) ==1 ) - enabled = value; -fclose (file); + enabled =igt_sysfs_get_boolean (dir,"enable_gvt" ); - errno =0 ; -return enabled; -} +close (dir); +close (fd); -static void unload_i915 (void ) -{ -kick_fbcon (false); -/* pkill alsact */ +return enabled; -igt_ignore_warn (system ("/sbin/modprobe -s -r i915" )); }bool igt_gvt_load_module (void )@@ -60,8 +55,11 @@ bool igt_gvt_load_module(void)if (is_gvt_enabled ())return true; -unload_i915 (); -igt_ignore_warn (system ("/sbin/modprobe -s i915 enable_gvt=1" )); +if (igt_i915_driver_unload ()) +return false; + +if (igt_i915_driver_load ("enable_gvt=1" )) +return false;return is_gvt_enabled (); }@@ -71,8 +69,9 @@ void igt_gvt_unload_module(void)if (!is_gvt_enabled ())return ; -unload_i915 (); -igt_ignore_warn (system ("/sbin/modprobe -s i915 enable_gvt=0" )); +igt_i915_driver_unload (); + +igt_i915_driver_load (NULL );igt_assert (!is_gvt_enabled ()); }tests/gvt_basic.c +0
-0@@ -32,7 +32,7 @@ igt_mainQuoted 7 lines
tests/gvt_basic.c igt_main · line 35
Quoted 4 lines
tests/gvt_basic.c +1
-1igt_fixture {igt_require (igt_gvt_load_module ()); - fd =drm_open_driver (DRIVER_INTEL ); + fd =__drm_open_driver (DRIVER_INTEL );I couldn't work out why this needed to switch to the non-checking, bare call to
open_driver().The last fixture unloads (actually reloads with enable_gvt=0) the driver and will fail to do so due the stray fd in
drm_open_driver():
Quoted 6 lines
at_exit_drm_fd = __drm_open_driver(chipset);which is closed atexit by the
quiescent_gpu_at_exit().Maybe I should document this in
lib/igt_kmodthat__drm_open_driver()is required when reloading/unloading the driver.
Hmm, indeed. Better perhaps might be
fd = igt_open_module(DRIVER_INTEL, "module options") ?
Time will tell.
Quoted 3 lines
There's also
igt_set_module_param()which should allow setting parameters dynamically without the need of reloading but I don't know if there's support for that.
Not all (most in fact do not) support runtime changes. And the ones that we do change, taint the kernel. Sigh.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 3/4 tests/drv_module_reload: Convert sh script to C version.
In reply to Marius Vladv5:
- reword gem_info to gem_sanitychecks (Chris Wilson)
- remove subgroups/subtests for gem_exec_store and gem_sanitycheck (Chris Wilson)
v4:
- adjust test to make use of lib/igt_kmod
- replaced SW_FINISH with SET_CACHEING (Chris Wilson)
v3:
- fix passing boolean value as flags to igt_kmod_unload().
v2:
- embedded gem_alive and gem_exec_store into test (Chris Wilson)
- int main() to igt_main (Chris Wilson)
- moved tests/gem_alive -> tools/gem_info (Chris Wilson)
- added to intel-ci/fast-feedback.testlist (Petri Latvala)
- added hda_dynamic_debug() (Petri Latvala)
- renamed from tests/drv_module_reload_basic to tests/drv_module_reload (all subtests are basic and have been added to fast-feedback.testlist)
--- tests/Makefile.am | 1 - tests/Makefile.sources | 2 +- tests/drv_module_reload.c | 332 ++++++++++++++++++++++++++++++++++ tests/drv_module_reload_basic | 111 ------------ tests/gem_alive.c | 35 ---- tests/intel-ci/fast-feedback.testlist | 4 +- tools/Makefile.sources | 1 + tools/intel_gem_info.c | 35 ++++ 8 files changed, 372 insertions(+), 149 deletions(-) create mode 100644 tests/drv_module_reload.c delete mode 100755 tests/drv_module_reload_basic delete mode 100644 tests/gem_alive.c create mode 100644 tools/intel_gem_info.c
tests/Makefile.am +0 -1
@@ -26,7 +26,6 @@ noinst_PROGRAMS = \ $(NULL) pkglibexec_PROGRAMS = \ - gem_alive \ gem_stress \ $(TESTS_progs) \ $(TESTS_progs_M) \
tests/Makefile.sources +1 -1
@@ -214,6 +214,7 @@ TESTS_progs = \ kms_pwrite_crc \ kms_sink_crc_basic \ prime_udl \ + drv_module_reload \ $(NULL) # IMPORTANT: The ZZ_ tests need to be run last!
@@ -224,7 +225,6 @@ TESTS_scripts_M = \ TESTS_scripts = \ debugfs_emon_crash \ drv_debugfs_reader \ - drv_module_reload_basic \ kms_sysfs_edid_timing \ sysfs_l3_parity \ test_rte_check \
tests/drv_module_reload.c new file +332 -0
332 lines not on this page · raw message
tests/drv_module_reload_basic deleted +0 -111
111 lines not on this page · raw message
tests/gem_alive.c deleted +0 -35
@@ -1,35 +0,0 @@ -#include "igt.h" -#include <sys/ioctl.h> -#include <fcntl.h> -#include <errno.h> -#include <string.h> -#include <signal.h> -#include <i915_drm.h> - - -int main (void ) -{ -struct drm_i915_gem_sw_finish arg = {0 }; -int fd; - -signal (SIGALRM ,SIG_IGN ); - - fd =__drm_open_driver (DRIVER_INTEL ); -if (fd <0 ) -return IGT_EXIT_SKIP ; - -alarm (1 ); -if (ioctl (fd,DRM_IOCTL_I915_GEM_SW_FINISH , &arg) ==0 ) -return IGT_EXIT_SKIP ; - -switch (errno) { -case ENOENT : -return 0 ; -case EIO : -return 1 ; -case EINTR : -return 2 ; -default : -return 3 ; - } -}
tests/intel-ci/fast-feedback.testlist +3 -1
@@ -3,7 +3,9 @@ igt@core_prop_blob@basic igt@drv_getparams_basic@basic-eu-total igt@drv_getparams_basic@basic-subslice-total igt@drv_hangman@error-state-basic -igt@drv_module_reload_basic +igt@drv_module_reload@basic-reload +igt@drv_module_reload@basic-reload-inject +igt@drv_module_reload@basic-reload-final igt@gem_basic@bad-close igt@gem_basic@create-close igt@gem_basic@create-fd-close
tools/Makefile.sources +1 -0
@@ -29,6 +29,7 @@ tools_prog_lists = \ intel_residency \ intel_stepping \ intel_watermark \ + intel_gem_info \ $(NULL) dist_bin_SCRIPTS = intel_gpu_abrt
tools/intel_gem_info.c new file +35 -0
@@ -0,0 +1,35 @@ +#include "igt.h" +#include <sys/ioctl.h> +#include <fcntl.h> +#include <errno.h> +#include <string.h> +#include <signal.h> +#include <i915_drm.h> + + +int main (void ) +{ +struct drm_i915_gem_sw_finish arg = {0 }; +int fd; + +signal (SIGALRM ,SIG_IGN ); + + fd =__drm_open_driver (DRIVER_INTEL ); +if (fd <0 ) +return IGT_EXIT_SKIP ; + +alarm (1 ); +if (ioctl (fd,DRM_IOCTL_I915_GEM_SW_FINISH , &arg) ==0 ) +return IGT_EXIT_SKIP ; + +switch (errno) { +case ENOENT : +return 0 ; +case EIO : +return 1 ; +case EINTR : +return 2 ; +default : +return 3 ; + } +}
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t 3/4 v6] tests/drv_module_reload: Convert sh script to C version.
Quoted 610 lines · Marius Vlad
v5:
- rewordgem_infotogem_sanitychecks(Chris Wilson)
- remove subgroups/subtests forgem_exec_storeandgem_sanitycheck(Chris Wilson)v4:
- adjust test to make use oflib/igt_kmod
- replacedSW_FINISHwithSET_CACHEING(Chris Wilson)v3:
- fix passing boolean value as flags toigt_kmod_unload().v2:
- embeddedgem_aliveandgem_exec_storeinto test (Chris Wilson)
- intmain()toigt_main(Chris Wilson)
- moved tests/gem_alive ->tools/gem_info(Chris Wilson)
- added to intel-ci/fast-feedback.testlist (Petri Latvala)
- addedhda_dynamic_debug()(Petri Latvala)
- renamed from tests/drv_module_reload_basic to tests/drv_module_reload (all subtests are basic and have been added to fast-feedback.testlist)Signed-off-by Marius Vlad <[email protected]>--- tests/Makefile.am | 1 - tests/Makefile.sources | 2 +- tests/drv_module_reload.c | 332 ++++++++++++++++++++++++++++++++++ tests/drv_module_reload_basic | 111 ------------ tests/gem_alive.c | 35 ---- tests/intel-ci/fast-feedback.testlist | 4 +- tools/Makefile.sources | 1 + tools/intel_gem_info.c | 35 ++++ 8 files changed, 372 insertions(+), 149 deletions(-) create mode 100644 tests/drv_module_reload.c delete mode 100755 tests/drv_module_reload_basic delete mode 100644 tests/gem_alive.c create mode 100644 tools/intel_gem_info.ctests/Makefile.am +0
-1@@ -26,7 +26,6 @@ noinst_PROGRAMS = \ $(NULL) pkglibexec_PROGRAMS = \ - gem_alive \ gem_stress \ $(TESTS_progs) \ $(TESTS_progs_M) \tests/Makefile.sources +1
-1@@ -214,6 +214,7 @@ TESTS_progs = \ kms_pwrite_crc \ kms_sink_crc_basic \ prime_udl \ + drv_module_reload \ $(NULL) # IMPORTANT: The ZZ_ tests need to be run last!@@ -224,7 +225,6 @@ TESTS_scripts_M = \ TESTS_scripts = \ debugfs_emon_crash \ drv_debugfs_reader \ - drv_module_reload_basic \ kms_sysfs_edid_timing \ sysfs_l3_parity \ test_rte_check \tests/drv_module_reload.c new file +332
-0@@ -0,0 +1,332 @@ +/* +* Copyright © 2016 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +*/ +#include "igt.h" +#include "igt_debugfs.h" +#include "igt_aux.h" +#include "igt_kmod.h" +#include "igt_sysfs.h" +#include "igt_core.h" + +#include <dirent.h> +#include <sys/utsname.h> +#include <linux/limits.h> +#include <signal.h> +#include <libgen.h> +#include <signal.h> +#include <sys/ioctl.h> +#include <fcntl.h> + + +#define LOCAL_I915_EXEC_BSD_SHIFT (13) +#define LOCAL_I915_EXEC_BSD_MASK (3 << LOCAL_I915_EXEC_BSD_SHIFT) + +#define ENGINE_MASK (I915_EXEC_RING_MASK | LOCAL_I915_EXEC_BSD_MASK) + +static void store_dword (int fd,unsigned ring) +{ +const int gen =intel_gen (intel_get_drm_devid (fd)); +struct drm_i915_gem_exec_object2 obj[2 ]; +struct drm_i915_gem_relocation_entry reloc; +struct drm_i915_gem_execbuffer2 execbuf; +uint32_t batch[16 ]; +int i; + +if (!gem_has_ring (fd, ring)) +return ; + +if (gen ==6 && (ring & ~(3 <<13 )) ==I915_EXEC_BSD ) +return ; + +intel_detect_and_clear_missed_interrupts (fd); +memset (&execbuf,0 ,sizeof (execbuf)); + execbuf.buffers_ptr = (uintptr_t )obj; + execbuf.buffer_count =2 ; + execbuf.flags = ring; +if (gen <6 ) + execbuf.flags |=I915_EXEC_SECURE ; + +memset (obj,0 ,sizeof (obj)); + obj[0 ].handle =gem_create (fd,4096 ); + obj[1 ].handle =gem_create (fd,4096 ); + +memset (&reloc,0 ,sizeof (reloc)); + reloc.target_handle = obj[0 ].handle; + reloc.presumed_offset =0 ; + reloc.offset =sizeof (uint32_t ); + reloc.delta =0 ; + reloc.read_domains =I915_GEM_DOMAIN_INSTRUCTION ; + reloc.write_domain =I915_GEM_DOMAIN_INSTRUCTION ; + obj[1 ].relocs_ptr = (uintptr_t )&reloc; + obj[1 ].relocation_count =1 ; + + i =0 ; + batch[i] =MI_STORE_DWORD_IMM | (gen <6 ?1 <<22 :0 ); +if (gen >=8 ) { + batch[++i] =0 ; + batch[++i] =0 ; + }else if (gen >=4 ) { + batch[++i] =0 ; + batch[++i] =0 ; + reloc.offset +=sizeof (uint32_t ); + }else { + batch[i]--; + batch[++i] =0 ; + } + batch[++i] =0xc0ffee ; + batch[++i] =MI_BATCH_BUFFER_END ; +gem_write (fd, obj[1 ].handle,0 , batch,sizeof (batch)); +gem_execbuf (fd, &execbuf); +gem_close (fd, obj[1 ].handle); + +gem_read (fd, obj[0 ].handle,0 , batch,sizeof (batch)); +gem_close (fd, obj[0 ].handle); +igt_assert_eq (*batch,0xc0ffee ); +igt_assert_eq (intel_detect_and_clear_missed_interrupts (fd),0 ); +} + +static void store_all (int fd) +{ +const int gen =intel_gen (intel_get_drm_devid (fd)); +struct drm_i915_gem_exec_object2 obj[2 ]; +struct drm_i915_gem_relocation_entry reloc[32 ]; +struct drm_i915_gem_execbuffer2 execbuf; +unsigned engines[16 ], permuted[16 ]; +uint32_t batch[16 ]; +uint64_t offset; +unsigned engine, nengine; +int value; +int i, j; + +memset (&execbuf,0 ,sizeof (execbuf)); + execbuf.buffers_ptr = (uintptr_t )obj; + execbuf.buffer_count =2 ; +if (gen <6 ) + execbuf.flags |=I915_EXEC_SECURE ; + +memset (reloc,0 ,sizeof (reloc)); +memset (obj,0 ,sizeof (obj)); + obj[0 ].handle =gem_create (fd,4096 ); + obj[1 ].handle =gem_create (fd,4096 ); + obj[1 ].relocation_count =1 ; + + offset =sizeof (uint32_t ); + i =0 ; + batch[i] =MI_STORE_DWORD_IMM | (gen <6 ?1 <<22 :0 ); +if (gen >=8 ) { + batch[++i] =0 ; + batch[++i] =0 ; + }else if (gen >=4 ) { + batch[++i] =0 ; + batch[++i] =0 ; + offset +=sizeof (uint32_t ); + }else { + batch[i]--; + batch[++i] =0 ; + } + batch[value = ++i] =0xc0ffee ; + batch[++i] =MI_BATCH_BUFFER_END ; + + nengine =0 ; +intel_detect_and_clear_missed_interrupts (fd); +for_each_engine (fd, engine) { +if (gen ==6 && (engine & ~(3 <<13 )) ==I915_EXEC_BSD ) +continue ; + +igt_assert (2 *(nengine+1 )*sizeof (batch) <=4096 ); + + execbuf.flags &= ~ENGINE_MASK ; + execbuf.flags |= engine; + + j =2 *nengine; + reloc[j].target_handle = obj[0 ].handle; + reloc[j].presumed_offset = ~0 ; + reloc[j].offset = j*sizeof (batch) + offset; + reloc[j].delta = nengine*sizeof (uint32_t ); + reloc[j].read_domains =I915_GEM_DOMAIN_INSTRUCTION ; + reloc[j].write_domain =I915_GEM_DOMAIN_INSTRUCTION ; + obj[1 ].relocs_ptr = (uintptr_t )&reloc[j]; + + batch[value] =0xdeadbeef ; +gem_write (fd, obj[1 ].handle, j*sizeof (batch), + batch,sizeof (batch)); + execbuf.batch_start_offset = j*sizeof (batch); +gem_execbuf (fd, &execbuf); + + j =2 *nengine +1 ; + reloc[j].target_handle = obj[0 ].handle; + reloc[j].presumed_offset = ~0 ; + reloc[j].offset = j*sizeof (batch) + offset; + reloc[j].delta = nengine*sizeof (uint32_t ); + reloc[j].read_domains =I915_GEM_DOMAIN_INSTRUCTION ; + reloc[j].write_domain =I915_GEM_DOMAIN_INSTRUCTION ; + obj[1 ].relocs_ptr = (uintptr_t )&reloc[j]; + + batch[value] = nengine; +gem_write (fd, obj[1 ].handle, j*sizeof (batch), + batch,sizeof (batch)); + execbuf.batch_start_offset = j*sizeof (batch); +gem_execbuf (fd, &execbuf); + + engines[nengine++] = engine; + } +gem_sync (fd, obj[1 ].handle); + +for (i =0 ; i < nengine; i++) { + obj[1 ].relocs_ptr = (uintptr_t )&reloc[2 *i]; + execbuf.batch_start_offset =2 *i*sizeof (batch); +memcpy (permuted, engines, nengine*sizeof (engines[0 ])); +igt_permute_array (permuted, nengine, igt_exchange_int); +for (j =0 ; j < nengine; j++) { + execbuf.flags &= ~ENGINE_MASK ; + execbuf.flags |= permuted[j]; +gem_execbuf (fd, &execbuf); + } + obj[1 ].relocs_ptr = (uintptr_t )&reloc[2 *i+1 ]; + execbuf.batch_start_offset = (2 *i+1 )*sizeof (batch); + execbuf.flags &= ~ENGINE_MASK ; + execbuf.flags |= engines[i]; +gem_execbuf (fd, &execbuf); + } +gem_close (fd, obj[1 ].handle); + +gem_read (fd, obj[0 ].handle,0 , engines,sizeof (engines)); +gem_close (fd, obj[0 ].handle); + +for (i =0 ; i < nengine; i++) +igt_assert_eq_u32 (engines[i], i); +igt_assert_eq (intel_detect_and_clear_missed_interrupts (fd),0 ); +} + +static int +reload (const char *opts_i915) +{ +int err =IGT_EXIT_SUCCESS ; + +if ((err =igt_i915_driver_unload ())) +return err; + +if ((err =igt_i915_driver_load (opts_i915))) +return err; + +return err; +} + +static void +gem_sanitycheck (void ) +{ +int err =0 ; +int fd; +struct drm_i915_gem_caching args = {}; + + + fd =__drm_open_driver (DRIVER_INTEL ); +igt_set_timeout (1 ,"Module reload timeout!" ); + +if (ioctl (fd,DRM_IOCTL_I915_GEM_SET_CACHING , &args) <0 ) + err = -errno; + +igt_set_timeout (0 ,NULL ); +close (fd); + +igt_assert_eq (err, -ENOENT ); +} + +static void +gem_exec_store (void ) +{ +int fd; +const struct intel_execution_engine *e; + + fd =__drm_open_driver (DRIVER_INTEL ); +igt_fork_hang_detector (fd); + +for (e = intel_execution_engines; e->name; e++) { +store_dword (fd, e->exec_id | e->flags); + } + +store_all (fd); + +igt_stop_hang_detector (); +close (fd); +} + +static void +hda_dynamic_debug (bool enable) +{ +FILE *fp; +const char snd_hda_intel_on[] ="module snd_hda_intel +pf" ; +const char snd_hda_core_on[] ="module snd_hda_core +pf" ; + +const char snd_hda_intel_off[] ="module snd_hda_core =_" ; +const char snd_hda_core_off[] ="module snd_hda_intel =_" ; + + fp =fopen ("/sys/kernel/debug/dynamic_debug/control" ,"w" ); +igt_assert (fp !=NULL ); + +if (enable) { +fwrite (snd_hda_intel_on,1 ,sizeof (snd_hda_intel_on), fp); +fwrite (snd_hda_core_on,1 ,sizeof (snd_hda_core_on), fp); + }else { +fwrite (snd_hda_intel_off,1 ,sizeof (snd_hda_intel_off), fp); +fwrite (snd_hda_core_off,1 ,sizeof (snd_hda_core_off), fp); + } + +fclose (fp); +} + +igt_main +{ +int i, err; +char buf[64 ]; + +igt_fixture +hda_dynamic_debug (true ); + + igt_subtest("basic-reload") { + +if ((err =reload (NULL ))) +igt_fail (err); + +gem_sanitycheck (); +gem_exec_store (); + } + + igt_subtest("basic-reload-inject") { +for (i =0 ; i <4 ; i++) { +memset (buf,0 ,sizeof (buf)); +snprintf (buf,sizeof (buf),"inject_load_failure=%d" , i); +reload (buf); + } + } + + igt_subtest("basic-reload-final") { +if ((err =reload (NULL ))) +igt_fail (err); + +gem_sanitycheck (); +gem_exec_store (); + } + +igt_fixture +hda_dynamic_debug (false ); +}tests/drv_module_reload_basic deleted +0
-111@@ -1,111 +0,0 @@ -#!/bin/bash -# -# Testcase: Reload the drm module -# -# ... we've broken this way too often :( -# - -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" -. $SOURCE_DIR/drm_lib.sh - -# no other drm service should be running, so we can just unbind - -# return 0 if module by name $1 is loaded according to lsmod -function mod_loaded() -{ - lsmod | grep -w "^$1" &> /dev/null -} - -function reload() { - local snd_hda_intel_unloaded - - echo Reloading i915.ko with $* - - # we must kick away fbcon (but only fbcon) - for vtcon in /sys/class/vtconsole/vtcon*/ ; do - if grep "frame buffer device" $vtcon/name > /dev/null ; then - echo unbinding $vtcon: `cat $vtcon/name` - echo 0 > $vtcon/bind - fi - done - - # The sound driver uses our power well - pkill alsactl - snd_hda_intel_unloaded=0 - if mod_loaded snd_hda_intel; then - # unbind sound cards - for card in $(find /sys/bus/pci/drivers/snd_hda_intel -name "0000:*" -printf "%f\n"); do - echo $card > /sys/bus/pci/drivers/snd_hda_intel/unbind - done - - if rmmod snd_hda_intel; then - snd_hda_intel_unloaded=1 - else - lsmod >&2 - lsof /dev/snd/* >&2 - fi - fi - - # gen5 only - if mod_loaded intel_ips; then - rmmod intel_ips - fi - - if ! rmmod i915; then - lsmod >&2 - return $IGT_EXIT_SKIP - fi - #ignore errors in intel-gtt, often built-in - rmmod intel-gtt &> /dev/null - # drm may be used by other devices (nouveau, radeon, udl, etc) - rmmod drm_kms_helper &> /dev/null - rmmod drm &> /dev/null - - if mod_loaded i915; then - echo WARNING: i915.ko still loaded! - return $IGT_EXIT_FAILURE - else - echo module successfully unloaded - fi - - modprobe i915 $* - - if [ -f /sys/class/vtconsole/vtcon1/bind ]; then - echo 1 > /sys/class/vtconsole/vtcon1/bind - fi - - modprobe -q snd_hda_intel || return $snd_hda_intel_unloaded -} - -function finish_load() { - # does the device exist? - if $SOURCE_DIR/gem_alive > /dev/null ; then - echo "module successfully loaded again" - else - echo "failed to reload module successfully" - return $IGT_EXIT_FAILURE - fi - - # then try to run something - if ! $SOURCE_DIR/gem_exec_store > /dev/null ; then - echo "failed to execute a simple batch after reload" - return $IGT_EXIT_FAILURE - fi - - return $IGT_EXIT_SUCCESS -} - -hda_dynamic_debug_enable - -reload || exit $? -finish_load || exit $? - -# Repeat the module reload trying to to generate faults -for i in $(seq 1 4); do - reload inject_load_failure=$i -done - -reload || exit $? -finish_load - -exit $?tests/gem_alive.c deleted +0
-35@@ -1,35 +0,0 @@ -#include "igt.h" -#include <sys/ioctl.h> -#include <fcntl.h> -#include <errno.h> -#include <string.h> -#include <signal.h> -#include <i915_drm.h> - - -int main (void ) -{ -struct drm_i915_gem_sw_finish arg = {0 }; -int fd; - -signal (SIGALRM ,SIG_IGN ); - - fd =__drm_open_driver (DRIVER_INTEL ); -if (fd <0 ) -return IGT_EXIT_SKIP ; - -alarm (1 ); -if (ioctl (fd,DRM_IOCTL_I915_GEM_SW_FINISH , &arg) ==0 ) -return IGT_EXIT_SKIP ; - -switch (errno) { -case ENOENT : -return 0 ; -case EIO : -return 1 ; -case EINTR : -return 2 ; -default : -return 3 ; - } -}tests/intel-ci/fast-feedback.testlist +3
-1@@ -3,7 +3,9 @@ igt@core_prop_blob@basic igt@drv_getparams_basic@basic-eu-total igt@drv_getparams_basic@basic-subslice-total igt@drv_hangman@error-state-basic -igt@drv_module_reload_basic +igt@drv_module_reload@basic-reload +igt@drv_module_reload@basic-reload-inject +igt@drv_module_reload@basic-reload-final igt@gem_basic@bad-close igt@gem_basic@create-close igt@gem_basic@create-fd-closetools/Makefile.sources +1
-0@@ -29,6 +29,7 @@ tools_prog_lists = \ intel_residency \ intel_stepping \ intel_watermark \ + intel_gem_info \ $(NULL) dist_bin_SCRIPTS = intel_gpu_abrttools/intel_gem_info.c new file +12
-0@@ -0,0 +1,35 @@ +#include "igt.h" +#include <sys/ioctl.h> +#include <fcntl.h> +#include <errno.h> +#include <string.h> +#include <signal.h> +#include <i915_drm.h> + + +int main (void ) +{ +struct drm_i915_gem_sw_finish arg = {0 };
tools/intel_gem_info.c line 22
Quoted 10 lines
tools/intel_gem_info.c new file +10
-0+int fd; + +signal (SIGALRM ,SIG_IGN ); + + fd =__drm_open_driver (DRIVER_INTEL ); +if (fd <0 ) +return IGT_EXIT_SKIP ; + +alarm (1 ); +if (ioctl (fd,DRM_IOCTL_I915_GEM_SW_FINISH , &arg) ==0 )
Oh dear, I've just been looking at removing the mutex_lock_interuptible from SW_FINISH.
I think the way forward has to be a dedicated ioctl so I stop breaking gem_alive!
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 4/4 tests/kms_sysfs_edid_timing: Convert sh to C version.
In reply to Marius Vladv3:
- use igt_mean for accounting (Chris Wilson)
- make it Intel-agnostic when searching for connectors (Chris Wilson)
v2:
- don't read cached values (Chris Wilson)
- warn on per connector, and fail per mean (Chris Wilson)
These are synthetic: 10ms per connector, and 50ms for all.
--- tests/Makefile.sources | 2 +- tests/kms_sysfs_edid_timing | 25 ----------- tests/kms_sysfs_edid_timing.c | 96 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 26 deletions(-) delete mode 100755 tests/kms_sysfs_edid_timing create mode 100644 tests/kms_sysfs_edid_timing.c
tests/Makefile.sources +1 -1
@@ -215,6 +215,7 @@ TESTS_progs = \ kms_sink_crc_basic \ prime_udl \ drv_module_reload \ + kms_sysfs_edid_timing \ $(NULL) # IMPORTANT: The ZZ_ tests need to be run last!
@@ -225,7 +226,6 @@ TESTS_scripts_M = \ TESTS_scripts = \ debugfs_emon_crash \ drv_debugfs_reader \ - kms_sysfs_edid_timing \ sysfs_l3_parity \ test_rte_check \ tools_test \
tests/kms_sysfs_edid_timing deleted +0 -25
@@ -1,25 +0,0 @@ -#!/bin/bash -# -# This check the time we take to read the content of all the possible connectors. -# Without the edid -ENXIO patch (http://permalink.gmane.org/gmane.comp.video.dri.devel/62083), -# we sometimes take a *really* long time. So let's just check for some reasonable timing here -# - -DRM_LIB_ALLOW_NO_MASTER=1 - -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" -. $SOURCE_DIR/drm_lib.sh - -TIME1=$(date +%s%N) -cat $(find /sys/devices/|grep drm | grep /status) > /dev/null -TIME2=$(date +%s%N) - -# time in ms -RES=$(((TIME2 - TIME1) / 1000000)) - -if [ $RES -gt 600 ]; then - echo "Talking to outputs took ${RES}ms, something is wrong" - exit $IGT_EXIT_FAILURE -fi - -exit $IGT_EXIT_SUCCESS
tests/kms_sysfs_edid_timing.c new file +96 -0
96 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH i-g-t 4/4 v6] tests/kms_sysfs_edid_timing: Convert sh to C version.
Quoted 136 lines · Marius Vlad
v3:
- useigt_meanfor accounting (Chris Wilson)
- make it Intel-agnostic when searching for connectors (Chris Wilson)v2:
- don't read cached values (Chris Wilson)
- warn on per connector, and fail per mean (Chris Wilson)These are synthetic: 10ms per connector, and 50ms for all.
Signed-off-by Marius Vlad <[email protected]>--- tests/Makefile.sources | 2 +- tests/kms_sysfs_edid_timing | 25 ----------- tests/kms_sysfs_edid_timing.c | 96 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 26 deletions(-) delete mode 100755 tests/kms_sysfs_edid_timing create mode 100644 tests/kms_sysfs_edid_timing.ctests/Makefile.sources +1
-1@@ -215,6 +215,7 @@ TESTS_progs = \ kms_sink_crc_basic \ prime_udl \ drv_module_reload \ + kms_sysfs_edid_timing \ $(NULL) # IMPORTANT: The ZZ_ tests need to be run last!@@ -225,7 +226,6 @@ TESTS_scripts_M = \ TESTS_scripts = \ debugfs_emon_crash \ drv_debugfs_reader \ - kms_sysfs_edid_timing \ sysfs_l3_parity \ test_rte_check \ tools_test \tests/kms_sysfs_edid_timing deleted +0
-25@@ -1,25 +0,0 @@ -#!/bin/bash -# -# This check the time we take to read the content of all the possible connectors. -# Without the edid -ENXIO patch (http://permalink.gmane.org/gmane.comp.video.dri.devel/62083), -# we sometimes take a *really* long time. So let's just check for some reasonable timing here -# - -DRM_LIB_ALLOW_NO_MASTER=1 - -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" -. $SOURCE_DIR/drm_lib.sh - -TIME1=$(date +%s%N) -cat $(find /sys/devices/|grep drm | grep /status) > /dev/null -TIME2=$(date +%s%N) - -# time in ms -RES=$(((TIME2 - TIME1) / 1000000)) - -if [ $RES -gt 600 ]; then - echo "Talking to outputs took ${RES}ms, something is wrong" - exit $IGT_EXIT_FAILURE -fi - -exit $IGT_EXIT_SUCCESStests/kms_sysfs_edid_timing.c new file +60
-0@@ -0,0 +1,96 @@ +/* +* Copyright © 2016 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +*/ +#include "igt.h" + +#include <dirent.h> +#include <fcntl.h> +#include <sys/stat.h> + +#define THRESHOLD_PER_CONNECTOR 10 +#define THRESHOLD_TOTAL 50 +#define CHECK_TIMES 15 + +IGT_TEST_DESCRIPTION ("This check the time we take to read the content of all " +"the possible connectors. Without the edid -ENXIO patch " +"(http://permalink.gmane.org/gmane.comp.video.dri.devel/62083), " +"we sometimes take a *really* long time. " +"So let's just check for some reasonable timing here" ); + + +igt_simple_main +{ +DIR *dirp; +struct dirent *de; + + dirp =opendir ("/sys/class/drm" ); +igt_assert (dirp !=NULL ); + +while ((de =readdir (dirp))) { +struct igt_mean mean = {}; +struct stat st; +char path[PATH_MAX ]; +int i; + +if (*de->d_name =='.' ) +continue ;; + +snprintf (path,sizeof (path),"/sys/class/drm/%s/status" , + de->d_name); + +if (stat (path, &st))
tests/kms_sysfs_edid_timing.c line 70
Quoted 10 lines
tests/kms_sysfs_edid_timing.c new file +10
-0+continue ; + +igt_mean_init (&mean); +for (i =0 ; i <CHECK_TIMES ; i++) { +struct timespec ts = {}; +int fd; + +igt_nsec_elapsed (&ts); + fd =open (path,O_WRONLY ); +igt_ignore_warn (write (fd,"detect\n" ,7 ));
Looks good, but just rearrange this slightly:
fd = open();
if (fd < 0)
continue;
igt_nsec_elapsed(&ts);igt_ignore_warn(write(fd, "detect\n", 7));igt_mean_add(&mean, igt_nsec_elapsed(&ts));
That tightens the measurement to just the synchronous probe.
tests/kms_sysfs_edid_timing.c line 81
Quoted 11 lines
tests/kms_sysfs_edid_timing.c new file +11
-0+ +igt_mean_add (&mean,igt_nsec_elapsed (&ts)); + +close (fd); + } + +igt_debug ("%s: mean.max %.2fns, %.2fus, %.2fms, " +"mean.avg %.2fns, %.2fus, %.2fms\n" , + de->d_name, + mean.max, mean.max /1e3 , mean.max /1e6 , + mean.mean, mean.mean /1e3 , mean.mean /1e6 );
For posterity, it might be nice to include a transcript of this output in the changelog. (That just helps us check the formatting comes out ok.)
Longer term, we might want ministats style plotting of strange results. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx