This patchset is sent to the mm-tree because it depends on Akinobu's patch "fault-injection: add ability to export fault_attr in..."
change log: v2 - Resolve build issue in mmc core.c due to multiple init_module by removing the fault inject module. - Export fault injection functions to make them available for modules - Update fault injection documentation on MMC IO v3 - add function descriptions in core.c - use export GPL for fault injection functions v4 - make the fault_attr per host. This prepares for upcoming patch from Akinobu that adds support for creating debugfs entries in arbitrary directory. v5 - Make use of fault_create_debugfs_attr() in Akinobu's patch "fault-injection: add ability to export fault_attr in...".
Per Forlin (3): fault-inject: export fault injection functions mmc: core: add random fault injection fault injection: add documentation on MMC IO fault injection
Documentation/fault-injection/fault-injection.txt | 5 ++ drivers/mmc/core/core.c | 44 +++++++++++++++++++++ drivers/mmc/core/debugfs.c | 24 +++++++++++ include/linux/mmc/host.h | 7 +++ lib/Kconfig.debug | 11 +++++ lib/fault-inject.c | 2 + 6 files changed, 93 insertions(+), 0 deletions(-)
export symbols fault_should_fail() and fault_create_debugfs_attr() in order to let modules utilize the fault injection
Signed-off-by: Per Forlin per.forlin@linaro.org --- lib/fault-inject.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/lib/fault-inject.c b/lib/fault-inject.c index f193b77..328d433 100644 --- a/lib/fault-inject.c +++ b/lib/fault-inject.c @@ -130,6 +130,7 @@ bool should_fail(struct fault_attr *attr, ssize_t size)
return true; } +EXPORT_SYMBOL_GPL(should_fail);
#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS
@@ -243,5 +244,6 @@ fail:
return ERR_PTR(-ENOMEM); } +EXPORT_SYMBOL_GPL(fault_create_debugfs_attr);
#endif /* CONFIG_FAULT_INJECTION_DEBUG_FS */
On 8 August 2011 22:07, Per Forlin per.forlin@linaro.org wrote:
export symbols fault_should_fail() and fault_create_debugfs_attr() in order to let modules utilize the fault injection
This patch is already merged in mainline too. Unfortunately I left a typo here. It says fault_should_fail() in the commit message but the function in the patch is called only should_fail(). This is already in rc1 so I guess we have to live with this typo.
This adds support to inject data errors after a completed host transfer. The mmc core will return error even though the host transfer is successful. This simple fault injection proved to be very useful to test the non-blocking error handling in the mmc_blk_issue_rw_rq(). Random faults can also test how the host driver handles pre_req() and post_req() in case of errors.
Signed-off-by: Per Forlin per.forlin@linaro.org Acked-by: Akinobu Mita akinobu.mita@gmail.com --- drivers/mmc/core/core.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ drivers/mmc/core/debugfs.c | 24 ++++++++++++++++++++++++ include/linux/mmc/host.h | 7 +++++++ lib/Kconfig.debug | 11 +++++++++++ 4 files changed, 86 insertions(+), 0 deletions(-)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 89bdeae..a4996b0 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -25,6 +25,11 @@ #include <linux/pm_runtime.h> #include <linux/suspend.h>
+#ifdef CONFIG_FAIL_MMC_REQUEST +#include <linux/fault-inject.h> +#include <linux/random.h> +#endif + #include <linux/mmc/card.h> #include <linux/mmc/host.h> #include <linux/mmc/mmc.h> @@ -83,6 +88,43 @@ static void mmc_flush_scheduled_work(void) flush_workqueue(workqueue); }
+#ifdef CONFIG_FAIL_MMC_REQUEST + +/* + * Internal function. Inject random data errors. + * If mmc_data is NULL no errors are injected. + */ +static void mmc_should_fail_request(struct mmc_host *host, + struct mmc_request *mrq) +{ + struct mmc_command *cmd = mrq->cmd; + struct mmc_data *data = mrq->data; + static const int data_errors[] = { + -ETIMEDOUT, + -EILSEQ, + -EIO, + }; + + if (!data) + return; + + if (cmd->error || data->error || + !should_fail(&host->fail_mmc_request, data->blksz * data->blocks)) + return; + + data->error = data_errors[random32() % ARRAY_SIZE(data_errors)]; + data->bytes_xfered = (random32() % (data->bytes_xfered >> 9)) << 9; +} + +#else /* CONFIG_FAIL_MMC_REQUEST */ + +static void mmc_should_fail_request(struct mmc_host *host, + struct mmc_request *mrq) +{ +} + +#endif /* CONFIG_FAIL_MMC_REQUEST */ + /** * mmc_request_done - finish processing an MMC request * @host: MMC host which completed request @@ -109,6 +151,8 @@ void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq) cmd->error = 0; host->ops->request(host, mrq); } else { + mmc_should_fail_request(host, mrq); + led_trigger_event(host->led, LED_OFF);
pr_debug("%s: req done (CMD%u): %d: %08x %08x %08x %08x\n", diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c index f573753..548c2e7 100644 --- a/drivers/mmc/core/debugfs.c +++ b/drivers/mmc/core/debugfs.c @@ -13,6 +13,9 @@ #include <linux/seq_file.h> #include <linux/slab.h> #include <linux/stat.h> +#ifdef CONFIG_FAIL_MMC_REQUEST +#include <linux/fault-inject.h> +#endif
#include <linux/mmc/card.h> #include <linux/mmc/host.h> @@ -159,6 +162,20 @@ static int mmc_clock_opt_set(void *data, u64 val) return 0; }
+#ifdef CONFIG_FAIL_MMC_REQUEST + +static DECLARE_FAULT_ATTR(fail_mmc_request); +/* + * Internal function. Pass the boot param fail_mmc_request to + * the setup fault injection attributes routine. + */ +static int __init setup_fail_mmc_request(char *str) +{ + return setup_fault_attr(&fail_mmc_request, str); +} +__setup("fail_mmc_request=", setup_fail_mmc_request); +#endif + DEFINE_SIMPLE_ATTRIBUTE(mmc_clock_fops, mmc_clock_opt_get, mmc_clock_opt_set, "%llu\n");
@@ -189,6 +206,13 @@ void mmc_add_host_debugfs(struct mmc_host *host) root, &host->clk_delay)) goto err_node; #endif +#ifdef CONFIG_FAIL_MMC_REQUEST + host->fail_mmc_request = fail_mmc_request; + if (IS_ERR(fault_create_debugfs_attr("fail_mmc_request", + root, + &host->fail_mmc_request))) + goto err_node; +#endif return;
err_node: diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 0f83858..ee472fe 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -12,6 +12,9 @@
#include <linux/leds.h> #include <linux/sched.h> +#ifdef CONFIG_FAIL_MMC_REQUEST +#include <linux/fault-inject.h> +#endif
#include <linux/mmc/core.h> #include <linux/mmc/pm.h> @@ -304,6 +307,10 @@ struct mmc_host {
struct mmc_async_req *areq; /* active async req */
+#ifdef CONFIG_FAIL_MMC_REQUEST + struct fault_attr fail_mmc_request; +#endif + unsigned long private[0] ____cacheline_aligned; };
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 47879c7..ebff0c9 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1090,6 +1090,17 @@ config FAIL_IO_TIMEOUT Only works with drivers that use the generic timeout handling, for others it wont do anything.
+config FAIL_MMC_REQUEST + bool "Fault-injection capability for MMC IO" + select DEBUG_FS + depends on FAULT_INJECTION && MMC + help + Provide fault-injection capability for MMC IO. + This will make the mmc core return data errors. This is + useful to test the error handling in the mmc block device + and to test how the mmc host driver handles retries from + the block device. + config FAULT_INJECTION_DEBUG_FS bool "Debugfs entries for fault-injection capabilities" depends on FAULT_INJECTION && SYSFS && DEBUG_FS
Add description on how to enable random fault injection for MMC IO
Signed-off-by: Per Forlin per.forlin@linaro.org --- Documentation/fault-injection/fault-injection.txt | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Documentation/fault-injection/fault-injection.txt b/Documentation/fault-injection/fault-injection.txt index 82a5d25..10571df 100644 --- a/Documentation/fault-injection/fault-injection.txt +++ b/Documentation/fault-injection/fault-injection.txt @@ -21,6 +21,11 @@ o fail_make_request /sys/block/<device>/make-it-fail or /sys/block/<device>/<partition>/make-it-fail. (generic_make_request())
+o fail_mmc_request + + injects MMC data errors on devices permitted by setting + debugfs entries under /sys/kernel/debug/mmc0/fail_mmc_request + Configure fault-injection capabilities behavior -----------------------------------------------
All three patches look good. Acked-by: Akinobu Mita akinobu.mita@gmail.com
2011/8/9 Per Forlin per.forlin@linaro.org:
This patchset is sent to the mm-tree because it depends on Akinobu's patch "fault-injection: add ability to export fault_attr in..."
That patch has already been merged in mainline.
On 9 August 2011 02:51, Akinobu Mita akinobu.mita@gmail.com wrote:
All three patches look good. Acked-by: Akinobu Mita akinobu.mita@gmail.com
2011/8/9 Per Forlin per.forlin@linaro.org:
This patchset is sent to the mm-tree because it depends on Akinobu's patch "fault-injection: add ability to export fault_attr in..."
That patch has already been merged in mainline.
Please drop this patchset. Patch #1 "fault-injection: export fault injection functions" is merged too. There is no need to merge this through mm-tree anymore. All fault-injection patches needed by MMC fault injection code are merged. I'll repost the patchset to mmc-next when mmc-next has moved to 3.1 code base.
Thanks, Per
2011/8/9 Per Forlin per.forlin@linaro.org:
Patch #1 "fault-injection: export fault injection functions" is merged
Maybe you are looking at wrong tree. I can't find it in Linus' tree or mmotm patches.
On 9 August 2011 11:24, Akinobu Mita akinobu.mita@gmail.com wrote:
2011/8/9 Per Forlin per.forlin@linaro.org:
Patch #1 "fault-injection: export fault injection functions" is merged
Maybe you are looking at wrong tree. I can't find it in Linus' tree or mmotm patches.
Thanks for double checking! I looked at the wrong tree. What a mess I am creating. Do you think it would be possible to get only the export fault-injection patch in 3.1? I know it's not a bugfix so I guess it wont be accepted. I'll prepare v6 of this patch-set.
Thanks for your help, Per
2011/8/9 Per Forlin per.forlin@linaro.org:
Do you think it would be possible to get only the export fault-injection patch in 3.1? I know it's not a bugfix so I guess it wont be accepted.
No modules except mmc plan to use those symbols. So I think there is no reason to merge them separately.
-
Akinobu Mita -
Per Forlin