From patchwork Wed Jun 14 10:06:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Abdiel Janulgue X-Patchwork-Id: 9786001 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5BE8F602C9 for ; Wed, 14 Jun 2017 10:08:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38BBE285C1 for ; Wed, 14 Jun 2017 10:08:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B7AD285E3; Wed, 14 Jun 2017 10:08:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7F175285C1 for ; Wed, 14 Jun 2017 10:08:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3CA116E50A; Wed, 14 Jun 2017 10:08:34 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 68AA96E50A for ; Wed, 14 Jun 2017 10:08:33 +0000 (UTC) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP; 14 Jun 2017 03:08:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,340,1493708400"; d="scan'208";a="980684302" Received: from skylake-nuc.fi.intel.com ([10.237.72.145]) by orsmga003.jf.intel.com with ESMTP; 14 Jun 2017 03:08:31 -0700 From: Abdiel Janulgue To: intel-gfx@lists.freedesktop.org Date: Wed, 14 Jun 2017 13:06:44 +0300 Message-Id: <1497434806-19901-1-git-send-email-abdiel.janulgue@linux.intel.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Subject: [Intel-gfx] [i-g-t v4 PATCH 1/2] Convert debugfs shell tests to C version X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: Arkadiusz Hiler Signed-off-by: Abdiel Janulgue Reviewed-by: Arkadiusz Hiler --- 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 diff --git a/tests/Makefile.sources b/tests/Makefile.sources index dafb028..c40b2ab 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -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) diff --git a/tests/debugfs_emon_crash b/tests/debugfs_emon_crash deleted file mode 100755 index 1dbfcb2..0000000 --- a/tests/debugfs_emon_crash +++ /dev/null @@ -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 diff --git a/tests/debugfs_test.c b/tests/debugfs_test.c new file mode 100644 index 0000000..6a4b871 --- /dev/null +++ b/tests/debugfs_test.c @@ -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. + */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif +#include "igt.h" +#include "igt_sysfs.h" +#include +#include +#include + +static void read_and_discard_sysfs_entry(int path_fd) +{ + 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 +{ + 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") { + 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); + } + + /* If we got here, we haven't crashed */ + igt_success(); + } + + igt_fixture { + close(debugfs); + close(fd); + } +} diff --git a/tests/debugfs_wedged b/tests/debugfs_wedged deleted file mode 100755 index f15ac46..0000000 --- a/tests/debugfs_wedged +++ /dev/null @@ -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 diff --git a/tests/drv_debugfs_reader b/tests/drv_debugfs_reader deleted file mode 100755 index 6ea4e64..0000000 --- a/tests/drv_debugfs_reader +++ /dev/null @@ -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