Skip to contentSkip to conversation

block/loop: handle discard/zeroout error

PATCH In review Shaohua Li 2 participants 6 messages Oct 4, 2017 – Oct 19, 2017 Block layer

lore
Share & tools
lore

Shaohua Li

author
#0 lore raw

v3 cover block/loop: handle discard/zeroout error

From: Shaohua Li <[email protected]>

Fix some problems when setting up loop device with a block device as back file and create/mount ext4 in the loop device.

Thanks,
Shaohua

Shaohua Li (3):
block/loop: don't hijack error number
block/loop: use FALLOC_FL_ZERO_RANGE for REQ_OP_WRITE_ZEROES
block: don't print message for discard error

 block/blk-core.c     | 2 ++
 drivers/block/loop.c | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
Signature · 1 line
2.9.5
author
#1 lore raw

PATCH v3 1/3 block/loop: don't hijack error number

From: Shaohua Li <[email protected]>

If the bio returns -EOPNOTSUPP, we shouldn't hijack it and return -EIO

Signed-off-by Shaohua Li <[email protected]>
Reviewed-by Ming Lei <[email protected]>
---
 drivers/block/loop.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/block/loop.c +3 -3
index bc8e615..6aa739f 100644
@@ -460,7 +460,7 @@ static void lo_complete_rq(struct request *rq)
 		zero_fill_bio(bio);
 	}
 
-	blk_mq_end_request(rq, cmd->ret < 0 ? BLK_STS_IOERR : BLK_STS_OK);
+	blk_mq_end_request(rq, errno_to_blk_status(cmd->ret));
 }
 
 static void lo_rw_aio_do_completion(struct loop_cmd *cmd)

@@ -478,7 +478,7 @@ static void lo_rw_aio_complete(struct kiocb *iocb, long ret, long ret2)
 
 	if (cmd->css)
 		css_put(cmd->css);
-	cmd->ret = ret;
+	cmd->ret = ret > 0 ? 0 : ret;
 	lo_rw_aio_do_completion(cmd);
 }
 

@@ -1719,7 +1719,7 @@ static void loop_handle_cmd(struct loop_cmd *cmd)
  failed:
 	/* complete non-aio request */
 	if (!cmd->use_aio || ret) {
-		cmd->ret = ret ? -EIO : 0;
+		cmd->ret = ret;
 		blk_mq_complete_request(cmd->rq);
 	}
 }
Signature · 1 line
2.9.5
author
#2 lore raw

PATCH v3 2/3 block/loop: use FALLOC_FL_ZERO_RANGE for REQ_OP_WRITE_ZEROES

In reply to Shaohua Li

From: Shaohua Li <[email protected]>

REQ_OP_WRITE_ZEROES really means zero the data. And in blkdev_fallocate, FALLOC_FL_ZERO_RANGE will retry but FALLOC_FL_PUNCH_HOLE not, even loop request doesn't have BLKDEV_ZERO_NOFALLBACK set.

Signed-off-by Shaohua Li <[email protected]>
Reviewed-by Ming Lei <[email protected]>
---
 drivers/block/loop.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/block/loop.c +3 -0
index 6aa739f..7269341 100644
@@ -426,6 +426,9 @@ static int lo_discard(struct loop_device *lo, struct request *rq, loff_t pos)
 	int mode = FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE;
 	int ret;
 
+	if (req_op(rq) == REQ_OP_WRITE_ZEROES)
+		mode = FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE;
+
 	if ((!file->f_op->fallocate) || lo->lo_encrypt_key_size) {
 		ret = -EOPNOTSUPP;
 		goto out;
Signature · 1 line
2.9.5
author
#3 lore raw

PATCH v3 3/3 block: don't print message for discard error

In reply to Shaohua Li

From: Shaohua Li <[email protected]>

discard error isn't fatal, don't flood discard error messages.

Suggested-by Ming Lei <[email protected]>
Signed-off-by Shaohua Li <[email protected]>
---
 block/blk-core.c | 2 ++
 1 file changed, 2 insertions(+)
block/blk-core.c +2 -0
index 14f7674..adb064a 100644
@@ -3090,6 +3090,8 @@ void blk_rq_bio_prep(struct request_queue *q, struct request *rq,
 	rq->__data_len = bio->bi_iter.bi_size;
 	rq->bio = rq->biotail = bio;
 
+	if (bio_op(bio) == REQ_OP_DISCARD)
+		rq->rq_flags |= RQF_QUIET;
 	if (bio->bi_disk)
 		rq->rq_disk = bio->bi_disk;
 }
Signature · 1 line
2.9.5
author
#5 lore raw
In reply to Shaohua Li
Quoted 4 lines · Shaohua Li

From: Shaohua Li <[email protected]>

Fix some problems when setting up loop device with a block device as back file and create/mount ext4 in the loop device.

Jens,
can you look at these patches?

Thanks,
Shaohua

Quoted 16 lines

Thanks,
Shaohua

Shaohua Li (3):
block/loop: don't hijack error number
block/loop: use FALLOC_FL_ZERO_RANGE for REQ_OP_WRITE_ZEROES
block: don't print message for discard error

 block/blk-core.c     | 2 ++
 drivers/block/loop.c | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
Signature · 1 line
2.9.5