Convert debugfs shell tests to C version
PATCH v4 1/2 Convert debugfs shell tests to C version
v4: Rename get_sysfs_entry -> read_and_discard_sysfs_entry,
assert on null igt_sysfs_get() (Arek).
v3: Drop redundant test covered by drv_hangman/basic. Descend thru
debugfs path when reading sysfs entries (Chris).
v2: Use internal igt_debugfs functions instead of cat and document
debugfs tests.
Convert sysfs_l3_parity properly.
Rename redundant names in tests.
Converted:
- debugfs_emon_crash
- debugfs_wedged
- drv_debugfs_reader
--- tests/Makefile.sources | 4 +- tests/debugfs_emon_crash | 16 -------- tests/debugfs_test.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/debugfs_wedged | 10 ----- tests/drv_debugfs_reader | 9 ----- 5 files changed, 99 insertions(+), 38 deletions(-) delete mode 100755 tests/debugfs_emon_crash create mode 100644 tests/debugfs_test.c delete mode 100755 tests/debugfs_wedged delete mode 100755 tests/drv_debugfs_reader
tests/Makefile.sources +1 -3
@@ -231,6 +231,7 @@ TESTS_progs = \ template \ vgem_basic \ vgem_slow \ + debugfs_test \ $(NULL) TESTS_progs_X = \
@@ -238,8 +239,6 @@ TESTS_progs_X = \ $(NULL) TESTS_scripts = \ - debugfs_emon_crash \ - drv_debugfs_reader \ sysfs_l3_parity \ test_rte_check \ tools_test \
@@ -276,7 +275,6 @@ HANG = \ scripts = \ check_drm_clients \ ddx_intel_after_fbdev \ - debugfs_wedged \ drm_lib.sh \ drm_getopt.sh \ $(NULL)
tests/debugfs_emon_crash deleted +0 -16
@@ -1,16 +0,0 @@ -#!/bin/bash -# -# This check if we can crash the kernel with segmentation-fault -# by reading /sys/kernel/debug/dri/0/i915_emon_status too quickly -# - -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" -. $SOURCE_DIR/drm_lib.sh - -for z in $(seq 1 1000); do - cat $i915_dfs_path/i915_emon_status > /dev/null 2&>1 -done - -# If we got here, we haven't crashed - -exit $IGT_EXIT_SUCCESS
tests/debugfs_test.c new file +98 -0
98 lines not on this page · raw message
tests/debugfs_wedged deleted +0 -10
@@ -1,10 +0,0 @@ -#!/bin/bash - -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" -. $SOURCE_DIR/drm_lib.sh - -# Testcase: wedge the hw to check the error_state reading -# -# Unfortunately wedged is permanent, so this test is not run by default -echo 1 > ${i915_dfs_path}/i915_wedged -cat $i915_dfs_path/i915_error_state > /dev/null 2>&1
tests/drv_debugfs_reader deleted +0 -9
@@ -1,9 +0,0 @@ -#!/bin/bash - -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" -. $SOURCE_DIR/drm_lib.sh - -# read everything we can -cat $i915_dfs_path/* > /dev/null 2>&1 - -exit $IGT_EXIT_SUCCESS
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 2/2 Convert tools shell tests to C version
v4: Go thru /dev/kmsg instead of doing "dmesg | grep ..." (Arek).
Split conversion to couple of patches.
Converted:
- sysfs_l3_parity
- test_rte_check (same as check_drm_clients)
- tools_test
- ZZ_check_dmesg
--- tests/Makefile.sources | 8 +-- tests/ZZ_check_dmesg | 11 ---- tests/check_drm_clients | 6 -- tests/sysfs_l3_parity | 22 -------- tests/test_rte_check | 6 -- tests/tools_test | 16 ------ tests/tools_test.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 147 insertions(+), 68 deletions(-) delete mode 100755 tests/ZZ_check_dmesg delete mode 100755 tests/check_drm_clients delete mode 100755 tests/sysfs_l3_parity delete mode 100755 tests/test_rte_check delete mode 100755 tests/tools_test create mode 100644 tests/tools_test.c
tests/Makefile.sources +1 -7
@@ -232,18 +232,13 @@ TESTS_progs = \ vgem_basic \ vgem_slow \ debugfs_test \ + tools_test \ $(NULL) TESTS_progs_X = \ gem_concurrent_all \ $(NULL) -TESTS_scripts = \ - sysfs_l3_parity \ - test_rte_check \ - tools_test \ - $(NULL) - kernel_tests = \ $(TESTS_progs) \ $(TESTS_scripts) \
@@ -273,7 +268,6 @@ HANG = \ $(NULL) scripts = \ - check_drm_clients \ ddx_intel_after_fbdev \ drm_lib.sh \ drm_getopt.sh \
tests/ZZ_check_dmesg deleted +0 -11
@@ -1,11 +0,0 @@ -#!/bin/sh - -if dmesg | grep '\*ERROR\*' > /dev/null ; then - echo "DRM_ERROR dirt in dmesg" - exit 1 -fi - -if dmesg | grep -- '------\[ cut here \]----' > /dev/null ; then - echo "found a backtrace in dmesg" - exit 1 -fi
tests/check_drm_clients deleted +0 -6
@@ -1,6 +0,0 @@ -#!/bin/bash - -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" -. $SOURCE_DIR/drm_lib.sh - -exit $IGT_EXIT_SUCCESS
tests/sysfs_l3_parity deleted +0 -22
@@ -1,22 +0,0 @@ -#!/bin/bash - -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" -. $SOURCE_DIR/drm_lib.sh - -$SOURCE_DIR/../tools/intel_l3_parity -r 0 -b 0 -s 0 -e || exit $? - -#Check that we can remap a row -$SOURCE_DIR/../tools/intel_l3_parity -r 0 -b 0 -s 0 -d -disabled=`$SOURCE_DIR/../tools/intel_l3_parity -l | grep -c 'Row 0, Bank 0, Subbank 0 is disabled'` -if [ "$disabled" != "1" ] ; then - echo "Fail" - exit $IGT_EXIT_FAILURE -fi - -$SOURCE_DIR/../tools/intel_l3_parity -r 0 -b 0 -s 0 -e - -#Check that we can clear remaps -if [ `$SOURCE_DIR/../tools/intel_l3_parity -l | wc -l` != 1 ] ; then - echo "Fail 2" - exit $IGT_EXIT_FAILURE -fi
tests/test_rte_check deleted +0 -6
@@ -1,6 +0,0 @@ -#!/bin/bash - -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" -. $SOURCE_DIR/drm_lib.sh - -exit $IGT_EXIT_SUCCESS
tests/tools_test deleted +0 -16
@@ -1,16 +0,0 @@ -#!/bin/bash -# Test some of the most critical tools we have accidentally broken before. -# TODO: Possibly make tests parse output - -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" -. $SOURCE_DIR/drm_lib.sh - -# ARB_MODE has existed for many gens -PATH=$SOURCE_DIR/../tools:$PATH -do_or_die "intel_reg read 0x4030" -do_or_die "intel_reg dump" - -# TODO: Add more tests - -exit $IGT_EXIT_SUCCESS -
tests/tools_test.c new file +146 -0
146 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: [i-g-t PATCH v4 2/2] Convert tools shell tests to C version
Quoted 32 lines · Abdiel Janulgue
v4: Go thru
/dev/kmsginstead of doing "dmesg | grep ..." (Arek).
Split conversion to couple of patches.Converted:
-sysfs_l3_parity
-test_rte_check(same ascheck_drm_clients)
-tools_test
-ZZ_check_dmesgSigned-off-by Abdiel Janulgue <[email protected]>Cc Cc: Arkadiusz Hiler <[email protected]>--- tests/Makefile.sources | 8 +-- tests/ZZ_check_dmesg | 11 ---- tests/check_drm_clients | 6 -- tests/sysfs_l3_parity | 22 -------- tests/test_rte_check | 6 -- tests/tools_test | 16 ------ tests/tools_test.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 147 insertions(+), 68 deletions(-) delete mode 100755 tests/ZZ_check_dmesg delete mode 100755 tests/check_drm_clients delete mode 100755 tests/sysfs_l3_parity delete mode 100755 tests/test_rte_check delete mode 100755 tests/tools_test create mode 100644 tests/tools_test.ctests/Makefile.sources +0
-0
tests/Makefile.sources TESTS_progs = \ · line 235
Quoted 4 lines
tests/Makefile.sources +1
-0@@ -232,18 +232,13 @@ TESTS_progs = \ vgem_basic \ vgem_slow \ debugfs_test \ + tools_test \
Now I've noticed: please stick to alphabetic ordering. That includes previous patch :-P
With that:
Quoted 16 lines
tests/Makefile.sources +0
-6$(NULL) TESTS_progs_X = \ gem_concurrent_all \ $(NULL) -TESTS_scripts = \ - sysfs_l3_parity \ - test_rte_check \ - tools_test \ - $(NULL) - kernel_tests = \ $(TESTS_progs) \ $(TESTS_scripts) \
tests/Makefile.sources HANG = \ · line 273
Quoted 7 lines
tests/Makefile.sources +0
-1@@ -273,7 +268,6 @@ HANG = \ $(NULL) scripts = \ - check_drm_clients \ ddx_intel_after_fbdev \ drm_lib.sh \ drm_getopt.sh \
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 18 lines · Abdiel Janulgue
v4: Rename
get_sysfs_entry->read_and_discard_sysfs_entry,
assert on nulligt_sysfs_get()(Arek).v3: Drop redundant test covered by drv_hangman/basic. Descend thru
debugfs path when reading sysfs entries (Chris).v2: Use internal
igt_debugfsfunctions instead of cat and document
debugfs tests.
Convertsysfs_l3_parityproperly.
Rename redundant names in tests.Converted:
-debugfs_emon_crash
-debugfs_wedged
-drv_debugfs_readerCc Arkadiusz Hiler <[email protected]>Signed-off-by Abdiel Janulgue <[email protected]>
<SNIP>
Quoted 28 lines
tests/debugfs_test.c new file +22
-0@@ -0,0 +1,98 @@ +/* +* Copyright © 2017 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. +*/
tests/debugfs_test.c line 32
Quoted 10 lines
tests/debugfs_test.c new file +10
-0+#ifdef HAVE_CONFIG_H +#include "config.h" +#endif +#include "igt.h" +#include "igt_sysfs.h" +#include <fcntl.h> +#include <sys/types.h> +#include <dirent.h> + +static void read_and_discard_sysfs_entry (int path_fd)
So it read every entry/file, including subdirectories, and we use that for debugfses only.
Yet another proposition:
void read_and_discard_sysfs_entries(int dir)
* plularized entries
* 'dir' is what igt_sysfs_get() uses for directory fd
If you have more sensible name in mind feel free to go with it.
Quoted 30 lines
tests/debugfs_test.c new file +30
-0+{ +struct dirent *dirent; +DIR *dir; + + dir =fdopendir (path_fd); +if (!dir) +return ; + +while ((dirent =readdir (dir))) { +if (!strcmp (dirent->d_name,"." ) || + !strcmp (dirent->d_name,".." )) +continue ; +if (dirent->d_type ==DT_DIR ) { +int sub_fd =-1 ; +igt_assert ((sub_fd = +openat (path_fd, dirent->d_name,O_RDONLY | +O_DIRECTORY )) >0 ); +read_and_discard_sysfs_entry (sub_fd); +close (sub_fd); + }else { +char *buf =igt_sysfs_get (path_fd, dirent->d_name); +igt_assert (buf); +free (buf); + } + } +closedir (dir); +} + +igt_main +{
tests/debugfs_test.c line 72
Quoted 10 lines
tests/debugfs_test.c new file +10
-0+int fd =-1 , debugfs; +igt_skip_on_simulation (); + + igt_fixture { + fd =drm_open_driver_master (DRIVER_INTEL ); +igt_require_gem (fd); + debugfs =igt_debugfs_dir (fd); + } + + igt_subtest("drv_reader") {
Name here could be more verbose - perhaps including information that we are reading through all debugfs entries?
My proposition 'read_all_entries'.
Although with the change to the name and function prototype the test body should be self-evident anyway.
Wit the above nitpicks:
Signature · 2 lines
Cheers, Arek
Quoted 16 lines
tests/debugfs_test.c new file +16
-0+read_and_discard_sysfs_entry (debugfs); + } + + igt_subtest("emon_crash") { +int i; +/* +* This check if we can crash the kernel with +* segmentation-fault by reading +* /sys/kernel/debug/dri/0/i915_emon_status too quickly +*/ +for (i =0 ; i <1000 ; i++) { +char *buf =igt_sysfs_get (debugfs, +"i915_emon_status" ); +igt_assert (buf); +free (buf); + }
tests/debugfs_test.c line 98
Quoted 10 lines
tests/debugfs_test.c new file +10
-0+ +/* If we got here, we haven't crashed */ +igt_success (); + } + + igt_fixture { +close (debugfs); +close (fd); + } +}
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx