bcache: device failure handling improvement
Subsystems (2)
v7 cover bcache: device failure handling improvement
Hi maintainers and folks,
This patch set tries to improve bcache device failure handling, includes cache device and backing device failures.
The basic idea to handle failed cache device is,
- Unregister cache set
- Detach all backing devices which are attached to this cache set
- Stop all the detached bcache devices (configurable)
- Stop all flash only volume on the cache set
The above process is named 'cache set retire' by me. The result of cache set retire is, cache set and bcache devices are all removed, following I/O requests will get failed immediately to notift upper layer or user space coce that the cache device is failed or disconnected.
- Stop all the detached bcache devices (configurable)
- Stop all flash only volume on the cache set
The above process is named 'cache set retire' by me. The result of cache set retire is, cache set and bcache devices are all removed (configurable), following I/O requests will get failed immediately to notify upper layer or user space coce that the cache device is failed or disconnected.
The change of v7 patch set is to add an inline wait_for_kthread_stop() in following 2 patches,
- bcache: add CACHE_SET_IO_DISABLE to struct cache_set flags
- bcache: stop bcache device when backing device is offline
When CACHE_SET_IO_DISABLE bit is set and writeback thread, gc thread or status update thread exits while-loop, before returns from the kernel thread routine, wait_for_kthread_stop() will be called. This inline function just sleep-and-wait for kthread_should_stop() to return true. By this modification, kthreads will always be stopped by kthread_stop() even CACHE_SET_IO_DISABLE bit set stops the while-loop of these kernel threads.
Changelog:
v7: add wait_for_kthread_stop() in writebac, gc, and status update kernel
threads.
v6: fix typo and mistaken spelling.
v5: replace patch "bcache: stop all attached bcache devices for a retired
cache set" from v4 patch set by "bcache: add stop_when_cache_set_failed option to backing device" from v5 patch set.
fix issues from v4 patch set.
improve kernel message format, remove redundant prefix string.
v4: add per-cached_dev option stop_attached_devs_on_fail to avoid stopping
attached bcache device from a retiring cache set.
v3: fix detach issue find in v2 patch set.
v2: fixes all problems found in v1 review.
add patches to handle backing device failure.
add one more patch to set writeback_rate_update_seconds range. include a patch from Junhui Tang.
v1: the initial version, only handles cache device failure.
Coly Li (8):
bcache: fix cached_dev->count usage for bch_cache_set_error()
bcache: quit dc->writeback_thread when BCACHE_DEV_DETACHING is set
bcache: stop dc->writeback_rate_update properly
bcache: add CACHE_SET_IO_DISABLE to struct cache_set flags
bcache: add stop_when_cache_set_failed option to backing device
bcache: add backing_request_endio() for bi_end_io of attached backing
device I/O
bcache: add io_disable to struct cached_dev
bcache: stop bcache device when backing device is offline
Tang Junhui (1):
bcache: fix inaccurate io state for detached bcache devices
Thanks in advance for any review, testing or bug report.
Coly Li
---
drivers/md/bcache/alloc.c | 3 +- drivers/md/bcache/bcache.h | 59 +++++++++++- drivers/md/bcache/btree.c | 11 ++- drivers/md/bcache/io.c | 16 +++- drivers/md/bcache/journal.c | 4 +- drivers/md/bcache/request.c | 185 ++++++++++++++++++++++++++++++++------ drivers/md/bcache/super.c | 205 ++++++++++++++++++++++++++++++++++++++---- drivers/md/bcache/sysfs.c | 55 +++++++++++- drivers/md/bcache/util.h | 6 -- drivers/md/bcache/writeback.c | 92 ++++++++++++++++--- drivers/md/bcache/writeback.h | 2 - 11 files changed, 559 insertions(+), 79 deletions(-)
Signature · 1 line
2.16.1
PATCH v7 1/9 bcache: fix cached_dev->count usage for bch_cache_set_error()
When bcache metadata I/O fails, bcache will call bch_cache_set_error() to retire the whole cache set. The expected behavior to retire a cache set is to unregister the cache set, and unregister all backing device attached to this cache set, then remove sysfs entries of the cache set and all attached backing devices, finally release memory of structs cache_set, cache, cached_dev and bcache_device.
In my testing when journal I/O failure triggered by disconnected cache device, sometimes the cache set cannot be retired, and its sysfs entry /sys/fs/bcache/<uuid> still exits and the backing device also references it. This is not expected behavior.
When metadata I/O failes, the call senquence to retire whole cache set is,
bch_cache_set_error()
bch_cache_set_unregister()
bch_cache_set_stop()
__cache_set_unregister() <- called as callback by calling
clousre_queue(&c->caching)
cache_set_flush() <- called as a callback when refcount
of cache_set->caching is 0
cache_set_free() <- called as a callback when refcount
of catch_set->cl is 0
bch_cache_set_release() <- called as a callback when refcount
of catch_set->kobj is 0
I find if kernel thread bch_writeback_thread() quits while-loop when kthread_should_stop() is true and searched_full_index is false, clousre callback cache_set_flush() set by continue_at() will never be called. The result is, bcache fails to retire whole cache set.
cache_set_flush() will be called when refcount of closure c->caching is 0, and in function bcache_device_detach() refcount of closure c->caching is released to 0 by clousre_put(). In metadata error code path, function bcache_device_detach() is called by cached_dev_detach_finish(). This is a callback routine being called when cached_dev->count is 0. This refcount is decreased by cached_dev_put().
The above dependence indicates, cache_set_flush() will be called when refcount of cache_set->cl is 0, and refcount of cache_set->cl to be 0 when refcount of cache_dev->count is 0.
The reason why sometimes cache_dev->count is not 0 (when metadata I/O fails and bch_cache_set_error() called) is, in bch_writeback_thread(), refcount of cache_dev is not decreased properly.
In bch_writeback_thread(), cached_dev_put() is called only when searched_full_index is true and cached_dev->writeback_keys is empty, a.k.a there is no dirty data on cache. In most of run time it is correct, but when bch_writeback_thread() quits the while-loop while cache is still dirty, current code forget to call cached_dev_put() before this kernel thread exits. This is why sometimes cache_set_flush() is not executed and cache set fails to be retired.
The reason to call cached_dev_put() in bch_writeback_rate() is, when the cache device changes from clean to dirty, cached_dev_get() is called, to make sure during writeback operatiions both backing and cache devices won't be released.
Adding following code in bch_writeback_thread() does not work,
static int bch_writeback_thread(void *arg)
}
+ if (atomic_read(&dc->has_dirty))
+ cached_dev_put()
+
return 0;
}
because writeback kernel thread can be waken up and start via sysfs entry:
echo 1 > /sys/block/bcache<N>/bcache/writeback_running
It is difficult to check whether backing device is dirty without race and extra lock. So the above modification will introduce potential refcount underflow in some conditions.
The correct fix is, to take cached dev refcount when creating the kernel thread, and put it before the kernel thread exits. Then bcache does not need to take a cached dev refcount when cache turns from clean to dirty, or to put a cached dev refcount when cache turns from ditry to clean. The writeback kernel thread is alwasy safe to reference data structure from cache set, cache and cached device (because a refcount of cache device is taken for it already), and no matter the kernel thread is stopped by I/O errors or system reboot, cached_dev->count can always be used correctly.
The patch is simple, but understanding how it works is quite complicated.
Changelog:
v2: set dc->writeback_thread to NULL in this patch, as suggested by Hannes.
v1: initial version for review.
--- drivers/md/bcache/super.c | 1 - drivers/md/bcache/writeback.c | 11 ++++++++--- drivers/md/bcache/writeback.h | 2 -- 3 files changed, 8 insertions(+), 6 deletions(-)
drivers/md/bcache/super.c +0 -1
@@ -1054,7 +1054,6 @@ int bch_cached_dev_attach(struct cached_dev *dc, struct cache_set *c,if (BDEV_STATE (&dc->sb) ==BDEV_STATE_DIRTY ) {bch_sectors_dirty_init (&dc->disk);atomic_set (&dc->has_dirty,1 ); -refcount_inc (&dc->count);bch_writeback_queue (dc); }
drivers/md/bcache/writeback.c +8 -3
@@ -572,7 +572,7 @@ static int bch_writeback_thread(void *arg)if (kthread_should_stop ()) {set_current_state (TASK_RUNNING ); -return 0 ; +break ; }schedule ();
@@ -585,7 +585,6 @@ static int bch_writeback_thread(void *arg)if (searched_full_index &&RB_EMPTY_ROOT (&dc->writeback_keys.keys)) {atomic_set (&dc->has_dirty,0 ); -cached_dev_put (dc);SET_BDEV_STATE (&dc->sb,BDEV_STATE_CLEAN );bch_write_bdev_super (dc,NULL ); }
@@ -606,6 +605,9 @@ static int bch_writeback_thread(void *arg) } } + dc->writeback_thread =NULL ; +cached_dev_put (dc); +return 0 ; }
@@ -669,10 +671,13 @@ int bch_cached_dev_writeback_start(struct cached_dev *dc)if (!dc->writeback_write_wq)return -ENOMEM ; +cached_dev_get (dc); dc->writeback_thread =kthread_create (bch_writeback_thread, dc,"bcache_writeback" ); -if (IS_ERR (dc->writeback_thread)) +if (IS_ERR (dc->writeback_thread)) { +cached_dev_put (dc);return PTR_ERR (dc->writeback_thread); + }schedule_delayed_work (&dc->writeback_rate_update, dc->writeback_rate_update_seconds *HZ );
drivers/md/bcache/writeback.h +0 -2
@@ -105,8 +105,6 @@ static inline void bch_writeback_add(struct cached_dev *dc) {if (!atomic_read (&dc->has_dirty) && !atomic_xchg (&dc->has_dirty,1 )) { -refcount_inc (&dc->count); -if (BDEV_STATE (&dc->sb) !=BDEV_STATE_DIRTY ) {SET_BDEV_STATE (&dc->sb,BDEV_STATE_DIRTY );/* XXX: should do this synchronously */
Signature · 1 line
2.16.1
Re: [PATCH v7 1/9] bcache: fix cached_dev->count usage for bch_cache_set_error()
Hi Coly Li---
Thanks for this. I've been uncomfortable with the interaction between the dirty status and the refcount (even aside from this issue), and I believe you've resolved it. I'm sorry for the slow review-- it's taken me some time to convince myself that this is safe.
I'm getting closer to be able to apply these for 4.17.
Mike
Quoted 170 lines · Coly Li
When bcache metadata I/O fails, bcache will call
bch_cache_set_error()to retire the whole cache set. The expected behavior to retire a cache set is to unregister the cache set, and unregister all backing device attached to this cache set, then remove sysfs entries of the cache set and all attached backing devices, finally release memory of structscache_set, cache,cached_devandbcache_device.In my testing when journal I/O failure triggered by disconnected cache device, sometimes the cache set cannot be retired, and its sysfs entry /sys/fs/bcache/<uuid> still exits and the backing device also references it. This is not expected behavior.
When metadata I/O failes, the call senquence to retire whole cache set is,
bch_cache_set_error()
bch_cache_set_unregister()
bch_cache_set_stop()
__cache_set_unregister()<- called as callback by calling
clousre_queue(&c->caching)
cache_set_flush()<- called as a callback when refcount
ofcache_set->cachingis 0
cache_set_free()<- called as a callback when refcount
ofcatch_set->clis 0
bch_cache_set_release()<- called as a callback when refcount
ofcatch_set->kobjis 0I find if kernel thread
bch_writeback_thread()quits while-loop whenkthread_should_stop()is true andsearched_full_indexis false, clousre callbackcache_set_flush()set bycontinue_at()will never be called. The result is, bcache fails to retire whole cache set.
cache_set_flush()will be called when refcount of closurec->cachingis 0, and in functionbcache_device_detach()refcount of closurec->cachingis released to 0 byclousre_put(). In metadata error code path, functionbcache_device_detach()is called bycached_dev_detach_finish(). This is a callback routine being called whencached_dev->countis 0. This refcount is decreased bycached_dev_put().The above dependence indicates,
cache_set_flush()will be called when refcount ofcache_set->clis 0, and refcount ofcache_set->clto be 0 when refcount ofcache_dev->countis 0.The reason why sometimes
cache_dev->countis not 0 (when metadata I/O fails andbch_cache_set_error()called) is, inbch_writeback_thread(), refcount ofcache_devis not decreased properly.In
bch_writeback_thread(),cached_dev_put()is called only whensearched_full_indexis true andcached_dev->writeback_keysis empty, a.k.a there is no dirty data on cache. In most of run time it is correct, but whenbch_writeback_thread()quits the while-loop while cache is still dirty, current code forget to callcached_dev_put()before this kernel thread exits. This is why sometimescache_set_flush()is not executed and cache set fails to be retired.The reason to call
cached_dev_put()inbch_writeback_rate()is, when the cache device changes from clean to dirty,cached_dev_get()is called, to make sure during writeback operatiions both backing and cache devices won't be released.Adding following code in
bch_writeback_thread()does not work,
static intbch_writeback_thread(void *arg)}drivers/md/bcache/writeback.c +3
-0+if (atomic_read (&dc->has_dirty)) + cached_dev_put() +return 0 ; }because writeback kernel thread can be waken up and start via sysfs entry:
echo 1 > /sys/block/bcache<N>/bcache/writeback_running
It is difficult to check whether backing device is dirty without race and extra lock. So the above modification will introduce potential refcount underflow in some conditions.The correct fix is, to take cached dev refcount when creating the kernel thread, and put it before the kernel thread exits. Then bcache does not need to take a cached dev refcount when cache turns from clean to dirty, or to put a cached dev refcount when cache turns from ditry to clean. The writeback kernel thread is alwasy safe to reference data structure from cache set, cache and cached device (because a refcount of cache device is taken for it already), and no matter the kernel thread is stopped by I/O errors or system reboot,
cached_dev->countcan always be used correctly.The patch is simple, but understanding how it works is quite complicated.
Changelog:
v2: setdc->writeback_threadto NULL in this patch, as suggested by Hannes.
v1: initial version for review.Signed-off-by Coly Li <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>Cc Michael Lyle <[email protected]>Cc Junhui Tang <[email protected]>--- drivers/md/bcache/super.c | 1 - drivers/md/bcache/writeback.c | 11 ++++++++--- drivers/md/bcache/writeback.h | 2 -- 3 files changed, 8 insertions(+), 6 deletions(-)drivers/md/bcache/super.c +0
-1@@ -1054,7 +1054,6 @@ int bch_cached_dev_attach(struct cached_dev *dc, struct cache_set *c,if (BDEV_STATE (&dc->sb) ==BDEV_STATE_DIRTY ) {bch_sectors_dirty_init (&dc->disk);atomic_set (&dc->has_dirty,1 ); -refcount_inc (&dc->count);bch_writeback_queue (dc); }drivers/md/bcache/writeback.c +8
-3@@ -572,7 +572,7 @@ static int bch_writeback_thread(void *arg)if (kthread_should_stop ()) {set_current_state (TASK_RUNNING ); -return 0 ; +break ; }schedule ();@@ -585,7 +585,6 @@ static int bch_writeback_thread(void *arg)if (searched_full_index &&RB_EMPTY_ROOT (&dc->writeback_keys.keys)) {atomic_set (&dc->has_dirty,0 ); -cached_dev_put (dc);SET_BDEV_STATE (&dc->sb,BDEV_STATE_CLEAN );bch_write_bdev_super (dc,NULL ); }@@ -606,6 +605,9 @@ static int bch_writeback_thread(void *arg) } } + dc->writeback_thread =NULL ; +cached_dev_put (dc); +return 0 ; }@@ -669,10 +671,13 @@ int bch_cached_dev_writeback_start(struct cached_dev *dc)if (!dc->writeback_write_wq)return -ENOMEM ; +cached_dev_get (dc); dc->writeback_thread =kthread_create (bch_writeback_thread, dc,"bcache_writeback" ); -if (IS_ERR (dc->writeback_thread)) +if (IS_ERR (dc->writeback_thread)) { +cached_dev_put (dc);return PTR_ERR (dc->writeback_thread); + }schedule_delayed_work (&dc->writeback_rate_update, dc->writeback_rate_update_seconds *HZ );drivers/md/bcache/writeback.h +0
-2@@ -105,8 +105,6 @@ static inline void bch_writeback_add(struct cached_dev *dc) {if (!atomic_read (&dc->has_dirty) && !atomic_xchg (&dc->has_dirty,1 )) { -refcount_inc (&dc->count); -if (BDEV_STATE (&dc->sb) !=BDEV_STATE_DIRTY ) {SET_BDEV_STATE (&dc->sb,BDEV_STATE_DIRTY );/* XXX: should do this synchronously */
PATCH v7 2/9 bcache: quit dc->writeback_thread when BCACHE_DEV_DETACHING is set
In reply to Coly LiIn patch "bcache: fix cached_dev->count usage for bch_cache_set_error()", cached_dev_get() is called when creating dc->writeback_thread, and cached_dev_put() is called when exiting dc->writeback_thread. This modification works well unless people detach the bcache device manually by
'echo 1 > /sys/block/bcache<N>/bcache/detach'
Because this sysfs interface only calls bch_cached_dev_detach() which wakes up dc->writeback_thread but does not stop it. The reason is, before patch "bcache: fix cached_dev->count usage for bch_cache_set_error()", inside bch_writeback_thread(), if cache is not dirty after writeback, cached_dev_put() will be called here. And in cached_dev_make_request() when a new write request makes cache from clean to dirty, cached_dev_get() will be called there. Since we don't operate dc->count in these locations, refcount d->count cannot be dropped after cache becomes clean, and cached_dev_detach_finish() won't be called to detach bcache device.
This patch fixes the issue by checking whether BCACHE_DEV_DETACHING is set inside bch_writeback_thread(). If this bit is set and cache is clean (no existing writeback_keys), break the while-loop, call cached_dev_put() and quit the writeback thread.
Please note if cache is still dirty, even BCACHE_DEV_DETACHING is set the writeback thread should continue to perform writeback, this is the original design of manually detach.
It is safe to do the following check without locking, let me explain why,
+ if (!test_bit(BCACHE_DEV_DETACHING, &dc->disk.flags) &&
+ (!atomic_read(&dc->has_dirty) || !dc->writeback_running)) {
If the kenrel thread does not sleep and continue to run due to conditions are not updated in time on the running CPU core, it just consumes more CPU cycles and has no hurt. This should-sleep-but-run is safe here. We just focus on the should-run-but-sleep condition, which means the writeback thread goes to sleep in mistake while it should continue to run.
1, First of all, no matter the writeback thread is hung or not, kthread_stop() from
cached_dev_detach_finish() will wake up it and terminate by making kthread_should_stop() return true. And in normal run time, bit on index BCACHE_DEV_DETACHING is always cleared, the condition
!test_bit(BCACHE_DEV_DETACHING, &dc->disk.flags)
is always true and can be ignored as constant value.
2, If one of the following conditions is true, the writeback thread should
go to sleep,
"!atomic_read(&dc->has_dirty)" or "!dc->writeback_running)" each of them independently controls the writeback thread should sleep or not, let's analyse them one by one.
2.1 condition "!atomic_read(&dc->has_dirty)"
If dc->has_dirty is set from 0 to 1 on another CPU core, bcache will call bch_writeback_queue() immediately or call bch_writeback_add() which indirectly calls bch_writeback_queue() too. In bch_writeback_queue(), wake_up_process(dc->writeback_thread) is called. It sets writeback thread's task state to TASK_RUNNING and following an implicit memory barrier, then tries to wake up the writeback thread.
In writeback thread, its task state is set to TASK_INTERRUPTIBLE before doing the condition check. If other CPU core sets the TASK_RUNNING state after writeback thread setting TASK_INTERRUPTIBLE, the writeback thread will be scheduled to run very soon because its state is not TASK_INTERRUPTIBLE. If other CPU core sets the TASK_RUNNING state before writeback thread setting TASK_INTERRUPTIBLE, the implict memory barrier of wake_up_process() will make sure modification of dc->has_dirty on other CPU core is updated and observed on the CPU core of writeback thread. Therefore the condition check will correctly be false, and continue writeback code without sleeping.
2.2 condition "!dc->writeback_running)"
dc->writeback_running can be changed via sysfs file, every time it is modified, a following bch_writeback_queue() is alwasy called. So the change is always observed on the CPU core of writeback thread. If dc->writeback_running is changed from 0 to 1 on other CPU core, this condition check will observe the modification and allow writeback thread to continue to run without sleeping.
Now we can see, even without a locking protection, multiple conditions check is safe here, no deadlock or process hang up will happen.
I compose a separte patch because that patch "bcache: fix cached_dev->count usage for bch_cache_set_error()" already gets a "Reviewed-by:" from Hannes Reinecke. Also this fix is not trivial and good for a separate patch.
--- drivers/md/bcache/writeback.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
drivers/md/bcache/writeback.c +17 -3
@@ -565,9 +565,15 @@ static int bch_writeback_thread(void *arg)while (!kthread_should_stop ()) {down_write (&dc->writeback_lock);set_current_state (TASK_INTERRUPTIBLE ); -if (!atomic_read (&dc->has_dirty) || - (!test_bit (BCACHE_DEV_DETACHING , &dc->disk.flags) && - !dc->writeback_running)) { +/* +* If the bache device is detaching, skip here and continue +* to perform writeback. Otherwise, if no dirty data on cache, +* or there is dirty data on cache but writeback is disabled, +* the writeback thread should sleep here and wait for others +* to wake up it. +*/ +if (!test_bit (BCACHE_DEV_DETACHING , &dc->disk.flags) && + (!atomic_read (&dc->has_dirty) || !dc->writeback_running)) {up_write (&dc->writeback_lock);if (kthread_should_stop ()) {
@@ -587,6 +593,14 @@ static int bch_writeback_thread(void *arg)atomic_set (&dc->has_dirty,0 );SET_BDEV_STATE (&dc->sb,BDEV_STATE_CLEAN );bch_write_bdev_super (dc,NULL ); +/* +* If bcache device is detaching via sysfs interface, +* writeback thread should stop after there is no dirty +* data on cache. BCACHE_DEV_DETACHING flag is set in +* bch_cached_dev_detach(). +*/ +if (test_bit (BCACHE_DEV_DETACHING , &dc->disk.flags)) +break ; }up_write (&dc->writeback_lock);
Signature · 1 line
2.16.1
PATCH v7 3/9 bcache: stop dc->writeback_rate_update properly
In reply to Coly Listruct delayed_work writeback_rate_update in struct cache_dev is a delayed worker to call function update_writeback_rate() in period (the interval is defined by dc->writeback_rate_update_seconds).
When a metadate I/O error happens on cache device, bcache error handling routine bch_cache_set_error() will call bch_cache_set_unregister() to retire whole cache set. On the unregister code path, this delayed work is stopped by calling cancel_delayed_work_sync(&dc->writeback_rate_update).
dc->writeback_rate_update is a special delayed work from others in bcache. In its routine update_writeback_rate(), this delayed work is re-armed itself. That means when cancel_delayed_work_sync() returns, this delayed work can still be executed after several seconds defined by dc->writeback_rate_update_seconds.
The problem is, after cancel_delayed_work_sync() returns, the cache set unregister code path will continue and release memory of struct cache set. Then the delayed work is scheduled to run, __update_writeback_rate() will reference the already released cache_set memory, and trigger a NULL pointer deference fault.
This patch introduces two more bcache device flags,
- BCACHE_DEV_WB_RUNNING
bit set: bcache device is in writeback mode and running, it is OK for
dc->writeback_rate_update to re-arm itself.
bit clear:bcache device is trying to stop dc->writeback_rate_update,
this delayed work should not re-arm itself and quit.
- BCACHE_DEV_RATE_DW_RUNNING
bit set: routine update_writeback_rate() is executing. bit clear: routine update_writeback_rate() quits.
This patch also adds a function cancel_writeback_rate_update_dwork() to wait for dc->writeback_rate_update quits before cancel it by calling cancel_delayed_work_sync(). In order to avoid a deadlock by unexpected quit dc->writeback_rate_update, after time_out seconds this function will give up and continue to call cancel_delayed_work_sync().
And here I explain how this patch stops self re-armed delayed work properly with the above stuffs.
update_writeback_rate() sets BCACHE_DEV_RATE_DW_RUNNING at its beginning and clears BCACHE_DEV_RATE_DW_RUNNING at its end. Before calling cancel_writeback_rate_update_dwork() clear flag BCACHE_DEV_WB_RUNNING.
Before calling cancel_delayed_work_sync() wait utill flag BCACHE_DEV_RATE_DW_RUNNING is clear. So when calling cancel_delayed_work_sync(), dc->writeback_rate_update must be already re- armed, or quite by seeing BCACHE_DEV_WB_RUNNING cleared. In both cases delayed work routine update_writeback_rate() won't be executed after cancel_delayed_work_sync() returns.
Inside update_writeback_rate() before calling schedule_delayed_work(), flag BCACHE_DEV_WB_RUNNING is checked before. If this flag is cleared, it means someone is about to stop the delayed work. Because flag BCACHE_DEV_RATE_DW_RUNNING is set already and cancel_delayed_work_sync() has to wait for this flag to be cleared, we don't need to worry about race condition here.
If update_writeback_rate() is scheduled to run after checking BCACHE_DEV_RATE_DW_RUNNING and before calling cancel_delayed_work_sync() in cancel_writeback_rate_update_dwork(), it is also safe. Because at this moment BCACHE_DEV_WB_RUNNING is cleared with memory barrier. As I mentioned previously, update_writeback_rate() will see BCACHE_DEV_WB_RUNNING is clear and quit immediately.
Because there are more dependences inside update_writeback_rate() to struct cache_set memory, dc->writeback_rate_update is not a simple self re-arm delayed work. After trying many different methods (e.g. hold dc->count, or use locks), this is the only way I can find which works to properly stop dc->writeback_rate_update delayed work.
Changelog:
v3: change values of BCACHE_DEV_WB_RUNNING and BCACHE_DEV_RATE_DW_RUNNING
to bit index, for test_bit().
v2: Try to fix the race issue which is pointed out by Junhui.
v1: The initial version for review
--- drivers/md/bcache/bcache.h | 9 +++++---- drivers/md/bcache/super.c | 39 +++++++++++++++++++++++++++++++++++---- drivers/md/bcache/sysfs.c | 3 ++- drivers/md/bcache/writeback.c | 29 ++++++++++++++++++++++++++++- 4 files changed, 70 insertions(+), 10 deletions(-)
drivers/md/bcache/bcache.h +5 -4
@@ -258,10 +258,11 @@ struct bcache_device {struct gendisk *disk;unsigned long flags; -#define BCACHE_DEV_CLOSING 0 -#define BCACHE_DEV_DETACHING 1 -#define BCACHE_DEV_UNLINK_DONE 2 - +#define BCACHE_DEV_CLOSING 0 +#define BCACHE_DEV_DETACHING 1 +#define BCACHE_DEV_UNLINK_DONE 2 +#define BCACHE_DEV_WB_RUNNING 3 +#define BCACHE_DEV_RATE_DW_RUNNING 4unsigned nr_stripes;unsigned stripe_size;atomic_t *stripe_sectors_dirty;
drivers/md/bcache/super.c +35 -4
@@ -899,6 +899,32 @@ void bch_cached_dev_run(struct cached_dev *dc)pr_debug ("error creating sysfs link" ); } +/* +* If BCACHE_DEV_RATE_DW_RUNNING is set, it means routine of the delayed +* work dc->writeback_rate_update is running. Wait until the routine +* quits (BCACHE_DEV_RATE_DW_RUNNING is clear), then continue to +* cancel it. If BCACHE_DEV_RATE_DW_RUNNING is not clear after time_out +* seconds, give up waiting here and continue to cancel it too. +*/ +static void cancel_writeback_rate_update_dwork (struct cached_dev *dc) +{ +int time_out =WRITEBACK_RATE_UPDATE_SECS_MAX *HZ ; + +do { +if (!test_bit (BCACHE_DEV_RATE_DW_RUNNING , + &dc->disk.flags)) +break ; + time_out--; +schedule_timeout_interruptible (1 ); + }while (time_out >0 ); + +if (time_out ==0 ) +pr_warn ("give up waiting for dc->writeback_write_update" +" to quit" ); + +cancel_delayed_work_sync (&dc->writeback_rate_update); +} +static void cached_dev_detach_finish (struct work_struct *w) { struct cached_dev *dc = container_of(w, struct cached_dev, detach);
@@ -911,7 +937,9 @@ static void cached_dev_detach_finish(struct work_struct *w)mutex_lock (&bch_register_lock); -cancel_delayed_work_sync (&dc->writeback_rate_update); +if (test_and_clear_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags)) +cancel_writeback_rate_update_dwork (dc); +if (!IS_ERR_OR_NULL (dc->writeback_thread)) {kthread_stop (dc->writeback_thread); dc->writeback_thread =NULL ;
@@ -954,6 +982,7 @@ void bch_cached_dev_detach(struct cached_dev *dc)closure_get (&dc->disk.cl);bch_writeback_queue (dc); +cached_dev_put (dc); }
@@ -1081,14 +1110,16 @@ static void cached_dev_free(struct closure *cl) { struct cached_dev *dc = container_of(cl, struct cached_dev, disk.cl); -cancel_delayed_work_sync (&dc->writeback_rate_update); +mutex_lock (&bch_register_lock); + +if (test_and_clear_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags)) +cancel_writeback_rate_update_dwork (dc); +if (!IS_ERR_OR_NULL (dc->writeback_thread))kthread_stop (dc->writeback_thread);if (dc->writeback_write_wq)destroy_workqueue (dc->writeback_write_wq); -mutex_lock (&bch_register_lock); -if (atomic_read (&dc->running))bd_unlink_disk_holder (dc->bdev, dc->disk.disk);bcache_device_free (&dc->disk);
drivers/md/bcache/sysfs.c +2 -1
@@ -309,7 +309,8 @@ STORE(bch_cached_dev)bch_writeback_queue (dc);if (attr == &sysfs_writeback_percent) -schedule_delayed_work (&dc->writeback_rate_update, +if (!test_and_set_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags)) +schedule_delayed_work (&dc->writeback_rate_update, dc->writeback_rate_update_seconds *HZ );mutex_unlock (&bch_register_lock);
drivers/md/bcache/writeback.c +28 -1
@@ -115,6 +115,21 @@ static void update_writeback_rate(struct work_struct *work) struct cached_dev, writeback_rate_update); +/* +* should check BCACHE_DEV_RATE_DW_RUNNING before calling +* cancel_delayed_work_sync(). +*/ +set_bit (BCACHE_DEV_RATE_DW_RUNNING , &dc->disk.flags); +/* paired with where BCACHE_DEV_RATE_DW_RUNNING is tested */ +smp_mb (); + +if (!test_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags)) { +clear_bit (BCACHE_DEV_RATE_DW_RUNNING , &dc->disk.flags); +/* paired with where BCACHE_DEV_RATE_DW_RUNNING is tested */ +smp_mb (); +return ; + } +down_read (&dc->writeback_lock); if (atomic_read(&dc->has_dirty) &&
@@ -123,8 +138,18 @@ static void update_writeback_rate(struct work_struct *work)up_read (&dc->writeback_lock); -schedule_delayed_work (&dc->writeback_rate_update, +if (test_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags)) { +schedule_delayed_work (&dc->writeback_rate_update, dc->writeback_rate_update_seconds *HZ ); + } + +/* +* should check BCACHE_DEV_RATE_DW_RUNNING before calling +* cancel_delayed_work_sync(). +*/ +clear_bit (BCACHE_DEV_RATE_DW_RUNNING , &dc->disk.flags); +/* paired with where BCACHE_DEV_RATE_DW_RUNNING is tested */ +smp_mb (); }static unsigned writeback_delay (struct cached_dev *dc,unsigned sectors)
@@ -675,6 +700,7 @@ void bch_cached_dev_writeback_init(struct cached_dev *dc) dc->writeback_rate_p_term_inverse =40 ; dc->writeback_rate_i_term_inverse =10000 ; +WARN_ON (test_and_clear_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags));INIT_DELAYED_WORK (&dc->writeback_rate_update, update_writeback_rate); }
@@ -693,6 +719,7 @@ int bch_cached_dev_writeback_start(struct cached_dev *dc)return PTR_ERR (dc->writeback_thread); } +WARN_ON (test_and_set_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags));schedule_delayed_work (&dc->writeback_rate_update, dc->writeback_rate_update_seconds *HZ );
Signature · 1 line
2.16.1
Re: [PATCH v7 3/9] bcache: stop dc->writeback_rate_update properly
OK, I have convinced myself this is safe.
Quoted 261 lines · Coly Li
struct
delayed_workwriteback_rate_updatein structcache_devis a delayed worker to call functionupdate_writeback_rate()in period (the interval is defined bydc->writeback_rate_update_seconds).When a metadate I/O error happens on cache device, bcache error handling routine
bch_cache_set_error()will callbch_cache_set_unregister()to retire whole cache set. On the unregister code path, this delayed work is stopped by callingcancel_delayed_work_sync(&dc->writeback_rate_update).
dc->writeback_rate_updateis a special delayed work from others in bcache. In its routineupdate_writeback_rate(), this delayed work is re-armed itself. That means whencancel_delayed_work_sync()returns, this delayed work can still be executed after several seconds defined bydc->writeback_rate_update_seconds.The problem is, after
cancel_delayed_work_sync()returns, the cache set unregister code path will continue and release memory of struct cache set. Then the delayed work is scheduled to run,__update_writeback_rate()will reference the already releasedcache_setmemory, and trigger a NULL pointer deference fault.This patch introduces two more bcache device flags,
-BCACHE_DEV_WB_RUNNING
bit set: bcache device is in writeback mode and running, it is OK fordc->writeback_rate_update to re-arm itself.bit clear:bcache device is trying to stop
dc->writeback_rate_update,
this delayed work should not re-arm itself and quit.
-BCACHE_DEV_RATE_DW_RUNNING
bit set: routineupdate_writeback_rate()is executing. bit clear: routineupdate_writeback_rate()quits.This patch also adds a function
cancel_writeback_rate_update_dwork()to wait fordc->writeback_rate_updatequits before cancel it by callingcancel_delayed_work_sync(). In order to avoid a deadlock by unexpected quitdc->writeback_rate_update, aftertime_outseconds this function will give up and continue to callcancel_delayed_work_sync().And here I explain how this patch stops self re-armed delayed work properly with the above stuffs.
update_writeback_rate()setsBCACHE_DEV_RATE_DW_RUNNINGat its beginning and clearsBCACHE_DEV_RATE_DW_RUNNINGat its end. Before callingcancel_writeback_rate_update_dwork()clear flagBCACHE_DEV_WB_RUNNING.Before calling
cancel_delayed_work_sync()wait utill flagBCACHE_DEV_RATE_DW_RUNNINGis clear. So when callingcancel_delayed_work_sync(),dc->writeback_rate_updatemust be already re- armed, or quite by seeingBCACHE_DEV_WB_RUNNINGcleared. In both cases delayed work routineupdate_writeback_rate()won't be executed aftercancel_delayed_work_sync()returns.Inside
update_writeback_rate()before callingschedule_delayed_work(), flagBCACHE_DEV_WB_RUNNINGis checked before. If this flag is cleared, it means someone is about to stop the delayed work. Because flagBCACHE_DEV_RATE_DW_RUNNINGis set already andcancel_delayed_work_sync()has to wait for this flag to be cleared, we don't need to worry about race condition here.If
update_writeback_rate()is scheduled to run after checkingBCACHE_DEV_RATE_DW_RUNNINGand before callingcancel_delayed_work_sync()incancel_writeback_rate_update_dwork(), it is also safe. Because at this momentBCACHE_DEV_WB_RUNNINGis cleared with memory barrier. As I mentioned previously,update_writeback_rate()will seeBCACHE_DEV_WB_RUNNINGis clear and quit immediately.Because there are more dependences inside
update_writeback_rate()to structcache_setmemory,dc->writeback_rate_updateis not a simple self re-arm delayed work. After trying many different methods (e.g. holddc->count, or use locks), this is the only way I can find which works to properly stopdc->writeback_rate_updatedelayed work.Changelog:
v3: change values ofBCACHE_DEV_WB_RUNNINGandBCACHE_DEV_RATE_DW_RUNNING
to bit index, fortest_bit().
v2: Try to fix the race issue which is pointed out by Junhui.
v1: The initial version for reviewSigned-off-by Coly Li <[email protected]>Reviewed-by Junhui Tang <[email protected]>Cc Michael Lyle <[email protected]>Cc Hannes Reinecke <[email protected]>--- drivers/md/bcache/bcache.h | 9 +++++---- drivers/md/bcache/super.c | 39 +++++++++++++++++++++++++++++++++++---- drivers/md/bcache/sysfs.c | 3 ++- drivers/md/bcache/writeback.c | 29 ++++++++++++++++++++++++++++- 4 files changed, 70 insertions(+), 10 deletions(-)drivers/md/bcache/bcache.h +5
-4@@ -258,10 +258,11 @@ struct bcache_device {struct gendisk *disk;unsigned long flags; -#define BCACHE_DEV_CLOSING 0 -#define BCACHE_DEV_DETACHING 1 -#define BCACHE_DEV_UNLINK_DONE 2 - +#define BCACHE_DEV_CLOSING 0 +#define BCACHE_DEV_DETACHING 1 +#define BCACHE_DEV_UNLINK_DONE 2 +#define BCACHE_DEV_WB_RUNNING 3 +#define BCACHE_DEV_RATE_DW_RUNNING 4unsigned nr_stripes;unsigned stripe_size;atomic_t *stripe_sectors_dirty;drivers/md/bcache/super.c +35
-4@@ -899,6 +899,32 @@ void bch_cached_dev_run(struct cached_dev *dc)pr_debug ("error creating sysfs link" ); } +/* +* If BCACHE_DEV_RATE_DW_RUNNING is set, it means routine of the delayed +* work dc->writeback_rate_update is running. Wait until the routine +* quits (BCACHE_DEV_RATE_DW_RUNNING is clear), then continue to +* cancel it. If BCACHE_DEV_RATE_DW_RUNNING is not clear after time_out +* seconds, give up waiting here and continue to cancel it too. +*/ +static void cancel_writeback_rate_update_dwork (struct cached_dev *dc) +{ +int time_out =WRITEBACK_RATE_UPDATE_SECS_MAX *HZ ; + +do { +if (!test_bit (BCACHE_DEV_RATE_DW_RUNNING , + &dc->disk.flags)) +break ; + time_out--; +schedule_timeout_interruptible (1 ); + }while (time_out >0 ); + +if (time_out ==0 ) +pr_warn ("give up waiting for dc->writeback_write_update" +" to quit" ); + +cancel_delayed_work_sync (&dc->writeback_rate_update); +} +static void cached_dev_detach_finish (struct work_struct *w) { struct cached_dev *dc = container_of(w, struct cached_dev, detach);@@ -911,7 +937,9 @@ static void cached_dev_detach_finish(struct work_struct *w)mutex_lock (&bch_register_lock); -cancel_delayed_work_sync (&dc->writeback_rate_update); +if (test_and_clear_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags)) +cancel_writeback_rate_update_dwork (dc); +if (!IS_ERR_OR_NULL (dc->writeback_thread)) {kthread_stop (dc->writeback_thread); dc->writeback_thread =NULL ;@@ -954,6 +982,7 @@ void bch_cached_dev_detach(struct cached_dev *dc)closure_get (&dc->disk.cl);bch_writeback_queue (dc); +cached_dev_put (dc); }@@ -1081,14 +1110,16 @@ static void cached_dev_free(struct closure *cl) { struct cached_dev *dc = container_of(cl, struct cached_dev, disk.cl); -cancel_delayed_work_sync (&dc->writeback_rate_update); +mutex_lock (&bch_register_lock); + +if (test_and_clear_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags)) +cancel_writeback_rate_update_dwork (dc); +if (!IS_ERR_OR_NULL (dc->writeback_thread))kthread_stop (dc->writeback_thread);if (dc->writeback_write_wq)destroy_workqueue (dc->writeback_write_wq); -mutex_lock (&bch_register_lock); -if (atomic_read (&dc->running))bd_unlink_disk_holder (dc->bdev, dc->disk.disk);bcache_device_free (&dc->disk);drivers/md/bcache/sysfs.c +2
-1@@ -309,7 +309,8 @@ STORE(bch_cached_dev)bch_writeback_queue (dc);if (attr == &sysfs_writeback_percent) -schedule_delayed_work (&dc->writeback_rate_update, +if (!test_and_set_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags)) +schedule_delayed_work (&dc->writeback_rate_update, dc->writeback_rate_update_seconds *HZ );mutex_unlock (&bch_register_lock);drivers/md/bcache/writeback.c +28
-1@@ -115,6 +115,21 @@ static void update_writeback_rate(struct work_struct *work) struct cached_dev, writeback_rate_update); +/* +* should check BCACHE_DEV_RATE_DW_RUNNING before calling +* cancel_delayed_work_sync(). +*/ +set_bit (BCACHE_DEV_RATE_DW_RUNNING , &dc->disk.flags); +/* paired with where BCACHE_DEV_RATE_DW_RUNNING is tested */ +smp_mb (); + +if (!test_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags)) { +clear_bit (BCACHE_DEV_RATE_DW_RUNNING , &dc->disk.flags); +/* paired with where BCACHE_DEV_RATE_DW_RUNNING is tested */ +smp_mb (); +return ; + } +down_read (&dc->writeback_lock); if (atomic_read(&dc->has_dirty) &&@@ -123,8 +138,18 @@ static void update_writeback_rate(struct work_struct *work)up_read (&dc->writeback_lock); -schedule_delayed_work (&dc->writeback_rate_update, +if (test_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags)) { +schedule_delayed_work (&dc->writeback_rate_update, dc->writeback_rate_update_seconds *HZ ); + } + +/* +* should check BCACHE_DEV_RATE_DW_RUNNING before calling +* cancel_delayed_work_sync(). +*/ +clear_bit (BCACHE_DEV_RATE_DW_RUNNING , &dc->disk.flags); +/* paired with where BCACHE_DEV_RATE_DW_RUNNING is tested */ +smp_mb (); }static unsigned writeback_delay (struct cached_dev *dc,unsigned sectors)@@ -675,6 +700,7 @@ void bch_cached_dev_writeback_init(struct cached_dev *dc) dc->writeback_rate_p_term_inverse =40 ; dc->writeback_rate_i_term_inverse =10000 ; +WARN_ON (test_and_clear_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags));INIT_DELAYED_WORK (&dc->writeback_rate_update, update_writeback_rate); }@@ -693,6 +719,7 @@ int bch_cached_dev_writeback_start(struct cached_dev *dc)return PTR_ERR (dc->writeback_thread); } +WARN_ON (test_and_set_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags));schedule_delayed_work (&dc->writeback_rate_update, dc->writeback_rate_update_seconds *HZ );
PATCH v7 4/9 bcache: add CACHE_SET_IO_DISABLE to struct cache_set flags
In reply to Coly LiWhen too many I/Os failed on cache device, bch_cache_set_error() is called in the error handling code path to retire whole problematic cache set. If new I/O requests continue to come and take refcount dc->count, the cache set won't be retired immediately, this is a problem.
Further more, there are several kernel thread and self-armed kernel work may still running after bch_cache_set_error() is called. It needs to wait quite a while for them to stop, or they won't stop at all. They also prevent the cache set from being retired.
The solution in this patch is, to add per cache set flag to disable I/O request on this cache and all attached backing devices. Then new coming I/O requests can be rejected in *_make_request() before taking refcount, kernel threads and self-armed kernel worker can stop very fast when flags bit CACHE_SET_IO_DISABLE is set.
Because bcache also do internal I/Os for writeback, garbage collection, bucket allocation, journaling, this kind of I/O should be disabled after bch_cache_set_error() is called. So closure_bio_submit() is modified to check whether CACHE_SET_IO_DISABLE is set on cache_set->flags. If set, closure_bio_submit() will set bio->bi_status to BLK_STS_IOERR and return, generic_make_request() won't be called.
A sysfs interface is also added to set or clear CACHE_SET_IO_DISABLE bit from cache_set->flags, to disable or enable cache set I/O for debugging. It is helpful to trigger more corner case issues for failed cache device.
Changelog
v4, add wait_for_kthread_stop(), and call it before exits writeback and gc
kernel threads.
v3, change CACHE_SET_IO_DISABLE from 4 to 3, since it is bit index.
remove "bcache: " prefix when printing out kernel message.
v2, more changes by previous review,
- Use CACHE_SET_IO_DISABLE of cache_set->flags, suggested by Junhui.
- Check CACHE_SET_IO_DISABLE in bch_btree_gc() to stop a while-loop, this is reported and inspired from origal patch of Pavel Vazharov.
v1, initial version.
--- drivers/md/bcache/alloc.c | 3 ++- drivers/md/bcache/bcache.h | 33 +++++++++++++++++++++++++++++++++ drivers/md/bcache/btree.c | 11 ++++++++--- drivers/md/bcache/io.c | 2 +- drivers/md/bcache/journal.c | 4 ++-- drivers/md/bcache/request.c | 26 +++++++++++++++++++------- drivers/md/bcache/super.c | 6 +++++- drivers/md/bcache/sysfs.c | 20 ++++++++++++++++++++ drivers/md/bcache/util.h | 6 ------ drivers/md/bcache/writeback.c | 37 ++++++++++++++++++++++++++++--------- 10 files changed, 118 insertions(+), 30 deletions(-)
drivers/md/bcache/alloc.c +2 -1
@@ -287,7 +287,8 @@ do { \break ; \ \mutex_unlock (&(ca)->set->bucket_lock); \ -if (kthread_should_stop ()) { \ +if (kthread_should_stop () || \ +test_bit (CACHE_SET_IO_DISABLE , &ca->set->flags)) { \set_current_state (TASK_RUNNING ); \return 0 ; \ } \
drivers/md/bcache/bcache.h +33 -0
@@ -188,6 +188,7 @@#include <linux/refcount.h> #include <linux/types.h> #include <linux/workqueue.h> +#include <linux/kthread.h> #include "bset.h" #include "util.h"
@@ -475,10 +476,15 @@ struct gc_stat {* * CACHE_SET_RUNNING means all cache devices have been registered and journal * replay is complete. +* +* CACHE_SET_IO_DISABLE is set when bcache is stopping the whold cache set, all +* external and internal I/O should be denied when this flag is set. +* */ #define CACHE_SET_UNREGISTERING 0#define CACHE_SET_STOPPING 1#define CACHE_SET_RUNNING 2 +#define CACHE_SET_IO_DISABLE 3struct cache_set {struct closure cl;
@@ -868,6 +874,33 @@ static inline void wake_up_allocators(struct cache_set *c)wake_up_process (ca->alloc_thread); } +static inline void closure_bio_submit (struct cache_set *c, +struct bio *bio, +struct closure *cl) +{ +closure_get (cl); +if (unlikely (test_bit (CACHE_SET_IO_DISABLE , &c->flags))) { + bio->bi_status =BLK_STS_IOERR ; +bio_endio (bio); +return ; + } +generic_make_request (bio); +} + +/* +* Prevent the kthread exits directly, and make sure when kthread_stop() +* is called to stop a kthread, it is still alive. If a kthread might be +* stopped by CACHE_SET_IO_DISABLE bit set, wait_for_kthread_stop() is +* necessary before the kthread returns. +*/ +static inline void wait_for_kthread_stop (void ) +{ +while (!kthread_should_stop ()) { +set_current_state (TASK_INTERRUPTIBLE ); +schedule (); + } +} +/* Forward declarations */ void bch_count_io_errors (struct cache *,blk_status_t ,int ,const char *);
drivers/md/bcache/btree.c +8 -3
@@ -1744,6 +1744,7 @@ static void bch_btree_gc(struct cache_set *c)btree_gc_start (c); +/* if CACHE_SET_IO_DISABLE set, gc thread should stop too */ do { ret = btree_root(gc_root, c, &op, &writes, &stats); closure_sync(&writes);
@@ -1751,7 +1752,7 @@ static void bch_btree_gc(struct cache_set *c)if (ret && ret != -EAGAIN )pr_warn ("gc failed!" ); - }while (ret); + }while (ret && !test_bit (CACHE_SET_IO_DISABLE , &c->flags));bch_btree_gc_finish (c);wake_up_allocators (c);
@@ -1789,15 +1790,19 @@ static int bch_gc_thread(void *arg)while (1 ) {wait_event_interruptible (c->gc_wait, -kthread_should_stop () ||gc_should_run (c)); +kthread_should_stop () || +test_bit (CACHE_SET_IO_DISABLE , &c->flags) || +gc_should_run (c)); -if (kthread_should_stop ()) +if (kthread_should_stop () || +test_bit (CACHE_SET_IO_DISABLE , &c->flags))break ;set_gc_sectors (c);bch_btree_gc (c); } +wait_for_kthread_stop ();return 0 ; }
drivers/md/bcache/io.c +1 -1
@@ -38,7 +38,7 @@ void __bch_submit_bbio(struct bio *bio, struct cache_set *c)bio_set_dev (bio,PTR_CACHE (c, &b->key,0 )->bdev); b->submit_time_us =local_clock_us (); -closure_bio_submit (bio, bio->bi_private); +closure_bio_submit (c, bio, bio->bi_private); } void bch_submit_bbio(struct bio *bio, struct cache_set *c,
drivers/md/bcache/journal.c +2 -2
@@ -62,7 +62,7 @@ reread: left = ca->sb.bucket_size - offset;bio_set_op_attrs (bio,REQ_OP_READ ,0 );bch_bio_map (bio, data); -closure_bio_submit (bio, &cl); +closure_bio_submit (ca->set, bio, &cl);closure_sync (&cl);/* This function could be simpler now since we no longer write
@@ -674,7 +674,7 @@ static void journal_write_unlocked(struct closure *cl)spin_unlock (&c->journal.lock);while ((bio =bio_list_pop (&list))) -closure_bio_submit (bio, cl); +closure_bio_submit (c, bio, cl);continue_at (cl, journal_write_done,NULL ); }
drivers/md/bcache/request.c +19 -7
@@ -747,7 +747,7 @@ static void cached_dev_read_error(struct closure *cl)/* XXX: invalidate cache */ -closure_bio_submit (bio, cl); +closure_bio_submit (s->iop.c, bio, cl); }continue_at (cl, cached_dev_cache_miss_done,NULL );
@@ -872,7 +872,7 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s, s->cache_miss = miss; s->iop.bio = cache_bio;bio_get (cache_bio); -closure_bio_submit (cache_bio, &s->cl); +closure_bio_submit (s->iop.c, cache_bio, &s->cl);return ret; out_put:
@@ -880,7 +880,7 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s, out_submit: miss->bi_end_io = request_endio; miss->bi_private = &s->cl; -closure_bio_submit (miss, &s->cl); +closure_bio_submit (s->iop.c, miss, &s->cl);return ret; }
@@ -945,7 +945,7 @@ static void cached_dev_write(struct cached_dev *dc, struct search *s)if ((bio_op (bio) !=REQ_OP_DISCARD ) ||blk_queue_discard (bdev_get_queue (dc->bdev))) -closure_bio_submit (bio, cl); +closure_bio_submit (s->iop.c, bio, cl); }else if (s->iop.writeback) {bch_writeback_add (dc); s->iop.bio = bio;
@@ -960,12 +960,12 @@ static void cached_dev_write(struct cached_dev *dc, struct search *s) flush->bi_private = cl; flush->bi_opf =REQ_OP_WRITE |REQ_PREFLUSH ; -closure_bio_submit (flush, cl); +closure_bio_submit (s->iop.c, flush, cl); } }else { s->iop.bio =bio_clone_fast (bio,GFP_NOIO , dc->disk.bio_split); -closure_bio_submit (bio, cl); +closure_bio_submit (s->iop.c, bio, cl); }closure_call (&s->iop.cl, bch_data_insert,NULL , cl);
@@ -981,7 +981,7 @@ static void cached_dev_nodata(struct closure *cl)bch_journal_meta (s->iop.c, cl);/* If it's a flush, we send the flush to the backing device too */ -closure_bio_submit (bio, cl); +closure_bio_submit (s->iop.c, bio, cl);continue_at (cl, cached_dev_bio_complete,NULL ); }
@@ -996,6 +996,12 @@ static blk_qc_t cached_dev_make_request(struct request_queue *q, struct cached_dev *dc = container_of(d, struct cached_dev, disk);int rw =bio_data_dir (bio); +if (unlikely (d->c &&test_bit (CACHE_SET_IO_DISABLE , &d->c->flags))) { + bio->bi_status =BLK_STS_IOERR ; +bio_endio (bio); +return BLK_QC_T_NONE ; + } +atomic_set (&dc->backing_idle,0 );generic_start_io_acct (q, rw,bio_sectors (bio), &d->disk->part0);
@@ -1112,6 +1118,12 @@ static blk_qc_t flash_dev_make_request(struct request_queue *q,struct bcache_device *d = bio->bi_disk->private_data;int rw =bio_data_dir (bio); +if (unlikely (d->c &&test_bit (CACHE_SET_IO_DISABLE , &d->c->flags))) { + bio->bi_status =BLK_STS_IOERR ; +bio_endio (bio); +return BLK_QC_T_NONE ; + } +generic_start_io_acct (q, rw,bio_sectors (bio), &d->disk->part0); s =search_alloc (bio, d);
drivers/md/bcache/super.c +5 -1
@@ -521,7 +521,7 @@ static void prio_io(struct cache *ca, uint64_t bucket, int op,bio_set_op_attrs (bio, op,REQ_SYNC |REQ_META |op_flags);bch_bio_map (bio, ca->disk_buckets); -closure_bio_submit (bio, &ca->prio); +closure_bio_submit (ca->set, bio, &ca->prio);closure_sync (cl); }
@@ -1351,6 +1351,9 @@ bool bch_cache_set_error(struct cache_set *c, const char *fmt, ...) test_bit(CACHE_SET_STOPPING, &c->flags))return false; +if (test_and_set_bit (CACHE_SET_IO_DISABLE , &c->flags)) +pr_warn ("CACHE_SET_IO_DISABLE already set" ); +/* XXX: we can be called from atomic context acquire_console_sem(); */
@@ -1586,6 +1589,7 @@ struct cache_set *bch_cache_set_alloc(struct cache_sb *sb) c->congested_read_threshold_us =2000 ; c->congested_write_threshold_us =20000 ; c->error_limit =DEFAULT_IO_ERROR_LIMIT ; +WARN_ON (test_and_clear_bit (CACHE_SET_IO_DISABLE , &c->flags));return c; err:
drivers/md/bcache/sysfs.c +20 -0
@@ -95,6 +95,7 @@ read_attribute(partial_stripes_expensive);rw_attribute (synchronous);rw_attribute (journal_delay_ms); +rw_attribute (io_disable);rw_attribute (discard);rw_attribute (running);rw_attribute (label);
@@ -591,6 +592,8 @@ SHOW(__bch_cache_set)sysfs_printf (gc_always_rewrite,"%i" , c->gc_always_rewrite);sysfs_printf (btree_shrinker_disabled,"%i" , c->shrinker_disabled);sysfs_printf (copy_gc_enabled,"%i" , c->copy_gc_enabled); +sysfs_printf (io_disable,"%i" , +test_bit (CACHE_SET_IO_DISABLE , &c->flags));if (attr == &sysfs_bset_tree_stats)return bch_bset_print_stats (c, buf);
@@ -680,6 +683,22 @@ STORE(__bch_cache_set)if (attr == &sysfs_io_error_halflife) c->error_decay =strtoul_or_return (buf) /88 ; +if (attr == &sysfs_io_disable) { +int v =strtoul_or_return (buf); + +if (v) { +if (test_and_set_bit (CACHE_SET_IO_DISABLE , + &c->flags)) +pr_warn ("CACHE_SET_IO_DISABLE" +" already set" ); + }else { +if (!test_and_clear_bit (CACHE_SET_IO_DISABLE , + &c->flags)) +pr_warn ("CACHE_SET_IO_DISABLE" +" already cleared" ); + } + } +sysfs_strtoul (journal_delay_ms, c->journal_delay_ms);sysfs_strtoul (verify, c->verify);sysfs_strtoul (key_merging_disabled, c->key_merging_disabled);
@@ -765,6 +784,7 @@ static struct attribute *bch_cache_set_internal_files[] = { &sysfs_gc_always_rewrite, &sysfs_btree_shrinker_disabled, &sysfs_copy_gc_enabled, + &sysfs_io_disable, NULL };KTYPE (bch_cache_set_internal);
drivers/md/bcache/util.h +0 -6
@@ -567,12 +567,6 @@ static inline sector_t bdev_sectors(struct block_device *bdev)return bdev->bd_inode->i_size >>9 ; } -#define closure_bio_submit (bio, cl) \ -do { \ - closure_get(cl); \ - generic_make_request(bio); \ -} while (0) -uint64_t bch_crc64_update (uint64_t ,const void *,size_t );uint64_t bch_crc64 (const void *,size_t );
drivers/md/bcache/writeback.c +28 -9
@@ -114,6 +114,7 @@ static void update_writeback_rate(struct work_struct *work)struct cached_dev *dc =container_of (to_delayed_work (work), struct cached_dev, writeback_rate_update); +struct cache_set *c = dc->disk.c;/* * should check BCACHE_DEV_RATE_DW_RUNNING before calling
@@ -123,7 +124,12 @@ static void update_writeback_rate(struct work_struct *work)/* paired with where BCACHE_DEV_RATE_DW_RUNNING is tested */ smp_mb (); -if (!test_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags)) { +/* +* CACHE_SET_IO_DISABLE might be set via sysfs interface, +* check it here too. +*/ +if (!test_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags) || +test_bit (CACHE_SET_IO_DISABLE , &c->flags)) {clear_bit (BCACHE_DEV_RATE_DW_RUNNING , &dc->disk.flags);/* paired with where BCACHE_DEV_RATE_DW_RUNNING is tested */ smp_mb ();
@@ -138,7 +144,12 @@ static void update_writeback_rate(struct work_struct *work)up_read (&dc->writeback_lock); -if (test_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags)) { +/* +* CACHE_SET_IO_DISABLE might be set via sysfs interface, +* check it here too. +*/ +if (test_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags) && + !test_bit (CACHE_SET_IO_DISABLE , &c->flags)) {schedule_delayed_work (&dc->writeback_rate_update, dc->writeback_rate_update_seconds *HZ ); }
@@ -278,7 +289,7 @@ static void write_dirty(struct closure *cl)bio_set_dev (&io->bio, io->dc->bdev); io->bio.bi_end_io = dirty_endio; -closure_bio_submit (&io->bio, cl); +closure_bio_submit (io->dc->disk.c, &io->bio, cl); }atomic_set (&dc->writeback_sequence_next, next_sequence);
@@ -304,7 +315,7 @@ static void read_dirty_submit(struct closure *cl) { struct dirty_io *io = container_of(cl, struct dirty_io, cl); -closure_bio_submit (&io->bio, cl); +closure_bio_submit (io->dc->disk.c, &io->bio, cl);continue_at (cl, write_dirty, io->dc->writeback_write_wq); }
@@ -330,7 +341,9 @@ static void read_dirty(struct cached_dev *dc) next =bch_keybuf_next (&dc->writeback_keys); -while (!kthread_should_stop () && next) { +while (!kthread_should_stop () && + !test_bit (CACHE_SET_IO_DISABLE , &dc->disk.c->flags) && + next) { size =0 ; nk =0 ;
@@ -427,7 +440,9 @@ static void read_dirty(struct cached_dev *dc) } } -while (!kthread_should_stop () && delay) { +while (!kthread_should_stop () && + !test_bit (CACHE_SET_IO_DISABLE , &dc->disk.c->flags) && + delay) {schedule_timeout_interruptible (delay); delay =writeback_delay (dc,0 ); }
@@ -583,11 +598,13 @@ static bool refill_dirty(struct cached_dev *dc)static int bch_writeback_thread (void *arg) {struct cached_dev *dc = arg; +struct cache_set *c = dc->disk.c;bool searched_full_index;bch_ratelimit_reset (&dc->writeback_rate); -while (!kthread_should_stop ()) { +while (!kthread_should_stop () && + !test_bit (CACHE_SET_IO_DISABLE , &c->flags)) {down_write (&dc->writeback_lock);set_current_state (TASK_INTERRUPTIBLE );/*
@@ -601,7 +618,8 @@ static int bch_writeback_thread(void *arg) (!atomic_read(&dc->has_dirty) || !dc->writeback_running)) {up_write (&dc->writeback_lock); -if (kthread_should_stop ()) { +if (kthread_should_stop () || +test_bit (CACHE_SET_IO_DISABLE , &c->flags)) {set_current_state (TASK_RUNNING );break ; }
@@ -637,6 +655,7 @@ static int bch_writeback_thread(void *arg)while (delay && !kthread_should_stop () && + !test_bit (CACHE_SET_IO_DISABLE , &c->flags) && !test_bit (BCACHE_DEV_DETACHING , &dc->disk.flags)) delay =schedule_timeout_interruptible (delay);
@@ -644,8 +663,8 @@ static int bch_writeback_thread(void *arg) } } - dc->writeback_thread =NULL ;cached_dev_put (dc); +wait_for_kthread_stop ();return 0 ; }
Signature · 1 line
2.16.1
Re: [PATCH v7 4/9] bcache: add CACHE_SET_IO_DISABLE to struct cache_set flags
Hi Coly Li--
Quoted 9 lines · Coly Li
When too many I/Os failed on cache device,
bch_cache_set_error()is called in the error handling code path to retire whole problematic cache set. If new I/O requests continue to come and take refcountdc->count, the cache set won't be retired immediately, this is a problem.Further more, there are several kernel thread and self-armed kernel work may still running after
bch_cache_set_error()is called. It needs to wait quite a while for them to stop, or they won't stop at all. They also prevent the cache set from being retired.
It's too bad this is necessary-- I wish the IO layer could latch error for us in some kind of meaningful way instead of us having to do it ourselves (and for filesystems, etc, having to each do similar things to prevent just continuously hitting IO timeouts). That said, the code looks good.
PATCH v7 5/9 bcache: add stop_when_cache_set_failed option to backing device
In reply to Coly LiWhen there are too many I/O errors on cache device, current bcache code will retire the whole cache set, and detach all bcache devices. But the detached bcache devices are not stopped, which is problematic when bcache is in writeback mode.
If the retired cache set has dirty data of backing devices, continue writing to bcache device will write to backing device directly. If the LBA of write request has a dirty version cached on cache device, next time when the cache device is re-registered and backing device re-attached to it again, the stale dirty data on cache device will be written to backing device, and overwrite latest directly written data. This situation causes a quite data corruption.
But we cannot simply stop all attached bcache devices when the cache set is broken or disconnected. For example, use bcache to accelerate performance of an email service. In such workload, if cache device is broken but no dirty data lost, keep the bcache device alive and permit email service continue to access user data might be a better solution for the cache device failure.
Nix <[email protected]> points out the issue and provides the above example to explain why it might be necessary to not stop bcache device for broken cache device. Pavel Goran <[email protected]> provides a brilliant suggestion to provide "always" and "auto" options to per-cached device sysfs file stop_when_cache_set_failed. If cache set is retiring and the backing device has no dirty data on cache, it should be safe to keep the bcache device alive. In this case, if stop_when_cache_set_failed is set to "auto", the device failure handling code will not stop this bcache device and permit application to access the backing device with a unattached bcache device.
Changelog:
v3: fix typos pointed out by Nix.
v2: change option values of stop_when_cache_set_failed from 1/0 to
"auto"/"always".
v1: initial version, stop_when_cache_set_failed can be 0 (not stop) or 1
(always stop).
--- drivers/md/bcache/bcache.h | 9 +++++ drivers/md/bcache/super.c | 82 ++++++++++++++++++++++++++++++++++++++++------ drivers/md/bcache/sysfs.c | 17 ++++++++++ 3 files changed, 98 insertions(+), 10 deletions(-)
drivers/md/bcache/bcache.h +9 -0
@@ -288,6 +288,12 @@ struct io {sector_t last; }; +enum stop_on_failure { +BCH_CACHED_DEV_STOP_AUTO =0 , +BCH_CACHED_DEV_STOP_ALWAYS , +BCH_CACHED_DEV_STOP_MODE_MAX , +}; +struct cached_dev {struct list_head list;struct bcache_device disk;
@@ -380,6 +386,8 @@ struct cached_dev {unsigned writeback_rate_i_term_inverse;unsigned writeback_rate_p_term_inverse;unsigned writeback_rate_minimum; + +enum stop_on_failure stop_when_cache_set_failed; };enum alloc_reserve {
@@ -939,6 +947,7 @@ void bch_write_bdev_super(struct cached_dev *, struct closure *);extern struct workqueue_struct *bcache_wq;extern const char *const bch_cache_modes[]; +extern const char *const bch_stop_on_failure_modes[];extern struct mutex bch_register_lock;extern struct list_head bch_cache_sets;
drivers/md/bcache/super.c +72 -10
109 lines not on this page · raw message
drivers/md/bcache/sysfs.c +17 -0
@@ -78,6 +78,7 @@ rw_attribute(congested_write_threshold_us);rw_attribute (sequential_cutoff);rw_attribute (data_csum);rw_attribute (cache_mode); +rw_attribute (stop_when_cache_set_failed);rw_attribute (writeback_metadata);rw_attribute (writeback_running);rw_attribute (writeback_percent);
@@ -126,6 +127,12 @@ SHOW(__bch_cached_dev) bch_cache_modes +1 , BDEV_CACHE_MODE(&dc->sb)); +if (attr == &sysfs_stop_when_cache_set_failed) +return bch_snprint_string_list (buf,PAGE_SIZE , + bch_stop_on_failure_modes +1 , + dc->stop_when_cache_set_failed); + +sysfs_printf (data_csum,"%i" , dc->disk.data_csum);var_printf (verify,"%i" );var_printf (bypass_torture_test,"%i" );
@@ -247,6 +254,15 @@ STORE(__cached_dev) } } +if (attr == &sysfs_stop_when_cache_set_failed) { + v =bch_read_string_list (buf, bch_stop_on_failure_modes +1 ); + +if (v <0 ) +return v; + + dc->stop_when_cache_set_failed = v; + } +if (attr == &sysfs_label) {if (size >SB_LABEL_SIZE )return -EINVAL ;
@@ -326,6 +342,7 @@ static struct attribute *bch_cached_dev_files[] = { &sysfs_data_csum, #endif &sysfs_cache_mode, + &sysfs_stop_when_cache_set_failed, &sysfs_writeback_metadata, &sysfs_writeback_running, &sysfs_writeback_delay,
Signature · 1 line
2.16.1
PATCH v7 6/9 bcache: fix inaccurate io state for detached bcache devices
In reply to Coly LiFrom: Tang Junhui <[email protected]>
When we run IO in a detached device, and run iostat to shows IO status, normally it will show like bellow (Omitted some fields):
Device: ... avgrq-sz avgqu-sz await r_await w_await svctm %util sdd ... 15.89 0.53 1.82 0.20 2.23 1.81 52.30 bcache0 ... 15.89 115.42 0.00 0.00 0.00 2.40 69.60
but after IO stopped, there are still very big avgqu-sz and %util values as bellow:
Device: ... avgrq-sz avgqu-sz await r_await w_await svctm %util
bcache0 ... 0 5326.32 0.00 0.00 0.00 0.00 100.10
The reason for this issue is that, only generic_start_io_acct() called and no generic_end_io_acct() called for detached device in cached_dev_make_request(). See the code:
//start generic_start_io_acct()generic_start_io_acct(q, rw, bio_sectors(bio), &d->disk->part0);
if (cached_dev_get(dc)) {
//will callback generic_end_io_acct()
}
else {
//will not call generic_end_io_acct()
}This patch calls generic_end_io_acct() in the end of IO for detached devices, so we can show IO state correctly.
(Modified to use GFP_NOIO in kzalloc() by Coly Li)
Changelog:
v2: fix typo.
v1: the initial version.
--- drivers/md/bcache/request.c | 58 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 7 deletions(-)
drivers/md/bcache/request.c +51 -7
@@ -986,6 +986,55 @@ static void cached_dev_nodata(struct closure *cl)continue_at (cl, cached_dev_bio_complete,NULL ); } +struct detached_dev_io_private { +struct bcache_device *d; +unsigned long start_time; +bio_end_io_t *bi_end_io; +void *bi_private; +}; + +static void detached_dev_end_io (struct bio *bio) +{ +struct detached_dev_io_private *ddip; + + ddip = bio->bi_private; + bio->bi_end_io = ddip->bi_end_io; + bio->bi_private = ddip->bi_private; + +generic_end_io_acct (ddip->d->disk->queue, +bio_data_dir (bio), + &ddip->d->disk->part0, ddip->start_time); + +kfree (ddip); + + bio->bi_end_io (bio); +} + +static void detached_dev_do_request (struct bcache_device *d,struct bio *bio) +{ +struct detached_dev_io_private *ddip; + struct cached_dev *dc = container_of(d, struct cached_dev, disk); + +/* +* no need to call closure_get(&dc->disk.cl), +* because upper layer had already opened bcache device, +* which would call closure_get(&dc->disk.cl) +*/ + ddip =kzalloc (sizeof (struct detached_dev_io_private ),GFP_NOIO ); + ddip->d = d; + ddip->start_time = jiffies; + ddip->bi_end_io = bio->bi_end_io; + ddip->bi_private = bio->bi_private; + bio->bi_end_io = detached_dev_end_io; + bio->bi_private = ddip; + +if ((bio_op (bio) ==REQ_OP_DISCARD ) && + !blk_queue_discard (bdev_get_queue (dc->bdev))) + bio->bi_end_io (bio); +else +generic_make_request (bio); +} +/* Cached devices - read & write stuff */ static blk_qc_t cached_dev_make_request(struct request_queue *q,
@@ -1028,13 +1077,8 @@ static blk_qc_t cached_dev_make_request(struct request_queue *q,else cached_dev_read (dc, s); } - }else { -if ((bio_op (bio) ==REQ_OP_DISCARD ) && - !blk_queue_discard (bdev_get_queue (dc->bdev))) -bio_endio (bio); -else -generic_make_request (bio); - } + }else +detached_dev_do_request (d, bio);return BLK_QC_T_NONE ; }
Signature · 1 line
2.16.1
PATCH v7 7/9 bcache: add backing_request_endio() for bi_end_io of attached backing device I/O
In reply to Coly LiIn order to catch I/O error of backing device, a separate bi_end_io call back is required. Then a per backing device counter can record I/O errors number and retire the backing device if the counter reaches a per backing device I/O error limit.
This patch adds backing_request_endio() to bcache backing device I/O code path, this is a preparation for further complicated backing device failure handling. So far there is no real code logic change, I make this change a separate patch to make sure it is stable and reliable for further work.
Changelog:
v2: Fix code comments typo, remove a redundant bch_writeback_add() line
added in v4 patch set.
v1: indeed this is new added in this patch set.
--- drivers/md/bcache/request.c | 93 +++++++++++++++++++++++++++++++++++-------- drivers/md/bcache/super.c | 1 + drivers/md/bcache/writeback.c | 1 + 3 files changed, 79 insertions(+), 16 deletions(-)
drivers/md/bcache/request.c +77 -16
@@ -139,6 +139,7 @@ static void bch_data_invalidate(struct closure *cl) } op->insert_data_done = true; +/* get in bch_data_insert() */ bio_put (bio); out:continue_at (cl, bch_data_insert_keys, op->wq);
@@ -630,6 +631,38 @@ static void request_endio(struct bio *bio)closure_put (cl); } +static void backing_request_endio (struct bio *bio) +{ +struct closure *cl = bio->bi_private; + +if (bio->bi_status) { + struct search *s = container_of(cl, struct search, cl); +/* +* If a bio has REQ_PREFLUSH for writeback mode, it is +* speically assembled in cached_dev_write() for a non-zero +* write request which has REQ_PREFLUSH. we don't set +* s->iop.status by this failure, the status will be decided +* by result of bch_data_insert() operation. +*/ +if (unlikely (s->iop.writeback && + bio->bi_opf &REQ_PREFLUSH )) { +char buf[BDEVNAME_SIZE ]; + +bio_devname (bio, buf); +pr_err ("Can't flush %s: returned bi_status %i" , + buf, bio->bi_status); + }else { +/* set to orig_bio->bi_status in bio_complete() */ + s->iop.status = bio->bi_status; + } + s->recoverable = false; +/* should count I/O error for backing device here */ + } + +bio_put (bio); +closure_put (cl); +} +static void bio_complete (struct search *s) {if (s->orig_bio) {
@@ -644,13 +677,21 @@ static void bio_complete(struct search *s) } } -static void do_bio_hook (struct search *s,struct bio *orig_bio) +static void do_bio_hook (struct search *s, +struct bio *orig_bio, +bio_end_io_t *end_io_fn) {struct bio *bio = &s->bio.bio;bio_init (bio,NULL ,0 );__bio_clone_fast (bio, orig_bio); - bio->bi_end_io = request_endio; +/* +* bi_end_io can be set separately somewhere else, e.g. the +* variants in, +* - cache_bio->bi_end_io from cached_dev_cache_miss() +* - n->bi_end_io from cache_lookup_fn() +*/ + bio->bi_end_io = end_io_fn; bio->bi_private = &s->cl;bio_cnt_set (bio,3 );
@@ -676,7 +717,7 @@ static inline struct search *search_alloc(struct bio *bio, s =mempool_alloc (d->c->search,GFP_NOIO );closure_init (&s->cl,NULL ); -do_bio_hook (s, bio); +do_bio_hook (s, bio, request_endio); s->orig_bio = bio; s->cache_miss =NULL ;
@@ -743,10 +784,11 @@ static void cached_dev_read_error(struct closure *cl)trace_bcache_read_retry (s->orig_bio); s->iop.status =0 ; -do_bio_hook (s, s->orig_bio); +do_bio_hook (s, s->orig_bio, backing_request_endio);/* XXX: invalidate cache */ +/* I/O request sent to backing device */ closure_bio_submit (s->iop.c, bio, cl); }
@@ -859,7 +901,7 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s,bio_copy_dev (cache_bio, miss); cache_bio->bi_iter.bi_size = s->insert_bio_sectors <<9 ; - cache_bio->bi_end_io = request_endio; + cache_bio->bi_end_io = backing_request_endio; cache_bio->bi_private = &s->cl;bch_bio_map (cache_bio,NULL );
@@ -872,14 +914,16 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s, s->cache_miss = miss; s->iop.bio = cache_bio;bio_get (cache_bio); +/* I/O request sent to backing device */ closure_bio_submit (s->iop.c, cache_bio, &s->cl);return ret; out_put:bio_put (cache_bio); out_submit: - miss->bi_end_io = request_endio; + miss->bi_end_io = backing_request_endio; miss->bi_private = &s->cl; +/* I/O request sent to backing device */ closure_bio_submit (s->iop.c, miss, &s->cl);return ret; }
@@ -943,31 +987,46 @@ static void cached_dev_write(struct cached_dev *dc, struct search *s) s->iop.bio = s->orig_bio;bio_get (s->iop.bio); -if ((bio_op (bio) !=REQ_OP_DISCARD ) || -blk_queue_discard (bdev_get_queue (dc->bdev))) -closure_bio_submit (s->iop.c, bio, cl); +if (bio_op (bio) ==REQ_OP_DISCARD && + !blk_queue_discard (bdev_get_queue (dc->bdev))) + goto insert_data; + +/* I/O request sent to backing device */ + bio->bi_end_io = backing_request_endio; +closure_bio_submit (s->iop.c, bio, cl); + }else if (s->iop.writeback) {bch_writeback_add (dc); s->iop.bio = bio;if (bio->bi_opf &REQ_PREFLUSH ) { -/* Also need to send a flush to the backing device */ -struct bio *flush =bio_alloc_bioset (GFP_NOIO ,0 , - dc->disk.bio_split); - +/* +* Also need to send a flush to the backing +* device. +*/ +struct bio *flush; + + flush =bio_alloc_bioset (GFP_NOIO ,0 , + dc->disk.bio_split); +if (!flush) { + s->iop.status =BLK_STS_RESOURCE ; + goto insert_data; + }bio_copy_dev (flush, bio); - flush->bi_end_io = request_endio; + flush->bi_end_io = backing_request_endio; flush->bi_private = cl; flush->bi_opf =REQ_OP_WRITE |REQ_PREFLUSH ; - +/* I/O request sent to backing device */ closure_bio_submit (s->iop.c, flush, cl); } }else { s->iop.bio =bio_clone_fast (bio,GFP_NOIO , dc->disk.bio_split); - +/* I/O request sent to backing device */ + bio->bi_end_io = backing_request_endio;closure_bio_submit (s->iop.c, bio, cl); } +insert_data:closure_call (&s->iop.cl, bch_data_insert,NULL , cl);continue_at (cl, cached_dev_write_complete,NULL ); }
@@ -981,6 +1040,7 @@ static void cached_dev_nodata(struct closure *cl)bch_journal_meta (s->iop.c, cl);/* If it's a flush, we send the flush to the backing device too */ + bio->bi_end_io = backing_request_endio;closure_bio_submit (s->iop.c, bio, cl);continue_at (cl, cached_dev_bio_complete,NULL );
@@ -1078,6 +1138,7 @@ static blk_qc_t cached_dev_make_request(struct request_queue *q,cached_dev_read (dc, s); } }else +/* I/O request sent to backing device */ detached_dev_do_request (d, bio);return BLK_QC_T_NONE ;
drivers/md/bcache/super.c +1 -0
@@ -273,6 +273,7 @@ void bch_write_bdev_super(struct cached_dev *dc, struct closure *parent) bio->bi_private = dc;closure_get (cl); +/* I/O request sent to backing device */ __write_super (&dc->sb, bio);closure_return_with_destructor (cl, bch_write_bdev_super_unlock);
drivers/md/bcache/writeback.c +1 -0
@@ -289,6 +289,7 @@ static void write_dirty(struct closure *cl)bio_set_dev (&io->bio, io->dc->bdev); io->bio.bi_end_io = dirty_endio; +/* I/O request sent to backing device */ closure_bio_submit (io->dc->disk.c, &io->bio, cl); }
Signature · 1 line
2.16.1
Re: [PATCH v7 7/9] bcache: add backing_request_endio() for bi_end_io of attached backing device I/O
LGTM, applying
Quoted 247 lines · Coly Li
In order to catch I/O error of backing device, a separate
bi_end_iocall back is required. Then a per backing device counter can record I/O errors number and retire the backing device if the counter reaches a per backing device I/O error limit.This patch adds
backing_request_endio()to bcache backing device I/O code path, this is a preparation for further complicated backing device failure handling. So far there is no real code logic change, I make this change a separate patch to make sure it is stable and reliable for further work.Changelog:
v2: Fix code comments typo, remove a redundantbch_writeback_add()line
added in v4 patch set.
v1: indeed this is new added in this patch set.Signed-off-by Coly Li <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>Cc Junhui Tang <[email protected]>Cc Michael Lyle <[email protected]>--- drivers/md/bcache/request.c | 93 +++++++++++++++++++++++++++++++++++-------- drivers/md/bcache/super.c | 1 + drivers/md/bcache/writeback.c | 1 + 3 files changed, 79 insertions(+), 16 deletions(-)drivers/md/bcache/request.c +77
-16@@ -139,6 +139,7 @@ static void bch_data_invalidate(struct closure *cl) } op->insert_data_done = true; +/* get in bch_data_insert() */ bio_put (bio); out:continue_at (cl, bch_data_insert_keys, op->wq);@@ -630,6 +631,38 @@ static void request_endio(struct bio *bio)closure_put (cl); } +static void backing_request_endio (struct bio *bio) +{ +struct closure *cl = bio->bi_private; + +if (bio->bi_status) { + struct search *s = container_of(cl, struct search, cl); +/* +* If a bio has REQ_PREFLUSH for writeback mode, it is +* speically assembled in cached_dev_write() for a non-zero +* write request which has REQ_PREFLUSH. we don't set +* s->iop.status by this failure, the status will be decided +* by result of bch_data_insert() operation. +*/ +if (unlikely (s->iop.writeback && + bio->bi_opf &REQ_PREFLUSH )) { +char buf[BDEVNAME_SIZE ]; + +bio_devname (bio, buf); +pr_err ("Can't flush %s: returned bi_status %i" , + buf, bio->bi_status); + }else { +/* set to orig_bio->bi_status in bio_complete() */ + s->iop.status = bio->bi_status; + } + s->recoverable = false; +/* should count I/O error for backing device here */ + } + +bio_put (bio); +closure_put (cl); +} +static void bio_complete (struct search *s) {if (s->orig_bio) {@@ -644,13 +677,21 @@ static void bio_complete(struct search *s) } } -static void do_bio_hook (struct search *s,struct bio *orig_bio) +static void do_bio_hook (struct search *s, +struct bio *orig_bio, +bio_end_io_t *end_io_fn) {struct bio *bio = &s->bio.bio;bio_init (bio,NULL ,0 );__bio_clone_fast (bio, orig_bio); - bio->bi_end_io = request_endio; +/* +* bi_end_io can be set separately somewhere else, e.g. the +* variants in, +* - cache_bio->bi_end_io from cached_dev_cache_miss() +* - n->bi_end_io from cache_lookup_fn() +*/ + bio->bi_end_io = end_io_fn; bio->bi_private = &s->cl;bio_cnt_set (bio,3 );@@ -676,7 +717,7 @@ static inline struct search *search_alloc(struct bio *bio, s =mempool_alloc (d->c->search,GFP_NOIO );closure_init (&s->cl,NULL ); -do_bio_hook (s, bio); +do_bio_hook (s, bio, request_endio); s->orig_bio = bio; s->cache_miss =NULL ;@@ -743,10 +784,11 @@ static void cached_dev_read_error(struct closure *cl)trace_bcache_read_retry (s->orig_bio); s->iop.status =0 ; -do_bio_hook (s, s->orig_bio); +do_bio_hook (s, s->orig_bio, backing_request_endio);/* XXX: invalidate cache */ +/* I/O request sent to backing device */ closure_bio_submit (s->iop.c, bio, cl); }@@ -859,7 +901,7 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s,bio_copy_dev (cache_bio, miss); cache_bio->bi_iter.bi_size = s->insert_bio_sectors <<9 ; - cache_bio->bi_end_io = request_endio; + cache_bio->bi_end_io = backing_request_endio; cache_bio->bi_private = &s->cl;bch_bio_map (cache_bio,NULL );@@ -872,14 +914,16 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s, s->cache_miss = miss; s->iop.bio = cache_bio;bio_get (cache_bio); +/* I/O request sent to backing device */ closure_bio_submit (s->iop.c, cache_bio, &s->cl);return ret; out_put:bio_put (cache_bio); out_submit: - miss->bi_end_io = request_endio; + miss->bi_end_io = backing_request_endio; miss->bi_private = &s->cl; +/* I/O request sent to backing device */ closure_bio_submit (s->iop.c, miss, &s->cl);return ret; }@@ -943,31 +987,46 @@ static void cached_dev_write(struct cached_dev *dc, struct search *s) s->iop.bio = s->orig_bio;bio_get (s->iop.bio); -if ((bio_op (bio) !=REQ_OP_DISCARD ) || -blk_queue_discard (bdev_get_queue (dc->bdev))) -closure_bio_submit (s->iop.c, bio, cl); +if (bio_op (bio) ==REQ_OP_DISCARD && + !blk_queue_discard (bdev_get_queue (dc->bdev))) + goto insert_data; + +/* I/O request sent to backing device */ + bio->bi_end_io = backing_request_endio; +closure_bio_submit (s->iop.c, bio, cl); + }else if (s->iop.writeback) {bch_writeback_add (dc); s->iop.bio = bio;if (bio->bi_opf &REQ_PREFLUSH ) { -/* Also need to send a flush to the backing device */ -struct bio *flush =bio_alloc_bioset (GFP_NOIO ,0 , - dc->disk.bio_split); - +/* +* Also need to send a flush to the backing +* device. +*/ +struct bio *flush; + + flush =bio_alloc_bioset (GFP_NOIO ,0 , + dc->disk.bio_split); +if (!flush) { + s->iop.status =BLK_STS_RESOURCE ; + goto insert_data; + }bio_copy_dev (flush, bio); - flush->bi_end_io = request_endio; + flush->bi_end_io = backing_request_endio; flush->bi_private = cl; flush->bi_opf =REQ_OP_WRITE |REQ_PREFLUSH ; - +/* I/O request sent to backing device */ closure_bio_submit (s->iop.c, flush, cl); } }else { s->iop.bio =bio_clone_fast (bio,GFP_NOIO , dc->disk.bio_split); - +/* I/O request sent to backing device */ + bio->bi_end_io = backing_request_endio;closure_bio_submit (s->iop.c, bio, cl); } +insert_data:closure_call (&s->iop.cl, bch_data_insert,NULL , cl);continue_at (cl, cached_dev_write_complete,NULL ); }@@ -981,6 +1040,7 @@ static void cached_dev_nodata(struct closure *cl)bch_journal_meta (s->iop.c, cl);/* If it's a flush, we send the flush to the backing device too */ + bio->bi_end_io = backing_request_endio;closure_bio_submit (s->iop.c, bio, cl);continue_at (cl, cached_dev_bio_complete,NULL );@@ -1078,6 +1138,7 @@ static blk_qc_t cached_dev_make_request(struct request_queue *q,cached_dev_read (dc, s); } }else +/* I/O request sent to backing device */ detached_dev_do_request (d, bio);return BLK_QC_T_NONE ;drivers/md/bcache/super.c +1
-0@@ -273,6 +273,7 @@ void bch_write_bdev_super(struct cached_dev *dc, struct closure *parent) bio->bi_private = dc;closure_get (cl); +/* I/O request sent to backing device */ __write_super (&dc->sb, bio);closure_return_with_destructor (cl, bch_write_bdev_super_unlock);drivers/md/bcache/writeback.c +1
-0@@ -289,6 +289,7 @@ static void write_dirty(struct closure *cl)bio_set_dev (&io->bio, io->dc->bdev); io->bio.bi_end_io = dirty_endio; +/* I/O request sent to backing device */ closure_bio_submit (io->dc->disk.c, &io->bio, cl); }
Re: [PATCH v7 7/9] bcache: add backing_request_endio() for bi_end_io of attached backing device I/O
In reply to Coly LiLGTM, applied (sorry if this is duplicated, had mail client problems)
Quoted 247 lines · Coly Li
In order to catch I/O error of backing device, a separate
bi_end_iocall back is required. Then a per backing device counter can record I/O errors number and retire the backing device if the counter reaches a per backing device I/O error limit.This patch adds
backing_request_endio()to bcache backing device I/O code path, this is a preparation for further complicated backing device failure handling. So far there is no real code logic change, I make this change a separate patch to make sure it is stable and reliable for further work.Changelog:
v2: Fix code comments typo, remove a redundantbch_writeback_add()line
added in v4 patch set.
v1: indeed this is new added in this patch set.Signed-off-by Coly Li <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>Cc Junhui Tang <[email protected]>Cc Michael Lyle <[email protected]>--- drivers/md/bcache/request.c | 93 +++++++++++++++++++++++++++++++++++-------- drivers/md/bcache/super.c | 1 + drivers/md/bcache/writeback.c | 1 + 3 files changed, 79 insertions(+), 16 deletions(-)drivers/md/bcache/request.c +77
-16@@ -139,6 +139,7 @@ static void bch_data_invalidate(struct closure *cl) } op->insert_data_done = true; +/* get in bch_data_insert() */ bio_put (bio); out:continue_at (cl, bch_data_insert_keys, op->wq);@@ -630,6 +631,38 @@ static void request_endio(struct bio *bio)closure_put (cl); } +static void backing_request_endio (struct bio *bio) +{ +struct closure *cl = bio->bi_private; + +if (bio->bi_status) { + struct search *s = container_of(cl, struct search, cl); +/* +* If a bio has REQ_PREFLUSH for writeback mode, it is +* speically assembled in cached_dev_write() for a non-zero +* write request which has REQ_PREFLUSH. we don't set +* s->iop.status by this failure, the status will be decided +* by result of bch_data_insert() operation. +*/ +if (unlikely (s->iop.writeback && + bio->bi_opf &REQ_PREFLUSH )) { +char buf[BDEVNAME_SIZE ]; + +bio_devname (bio, buf); +pr_err ("Can't flush %s: returned bi_status %i" , + buf, bio->bi_status); + }else { +/* set to orig_bio->bi_status in bio_complete() */ + s->iop.status = bio->bi_status; + } + s->recoverable = false; +/* should count I/O error for backing device here */ + } + +bio_put (bio); +closure_put (cl); +} +static void bio_complete (struct search *s) {if (s->orig_bio) {@@ -644,13 +677,21 @@ static void bio_complete(struct search *s) } } -static void do_bio_hook (struct search *s,struct bio *orig_bio) +static void do_bio_hook (struct search *s, +struct bio *orig_bio, +bio_end_io_t *end_io_fn) {struct bio *bio = &s->bio.bio;bio_init (bio,NULL ,0 );__bio_clone_fast (bio, orig_bio); - bio->bi_end_io = request_endio; +/* +* bi_end_io can be set separately somewhere else, e.g. the +* variants in, +* - cache_bio->bi_end_io from cached_dev_cache_miss() +* - n->bi_end_io from cache_lookup_fn() +*/ + bio->bi_end_io = end_io_fn; bio->bi_private = &s->cl;bio_cnt_set (bio,3 );@@ -676,7 +717,7 @@ static inline struct search *search_alloc(struct bio *bio, s =mempool_alloc (d->c->search,GFP_NOIO );closure_init (&s->cl,NULL ); -do_bio_hook (s, bio); +do_bio_hook (s, bio, request_endio); s->orig_bio = bio; s->cache_miss =NULL ;@@ -743,10 +784,11 @@ static void cached_dev_read_error(struct closure *cl)trace_bcache_read_retry (s->orig_bio); s->iop.status =0 ; -do_bio_hook (s, s->orig_bio); +do_bio_hook (s, s->orig_bio, backing_request_endio);/* XXX: invalidate cache */ +/* I/O request sent to backing device */ closure_bio_submit (s->iop.c, bio, cl); }@@ -859,7 +901,7 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s,bio_copy_dev (cache_bio, miss); cache_bio->bi_iter.bi_size = s->insert_bio_sectors <<9 ; - cache_bio->bi_end_io = request_endio; + cache_bio->bi_end_io = backing_request_endio; cache_bio->bi_private = &s->cl;bch_bio_map (cache_bio,NULL );@@ -872,14 +914,16 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s, s->cache_miss = miss; s->iop.bio = cache_bio;bio_get (cache_bio); +/* I/O request sent to backing device */ closure_bio_submit (s->iop.c, cache_bio, &s->cl);return ret; out_put:bio_put (cache_bio); out_submit: - miss->bi_end_io = request_endio; + miss->bi_end_io = backing_request_endio; miss->bi_private = &s->cl; +/* I/O request sent to backing device */ closure_bio_submit (s->iop.c, miss, &s->cl);return ret; }@@ -943,31 +987,46 @@ static void cached_dev_write(struct cached_dev *dc, struct search *s) s->iop.bio = s->orig_bio;bio_get (s->iop.bio); -if ((bio_op (bio) !=REQ_OP_DISCARD ) || -blk_queue_discard (bdev_get_queue (dc->bdev))) -closure_bio_submit (s->iop.c, bio, cl); +if (bio_op (bio) ==REQ_OP_DISCARD && + !blk_queue_discard (bdev_get_queue (dc->bdev))) + goto insert_data; + +/* I/O request sent to backing device */ + bio->bi_end_io = backing_request_endio; +closure_bio_submit (s->iop.c, bio, cl); + }else if (s->iop.writeback) {bch_writeback_add (dc); s->iop.bio = bio;if (bio->bi_opf &REQ_PREFLUSH ) { -/* Also need to send a flush to the backing device */ -struct bio *flush =bio_alloc_bioset (GFP_NOIO ,0 , - dc->disk.bio_split); - +/* +* Also need to send a flush to the backing +* device. +*/ +struct bio *flush; + + flush =bio_alloc_bioset (GFP_NOIO ,0 , + dc->disk.bio_split); +if (!flush) { + s->iop.status =BLK_STS_RESOURCE ; + goto insert_data; + }bio_copy_dev (flush, bio); - flush->bi_end_io = request_endio; + flush->bi_end_io = backing_request_endio; flush->bi_private = cl; flush->bi_opf =REQ_OP_WRITE |REQ_PREFLUSH ; - +/* I/O request sent to backing device */ closure_bio_submit (s->iop.c, flush, cl); } }else { s->iop.bio =bio_clone_fast (bio,GFP_NOIO , dc->disk.bio_split); - +/* I/O request sent to backing device */ + bio->bi_end_io = backing_request_endio;closure_bio_submit (s->iop.c, bio, cl); } +insert_data:closure_call (&s->iop.cl, bch_data_insert,NULL , cl);continue_at (cl, cached_dev_write_complete,NULL ); }@@ -981,6 +1040,7 @@ static void cached_dev_nodata(struct closure *cl)bch_journal_meta (s->iop.c, cl);/* If it's a flush, we send the flush to the backing device too */ + bio->bi_end_io = backing_request_endio;closure_bio_submit (s->iop.c, bio, cl);continue_at (cl, cached_dev_bio_complete,NULL );@@ -1078,6 +1138,7 @@ static blk_qc_t cached_dev_make_request(struct request_queue *q,cached_dev_read (dc, s); } }else +/* I/O request sent to backing device */ detached_dev_do_request (d, bio);return BLK_QC_T_NONE ;drivers/md/bcache/super.c +1
-0@@ -273,6 +273,7 @@ void bch_write_bdev_super(struct cached_dev *dc, struct closure *parent) bio->bi_private = dc;closure_get (cl); +/* I/O request sent to backing device */ __write_super (&dc->sb, bio);closure_return_with_destructor (cl, bch_write_bdev_super_unlock);drivers/md/bcache/writeback.c +1
-0@@ -289,6 +289,7 @@ static void write_dirty(struct closure *cl)bio_set_dev (&io->bio, io->dc->bdev); io->bio.bi_end_io = dirty_endio; +/* I/O request sent to backing device */ closure_bio_submit (io->dc->disk.c, &io->bio, cl); }
PATCH v7 8/9 bcache: add io_disable to struct cached_dev
In reply to Coly LiIf a bcache device is configured to writeback mode, current code does not handle write I/O errors on backing devices properly.
In writeback mode, write request is written to cache device, and latter being flushed to backing device. If I/O failed when writing from cache device to the backing device, bcache code just ignores the error and upper layer code is NOT noticed that the backing device is broken.
This patch tries to handle backing device failure like how the cache device failure is handled,
- Add a error counter 'io_errors' and error limit 'error_limit' in struct cached_dev. Add another io_disable to struct cached_dev to disable I/Os on the problematic backing device.
- When I/O error happens on backing device, increase io_errors counter. And if io_errors reaches error_limit, set cache_dev->io_disable to true, and stop the bcache device.
The result is, if backing device is broken of disconnected, and I/O errors reach its error limit, backing device will be disabled and the associated bcache device will be removed from system.
Changelog:
v2: remove "bcache: " prefix in pr_error(), and use correct name string to
print out bcache device gendisk name.
v1: indeed this is new added in v2 patch set.
--- drivers/md/bcache/bcache.h | 6 ++++++ drivers/md/bcache/io.c | 14 ++++++++++++++ drivers/md/bcache/request.c | 14 ++++++++++++-- drivers/md/bcache/super.c | 21 +++++++++++++++++++++ drivers/md/bcache/sysfs.c | 15 ++++++++++++++- 5 files changed, 67 insertions(+), 3 deletions(-)
drivers/md/bcache/bcache.h +6 -0
@@ -367,6 +367,7 @@ struct cached_dev {unsigned sequential_cutoff;unsigned readahead; + unsigned io_disable:1; unsigned verify:1; unsigned bypass_torture_test:1;
@@ -388,6 +389,9 @@ struct cached_dev {unsigned writeback_rate_minimum;enum stop_on_failure stop_when_cache_set_failed; +#define DEFAULT_CACHED_DEV_ERROR_LIMIT 64 +atomic_t io_errors; +unsigned error_limit; };enum alloc_reserve {
@@ -911,6 +915,7 @@ static inline void wait_for_kthread_stop(void)/* Forward declarations */ +void bch_count_backing_io_errors (struct cached_dev *dc,struct bio *bio);void bch_count_io_errors (struct cache *,blk_status_t ,int ,const char *);void bch_bbio_count_io_errors (struct cache_set *,struct bio *,blk_status_t ,const char *);
@@ -938,6 +943,7 @@ int bch_bucket_alloc_set(struct cache_set *, unsigned, struct bkey *, int, bool);bool bch_alloc_sectors (struct cache_set *,struct bkey *,unsigned ,unsigned ,unsigned ,bool ); +bool bch_cached_dev_error (struct cached_dev *dc); __printf(2, 3)bool bch_cache_set_error (struct cache_set *,const char *, ...);
drivers/md/bcache/io.c +14 -0
@@ -50,6 +50,20 @@ void bch_submit_bbio(struct bio *bio, struct cache_set *c, }/* IO errors */ +void bch_count_backing_io_errors (struct cached_dev *dc,struct bio *bio) +{ +char buf[BDEVNAME_SIZE ]; +unsigned errors; + +WARN_ONCE (!dc,"NULL pointer of struct cached_dev" ); + + errors =atomic_add_return (1 , &dc->io_errors); +if (errors < dc->error_limit) +pr_err ("%s: IO error on backing device, unrecoverable" , +bio_devname (bio, buf)); +else +bch_cached_dev_error (dc); +} void bch_count_io_errors(struct cache *ca, blk_status_t error,
drivers/md/bcache/request.c +12 -2
@@ -637,6 +637,8 @@ static void backing_request_endio(struct bio *bio)if (bio->bi_status) { struct search *s = container_of(cl, struct search, cl); +struct cached_dev *dc =container_of (s->d, + struct cached_dev, disk);/* * If a bio has REQ_PREFLUSH for writeback mode, it is * speically assembled in cached_dev_write() for a non-zero
@@ -657,6 +659,7 @@ static void backing_request_endio(struct bio *bio) } s->recoverable = false;/* should count I/O error for backing device here */ +bch_count_backing_io_errors (dc, bio); }bio_put (bio);
@@ -1065,8 +1068,14 @@ static void detached_dev_end_io(struct bio *bio)bio_data_dir (bio), &ddip->d->disk->part0, ddip->start_time); -kfree (ddip); +if (bio->bi_status) { +struct cached_dev *dc =container_of (ddip->d, + struct cached_dev, disk); +/* should count I/O error for backing device here */ +bch_count_backing_io_errors (dc, bio); + } +kfree (ddip); bio->bi_end_io (bio); }
@@ -1105,7 +1114,8 @@ static blk_qc_t cached_dev_make_request(struct request_queue *q, struct cached_dev *dc = container_of(d, struct cached_dev, disk);int rw =bio_data_dir (bio); -if (unlikely (d->c &&test_bit (CACHE_SET_IO_DISABLE , &d->c->flags))) { +if (unlikely ((d->c &&test_bit (CACHE_SET_IO_DISABLE , &d->c->flags)) || + dc->io_disable)) { bio->bi_status =BLK_STS_IOERR ;bio_endio (bio);return BLK_QC_T_NONE ;
drivers/md/bcache/super.c +21 -0
@@ -1198,6 +1198,9 @@ static int cached_dev_init(struct cached_dev *dc, unsigned block_size)max (dc->disk.disk->queue->backing_dev_info->ra_pages, q->backing_dev_info->ra_pages); +atomic_set (&dc->io_errors,0 ); + dc->io_disable = false; + dc->error_limit =DEFAULT_CACHED_DEV_ERROR_LIMIT ;/* default to auto */ dc->stop_when_cache_set_failed =BCH_CACHED_DEV_STOP_AUTO ;
@@ -1352,6 +1355,24 @@ int bch_flash_dev_create(struct cache_set *c, uint64_t size)return flash_dev_run (c, u); } +bool bch_cached_dev_error (struct cached_dev *dc) +{ +char name[BDEVNAME_SIZE ]; + +if (!dc ||test_bit (BCACHE_DEV_CLOSING , &dc->disk.flags)) +return false; + + dc->io_disable = true; +/* make others know io_disable is true earlier */ +smp_mb (); + +pr_err ("stop %s: too many IO errors on backing device %s\n" , + dc->disk.disk->disk_name,bdevname (dc->bdev, name)); + +bcache_device_stop (&dc->disk); +return true; +} +/* Cache set */ __printf (2 ,3 )
drivers/md/bcache/sysfs.c +14 -1
@@ -141,7 +141,9 @@ SHOW(__bch_cached_dev)var_print (writeback_delay);var_print (writeback_percent);sysfs_hprint (writeback_rate, dc->writeback_rate.rate <<9 ); - +sysfs_hprint (io_errors,atomic_read (&dc->io_errors)); +sysfs_printf (io_error_limit,"%i" , dc->error_limit); +sysfs_printf (io_disable,"%i" , dc->io_disable);var_print (writeback_rate_update_seconds);var_print (writeback_rate_i_term_inverse);var_print (writeback_rate_p_term_inverse);
@@ -232,6 +234,14 @@ STORE(__cached_dev)d_strtoul (writeback_rate_i_term_inverse);d_strtoul_nonzero (writeback_rate_p_term_inverse); +sysfs_strtoul_clamp (io_error_limit, dc->error_limit,0 ,INT_MAX ); + +if (attr == &sysfs_io_disable) { +int v =strtoul_or_return (buf); + + dc->io_disable = v ?1 :0 ; + } +d_strtoi_h (sequential_cutoff);d_strtoi_h (readahead);
@@ -352,6 +362,9 @@ static struct attribute *bch_cached_dev_files[] = { &sysfs_writeback_rate_i_term_inverse, &sysfs_writeback_rate_p_term_inverse, &sysfs_writeback_rate_debug, + &sysfs_errors, + &sysfs_io_error_limit, + &sysfs_io_disable, &sysfs_dirty_data, &sysfs_stripe_size, &sysfs_partial_stripes_expensive,
Signature · 1 line
2.16.1
Re: [PATCH v7 8/9] bcache: add io_disable to struct cached_dev
LGTM, applying.
Quoted 228 lines · Coly Li
If a bcache device is configured to writeback mode, current code does not handle write I/O errors on backing devices properly.
In writeback mode, write request is written to cache device, and latter being flushed to backing device. If I/O failed when writing from cache device to the backing device, bcache code just ignores the error and upper layer code is NOT noticed that the backing device is broken.
This patch tries to handle backing device failure like how the cache device failure is handled,
- Add a error counter 'io_errors' and error limit 'error_limit' in structcached_dev. Add anotherio_disableto structcached_devto disable I/Os on the problematic backing device.
- When I/O error happens on backing device, increaseio_errorscounter. And ifio_errorsreacheserror_limit, setcache_dev->io_disableto true, and stop the bcache device.The result is, if backing device is broken of disconnected, and I/O errors reach its error limit, backing device will be disabled and the associated bcache device will be removed from system.
Changelog:
v2: remove "bcache: " prefix inpr_error(), and use correct name string to
print out bcache device gendisk name.
v1: indeed this is new added in v2 patch set.Signed-off-by Coly Li <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>Cc Michael Lyle <[email protected]>Cc Junhui Tang <[email protected]>--- drivers/md/bcache/bcache.h | 6 ++++++ drivers/md/bcache/io.c | 14 ++++++++++++++ drivers/md/bcache/request.c | 14 ++++++++++++-- drivers/md/bcache/super.c | 21 +++++++++++++++++++++ drivers/md/bcache/sysfs.c | 15 ++++++++++++++- 5 files changed, 67 insertions(+), 3 deletions(-)drivers/md/bcache/bcache.h +6
-0@@ -367,6 +367,7 @@ struct cached_dev {unsigned sequential_cutoff;unsigned readahead; + unsigned io_disable:1; unsigned verify:1; unsigned bypass_torture_test:1;@@ -388,6 +389,9 @@ struct cached_dev {unsigned writeback_rate_minimum;enum stop_on_failure stop_when_cache_set_failed; +#define DEFAULT_CACHED_DEV_ERROR_LIMIT 64 +atomic_t io_errors; +unsigned error_limit; };enum alloc_reserve {@@ -911,6 +915,7 @@ static inline void wait_for_kthread_stop(void)/* Forward declarations */ +void bch_count_backing_io_errors (struct cached_dev *dc,struct bio *bio);void bch_count_io_errors (struct cache *,blk_status_t ,int ,const char *);void bch_bbio_count_io_errors (struct cache_set *,struct bio *,blk_status_t ,const char *);@@ -938,6 +943,7 @@ int bch_bucket_alloc_set(struct cache_set *, unsigned, struct bkey *, int, bool);bool bch_alloc_sectors (struct cache_set *,struct bkey *,unsigned ,unsigned ,unsigned ,bool ); +bool bch_cached_dev_error (struct cached_dev *dc); __printf(2, 3)bool bch_cache_set_error (struct cache_set *,const char *, ...);drivers/md/bcache/io.c +14
-0@@ -50,6 +50,20 @@ void bch_submit_bbio(struct bio *bio, struct cache_set *c, }/* IO errors */ +void bch_count_backing_io_errors (struct cached_dev *dc,struct bio *bio) +{ +char buf[BDEVNAME_SIZE ]; +unsigned errors; + +WARN_ONCE (!dc,"NULL pointer of struct cached_dev" ); + + errors =atomic_add_return (1 , &dc->io_errors); +if (errors < dc->error_limit) +pr_err ("%s: IO error on backing device, unrecoverable" , +bio_devname (bio, buf)); +else +bch_cached_dev_error (dc); +} void bch_count_io_errors(struct cache *ca, blk_status_t error,drivers/md/bcache/request.c +12
-2@@ -637,6 +637,8 @@ static void backing_request_endio(struct bio *bio)if (bio->bi_status) { struct search *s = container_of(cl, struct search, cl); +struct cached_dev *dc =container_of (s->d, + struct cached_dev, disk);/* * If a bio has REQ_PREFLUSH for writeback mode, it is * speically assembled in cached_dev_write() for a non-zero @@ -657,6 +659,7 @@ static void backing_request_endio(struct bio *bio) } s->recoverable = false;/* should count I/O error for backing device here */ +bch_count_backing_io_errors (dc, bio); }bio_put (bio);@@ -1065,8 +1068,14 @@ static void detached_dev_end_io(struct bio *bio)bio_data_dir (bio), &ddip->d->disk->part0, ddip->start_time); -kfree (ddip); +if (bio->bi_status) { +struct cached_dev *dc =container_of (ddip->d, + struct cached_dev, disk); +/* should count I/O error for backing device here */ +bch_count_backing_io_errors (dc, bio); + } +kfree (ddip); bio->bi_end_io (bio); }@@ -1105,7 +1114,8 @@ static blk_qc_t cached_dev_make_request(struct request_queue *q, struct cached_dev *dc = container_of(d, struct cached_dev, disk);int rw =bio_data_dir (bio); -if (unlikely (d->c &&test_bit (CACHE_SET_IO_DISABLE , &d->c->flags))) { +if (unlikely ((d->c &&test_bit (CACHE_SET_IO_DISABLE , &d->c->flags)) || + dc->io_disable)) { bio->bi_status =BLK_STS_IOERR ;bio_endio (bio);return BLK_QC_T_NONE ;drivers/md/bcache/super.c +21
-0@@ -1198,6 +1198,9 @@ static int cached_dev_init(struct cached_dev *dc, unsigned block_size)max (dc->disk.disk->queue->backing_dev_info->ra_pages, q->backing_dev_info->ra_pages); +atomic_set (&dc->io_errors,0 ); + dc->io_disable = false; + dc->error_limit =DEFAULT_CACHED_DEV_ERROR_LIMIT ;/* default to auto */ dc->stop_when_cache_set_failed =BCH_CACHED_DEV_STOP_AUTO ;@@ -1352,6 +1355,24 @@ int bch_flash_dev_create(struct cache_set *c, uint64_t size)return flash_dev_run (c, u); } +bool bch_cached_dev_error (struct cached_dev *dc) +{ +char name[BDEVNAME_SIZE ]; + +if (!dc ||test_bit (BCACHE_DEV_CLOSING , &dc->disk.flags)) +return false; + + dc->io_disable = true; +/* make others know io_disable is true earlier */ +smp_mb (); + +pr_err ("stop %s: too many IO errors on backing device %s\n" , + dc->disk.disk->disk_name,bdevname (dc->bdev, name)); + +bcache_device_stop (&dc->disk); +return true; +} +/* Cache set */ __printf (2 ,3 )drivers/md/bcache/sysfs.c +14
-1@@ -141,7 +141,9 @@ SHOW(__bch_cached_dev)var_print (writeback_delay);var_print (writeback_percent);sysfs_hprint (writeback_rate, dc->writeback_rate.rate <<9 ); - +sysfs_hprint (io_errors,atomic_read (&dc->io_errors)); +sysfs_printf (io_error_limit,"%i" , dc->error_limit); +sysfs_printf (io_disable,"%i" , dc->io_disable);var_print (writeback_rate_update_seconds);var_print (writeback_rate_i_term_inverse);var_print (writeback_rate_p_term_inverse);@@ -232,6 +234,14 @@ STORE(__cached_dev)d_strtoul (writeback_rate_i_term_inverse);d_strtoul_nonzero (writeback_rate_p_term_inverse); +sysfs_strtoul_clamp (io_error_limit, dc->error_limit,0 ,INT_MAX ); + +if (attr == &sysfs_io_disable) { +int v =strtoul_or_return (buf); + + dc->io_disable = v ?1 :0 ; + } +d_strtoi_h (sequential_cutoff);d_strtoi_h (readahead);@@ -352,6 +362,9 @@ static struct attribute *bch_cached_dev_files[] = { &sysfs_writeback_rate_i_term_inverse, &sysfs_writeback_rate_p_term_inverse, &sysfs_writeback_rate_debug, + &sysfs_errors, + &sysfs_io_error_limit, + &sysfs_io_disable, &sysfs_dirty_data, &sysfs_stripe_size, &sysfs_partial_stripes_expensive,
Re: [PATCH v7 8/9] bcache: add io_disable to struct cached_dev
In reply to Coly LiQuoted 7 lines · Coly Li
If a bcache device is configured to writeback mode, current code does not handle write I/O errors on backing devices properly.
In writeback mode, write request is written to cache device, and latter being flushed to backing device. If I/O failed when writing from cache device to the backing device, bcache code just ignores the error and upper layer code is NOT noticed that the backing device is broken.
lgtm, applied
PATCH v7 9/9 bcache: stop bcache device when backing device is offline
In reply to Coly LiCurrently bcache does not handle backing device failure, if backing device is offline and disconnected from system, its bcache device can still be accessible. If the bcache device is in writeback mode, I/O requests even can success if the requests hit on cache device. That is to say, when and how bcache handles offline backing device is undefined.
This patch tries to handle backing device offline in a rather simple way,
- Add cached_dev->status_update_thread kernel thread to update backing device status in every 1 second.
- Add cached_dev->offline_seconds to record how many seconds the backing device is observed to be offline. If the backing device is offline for BACKING_DEV_OFFLINE_TIMEOUT (30) seconds, set dc->io_disable to 1 and call bcache_device_stop() to stop the bache device which linked to the offline backing device.
Now if a backing device is offline for BACKING_DEV_OFFLINE_TIMEOUT seconds, its bcache device will be removed, then user space application writing on it will get error immediately, and handler the device failure in time.
This patch is quite simple, does not handle more complicated situations. Once the bcache device is stopped, users need to recovery the backing device, register and attach it manually.
Changelog:
v3: call wait_for_kthread_stop() before exits kernel thread.
v2: remove "bcache: " prefix when calling pr_warn().
v1: initial version.
--- drivers/md/bcache/bcache.h | 2 ++ drivers/md/bcache/super.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+)
drivers/md/bcache/bcache.h +2 -0
@@ -345,6 +345,7 @@ struct cached_dev {struct keybuf writeback_keys; +struct task_struct *status_update_thread;/* * Order the write-half of writeback operations strongly in dispatch * order. (Maintain LBA order; don't allow reads completing out of
@@ -392,6 +393,7 @@ struct cached_dev {#define DEFAULT_CACHED_DEV_ERROR_LIMIT 64atomic_t io_errors;unsigned error_limit; +unsigned offline_seconds; };enum alloc_reserve {
drivers/md/bcache/super.c +55 -0
79 lines not on this page · raw message
Signature · 1 line
2.16.1
Re: [PATCH v7 9/9] bcache: stop bcache device when backing device is offline
Hi Coly Li--
Just a couple of questions.
Quoted 1 line · Coly Li
+#define
BACKING_DEV_OFFLINE_TIMEOUT5
I think you wanted this to be 30 (per commit message)-- was this turned down for testing or deliberate?
Quoted 4 lines
drivers/md/bcache/super.c +4
-0+static int cached_dev_status_update (void *arg) +{ +struct cached_dev *dc = arg; +struct request_queue *q;
drivers/md/bcache/super.c static void calc_cached_dev_sectors(struct cache_set *c) · line 886
Quoted 10 lines
drivers/md/bcache/super.c +10
-0+char buf[BDEVNAME_SIZE ]; + +/* +* If this delayed worker is stopping outside, directly quit here. +* dc->io_disable might be set via sysfs interface, so check it +* here too. +*/ +while (!kthread_should_stop () && !dc->io_disable) { + q =bdev_get_queue (dc->bdev); +if (blk_queue_dying (q))
I am not sure-- is this the correct test to know if the bdev is offline?
It's very sparsely used outside of the core block system. (Is there
any scenario where the queue comes back? Can the device be "offline" and still have a live queue? Another approach might be to set io_disable when there's an extended period without a successful IO, and it might be possible to do this with atomics without a thread).
This approach can work if you're certain that blk_queue_dying is an appropriate test for all failure scenarios (I just don't know).
Mike
Re: [PATCH v7 9/9] bcache: stop bcache device when backing device is offline
Quoted 7 lines · Michael Lyle
Hi Coly Li--
Just a couple of questions.
Quoted 1 line · Coly Li
+#define
BACKING_DEV_OFFLINE_TIMEOUT5
Hi Mike,
Quoted 3 lines
I think you wanted this to be 30 (per commit message)-- was this turned down for testing or deliberate?
Currently the correct timeout is 5 seconds. The 30 seconds was for the condition when the offline backing device came back within 30 seconds, which is not implemented yet. In general after 5 seconds, the offline device will be deleted from system, if it comes back again the device name might be changed (e.g. from /dev/sdc to /dev/sdd) with different bdev index. I need to recognize the new coming drive is previous offline one, and modify bcache internal data structures to link to the new device name. This requires more details and effort, and I decided to work on it later as a separate topic. Obviously I didn't update patch commit log properly. Thanks for point out this :-)
Quoted 13 lines
Quoted 13 lines
drivers/md/bcache/super.c +13
-0+static int cached_dev_status_update (void *arg) +{ +struct cached_dev *dc = arg; +struct request_queue *q; +char buf[BDEVNAME_SIZE ]; + +/* +* If this delayed worker is stopping outside, directly quit here. +* dc->io_disable might be set via sysfs interface, so check it +* here too. +*/ +while (!kthread_should_stop () && !dc->io_disable) { + q =bdev_get_queue (dc->bdev);
Quoted 9 lines
drivers/md/bcache/super.c static void calc_cached_dev_sectors(struct cache_set *c) · line 886
Quoted 1 line
drivers/md/bcache/super.c +1
-0+if (blk_queue_dying (q))I am not sure-- is this the correct test to know if the bdev is offline?
It's very sparsely used outside of the core block system. (Is there
any scenario where the queue comes back? Can the device be "offline" and still have a live queue? Another approach might be to setio_disablewhen there's an extended period without a successful IO, and it might be possible to do this with atomics without a thread).
I asked blocker layer developers Ming Lei, this is the methods suggested
for now. And in my test, it works as expected.
Anyway, using a kernel thread to monitor device status is ugly, the reason I have to do it this way is because there is no general notifier for block layer device offline or failure. There is a bus notifier, but for devices have no bus, it does not work well. So I am also thinking of the possibility for a generic notifier for block device offline or failure, if it can be done someday, we can just register a callback routine, and not need an extra kernel thread.
Quoted 2 lines
This approach can work if you're certain that
blk_queue_dyingis an appropriate test for all failure scenarios (I just don't know).
So far it works well, and I am collaborating with our partners to test the patch set, no negative report so far.
Thanks.
Coly Li
Michael Lyle
AppliedHi Coly Li--
Quoted 4 lines · Coly Li
Hi maintainers and folks,
This patch set tries to improve bcache device failure handling, includes cache device and backing device failures.
I have applied 1, 2, 4 & 6 from this series to my 4.17 bcache-for-next for testing.
Mike
Quoted 10 lines · Michael Lyle
Hi Coly Li--
Quoted 4 lines · Coly Li
Hi maintainers and folks,
This patch set tries to improve bcache device failure handling, includes cache device and backing device failures.
I have applied 1, 2, 4 & 6 from this series to my 4.17 bcache-for-next for testing.
Correction: I meant 1, 2, 5 & 6.
Quoted 7 lines
Mike
--
To unsubscribe from this list: send the line "unsubscribe linux-bcache" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 6 lines · Michael Lyle
Quoted 5 lines · Michael Lyle
Hi Coly Li--
Quoted 2 lines · Coly Li
Hi maintainers and folks,
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
This patch set tries to improve bcache device failure handling, includes cache device and backing device failures.
I have applied 1, 2, 4 & 6 from this series to my 4.17 bcache-for-next for testing.
Correction: I meant 1, 2, 5 & 6.
Sorry everyone for churn. Present applied state is 1-6:
#6 6a2fb6357eae bcache: fix inaccurate io state for detached bcache devices #5 6aee8a57d141 bcache: add stop_when_cache_set_failed option to backing device
#4 3a9c638b1950 bcache: add CACHE_SET_IO_DISABLE to struct cache_set flags #3 1b355007b5ae bcache: stop dc->writeback_rate_update properly #2 70120583e4b5 bcache: quit dc->writeback_thread when BCACHE_DEV_DETACHING is set
#1 b8f557d64115 bcache: fix cached_dev->count usage for bch_cache_set_error()
There's some checkpatch warnings relating to non-preferred style (splitting strings to hit 80 character limit) but I will fix them up myself later). This subset is through review and passes initial testing (will be testing more / and writing test suite).
Mike
Quoted 27 lines · Michael Lyle
Quoted 6 lines · Michael Lyle
Quoted 5 lines · Michael Lyle
Hi Coly Li--
Quoted 2 lines · Coly Li
Hi maintainers and folks,
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
This patch set tries to improve bcache device failure handling, includes cache device and backing device failures.
I have applied 1, 2, 4 & 6 from this series to my 4.17 bcache-for-next for testing.
Correction: I meant 1, 2, 5 & 6.
Sorry everyone for churn. Present applied state is 1-6:
#6
6a2fb6357eaebcache: fix inaccurate io state for detached bcache devices #56aee8a57d141bcache: addstop_when_cache_set_failedoption to backing device
#43a9c638b1950bcache: addCACHE_SET_IO_DISABLEto structcache_setflags #31b355007b5aebcache: stopdc->writeback_rate_updateproperly #270120583e4b5bcache: quitdc->writeback_threadwhenBCACHE_DEV_DETACHINGis set
#1b8f557d64115bcache: fixcached_dev->countusage forbch_cache_set_error()
Quoted 4 lines
There's some checkpatch warnings relating to non-preferred style (splitting strings to hit 80 character limit) but I will fix them up myself later). This subset is through review and passes initial testing (will be testing more / and writing test suite).
Hi Mike,
Thanks for your effort.
Coly Li