Skip to contentSkip to conversation

Block nowait fix

PATCH In review Jens Axboe 3 participants 9 messages Aug 8, 2023 – Aug 9, 2023 Block layer

lore
Share & tools
lore

Jens Axboe

author maintainer
#0 lore raw

cover Block nowait fix

Hi,

Patch 1 is just something I came across while debugging an issue, killing old and unused code.

Patch 2 fixes an issue with IOCB_HIPRI -> REQ_POLLED, where we always set REQ_NOWAIT as well. We should not be combining these two flags, they are separate properties and it's up to the caller to do the right thing and set one or both as they see fit.

Signature · 1 line
Jens Axboe
author maintainer
#1 lore raw

PATCH 1/2 block: get rid of unused plug->nowait flag

This was introduced to add a plug based way of signaling nowait issues, but we have since moved on from that. Kill the old dead code, nobody is setting it anymore.

---
 block/blk-core.c       | 6 ------
 include/linux/blkdev.h | 1 -
 2 files changed, 7 deletions(-)
block/blk-core.c +0 -6
index 90de50082146..9866468c72a2 100644
@@ -722,14 +722,9 @@ void submit_bio_noacct(struct bio *bio)
 	struct block_device *bdev = bio->bi_bdev;
 	struct request_queue *q = bdev_get_queue(bdev);
 	blk_status_t status = BLK_STS_IOERR;
-	struct blk_plug *plug;
 
 	might_sleep();
 
-	plug = blk_mq_plug(bio);
-	if (plug && plug->nowait)
-		bio->bi_opf |= REQ_NOWAIT;
-
 	/*
 	 * For a REQ_NOWAIT based request, return -EOPNOTSUPP
 	 * if queue does not support NOWAIT.
@@ -1059,7 +1054,6 @@ void blk_start_plug_nr_ios(struct blk_plug *plug, unsigned short nr_ios)
 	plug->rq_count = 0;
 	plug->multiple_queues = false;
 	plug->has_elevator = false;
-	plug->nowait = false;
 	INIT_LIST_HEAD(&plug->cb_list);
 
 	/*
include/linux/blkdev.h +0 -1
index ed44a997f629..87d94be7825a 100644
@@ -969,7 +969,6 @@ struct blk_plug {
 
 	bool multiple_queues;
 	bool has_elevator;
-	bool nowait;
 
 	struct list_head cb_list; /* md requires an unplug callback */
 };
Signature · 1 line
2.40.1
author maintainer
#4 lore raw

PATCH 2/2 block: don't make REQ_POLLED imply REQ_NOWAIT

In reply to Jens Axboe

Normally these two flags do go together, as the issuer of polled IO generally cannot wait for resources that will get freed as part of IO completion. This is because that very task is the one that will complete the request and free those resources, hence that would introduce a deadlock.

But it is possible to have someone else issue the polled IO, eg via io_uring if the request is punted to io-wq. For that case, it's fine to have the task block on IO submission, as it is not the same task that will be completing the IO.

It's completely up to the caller to ask for both polled and nowait IO separately! If we don't allow polled IO where IOCB_NOWAIT isn't set in the kiocb, then we can run into repeated -EAGAIN submissions and not make any progress.

---
 include/linux/bio.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/bio.h +1 -1
