configurable block error injection v4
Subsystems (2)
Hi all,
this series adds a new configurable block error injection facility. We already have a few to inject block errors, but unfortunately most of them are either not very useful or hard to use, or both:
- The fail_make_request failure injection point can't distinguish different commands, different ranges in the file and can only injection plain I/O errors.
- the should_fail_bio 'dynamic' failure injection has all the same issues as fail_make_request
- dm-error can only fail all command in the table using BLK_STS_IOERR and requires setting up a new block device
- dm-flakey and dm-dust allow all kinds of configurability, but still don't have good error selection, no good support for non-read/write commands and are limited to the dm table alignment requirements, which for zoned devices enforces setting them up for an entire zone. They also once again require setting up a stacked block device, which is really annoying in harnesses like xfstests
This series adds a new debugfs-based block layer error injection that allows to configure what operations and ranges the injection applied to, and what status to return. It also allows to configure a failure ratio similar to the xfs errortag injection.
Changes since v3:
- use a static branch to guard the new condition
- split out a new header so that jump_label.h doesn't get pulled into blk.h
- more checking for impossible conditions in blk_status_to_tag
- more spelling fixes
Changes since v2:
- improve the documentation a bit
- fix a spelling mistake in a comment
Changes since v1:
- drop the should_fail_bio removal and cleanup depending on it, as it's used by eBPF programs and thus a hidden UABI.
- as a result split the code out to it's own Kconfig symbol
- various error handling fixed pointed out by Keith
- documentation spelling fixes pointed out by Randy
Diffstat:
Documentation/block/error-injection.rst | 59 ++++++ Documentation/block/index.rst | 1 block/Kconfig | 8 block/Makefile | 1 block/blk-core.c | 87 ++++++-- block/blk-sysfs.c | 5 block/blk.h | 3 block/error-injection.c | 314 ++++++++++++++++++++++++++++++++ block/error-injection.h | 21 ++ block/genhd.c | 4 include/linux/blkdev.h | 6 11 files changed, 489 insertions(+), 20 deletions(-)
PATCH 1/4 block: add a macro to initialize the status table
Prepare for adding a new value to the error table by adding a macro to fill it.
--- block/blk-core.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-)
block/blk-core.c +25 -20
@@ -132,39 +132,44 @@ inline const char *blk_op_str(enum req_op op) }EXPORT_SYMBOL_GPL (blk_op_str); +#define ENT (_tag, _errno, _desc) \ +[BLK_STS_##_tag] = { \ + .errno = _errno, \ + .name = _desc, \ +}static const struct {int errno;const char *name; } blk_errors[] = { - [BLK_STS_OK ] = {0 ,"" }, - [BLK_STS_NOTSUPP ] = { -EOPNOTSUPP ,"operation not supported" }, - [BLK_STS_TIMEOUT ] = { -ETIMEDOUT ,"timeout" }, - [BLK_STS_NOSPC ] = { -ENOSPC ,"critical space allocation" }, - [BLK_STS_TRANSPORT ] = { -ENOLINK ,"recoverable transport" }, - [BLK_STS_TARGET ] = { -EREMOTEIO ,"critical target" }, - [BLK_STS_RESV_CONFLICT ] = { -EBADE ,"reservation conflict" }, - [BLK_STS_MEDIUM ] = { -ENODATA ,"critical medium" }, - [BLK_STS_PROTECTION ] = { -EILSEQ ,"protection" }, - [BLK_STS_RESOURCE ] = { -ENOMEM ,"kernel resource" }, - [BLK_STS_DEV_RESOURCE ] = { -EBUSY ,"device resource" }, - [BLK_STS_AGAIN ] = { -EAGAIN ,"nonblocking retry" }, - [BLK_STS_OFFLINE ] = { -ENODEV ,"device offline" }, +ENT (OK ,0 ,"" ), +ENT (NOTSUPP , -EOPNOTSUPP ,"operation not supported" ), +ENT (TIMEOUT , -ETIMEDOUT ,"timeout" ), +ENT (NOSPC , -ENOSPC ,"critical space allocation" ), +ENT (TRANSPORT , -ENOLINK ,"recoverable transport" ), +ENT (TARGET , -EREMOTEIO ,"critical target" ), +ENT (RESV_CONFLICT , -EBADE ,"reservation conflict" ), +ENT (MEDIUM , -ENODATA ,"critical medium" ), +ENT (PROTECTION , -EILSEQ ,"protection" ), +ENT (RESOURCE , -ENOMEM ,"kernel resource" ), +ENT (DEV_RESOURCE , -EBUSY ,"device resource" ), +ENT (AGAIN , -EAGAIN ,"nonblocking retry" ), +ENT (OFFLINE , -ENODEV ,"device offline" ),/* device mapper special case, should not leak out: */ - [BLK_STS_DM_REQUEUE ] = { -EREMCHG ,"dm internal retry" }, +ENT (DM_REQUEUE , -EREMCHG ,"dm internal retry" ),/* zone device specific errors */ - [BLK_STS_ZONE_OPEN_RESOURCE ] = { -ETOOMANYREFS ,"open zones exceeded" }, - [BLK_STS_ZONE_ACTIVE_RESOURCE ] = { -EOVERFLOW ,"active zones exceeded" }, +ENT (ZONE_OPEN_RESOURCE , -ETOOMANYREFS ,"open zones exceeded" ), +ENT (ZONE_ACTIVE_RESOURCE , -EOVERFLOW ,"active zones exceeded" ),/* Command duration limit device-side timeout */ - [BLK_STS_DURATION_LIMIT ] = { -ETIME ,"duration limit exceeded" }, - - [BLK_STS_INVAL ] = { -EINVAL ,"invalid" }, +ENT (DURATION_LIMIT , -ETIME ,"duration limit exceeded" ), +ENT (INVAL , -EINVAL ,"invalid" ),/* everything else not covered above: */ - [BLK_STS_IOERR ] = { -EIO ,"I/O" }, +ENT (IOERR , -EIO ,"I/O" ), }; +#undef ENTblk_status_t errno_to_blk_status (int errno) {
Signature · 1 line
2.53.0
PATCH 2/4 block: add a "tag" for block status codes
In reply to Christoph HellwigThe full name of the status codes is not good for user interfaces as it can contain white spaces. Add the name of the status code without the BLK_STS_ prefix as a tag so that it can be used for user interfaces.
--- block/blk-core.c | 28 ++++++++++++++++++++++++++++ block/blk.h | 2 ++ 2 files changed, 30 insertions(+)
block/blk-core.c +28 -0
@@ -135,10 +135,12 @@ EXPORT_SYMBOL_GPL(blk_op_str);#define ENT (_tag, _errno, _desc) \ [BLK_STS_##_tag] = { \ .errno = _errno, \ + .tag = __stringify(_tag), \ .name = _desc, \ }static const struct {int errno; +const char *tag;const char *name; } blk_errors[] = {ENT (OK ,0 ,"" ),
@@ -203,6 +205,32 @@ const char *blk_status_to_str(blk_status_t status)return blk_errors[idx].name; } +const char *blk_status_to_tag (blk_status_t status) +{ +int idx = (__force int )status; + +if (WARN_ON_ONCE (idx >=ARRAY_SIZE (blk_errors) || !blk_errors[idx].tag)) +return "<null>" ; +return blk_errors[idx].tag; +} + +blk_status_t tag_to_blk_status (const char *tag) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (blk_errors); i++) { +if (blk_errors[i].tag && + !strcmp (blk_errors[i].tag, tag)) +return (__force blk_status_t )i; + } + +/* +* Return BLK_STS_OK for mismatches as this function is intended to +* parse error status values. +*/ +return BLK_STS_OK ; +} +/** * blk_sync_queue - cancel any pending callbacks on a queue * @q: the queue
block/blk.h +2 -0
@@ -51,6 +51,8 @@ struct blk_flush_queue *blk_alloc_flush_queue(int node, int cmd_size,void blk_free_flush_queue (struct blk_flush_queue *q);const char *blk_status_to_str (blk_status_t status); +const char *blk_status_to_tag (blk_status_t status); +blk_status_t tag_to_blk_status (const char *tag);bool __blk_mq_unfreeze_queue (struct request_queue *q,bool force_atomic);bool blk_queue_start_drain (struct request_queue *q);
Signature · 1 line
2.53.0
PATCH 3/4 block: add a str_to_blk_op helper
In reply to Christoph HellwigAdd a helper to find the REQ_OP_XYZ constant from the "XYZ" string. This will be used for the error injection debugfs interface.
--- block/blk-core.c | 10 ++++++++++ block/blk.h | 1 + 2 files changed, 11 insertions(+)
block/blk-core.c +10 -0
@@ -132,6 +132,16 @@ inline const char *blk_op_str(enum req_op op) }EXPORT_SYMBOL_GPL (blk_op_str); +enum req_op str_to_blk_op (const char *op) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (blk_op_name); i++) +if (blk_op_name[i] && !strcmp (blk_op_name[i], op)) +return (enum req_op )i; +return REQ_OP_LAST ; +} +#define ENT (_tag, _errno, _desc) \ [BLK_STS_##_tag] = { \ .errno = _errno, \
block/blk.h +1 -0
@@ -53,6 +53,7 @@ void blk_free_flush_queue(struct blk_flush_queue *q);const char *blk_status_to_str (blk_status_t status);const char *blk_status_to_tag (blk_status_t status);blk_status_t tag_to_blk_status (const char *tag); +enum req_op str_to_blk_op (const char *op);bool __blk_mq_unfreeze_queue (struct request_queue *q,bool force_atomic);bool blk_queue_start_drain (struct request_queue *q);
Signature · 1 line
2.53.0
PATCH 4/4 block: add configurable error injection
In reply to Christoph HellwigAdd a new block error injection interface that allows to inject specific status code for specific ranges.
--- Documentation/block/error-injection.rst | 59 +++++ Documentation/block/index.rst | 1 + block/Kconfig | 8 + block/Makefile | 1 + block/blk-core.c | 4 + block/blk-sysfs.c | 5 + block/error-injection.c | 314 ++++++++++++++++++++++++ block/error-injection.h | 21 ++ block/genhd.c | 4 + include/linux/blkdev.h | 6 + 10 files changed, 423 insertions(+) create mode 100644 Documentation/block/error-injection.rst create mode 100644 block/error-injection.c create mode 100644 block/error-injection.h
Documentation/block/error-injection.rst new file +59 -0
@@ -0,0 +1,59 @@ +.. SPDX-License-Identifier: GPL-2.0 + +============================ +Configurable Error Injection +============================ + +Overview +-------- + +Configurable error injection allows injecting specific block layer status codes +for sector ranges of a block device. Errors can be injected unconditionally, or +with a given probability. + +To use configurable error injection, CONFIG_BLK_ERROR_INJECTION must be enabled. + +The only interface is the error_injection debugfs file, which is created for +each registered gendisk. Writes to this file are used to create or delete rules +and reads return a list of the current error injection sites. + +Options +------- + +The following options specify the operations: + +=================== ======================================================= +add add a new rule +removeall remove all existing rules +=================== ======================================================= + +The following options specify the details of the rule for the add operation: + +=================== ======================================================= +op=<string> block layer operation this rule applies to. This uses + the XYZ for each REQ_OP_XYZ operation, e.g. READ, WRITE + or DISCARD. Mandatory. +status=<string> Status to return. This uses XYZ for each BLK_STS_XYZ + code, e.g. IOERR or MEDIUM. Mandatory. +start=<number> First block layer sector the rule applies to. + Optional, defaults to 0. +nr_sectors=<number> Number of sectors this rule applies. + Optional, defaults to the remainder of the device. +chance=<number> Only return a failure with a likelihood of 1/chance. + Optional, defaults to 1 (always). +=================== ======================================================= + +Example +------- + +Return BLK_STS_IOERR for one in 10 reads of sector 0 of /dev/nvme0n1: + + $ echo 'add,op=READ,start=0,status=IOERR,chance=10' > /sys/kernel/debug/block/nvme0n1/error_injection + +Return BLK_STS_MEDIUM for every write to /dev/nvme0n1: + + $ echo 'add,op=WRITE,start=0,status=MEDIUM' > /sys/kernel/debug/block/nvme0n1/error_injection + +Remove all rules for /dev/nvme0n1: + + $ echo 'removeall' > /sys/kernel/debug/block/nvme0n1/error_injection
Documentation/block/index.rst +1 -0
@@ -22,3 +22,4 @@ Block switching-sched writeback_cache_control ublk + error-injection
block/Kconfig +8 -0
@@ -221,6 +221,14 @@ config BLOCK_HOLDER_DEPRECATED config BLK_MQ_STACKING bool +config BLK_ERROR_INJECTION + bool "Enable block layer error injection" + select JUMP_LABEL if HAVE_ARCH_JUMP_LABEL + help + Enable inserting arbitrary block errors through a debugfs interface. + + See Documentation/block/error-injection.rst for details. + source "block/Kconfig.iosched" endif # BLOCK
block/Makefile +1 -0
@@ -13,6 +13,7 @@ obj-y := bdev.o fops.o bio.o elevator.o blk-core.o blk-sysfs.o \ genhd.o ioprio.o badblocks.o partitions/ blk-rq-qos.o \ disk-events.o blk-ia-ranges.o early-lookup.o +obj-$(CONFIG_BLK_ERROR_INJECTION) += error-injection.o obj-$(CONFIG_BLK_DEV_BSG_COMMON) += bsg.o obj-$(CONFIG_BLK_DEV_BSGLIB) += bsg-lib.o obj-$(CONFIG_BLK_CGROUP) += blk-cgroup.o
block/blk-core.c +4 -0
@@ -50,6 +50,7 @@#include "blk-cgroup.h" #include "blk-throttle.h" #include "blk-ioprio.h" +#include "error-injection.h" struct dentry *blk_debugfs_root;
@@ -767,6 +768,9 @@ static void __submit_bio_noacct_mq(struct bio *bio)void submit_bio_noacct_nocheck (struct bio *bio,bool split) { +if (unlikely (blk_error_inject (bio))) +return ; +blk_cgroup_bio_start (bio);if (!bio_flagged (bio,BIO_TRACE_COMPLETION )) {
block/blk-sysfs.c +5 -0
@@ -19,6 +19,7 @@#include "blk-wbt.h" #include "blk-cgroup.h" #include "blk-throttle.h" +#include "error-injection.h" struct queue_sysfs_entry {struct attribute attr;
@@ -933,6 +934,8 @@ static void blk_debugfs_remove(struct gendisk *disk)blk_debugfs_lock_nomemsave (q);blk_trace_shutdown (q); +if (IS_ENABLED (CONFIG_BLK_ERROR_INJECTION )) +blk_error_injection_exit (disk);debugfs_remove_recursive (q->debugfs_dir); q->debugfs_dir =NULL ; q->sched_debugfs_dir =NULL ;
@@ -963,6 +966,8 @@ int blk_register_queue(struct gendisk *disk) memflags =blk_debugfs_lock (q); q->debugfs_dir =debugfs_create_dir (disk->disk_name, blk_debugfs_root); +if (IS_ENABLED (CONFIG_BLK_ERROR_INJECTION )) +blk_error_injection_init (disk);if (queue_is_mq (q))blk_mq_debugfs_register (q);blk_debugfs_unlock (q, memflags);
block/error-injection.c new file +314 -0
314 lines not on this page · raw message
block/error-injection.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _BLK_ERROR_INJECTION_H +#define _BLK_ERROR_INJECTION_H 1 + +#include <linux/jump_label.h> + +DECLARE_STATIC_KEY_FALSE (blk_error_injection_enabled); + +void blk_error_injection_init (struct gendisk *disk); +void blk_error_injection_exit (struct gendisk *disk); +bool __blk_error_inject (struct bio *bio); +static inline bool blk_error_inject (struct bio *bio) +{ +if (IS_ENABLED (CONFIG_BLK_ERROR_INJECTION ) && +static_branch_unlikely (&blk_error_injection_enabled) && +test_bit (GD_ERROR_INJECT , &bio->bi_bdev->bd_disk->state)) +return __blk_error_inject (bio); +return false; +} + +#endif /* _BLK_ERROR_INJECTION_H */
block/genhd.c +4 -0
@@ -1485,6 +1485,10 @@ struct gendisk *__alloc_disk_node(struct request_queue *q, int node_id,lockdep_init_map (&disk->lockdep_map,"(bio completion)" , lkclass,0 );#ifdef CONFIG_BLOCK_HOLDER_DEPRECATED INIT_LIST_HEAD (&disk->slave_bdevs); +#endif +#ifdef CONFIG_BLK_ERROR_INJECTION +mutex_init (&disk->error_injection_lock); +INIT_LIST_HEAD (&disk->error_injection_list);#endif mutex_init (&disk->rqos_state_mutex);kobject_init (&disk->queue_kobj, &blk_queue_ktype);
include/linux/blkdev.h +6 -0
@@ -176,6 +176,7 @@ struct gendisk {#define GD_SUPPRESS_PART_SCAN 5#define GD_OWNS_QUEUE 6#define GD_ZONE_APPEND_USED 7 +#define GD_ERROR_INJECT 8struct mutex open_mutex;/* open/close mutex */ unsigned open_partitions;/* number of open partitions */
@@ -227,6 +228,11 @@ struct gendisk {*/ struct blk_independent_access_ranges *ia_ranges; +#ifdef CONFIG_BLK_ERROR_INJECTION +struct mutex error_injection_lock; +struct list_head error_injection_list; +#endif +struct mutex rqos_state_mutex;/* rqos state change mutex */ };
Signature · 1 line
2.53.0
Sashiko had two comments on this:
- the one about the race of removal vs. addition is spot on, and trivially fixed by actually removing the code (unlock/lock cycle).
- the other about zero-sized commands is valid, but more of an enhancement. And one that if implemented right now actually make things worse, as flushed actually show up as empty writes with the preflush bit and not as REQ_OP_FLUSH. So if we'd special case zero-sized bios, we'd make a flush hit all write rules, which would defeat the point. We really need to do flushes as REQ_OP_FLUSH at the bio level :(
Below is what I plan to fold in, and I'm thinking of the empty bio issue above can be caught in a comment or the documentation nicely.
block/error-injection.c +0 -4
@@ -119,11 +119,7 @@ static void error_inject_removeall(struct gendisk *disk)while ((inj =list_first_entry_or_null (&disk->error_injection_list, struct blk_error_inject, entry))) {list_del_rcu (&inj->entry); -mutex_unlock (&disk->error_injection_lock); -kfree_rcu_mightsleep (inj); - -mutex_lock (&disk->error_injection_lock); }static_branch_dec (&blk_error_injection_enabled);mutex_unlock (&disk->error_injection_lock);