The patch titled
PM: PM notifier error injection
has been added to the -mm tree. Its filename is
pm-pm-notifier-error-injection.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: PM: PM notifier error injection
From: Akinobu Mita <akinobu.mita@xxxxxxxxx>
This provides the ability to inject artifical errors to PM notifier chain
callbacks. It is controlled through debugfs interface under
/sys/kernel/debug/pm-notifier-error-inject/
Each of the files in the 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.
Example: Inject PM suspend error (-12 = -ENOMEM)
# cd /sys/kernel/debug/pm-notifier-error-inject
# echo -12 > PM_SUSPEND_PREPARE
# echo mem > /sys/power/state
bash: echo: write error: Cannot allocate memory
Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Cc: Pavel Machek <pavel@xxxxxx>
Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/power/main.c | 30 ++++++++++++++++++++++++++++++
lib/Kconfig.debug | 16 ++++++++++++++++
2 files changed, 46 insertions(+)
diff -puN kernel/power/main.c~pm-pm-notifier-error-injection kernel/power/main.c
--- a/kernel/power/main.c~pm-pm-notifier-error-injection
+++ a/kernel/power/main.c
@@ -42,6 +42,36 @@ int pm_notifier_call_chain(unsigned long
return notifier_to_errno(ret);
}
+#ifdef CONFIG_PM_NOTIFIER_ERROR_INJECTION
+
+static struct err_inject_notifier_block err_inject_pm_notifier = {
+ .actions = {
+ { ERR_INJECT_NOTIFIER_ACTION(PM_HIBERNATION_PREPARE) },
+ { ERR_INJECT_NOTIFIER_ACTION(PM_SUSPEND_PREPARE) },
+ { ERR_INJECT_NOTIFIER_ACTION(PM_RESTORE_PREPARE) },
+ {}
+ }
+};
+
+static int __init err_inject_pm_notifier_init(void)
+{
+ int err;
+
+ err = err_inject_notifier_block_init(&err_inject_pm_notifier,
+ "pm-notifier-error-inject", -1);
+ if (err)
+ return err;
+
+ err = register_pm_notifier(&err_inject_pm_notifier.nb);
+ if (err)
+ err_inject_notifier_block_cleanup(&err_inject_pm_notifier);
+
+ return err;
+}
+late_initcall(err_inject_pm_notifier_init);
+
+#endif /* CONFIG_PM_NOTIFIER_ERROR_INJECTION */
+
/* If set, devices may be suspended and resumed asynchronously. */
int pm_async_enabled = 1;
diff -puN lib/Kconfig.debug~pm-pm-notifier-error-injection lib/Kconfig.debug
--- a/lib/Kconfig.debug~pm-pm-notifier-error-injection
+++ a/lib/Kconfig.debug
@@ -1053,6 +1053,22 @@ config CPU_NOTIFIER_ERROR_INJECTION
# echo 0 > /sys/devices/system/cpu/cpu1/online
bash: echo: write error: Operation not permitted
+config PM_NOTIFIER_ERROR_INJECTION
+ bool "PM notifier error injection"
+ depends on PM && NOTIFIER_ERROR_INJECTION
+ default PM_DEBUG
+ help
+ This option provides the ability to inject artifical errors to
+ PM notifier chain callbacks. It is controlled through debugfs
+ interface.
+
+ Example: Inject PM suspend error (-12 = -ENOMEM)
+
+ # cd /sys/kernel/debug/pm-notifier-error-inject
+ # echo -12 > PM_SUSPEND_PREPARE
+ # echo mem > /sys/power/state
+ bash: echo: write error: Cannot allocate memory
+
config CPU_NOTIFIER_ERROR_INJECT
tristate "CPU notifier error injection module"
depends on HOTPLUG_CPU && DEBUG_KERNEL
_
Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are
origin.patch
linux-next.patch
ext4-use-proper-little-endian-bitops.patch
ocfs2-avoid-unaligned-access-to-dqc_bitmap.patch
reiserfs-use-proper-little-endian-bitops.patch
reiserfs-use-hweight_long.patch
fault-injection-do-not-include-unneeded-header.patch
fault-injection-remove-nonexistent-function-extern.patch
fault-injection-cleanup-simple-attribute-of-stacktrace_depth.patch
fault-injection-use-debugfs_remove_recursive.patch
failslab-simplify-debugfs-initialization.patch
fail_page_alloc-simplify-debugfs-initialization.patch
fail_make_request-cleanup-should_fail_request.patch
fault-injection-notifier-error-injection.patch
cpu-cpu-notifier-error-injection.patch
pm-pm-notifier-error-injection.patch
memory-memory-notifier-error-injection.patch
powerpc-pseries-reconfig-notifier-error-injection.patch
asm-generic-add-another-generic-ext2-atomic-bitops.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
