Skip to contentSkip to conversation

bcache: first wave for Linux v5.11

PATCH Applied Coly Li 2 participants 3 messages Dec 7, 2020

Subsystems (2)
lore
Share & tools
lore

Coly Li

author
#0 lore raw

cover bcache: first wave for Linux v5.11

Hi Jens,

The first wave bcache change for Linux v5.11 is quite silent. Most of the development is not ready for this merge window. The only change in this submission is from Dongsheng Yang, this is his second contribution which catches a very implict bug and provides a fix. The patch runs on his environment for a while and takes effect.

Please take it for v5.11. Thank you in advance.

Coly Li
---
Dongsheng Yang (1):
bcache: fix race between setting bdev state to none and new write
request direct to backing

 drivers/md/bcache/super.c     | 9 ---------
 drivers/md/bcache/writeback.c | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)
Signature · 1 line
2.26.2
author
#1 lore raw

PATCH 1/1 bcache: fix race between setting bdev state to none and new write request direct to backing

From: Dongsheng Yang <[email protected]>

There is a race condition in detaching as below:
A. detaching B. Write request
(1) writing back
(2) write back done, set bdev
state to clean.
(3) cached_dev_put() and
schedule_work(&dc->detach);
(4) write data [0 - 4K] directly into backing and ack to user.
(5) power-failure...

When we restart this bcache device, this bdev is clean but not detached, and read [0 - 4K], we will get unexpected old data from cache device.

To fix this problem, set the bdev state to none when we writeback done in detaching, and then if power-failure happened as above, the data in cache will not be used in next bcache device starting, it's detached, we will read the correct data from backing derectly.

---
 drivers/md/bcache/super.c     | 9 ---------
 drivers/md/bcache/writeback.c | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)
drivers/md/bcache/super.c +0 -9
index 46a00134a36a..b1a6ba9a5adb 100644
@@ -1114,9 +1114,6 @@ static void cancel_writeback_rate_update_dwork(struct cached_dev *dc)
 static void cached_dev_detach_finish(struct work_struct *w)
 {
 	struct cached_dev *dc = container_of(w, struct cached_dev, detach);
-	struct closure cl;
-
-	closure_init_stack(&cl);
 
 	BUG_ON(!test_bit(BCACHE_DEV_DETACHING, &dc->disk.flags));
 	BUG_ON(refcount_read(&dc->count));
@@ -1130,12 +1127,6 @@ static void cached_dev_detach_finish(struct work_struct *w)
 		dc->writeback_thread = NULL;
 	}
 
-	memset(&dc->sb.set_uuid, 0, 16);
-	SET_BDEV_STATE(&dc->sb, BDEV_STATE_NONE);
-
-	bch_write_bdev_super(dc, &cl);
-	closure_sync(&cl);
-
 	mutex_lock(&bch_register_lock);
 
 	calc_cached_dev_sectors(dc->disk.c);
drivers/md/bcache/writeback.c +9 -0
index 3c74996978da..a129e4d2707c 100644
@@ -705,6 +705,15 @@ static int bch_writeback_thread(void *arg)
 			 * bch_cached_dev_detach().
 			 */
 			if (test_bit(BCACHE_DEV_DETACHING, &dc->disk.flags)) {
+				struct closure cl;
+
+				closure_init_stack(&cl);
+				memset(&dc->sb.set_uuid, 0, 16);
+				SET_BDEV_STATE(&dc->sb, BDEV_STATE_NONE);
+
+				bch_write_bdev_super(dc, &cl);
+				closure_sync(&cl);
+
 				up_write(&dc->writeback_lock);
 				break;
 			}
Signature · 1 line
2.26.2
maintainer Applied
#2 lore raw
In reply to Coly Li
Quoted 7 lines · Coly Li

Hi Jens,

The first wave bcache change for Linux v5.11 is quite silent. Most of the development is not ready for this merge window. The only change in this submission is from Dongsheng Yang, this is his second contribution which catches a very implict bug and provides a fix. The patch runs on his environment for a while and takes effect.

Applied, thanks.

Signature · 1 line
Jens Axboe