* [PATCH v4 1/3] bcache: bch_sectors_dirty_init() check each thread result and return error
@ 2022-09-22 2:20 mingzhe.zou
2022-09-22 2:20 ` [PATCH v4 2/3] bcache: check bch_sectors_dirty_init() return value mingzhe.zou
2022-09-22 2:20 ` [PATCH v4 3/3] bcache: check bch_cached_dev_attach() " mingzhe.zou
0 siblings, 2 replies; 3+ messages in thread
From: mingzhe.zou @ 2022-09-22 2:20 UTC (permalink / raw)
To: colyli, linux-bcache; +Cc: zoumingzhe
From: ZouMingzhe <mingzhe.zou@easystack.cn>
1. bch_dirty_init_thread() dont check bch_root_node_dirty_init() error
and return it, add result in struct dirty_init_thrd_info.
2. bch_sectors_dirty_init() dont check each thread result and return void,
we should check each thread and return error.
3. bch_btree_check() and bch_sectors_dirty_init() must wait all threads stop,
cannot return error immediately.
Signed-off-by: mingzhe <mingzhe.zou@easystack.cn>
---
drivers/md/bcache/btree.c | 6 +++++-
drivers/md/bcache/writeback.c | 28 +++++++++++++++++++++++-----
drivers/md/bcache/writeback.h | 3 ++-
3 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
index 147c493a989a..a76a77764b2c 100644
--- a/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
@@ -2051,7 +2051,7 @@ int bch_btree_check(struct cache_set *c)
for (--i; i >= 0; i--)
kthread_stop(check_state.infos[i].thread);
ret = -ENOMEM;
- goto out;
+ goto out_wait;
}
atomic_inc(&check_state.started);
}
@@ -2059,8 +2059,12 @@ int bch_btree_check(struct cache_set *c)
/*
* Must wait for all threads to stop.
*/
+out_wait:
wait_event(check_state.wait, atomic_read(&check_state.started) == 0);
+ if (ret)
+ goto out;
+
for (i = 0; i < check_state.total_threads; i++) {
if (check_state.infos[i].result) {
ret = check_state.infos[i].result;
diff --git a/drivers/md/bcache/writeback.c b/drivers/md/bcache/writeback.c
index 3f0ff3aab6f2..c21b1cddefdd 100644
--- a/drivers/md/bcache/writeback.c
+++ b/drivers/md/bcache/writeback.c
@@ -865,6 +865,7 @@ static int bch_root_node_dirty_init(struct cache_set *c,
static int bch_dirty_init_thread(void *arg)
{
+ int ret = 0;
struct dirty_init_thrd_info *info = arg;
struct bch_dirty_init_state *state = info->state;
struct cache_set *c = state->c;
@@ -905,7 +906,8 @@ static int bch_dirty_init_thread(void *arg)
}
if (p) {
- if (bch_root_node_dirty_init(c, state->d, p) < 0)
+ ret = bch_root_node_dirty_init(c, state->d, p);
+ if (ret < 0)
goto out;
}
@@ -914,6 +916,7 @@ static int bch_dirty_init_thread(void *arg)
}
out:
+ info->result = ret;
/* In order to wake up state->wait in time */
smp_mb__before_atomic();
if (atomic_dec_and_test(&state->started))
@@ -934,9 +937,10 @@ static int bch_btre_dirty_init_thread_nr(void)
return n;
}
-void bch_sectors_dirty_init(struct bcache_device *d)
+int bch_sectors_dirty_init(struct bcache_device *d)
{
int i;
+ int ret = 0;
struct bkey *k = NULL;
struct btree_iter iter;
struct sectors_dirty_init op;
@@ -955,7 +959,7 @@ void bch_sectors_dirty_init(struct bcache_device *d)
sectors_dirty_init_fn(&op.op, c->root, k);
rw_unlock(0, c->root);
- return;
+ return 0;
}
memset(&state, 0, sizeof(struct bch_dirty_init_state));
@@ -982,15 +986,29 @@ void bch_sectors_dirty_init(struct bcache_device *d)
pr_err("fails to run thread bch_dirty_init[%d]\n", i);
for (--i; i >= 0; i--)
kthread_stop(state.infos[i].thread);
- goto out;
+ ret = -ENOMEM;
+ goto out_wait;
}
atomic_inc(&state.started);
}
-out:
+out_wait:
/* Must wait for all threads to stop. */
wait_event(state.wait, atomic_read(&state.started) == 0);
+
+ if (ret)
+ goto out;
+
+ for (i = 0; i < state.total_threads; i++) {
+ if (state.infos[i].result) {
+ ret = state.infos[i].result;
+ goto out;
+ }
+ }
+
+out:
rw_unlock(0, c->root);
+ return ret;
}
void bch_cached_dev_writeback_init(struct cached_dev *dc)
diff --git a/drivers/md/bcache/writeback.h b/drivers/md/bcache/writeback.h
index 31df716951f6..bb5372a14adc 100644
--- a/drivers/md/bcache/writeback.h
+++ b/drivers/md/bcache/writeback.h
@@ -32,6 +32,7 @@ struct bch_dirty_init_state;
struct dirty_init_thrd_info {
struct bch_dirty_init_state *state;
struct task_struct *thread;
+ int result;
};
struct bch_dirty_init_state {
@@ -148,7 +149,7 @@ static inline void bch_writeback_add(struct cached_dev *dc)
void bcache_dev_sectors_dirty_add(struct cache_set *c, unsigned int inode,
uint64_t offset, int nr_sectors);
-void bch_sectors_dirty_init(struct bcache_device *d);
+int bch_sectors_dirty_init(struct bcache_device *d);
void bch_cached_dev_writeback_init(struct cached_dev *dc);
int bch_cached_dev_writeback_start(struct cached_dev *dc);
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v4 2/3] bcache: check bch_sectors_dirty_init() return value
2022-09-22 2:20 [PATCH v4 1/3] bcache: bch_sectors_dirty_init() check each thread result and return error mingzhe.zou
@ 2022-09-22 2:20 ` mingzhe.zou
2022-09-22 2:20 ` [PATCH v4 3/3] bcache: check bch_cached_dev_attach() " mingzhe.zou
1 sibling, 0 replies; 3+ messages in thread
From: mingzhe.zou @ 2022-09-22 2:20 UTC (permalink / raw)
To: colyli, linux-bcache; +Cc: zoumingzhe
From: ZouMingzhe <mingzhe.zou@easystack.cn>
handle error when call bch_sectors_dirty_init() function
Signed-off-by: mingzhe <mingzhe.zou@easystack.cn>
---
drivers/md/bcache/super.c | 34 ++++++++++++++++++++++------------
1 file changed, 22 insertions(+), 12 deletions(-)
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index ba3909bb6bea..9dcffeb4c182 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -1298,21 +1298,17 @@ int bch_cached_dev_attach(struct cached_dev *dc, struct cache_set *c,
bch_writeback_queue(dc);
}
- bch_sectors_dirty_init(&dc->disk);
+ ret = bch_sectors_dirty_init(&dc->disk);
+ if (ret) {
+ pr_err("Fails in sectors dirty init for %s\n",
+ dc->disk.disk->disk_name);
+ goto err;
+ }
ret = bch_cached_dev_run(dc);
if (ret && (ret != -EBUSY)) {
- up_write(&dc->writeback_lock);
- /*
- * bch_register_lock is held, bcache_device_stop() is not
- * able to be directly called. The kthread and kworker
- * created previously in bch_cached_dev_writeback_start()
- * have to be stopped manually here.
- */
- kthread_stop(dc->writeback_thread);
- cancel_writeback_rate_update_dwork(dc);
pr_err("Couldn't run cached device %pg\n", dc->bdev);
- return ret;
+ goto err;
}
bcache_device_link(&dc->disk, c, "bdev");
@@ -1332,6 +1328,18 @@ int bch_cached_dev_attach(struct cached_dev *dc, struct cache_set *c,
dc->disk.disk->disk_name,
dc->disk.c->set_uuid);
return 0;
+
+err:
+ up_write(&dc->writeback_lock);
+ /*
+ * bch_register_lock is held, bcache_device_stop() is not
+ * able to be directly called. The kthread and kworker
+ * created previously in bch_cached_dev_writeback_start()
+ * have to be stopped manually here.
+ */
+ kthread_stop(dc->writeback_thread);
+ cancel_writeback_rate_update_dwork(dc);
+ return ret;
}
/* when dc->disk.kobj released */
@@ -1540,7 +1548,9 @@ static int flash_dev_run(struct cache_set *c, struct uuid_entry *u)
goto err;
bcache_device_attach(d, c, u - c->uuids);
- bch_sectors_dirty_init(d);
+ err = bch_sectors_dirty_init(d);
+ if (err)
+ goto err;
bch_flash_dev_request_init(d);
err = add_disk(d->disk);
if (err)
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v4 3/3] bcache: check bch_cached_dev_attach() return value
2022-09-22 2:20 [PATCH v4 1/3] bcache: bch_sectors_dirty_init() check each thread result and return error mingzhe.zou
2022-09-22 2:20 ` [PATCH v4 2/3] bcache: check bch_sectors_dirty_init() return value mingzhe.zou
@ 2022-09-22 2:20 ` mingzhe.zou
1 sibling, 0 replies; 3+ messages in thread
From: mingzhe.zou @ 2022-09-22 2:20 UTC (permalink / raw)
To: colyli, linux-bcache; +Cc: zoumingzhe
From: ZouMingzhe <mingzhe.zou@easystack.cn>
handle error when call bch_cached_dev_attach() function
Signed-off-by: mingzhe <mingzhe.zou@easystack.cn>
---
drivers/md/bcache/super.c | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index 9dcffeb4c182..14cd5e5dc65b 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -1458,7 +1458,7 @@ static int register_bdev(struct cache_sb *sb, struct cache_sb_disk *sb_disk,
{
const char *err = "cannot allocate memory";
struct cache_set *c;
- int ret = -ENOMEM;
+ int ret = -ENOMEM, ret_tmp;
memcpy(&dc->sb, sb, sizeof(struct cache_sb));
dc->bdev = bdev;
@@ -1478,8 +1478,14 @@ static int register_bdev(struct cache_sb *sb, struct cache_sb_disk *sb_disk,
list_add(&dc->list, &uncached_devices);
/* attach to a matched cache set if it exists */
- list_for_each_entry(c, &bch_cache_sets, list)
- bch_cached_dev_attach(dc, c, NULL);
+ err = "failed to attach cached device";
+ list_for_each_entry(c, &bch_cache_sets, list) {
+ ret_tmp = bch_cached_dev_attach(dc, c, NULL);
+ if (ret_tmp)
+ ret = ret_tmp;
+ }
+ if (ret)
+ goto err;
if (BDEV_STATE(&dc->sb) == BDEV_STATE_NONE ||
BDEV_STATE(&dc->sb) == BDEV_STATE_STALE) {
@@ -1979,6 +1985,7 @@ struct cache_set *bch_cache_set_alloc(struct cache_sb *sb)
static int run_cache_set(struct cache_set *c)
{
+ int ret = -EIO, ret_tmp;
const char *err = "cannot allocate memory";
struct cached_dev *dc, *t;
struct cache *ca = c->cache;
@@ -2131,8 +2138,14 @@ static int run_cache_set(struct cache_set *c)
if (bch_has_feature_obso_large_bucket(&c->cache->sb))
pr_err("Detect obsoleted large bucket layout, all attached bcache device will be read-only\n");
- list_for_each_entry_safe(dc, t, &uncached_devices, list)
- bch_cached_dev_attach(dc, c, NULL);
+ err = "failed to attach cached device";
+ list_for_each_entry_safe(dc, t, &uncached_devices, list) {
+ ret_tmp = bch_cached_dev_attach(dc, c, NULL);
+ if (ret_tmp)
+ ret = ret_tmp;
+ }
+ if (ret)
+ goto err;
flash_devs_run(c);
@@ -2150,7 +2163,7 @@ static int run_cache_set(struct cache_set *c)
bch_cache_set_error(c, "%s", err);
- return -EIO;
+ return ret;
}
static const char *register_cache_set(struct cache *ca)
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-22 2:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-22 2:20 [PATCH v4 1/3] bcache: bch_sectors_dirty_init() check each thread result and return error mingzhe.zou
2022-09-22 2:20 ` [PATCH v4 2/3] bcache: check bch_sectors_dirty_init() return value mingzhe.zou
2022-09-22 2:20 ` [PATCH v4 3/3] bcache: check bch_cached_dev_attach() " mingzhe.zou
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).