Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932401AbWHWLfg (ORCPT ); Wed, 23 Aug 2006 07:35:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932386AbWHWLfB (ORCPT ); Wed, 23 Aug 2006 07:35:01 -0400 Received: from ns.miraclelinux.com ([219.118.163.66]:62552 "EHLO mail01.miraclelinux.com") by vger.kernel.org with ESMTP id S932404AbWHWLe6 (ORCPT ); Wed, 23 Aug 2006 07:34:58 -0400 Message-Id: <20060823113318.089156027@localhost.localdomain> References: <20060823113243.210352005@localhost.localdomain> Date: Wed, 23 Aug 2006 20:32:48 +0900 From: Akinobu Mita To: linux-kernel@vger.kernel.org Cc: akpm@osdl.org, okuji@enbug.org, Akinobu Mita Subject: [patch 5/5] debugfs entries for configuration Content-Disposition: inline; filename=knobs.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6022 Lines: 235 This kernel module provides debugfs entries for fault-injection capabilities configuation. /debug/ |-- fail_make_request | |-- interval | |-- probability | |-- space | `-- times |-- fail_page_alloc | |-- interval | |-- probability | |-- space | `-- times `-- failslab |-- interval |-- probability |-- space `-- times Signed-off-by: Akinobu Mita lib/Kconfig.debug | 8 ++ lib/Makefile | 1 lib/should_fail_knobs.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 177 insertions(+) Index: work-failmalloc/lib/should_fail_knobs.c =================================================================== --- /dev/null +++ work-failmalloc/lib/should_fail_knobs.c @@ -0,0 +1,168 @@ +#include +#include +#include + +struct should_fail_knobs { + struct dentry *dir; + struct dentry *probability_file; + struct dentry *interval_file; + struct dentry *times_file; + struct dentry *space_file; +}; + +static void debugfs_ul_set(void *data, u64 val) +{ + *(unsigned long *)data = val; +} + +static u64 debugfs_ul_get(void *data) +{ + return *(unsigned long *)data; +} + +DEFINE_SIMPLE_ATTRIBUTE(fops_ul, debugfs_ul_get, debugfs_ul_set, "%llu\n"); + +static struct dentry *debugfs_create_ul(const char *name, mode_t mode, + struct dentry *parent, unsigned long *value) +{ + return debugfs_create_file(name, mode, parent, value, &fops_ul); +} + +static void debugfs_atomic_t_set(void *data, u64 val) +{ + atomic_set((atomic_t *)data, val); +} + +static u64 debugfs_atomic_t_get(void *data) +{ + return atomic_read((atomic_t *)data); +} + +DEFINE_SIMPLE_ATTRIBUTE(fops_atomic_t, debugfs_atomic_t_get, + debugfs_atomic_t_set, "%lld\n"); + +static struct dentry *debugfs_create_atomic_t(const char *name, mode_t mode, + struct dentry *parent, atomic_t *value) +{ + return debugfs_create_file(name, mode, parent, value, &fops_atomic_t); +} + +static void cleanup_should_fail_knobs(struct should_fail_knobs *knobs) +{ + if (knobs->dir) { + if (knobs->probability_file) { + debugfs_remove(knobs->probability_file); + knobs->probability_file = NULL; + } + if (knobs->interval_file) { + debugfs_remove(knobs->interval_file); + knobs->interval_file = NULL; + } + if (knobs->times_file) { + debugfs_remove(knobs->times_file); + knobs->times_file = NULL; + } + if (knobs->space_file) { + debugfs_remove(knobs->space_file); + knobs->space_file = NULL; + } + debugfs_remove(knobs->dir); + knobs->dir = NULL; + } +} + +static int init_should_fail_knobs(struct should_fail_knobs *knobs, + struct should_fail_data *data, const char *name) +{ + mode_t mode = S_IFREG | S_IRUSR | S_IWUSR; + struct dentry *dir; + struct dentry *file; + + memset(knobs, 0, sizeof(*knobs)); + + dir = debugfs_create_dir(name, NULL); + if (!dir) + goto fail; + knobs->dir = dir; + + file = debugfs_create_ul("probability", mode, dir, &data->probability); + if (!file) + goto fail; + knobs->probability_file = file; + + file = debugfs_create_ul("interval", mode, dir, &data->interval); + if (!file) + goto fail; + knobs->interval_file = file; + + file = debugfs_create_atomic_t("times", mode, dir, &data->times); + if (!file) + goto fail; + knobs->times_file = file; + + file = debugfs_create_atomic_t("space", mode, dir, &data->space); + if (!file) + goto fail; + knobs->space_file = file; + + return 0; +fail: + cleanup_should_fail_knobs(knobs); + return -ENOMEM; +} + +#ifdef CONFIG_FAILSLAB +static struct should_fail_knobs failslab_knobs; +#endif +#ifdef CONFIG_FAIL_PAGE_ALLOC +static struct should_fail_knobs fail_page_alloc_knobs; +#endif +#ifdef CONFIG_FAIL_MAKE_REQUEST +static struct should_fail_knobs fail_make_request_knobs; +#endif + +static void cleanup_knobs(void) +{ +#ifdef CONFIG_FAILSLAB + cleanup_should_fail_knobs(&fail_make_request_knobs); +#endif +#ifdef CONFIG_FAIL_PAGE_ALLOC + cleanup_should_fail_knobs(&fail_page_alloc_knobs); +#endif +#ifdef CONFIG_FAIL_MAKE_REQUEST + cleanup_should_fail_knobs(&failslab_knobs); +#endif +} + +static int init_knobs(void) +{ + int err; + +#ifdef CONFIG_FAILSLAB + err = init_should_fail_knobs(&failslab_knobs, failslab, "failslab"); + if (err) + goto fail; +#endif +#ifdef CONFIG_FAIL_PAGE_ALLOC + err = init_should_fail_knobs(&fail_page_alloc_knobs, fail_page_alloc, + "fail_page_alloc"); + if (err) + goto fail; +#endif +#ifdef CONFIG_FAIL_MAKE_REQUEST + err = init_should_fail_knobs(&fail_make_request_knobs, + fail_make_request, "fail_make_request"); + if (err) + goto fail; +#endif + + return 0; +fail: + cleanup_knobs(); + + return err; +} + +module_init(init_knobs); +module_exit(cleanup_knobs); +MODULE_LICENSE("GPL"); Index: work-failmalloc/lib/Kconfig.debug =================================================================== --- work-failmalloc.orig/lib/Kconfig.debug +++ work-failmalloc/lib/Kconfig.debug @@ -393,3 +393,11 @@ config FAIL_MAKE_REQUEST help This option provides fault-injection capabilitiy to disk IO. +config SHOULD_FAIL_KNOBS + tristate "runtime configuration for fault-injection capabilities" + depends on DEBUG_KERNEL && SYSFS && SHOULD_FAIL + select DEBUG_FS + help + This option provides kernel module that provides runtime + configuration interface by debugfs. + Index: work-failmalloc/lib/Makefile =================================================================== --- work-failmalloc.orig/lib/Makefile +++ work-failmalloc/lib/Makefile @@ -52,6 +52,7 @@ obj-$(CONFIG_SMP) += percpu_counter.o obj-$(CONFIG_SWIOTLB) += swiotlb.o obj-$(CONFIG_SHOULD_FAIL) += should_fail.o +obj-$(CONFIG_SHOULD_FAIL_KNOBS) += should_fail_knobs.o hostprogs-y := gen_crc32table clean-files := crc32table.h -- - 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/