The patch titled powerpc: pSeries reconfig notifier error injection has been added to the -mm tree. Its filename is powerpc-pseries-reconfig-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: powerpc: pSeries reconfig notifier error injection From: Akinobu Mita <akinobu.mita@xxxxxxxxx> This provides the ability to inject artifical errors to pSeries reconfig notifier chain callbacks. It is controlled through debugfs interface under /sys/kernel/debug/pSeries-reconfig-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. 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> --- arch/powerpc/platforms/pseries/reconfig.c | 31 ++++++++++++++++++++ lib/Kconfig.debug | 9 +++++ 2 files changed, 40 insertions(+) diff -puN arch/powerpc/platforms/pseries/reconfig.c~powerpc-pseries-reconfig-notifier-error-injection arch/powerpc/platforms/pseries/reconfig.c --- a/arch/powerpc/platforms/pseries/reconfig.c~powerpc-pseries-reconfig-notifier-error-injection +++ a/arch/powerpc/platforms/pseries/reconfig.c @@ -117,6 +117,37 @@ int pSeries_reconfig_notify(unsigned lon return notifier_to_errno(err); } +#ifdef CONFIG_PSERIES_RECONFIG_NOTIFIER_ERROR_INJECTION + +static struct err_inject_notifier_block err_inject_reconfig_nb = { + .actions = { + { ERR_INJECT_NOTIFIER_ACTION(PSERIES_RECONFIG_ADD) }, + { ERR_INJECT_NOTIFIER_ACTION(PSERIES_RECONFIG_REMOVE) }, + { ERR_INJECT_NOTIFIER_ACTION(PSERIES_DRCONF_MEM_ADD) }, + { ERR_INJECT_NOTIFIER_ACTION(PSERIES_DRCONF_MEM_REMOVE) }, + {} + } +}; + +static int __init err_inject_reconfig_notifier_init(void) +{ + int err; + + err = err_inject_notifier_block_init(&err_inject_reconfig_nb, + "pSeries-reconfig-notifier-error-inject", -1); + if (err) + return err; + + err = pSeries_reconfig_notifier_register(&err_inject_reconfig_nb.nb); + if (err) + err_inject_notifier_block_cleanup(&err_inject_reconfig_nb); + + return err; +} +late_initcall(err_inject_reconfig_notifier_init); + +#endif /* CONFIG_PSERIES_RECONFIG_NOTIFIER_ERROR_INJECTION */ + static int pSeries_reconfig_add_node(const char *path, struct property *proplist) { struct device_node *np; diff -puN lib/Kconfig.debug~powerpc-pseries-reconfig-notifier-error-injection lib/Kconfig.debug --- a/lib/Kconfig.debug~powerpc-pseries-reconfig-notifier-error-injection +++ a/lib/Kconfig.debug @@ -1084,6 +1084,15 @@ config MEMORY_NOTIFIER_ERROR_INJECTION # echo offline > /sys/devices/system/memory/memoryXXX/state bash: echo: write error: Cannot allocate memory +config PSERIES_RECONFIG_NOTIFIER_ERROR_INJECTION + bool "pSeries reconfig notifier error injection" + 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/pSeries-reconfig-notifier-error-inject/ + 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