1 files changed, 89 insertions, 2 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 4a186508bf8b..2403a63b5da5 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1084,18 +1084,105 @@ config LKDTM
         Documentation on how to use the module can be found in
         Documentation/fault-injection/provoke-crashes.txt
 
+config NOTIFIER_ERROR_INJECTION
+        tristate "Notifier error injection"
+        depends on DEBUG_KERNEL
+        select DEBUG_FS
+        help
+          This option provides the ability to inject artifical errors to
+          specified notifier chain callbacks. It is useful to test the error
+          handling of notifier call chain failures.
+
+          Say N if unsure.
+
 config CPU_NOTIFIER_ERROR_INJECT
         tristate "CPU notifier error injection module"
-        depends on HOTPLUG_CPU && DEBUG_KERNEL
+        depends on HOTPLUG_CPU && NOTIFIER_ERROR_INJECTION
         help
           This option provides a kernel module that can be used to test
-          the error handling of the cpu notifiers
+          the error handling of the cpu notifiers by injecting artifical
+          errors to CPU notifier chain callbacks.  It is controlled through
+          debugfs interface under /sys/kernel/debug/notifier-error-inject/cpu
+
+          If the notifier call chain should be failed with some events
+          notified, write the error code to "actions/<notifier event>/error".
+
+          Example: Inject CPU offline error (-1 == -EPERM)
+
+          # cd /sys/kernel/debug/notifier-error-inject/cpu
+          # echo -1 > actions/CPU_DOWN_PREPARE/error
+          # echo 0 > /sys/devices/system/cpu/cpu1/online
+          bash: echo: write error: Operation not permitted
 
           To compile this code as a module, choose M here: the module will
           be called 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/<notifier event>/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 MEMORY_NOTIFIER_ERROR_INJECT
+        tristate "Memory hotplug notifier error injection module"
+        depends on MEMORY_HOTPLUG_SPARSE && NOTIFIER_ERROR_INJECTION
+        help
+          This option provides the ability to inject artifical errors to
+          memory hotplug notifier chain callbacks.  It is controlled through
+          debugfs interface under /sys/kernel/debug/notifier-error-inject/memory
+
+          If the notifier call chain should be failed with some events
+          notified, write the error code to "actions/<notifier event>/error".
+
+          Example: Inject memory hotplug offline error (-12 == -ENOMEM)
+
+          # cd /sys/kernel/debug/notifier-error-inject/memory
+          # echo -12 > actions/MEM_GOING_OFFLINE/error
+          # echo offline > /sys/devices/system/memory/memoryXXX/state
+          bash: echo: write error: Cannot allocate memory
+
+          To compile this code as a module, choose M here: the module will
+          be called pSeries-reconfig-notifier-error-inject.
+
+          If unsure, say N.
+
+config PSERIES_RECONFIG_NOTIFIER_ERROR_INJECT
+        tristate "pSeries reconfig notifier error injection module"
+        depends on PPC_PSERIES && NOTIFIER_ERROR_INJECTION
+        help
+          This option provides the ability to inject artifical errors to
+          pSeries reconfig notifier chain callbacks.  It is controlled
+          through debugfs interface under
+          /sys/kernel/debug/notifier-error-inject/pSeries-reconfig/
+
+          If the notifier call chain should be failed with some events
+          notified, write the error code to "actions/<notifier event>/error".
+
+          To compile this code as a module, choose M here: the module will
+          be called memory-notifier-error-inject.
+
+          If unsure, say N.
+
 config FAULT_INJECTION
         bool "Fault-injection framework"
         depends on DEBUG_KERNEL