Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755663Ab2F1Vjv (ORCPT ); Thu, 28 Jun 2012 17:39:51 -0400 Received: from ogre.sisk.pl ([193.178.161.156]:45197 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755582Ab2F1Vju (ORCPT ); Thu, 28 Jun 2012 17:39:50 -0400 From: "Rafael J. Wysocki" To: Akinobu Mita Subject: Re: [PATCH -v4 3/6] PM: PM notifier error injection module Date: Thu, 28 Jun 2012 23:45:17 +0200 User-Agent: KMail/1.13.6 (Linux/3.5.0-rc4+; KDE/4.6.0; x86_64; ; ) Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, Pavel Machek , linux-pm@lists.linux-foundation.org References: <1340463502-15341-1-git-send-email-akinobu.mita@gmail.com> <1340463502-15341-4-git-send-email-akinobu.mita@gmail.com> In-Reply-To: <1340463502-15341-4-git-send-email-akinobu.mita@gmail.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-2" Content-Transfer-Encoding: 7bit Message-Id: <201206282345.17707.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4859 Lines: 149 On Saturday, June 23, 2012, Akinobu Mita wrote: > This provides the ability to inject artifical errors to PM notifier chain > callbacks. It is controlled through debugfs interface under > /sys/kernel/debug/notifier-error-inject/pm > > Each of the files in "error" directory represents an event which can be > failed and contains the error code. If the notifier call chain should > be failed with some events notified, write the error code to the files. > > If the notifier call chain should be failed with some events notified, > write the error code to "actions//error". > > Example: Inject PM suspend error (-12 = -ENOMEM) > > # cd /sys/kernel/debug/notifier-error-inject/pm > # echo -12 > actions/PM_SUSPEND_PREPARE/error > # echo mem > /sys/power/state > bash: echo: write error: Cannot allocate memory > > Signed-off-by: Akinobu Mita > Cc: Pavel Machek > Cc: "Rafael J. Wysocki" > Cc: linux-pm@lists.linux-foundation.org OK, I have no objections. Thanks, Rafael > --- > * v4 > - update modules to follow new interface > > lib/Kconfig.debug | 24 ++++++++++++++++++++ > lib/Makefile | 1 + > lib/pm-notifier-error-inject.c | 49 ++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 74 insertions(+) > create mode 100644 lib/pm-notifier-error-inject.c > > diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug > index be0c197..246cea6 100644 > --- a/lib/Kconfig.debug > +++ b/lib/Kconfig.debug > @@ -1119,6 +1119,30 @@ config CPU_NOTIFIER_ERROR_INJECT > > If unsure, say N. > > +config PM_NOTIFIER_ERROR_INJECT > + tristate "PM notifier error injection module" > + depends on PM && NOTIFIER_ERROR_INJECTION > + default m if PM_DEBUG > + help > + This option provides the ability to inject artifical errors to > + PM notifier chain callbacks. It is controlled through debugfs > + interface /sys/kernel/debug/notifier-error-inject/pm > + > + If the notifier call chain should be failed with some events > + notified, write the error code to "actions//error". > + > + Example: Inject PM suspend error (-12 = -ENOMEM) > + > + # cd /sys/kernel/debug/notifier-error-inject/pm/ > + # echo -12 > actions/PM_SUSPEND_PREPARE/error > + # echo mem > /sys/power/state > + bash: echo: write error: Cannot allocate memory > + > + To compile this code as a module, choose M here: the module will > + be called pm-notifier-error-inject. > + > + If unsure, say N. > + > config FAULT_INJECTION > bool "Fault-injection framework" > depends on DEBUG_KERNEL > diff --git a/lib/Makefile b/lib/Makefile > index 23fba9e..230a949 100644 > --- a/lib/Makefile > +++ b/lib/Makefile > @@ -92,6 +92,7 @@ obj-$(CONFIG_IOMMU_HELPER) += iommu-helper.o > obj-$(CONFIG_FAULT_INJECTION) += fault-inject.o > obj-$(CONFIG_NOTIFIER_ERROR_INJECTION) += notifier-error-inject.o > obj-$(CONFIG_CPU_NOTIFIER_ERROR_INJECT) += cpu-notifier-error-inject.o > +obj-$(CONFIG_PM_NOTIFIER_ERROR_INJECT) += pm-notifier-error-inject.o > > lib-$(CONFIG_GENERIC_BUG) += bug.o > > diff --git a/lib/pm-notifier-error-inject.c b/lib/pm-notifier-error-inject.c > new file mode 100644 > index 0000000..c094b2d > --- /dev/null > +++ b/lib/pm-notifier-error-inject.c > @@ -0,0 +1,49 @@ > +#include > +#include > +#include > + > +#include "notifier-error-inject.h" > + > +static int priority; > +module_param(priority, int, 0); > +MODULE_PARM_DESC(priority, "specify PM notifier priority"); > + > +static struct notifier_err_inject pm_notifier_err_inject = { > + .actions = { > + { NOTIFIER_ERR_INJECT_ACTION(PM_HIBERNATION_PREPARE) }, > + { NOTIFIER_ERR_INJECT_ACTION(PM_SUSPEND_PREPARE) }, > + { NOTIFIER_ERR_INJECT_ACTION(PM_RESTORE_PREPARE) }, > + {} > + } > +}; > + > +static struct dentry *dir; > + > +static int err_inject_init(void) > +{ > + int err; > + > + dir = notifier_err_inject_init("pm", notifier_err_inject_dir, > + &pm_notifier_err_inject, priority); > + if (IS_ERR(dir)) > + return PTR_ERR(dir); > + > + err = register_pm_notifier(&pm_notifier_err_inject.nb); > + if (err) > + debugfs_remove_recursive(dir); > + > + return err; > +} > + > +static void err_inject_exit(void) > +{ > + unregister_pm_notifier(&pm_notifier_err_inject.nb); > + debugfs_remove_recursive(dir); > +} > + > +module_init(err_inject_init); > +module_exit(err_inject_exit); > + > +MODULE_DESCRIPTION("PM notifier error injection module"); > +MODULE_LICENSE("GPL"); > +MODULE_AUTHOR("Akinobu Mita "); > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/