From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>,
Linux Edac Mailing List <linux-edac@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH v3 25/31] edac: Add a sysfs node to test the EDAC error report facility
Date: Thu, 9 Feb 2012 22:01:24 -0200 [thread overview]
Message-ID: <1328832090-9166-26-git-send-email-mchehab@redhat.com> (raw)
In-Reply-To: <1328832090-9166-1-git-send-email-mchehab@redhat.com>
Not all hardware supports error injection. Also, this feature
could be disabled by the BIOS. As we need to test the EDAC
error report facilities and the edac utils logic, add a way
to generate fake errors, when EDAC debug is enabled.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/edac/edac_mc_sysfs.c | 62 ++++++++++++++++++++++++++++++++++++++++-
include/linux/edac.h | 4 +++
2 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index 4e8f0ec..f8132ff 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -744,6 +744,42 @@ static ssize_t mci_size_mb_show(struct mem_ctl_info *mci, char *data,
return sprintf(data, "%u\n", PAGES_TO_MiB(total_pages));
}
+#ifdef CONFIG_EDAC_DEBUG
+static ssize_t edac_fake_inject_show(struct mem_ctl_info *mci,
+ char *data, void *priv)
+{
+ return sprintf(data,
+ "EDAC fake test engine. Writing to this node a value in the form of :\n"
+ "\t0:1:0\n"
+ "will call the EDAC core routine to produce a memory error for the given memory location (0, 1, 0).\n"
+ "The driver's error parsing logic won't be tested. This tool is useful only\n"
+ "if you're testing the EDAC core tracing facility, or if you're needing to test\n"
+ "some userspace application.\n");
+}
+
+static ssize_t edac_fake_inject_store(struct mem_ctl_info *mci,
+ const char *data, size_t count,
+ void *priv)
+{
+ static enum hw_event_mc_err_type type = HW_EVENT_ERR_CORRECTED;
+ int err, layer0 = -1, layer1 = -1, layer2= -1;
+ err = sscanf(data, "%i:%i:%i", &layer0, &layer1, &layer2);
+ if (err < 0)
+ return err;
+
+ printk(KERN_DEBUG
+ "Generating a fake error to %d.%d.%d to test core handling. NOTE: this won't test the driver-specific decoding logic.\n",
+ layer0, layer1, layer2);
+ edac_mc_handle_error(type, mci, 0, 0, 0,
+ layer0, layer1, layer2,
+ "FAKE ERROR", "for EDAC testing only", NULL);
+ if (++type == HW_EVENT_ERR_FATAL)
+ type = HW_EVENT_ERR_CORRECTED;
+
+ return count;
+}
+#endif
+
#define to_mci(k) container_of(k, struct mem_ctl_info, edac_mci_kobj)
#define to_mcidev_attr(a) container_of(a,struct mcidev_sysfs_attribute,attr)
@@ -875,7 +911,7 @@ static int edac_create_errcount_layer(struct mem_ctl_info *mci,
debugf4("%s() creating %s\n", __func__, (*erc)->attr.name);
if (!(*erc)->attr.name)
return -ENOMEM;
- (*erc)->attr.mode = S_IRUGO;
+ (*erc)->attr.mode = S_IRUGO | S_IWUSR;
(*erc)->show = errcount_ce_show;
(*erc)->priv = *ercd;
(*ercd)->n_layers = layer + 1;
@@ -1320,7 +1356,24 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
goto fail2;
}
}
- edac_create_errcount_objects(mci);
+ err = edac_create_errcount_objects(mci);
+ if (err) {
+ debugf1("%s() failure: create error count objects\n",
+ __func__);
+ goto fail2;
+ }
+#ifdef CONFIG_EDAC_DEBUG
+ mci->errinject_attr.attr.name = "fake_inject";
+ mci->errinject_attr.attr.mode = S_IRUGO | S_IWUSR;
+ mci->errinject_attr.show = edac_fake_inject_show;
+ mci->errinject_attr.store = edac_fake_inject_store;
+ err = sysfs_create_file(&mci->edac_mci_kobj, &mci->errinject_attr.attr);
+ if (err < 0) {
+ printk(KERN_ERR
+ "sysfs_create_file for fake inject failed: %d\n", err);
+ mci->errinject_attr.attr.name = NULL;
+ }
+#endif
return 0;
@@ -1366,6 +1419,11 @@ void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci)
debugf0("%s()\n", __func__);
+#ifdef CONFIG_EDAC_DEBUG
+ if (mci->errinject_attr.attr.name)
+ sysfs_remove_file(&mci->edac_mci_kobj,
+ &mci->errinject_attr.attr);
+#endif
edac_remove_errcount(mci);
/* remove all dimms kobjects */
diff --git a/include/linux/edac.h b/include/linux/edac.h
index 790e1c2..6f03768 100644
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -597,6 +597,10 @@ struct mem_ctl_info {
struct mcidev_sysfs_attribute *errcount_attr;
struct errcount_attribute_data *errcount_attr_data;
+#ifdef CONFIG_EDAC_DEBUG
+ struct mcidev_sysfs_attribute errinject_attr;
+#endif
+
struct completion complete;
/* edac sysfs device control */
--
1.7.8
next prev parent reply other threads:[~2012-02-10 0:03 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-10 0:00 [PATCH v3 00/31] Hardware Events Report Mecanism (HERM) Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 01/31] events/hw_event: Create a " Mauro Carvalho Chehab
2012-02-10 13:41 ` Borislav Petkov
2012-02-10 14:17 ` Mauro Carvalho Chehab
2012-02-12 12:48 ` Borislav Petkov
2012-02-12 17:21 ` Mauro Carvalho Chehab
2012-02-12 18:44 ` Borislav Petkov
2012-02-12 19:38 ` Mauro Carvalho Chehab
2012-02-13 9:21 ` Borislav Petkov
2012-02-13 10:23 ` Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 02/31] events/hw_event: use __string() trace macros for events Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 03/31] hw_event: Consolidate uncorrected/corrected error msgs into one Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 04/31] drivers/edac: rename channel_info to csrow_channel_info Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 05/31] edac: Create a dimm struct and move the labels into it Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 06/31] edac: Add per dimm's sysfs nodes Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 07/31] edac: Prepare to push down to drivers the filling of the dimm_info Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 08/31] edac: Better describe the memory concepts The memory terms changed along the time, since when EDAC were originally written: new concepts were introduced, and some things have different meanings, depending on the memory architecture. Better define those terms, and better describe each supported memory type Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 09/31] i5400_edac: Convert it to report memory with the new location Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 10/31] i7300_edac: " Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 11/31] edac: move dimm properties to struct dimm_info Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 12/31] edac: Don't initialize csrow's first_page & friends when not needed Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 13/31] edac: move nr_pages to dimm struct Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 14/31] edac: Add per-dimm sysfs show nodes Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 15/31] edac: DIMM location cleanup Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 16/31] edac/ppc4xx_edac: Fix compilation Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 17/31] edac-mc: Allow reporting errors on a non-csrow oriented way Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 18/31] edac.h: Use kernel-doc-nano-HOWTO.txt notation for enums Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 19/31] edac: rework memory layer hierarchy description Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 20/31] edac: Export MC hierarchy counters for CE and UE Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 21/31] hw_event: Add x86 MCE events on it Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 22/31] amd64_edac: convert it to use the MCE log tracepoint where applicable Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 23/31] edac: Simplify logs for i7core and sb edac drivers Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 24/31] edac_mc: Some clenups at the log message Mauro Carvalho Chehab
2012-02-10 0:01 ` Mauro Carvalho Chehab [this message]
2012-02-10 0:01 ` [PATCH v3 26/31] edac_mc: Fix the enable label filter logic Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 27/31] edac: Initialize the dimm label with the known information Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 28/31] edac: don't OOPS if the csrow is not visible Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 29/31] edac: Fix sysfs csrow?/*ce*count counters Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 30/31] edac: Fix new error counts Mauro Carvalho Chehab
2012-02-10 0:01 ` [PATCH v3 31/31] edac: Fix per layer error count counters Mauro Carvalho Chehab
2012-02-10 13:26 ` [PATCH v3 00/31] Hardware Events Report Mecanism (HERM) Borislav Petkov
2012-02-10 16:39 ` Mauro Carvalho Chehab
2012-02-12 12:08 ` Borislav Petkov
2012-02-12 17:10 ` Mauro Carvalho Chehab
2012-02-13 21:29 ` Luck, Tony
2012-02-10 16:48 ` [PATCH v3 32/31] edac: restore mce.h file Mauro Carvalho Chehab
2012-02-13 9:23 ` [PATCH v3 00/31] Hardware Events Report Mecanism (HERM) Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1328832090-9166-26-git-send-email-mchehab@redhat.com \
--to=mchehab@redhat.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).