From patchwork Fri Sep 13 05:28:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 2881701 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E72879F1E3 for ; Fri, 13 Sep 2013 05:39:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DCE8420278 for ; Fri, 13 Sep 2013 05:39:14 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B350820276 for ; Fri, 13 Sep 2013 05:39:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7FCA8E6628 for ; Thu, 12 Sep 2013 22:39:13 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail.bwidawsk.net (bwidawsk.net [166.78.191.112]) by gabe.freedesktop.org (Postfix) with ESMTP id 16C1FE635E for ; Thu, 12 Sep 2013 22:29:16 -0700 (PDT) Received: by mail.bwidawsk.net (Postfix, from userid 5001) id A522659D18; Thu, 12 Sep 2013 22:29:15 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from lundgren.intel.com (c-24-21-100-90.hsd1.or.comcast.net [24.21.100.90]) by mail.bwidawsk.net (Postfix) with ESMTPSA id B62E359D19; Thu, 12 Sep 2013 22:28:57 -0700 (PDT) From: Ben Widawsky To: intel-gfx@lists.freedesktop.org Date: Thu, 12 Sep 2013 22:28:42 -0700 Message-Id: <1379050122-12774-17-git-send-email-benjamin.widawsky@intel.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1379050122-12774-1-git-send-email-benjamin.widawsky@intel.com> References: <1379050122-12774-1-git-send-email-benjamin.widawsky@intel.com> Cc: bryan.j.bell@intel.com, Ben Widawsky , Ben Widawsky , vishnu.venkatesh@intel.com Subject: [Intel-gfx] [PATCH 16/16] intel_l3_parity: Support a daemonic mode X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ben Widawsky --- tools/Makefile.am | 6 ++- tools/intel_l3_parity.c | 39 +++++++++++++-- tools/intel_l3_parity.h | 31 ++++++++++++ tools/intel_l3_udev_listener.c | 108 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 179 insertions(+), 5 deletions(-) create mode 100644 tools/intel_l3_parity.h create mode 100644 tools/intel_l3_udev_listener.c diff --git a/tools/Makefile.am b/tools/Makefile.am index 47bd5b3..19810cf 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -39,7 +39,7 @@ dist_bin_SCRIPTS = intel_gpu_abrt AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) $(CAIRO_CFLAGS) -LDADD = $(top_builddir)/lib/libintel_tools.la $(DRM_LIBS) $(PCIACCESS_LIBS) $(CAIRO_LIBS) +LDADD = $(top_builddir)/lib/libintel_tools.la $(DRM_LIBS) $(PCIACCESS_LIBS) $(CAIRO_LIBS) $(LIBUDEV_LIBS) intel_dump_decode_SOURCES = \ intel_dump_decode.c @@ -50,3 +50,7 @@ intel_error_decode_SOURCES = \ intel_bios_reader_SOURCES = \ intel_bios_reader.c \ intel_bios.h + +intel_l3_parity_SOURCES = \ + intel_l3_parity.c \ + intel_l3_udev_listener.c diff --git a/tools/intel_l3_parity.c b/tools/intel_l3_parity.c index cd6754e..1af424e 100644 --- a/tools/intel_l3_parity.c +++ b/tools/intel_l3_parity.c @@ -37,6 +37,14 @@ #include "intel_chipset.h" #include "intel_gpu_tools.h" #include "drmtest.h" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif +#if HAVE_UDEV +#include +#include +#endif +#include "intel_l3_parity.h" static unsigned int devid; /* L3 size is always a function of banks. The number of banks cannot be @@ -157,7 +165,8 @@ static void usage(const char *name) " -r, --row=[row] The row to act upon (default 0)\n" " -b, --bank=[bank] The bank to act upon (default 0)\n" " -s, --subbank=[subbank] The subbank to act upon (default 0)\n" - " -w, --slice=[slice] Which slice to act on (default: -1 [all])" + " -w, --slice=[slice] Which slice to act on (default: -1 [all])\n" + " , --daemon Run the listener (-L) as a daemon\n" " ACTIONS (only 1 may be specified at a time):\n" " -h, --help Display this help\n" " -H, --hw-info Display the current L3 properties\n" @@ -166,7 +175,8 @@ static void usage(const char *name) " -e, --enable Enable row, bank, subbank (undo -d)\n" " -d, --disable= Disable row, bank, subbank (inline arguments are deprecated. Please use -r, -b, -s instead\n" " -i, --inject [HSW only] Cause hardware to inject a row errors\n" - " -u, --uninject [HSW only] Turn off hardware error injectection (undo -i)\n", + " -u, --uninject [HSW only] Turn off hardware error injectection (undo -i)\n" + " -L, --listen Listen for uevent errors\n", name); } @@ -179,6 +189,7 @@ int main(int argc, char *argv[]) int fd[REAL_MAX_SLICES] = {0}, ret, i; int action = '0'; int drm_fd = drm_open_any(); + int daemonize = 0; devid = intel_get_drm_devid(drm_fd); if (intel_gen(devid) < 7) @@ -206,7 +217,7 @@ int main(int argc, char *argv[]) while (1) { int c, option_index = 0; - static struct option long_options[] = { + struct option long_options[] = { { "help", no_argument, 0, 'h' }, { "list", no_argument, 0, 'l' }, { "clear-all", no_argument, 0, 'a' }, @@ -215,18 +226,23 @@ int main(int argc, char *argv[]) { "inject", no_argument, 0, 'i' }, { "uninject", no_argument, 0, 'u' }, { "hw-info", no_argument, 0, 'H' }, + { "listen", no_argument, 0, 'L' }, { "row", required_argument, 0, 'r' }, { "bank", required_argument, 0, 'b' }, { "subbank", required_argument, 0, 's' }, { "slice", required_argument, 0, 'w' }, + { "daemon", no_argument, &daemonize, 1 }, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "hHr:b:s:w:aled::iu", long_options, + c = getopt_long(argc, argv, "hHr:b:s:w:aled::iuL", long_options, &option_index); if (c == -1) break; + if (c == 0) + continue; + switch (c) { case '?': case 'h': @@ -274,6 +290,7 @@ int main(int argc, char *argv[]) case 'a': case 'l': case 'e': + case 'L': if (action != '0') { fprintf(stderr, "Only one action may be specified\n"); exit(EXIT_FAILURE); @@ -299,6 +316,20 @@ int main(int argc, char *argv[]) printf("warning: overwriting existing injections. This is very dangerous.\n"); } + /* Daemon doesn't work like the other commands */ + if (action == 'L') { + struct l3_parity par; + struct l3_location loc; + if (daemonize) { + assert(daemon(0, 0) == 0); + openlog(argv[0], LOG_CONS | LOG_PID, LOG_USER); + } + memset(&par, 0, sizeof(par)); + assert(l3_uevent_setup(&par) == 0); + assert(l3_listen(&par, daemonize == 1, &loc) == 0); + exit(EXIT_SUCCESS); + } + if (action == 'l') decode_dft(dft); diff --git a/tools/intel_l3_parity.h b/tools/intel_l3_parity.h new file mode 100644 index 0000000..65697c4 --- /dev/null +++ b/tools/intel_l3_parity.h @@ -0,0 +1,31 @@ +#ifndef INTEL_L3_PARITY_H_ +#define INTEL_L3_PARITY_H_ + +#include +#include + +struct l3_parity { + struct udev *udev; + struct udev_monitor *uevent_monitor; + int fd; + fd_set fdset; +}; + +struct l3_location { + uint8_t slice; + uint16_t row; + uint8_t bank; + uint8_t subbank; +}; + +#if HAVE_UDEV +int l3_uevent_setup(struct l3_parity *par); +/* Listens (blocks) for an l3 parity event. Returns the location of the error. */ +int l3_listen(struct l3_parity *par, bool daemon, struct l3_location *loc); +#define l3_uevent_teardown(par) {} +#else +#define l3_uevent_setup(par, daemon, loc) -1 +#define l3_listen(par) -1 +#endif + +#endif diff --git a/tools/intel_l3_udev_listener.c b/tools/intel_l3_udev_listener.c new file mode 100644 index 0000000..c50820c --- /dev/null +++ b/tools/intel_l3_udev_listener.c @@ -0,0 +1,108 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#if HAVE_UDEV +#include +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif +#include +#include +#include +#include +#include +#include +#include "i915_drm.h" +#include "intel_l3_parity.h" + +#ifndef I915_L3_PARITY_UEVENT +#define I915_L3_PARITY_UEVENT "L3_PARITY_ERROR" +#endif + +int l3_uevent_setup(struct l3_parity *par) +{ + struct udev *udev; + struct udev_monitor *uevent_monitor; + fd_set fdset; + int fd, ret = -1; + + udev = udev_new(); + if (!udev) { + return -1; + } + + uevent_monitor = udev_monitor_new_from_netlink(udev, "udev"); + if (!uevent_monitor) + goto err_out; + + ret = udev_monitor_filter_add_match_subsystem_devtype(uevent_monitor, "drm", "drm_minor"); + if (ret < 0) + goto err_out; + + ret = udev_monitor_enable_receiving(uevent_monitor); + if (ret < 0) + goto err_out; + + fd = udev_monitor_get_fd(uevent_monitor); + FD_ZERO(&fdset); + FD_SET(fd, &fdset); + + par->udev = udev; + par->fd = fd; + par->fdset = fdset; + par->uevent_monitor = uevent_monitor; + return 0; + +err_out: + udev_unref(udev); + return ret; +} + +int l3_listen(struct l3_parity *par, bool daemon, struct l3_location *loc) +{ + struct udev_device *udev_dev; + const char *parity_status; + char *err_msg; + int ret; + +again: + ret = select(par->fd + 1, &par->fdset, NULL, NULL, NULL); + /* Number of bits set is returned, must be >= 1 */ + if (ret <= 0) { + return ret; + } + + assert(FD_ISSET(par->fd, &par->fdset)); + + udev_dev = udev_monitor_receive_device(par->uevent_monitor); + if (!udev_dev) + return -1; + + parity_status = udev_device_get_property_value(udev_dev, I915_L3_PARITY_UEVENT); + if (strncmp(parity_status, "1", 1)) + goto again; + + loc->slice = atoi(udev_device_get_property_value(udev_dev, "SLICE")); + loc->row = atoi(udev_device_get_property_value(udev_dev, "ROW")); + loc->bank = atoi(udev_device_get_property_value(udev_dev, "BANK")); + loc->subbank = atoi(udev_device_get_property_value(udev_dev, "SUBBANK")); + + udev_device_unref(udev_dev); + + asprintf(&err_msg, "Parity error detected on: %d,%d,%d,%d. " + "Try to run intel_l3_parity -r %d -b %d -s %d -w %d -d", + loc->slice, loc->row, loc->bank, loc->subbank, + loc->row, loc->bank, loc->subbank, loc->slice); + if (daemon) { + syslog(LOG_INFO, "%s\n", err_msg); + goto again; + } + + fprintf(stderr, "%s\n", err_msg); + + free(err_msg); + + return 0; +} +#endif