index c4f5b5228105..11984ed29cb8 100644
@@ -791,7 +791,7 @@ static inline int bio_integrity_add_page(struct bio *bio, struct page *page,
 static inline void bio_set_polled(struct bio *bio, struct kiocb *kiocb)
 {
 	bio->bi_opf |= REQ_POLLED;
-	if (!is_sync_kiocb(kiocb))
+	if (kiocb->ki_flags & IOCB_NOWAIT)
 		bio->bi_opf |= REQ_NOWAIT;
 }
 
Signature · 1 line
2.40.1
author maintainer
#5 lore raw

Re: [PATCH 2/2] block: don't make REQ_POLLED imply REQ_NOWAIT

Quoted 11 lines · Jens Axboe

Normally these two flags do go together, as the issuer of polled IO generally cannot wait for resources that will get freed as part of IO completion. This is because that very task is the one that will complete the request and free those resources, hence that would introduce a deadlock.

But it is possible to have someone else issue the polled IO, eg via io_uring if the request is punted to io-wq. For that case, it's fine to have the task block on IO submission, as it is not the same task that will be completing the IO.

Quoted 4 lines

It's completely up to the caller to ask for both polled and nowait IO separately! If we don't allow polled IO where IOCB_NOWAIT isn't set in the kiocb, then we can run into repeated -EAGAIN submissions and not make any progress.

Looks like I forgot to update when adding the first half of this... Here's the full patch 2/2:

commit 50bd4aa84442442c87e669d72d1a6d0b01c332a8

Author: Jens Axboe <[email protected]>
Date:   Tue Aug 8 11:06:17 2023 -0600

block: don't make REQ_POLLED imply REQ_NOWAIT

Normally these two flags do go together, as the issuer of polled IO generally cannot wait for resources that will get freed as part of IO completion. This is because that very task is the one that will complete the request and free those resources, hence that would introduce a deadlock.

But it is possible to have someone else issue the polled IO, eg via io_uring if the request is punted to io-wq. For that case, it's fine to have the task block on IO submission, as it is not the same task that will be completing the IO.

It's completely up to the caller to ask for both polled and nowait IO separately! If we don't allow polled IO where IOCB_NOWAIT isn't set in the kiocb, then we can run into repeated -EAGAIN submissions and not make any progress.

block/fops.c +4 -3
index a286bf3325c5..838ffada5341 100644
@@ -358,13 +358,14 @@ static ssize_t __blkdev_direct_IO_async(struct kiocb *iocb,
 		task_io_account_write(bio->bi_iter.bi_size);
 	}
 
+	if (iocb->ki_flags & IOCB_NOWAIT)
+		bio->bi_opf |= REQ_NOWAIT;
+
 	if (iocb->ki_flags & IOCB_HIPRI) {
-		bio->bi_opf |= REQ_POLLED | REQ_NOWAIT;
+		bio->bi_opf |= REQ_POLLED;
 		submit_bio(bio);
 		WRITE_ONCE(iocb->private, bio);
 	} else {
-		if (iocb->ki_flags & IOCB_NOWAIT)
-			bio->bi_opf |= REQ_NOWAIT;
 		submit_bio(bio);
 	}
 	return -EIOCBQUEUED;
include/linux/bio.h +1 -1
index c4f5b5228105..11984ed29cb8 100644
@@ -791,7 +791,7 @@ static inline int bio_integrity_add_page(struct bio *bio, struct page *page,
 static inline void bio_set_polled(struct bio *bio, struct kiocb *kiocb)
 {
 	bio->bi_opf |= REQ_POLLED;
-	if (!is_sync_kiocb(kiocb))
+	if (kiocb->ki_flags & IOCB_NOWAIT)
 		bio->bi_opf |= REQ_NOWAIT;
 }
 
Signature · 1 line
Jens Axboe
#6 lore raw

Re: [PATCH 2/2] block: don't make REQ_POLLED imply REQ_NOWAIT

In reply to Jens Axboe

include/linux/bio.h static inline int bio_integrity_add_page(struct bio *bio, struct page *page, · line 796

Quoted 12 lines · Jens Axboe
include/linux/bio.h +1 -1
index c4f5b5228105..11984ed29cb8 100644
@@ -791,7 +791,7 @@ static inline int bio_integrity_add_page(struct bio *bio, struct page *page,
  static inline void bio_set_polled(struct bio *bio, struct kiocb *kiocb)
  {
  	bio->bi_opf |= REQ_POLLED;
-	if (!is_sync_kiocb(kiocb))
+	if (kiocb->ki_flags & IOCB_NOWAIT)
  		bio->bi_opf |= REQ_NOWAIT;
  }

The implementation of bio_set_polled() is short and that function has only one caller. Has it been considered to inline that function into its caller?

Thanks,

Bart.

author maintainer
#7 lore raw

Re: [PATCH 2/2] block: don't make REQ_POLLED imply REQ_NOWAIT

Quoted 17 lines · Bart Van Assche

include/linux/bio.h static inline int bio_integrity_add_page(struct bio *bio, struct page *page, · line 796

Quoted 12 lines · Jens Axboe
include/linux/bio.h +1 -1
index c4f5b5228105..11984ed29cb8 100644
@@ -791,7 +791,7 @@ static inline int bio_integrity_add_page(struct bio *bio, struct page *page,
  static inline void bio_set_polled(struct bio *bio, struct kiocb *kiocb)
  {
      bio->bi_opf |= REQ_POLLED;
-    if (!is_sync_kiocb(kiocb))
+    if (kiocb->ki_flags & IOCB_NOWAIT)
          bio->bi_opf |= REQ_NOWAIT;
  }

The implementation of bio_set_polled() is short and that function has only one caller. Has it been considered to inline that function into its caller?

I think it should probably just go away, but wanted to leave that for a non-functional cleanup (which can wait for 6.6).

Signature · 1 line
Jens Axboe
Reviewed-by on v1 2/2
#8 lore raw

Re: [PATCH 2/2] block: don't make REQ_POLLED imply REQ_NOWAIT

In reply to Jens Axboe

include/linux/bio.h static inline int bio_integrity_add_page(struct bio *bio, struct page *page, · line 796

Quoted 10 lines · Jens Axboe
include/linux/bio.h +1 -1
@@ -791,7 +791,7 @@ static inline int bio_integrity_add_page(struct bio *bio, struct page *page,
  static inline void bio_set_polled(struct bio *bio, struct kiocb *kiocb)
  {
  	bio->bi_opf |= REQ_POLLED;
-	if (!is_sync_kiocb(kiocb))
+	if (kiocb->ki_flags & IOCB_NOWAIT)
  		bio->bi_opf |= REQ_NOWAIT;
  }