Skip to content

Commit f8b78ca

Browse files
isilenceaxboe
authored andcommitted
block: don't ignore REQ_NOWAIT for direct IO
If IOCB_NOWAIT is set on submission, then that needs to get propagated to REQ_NOWAIT on the block side. Otherwise we completely lose this information, and any issuer of IOCB_NOWAIT IO will potentially end up blocking on eg request allocation on the storage side. Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent de3510e commit f8b78ca

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

fs/block_dev.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,8 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter,
275275
bio.bi_opf = dio_bio_write_op(iocb);
276276
task_io_account_write(ret);
277277
}
278+
if (iocb->ki_flags & IOCB_NOWAIT)
279+
bio.bi_opf |= REQ_NOWAIT;
278280
if (iocb->ki_flags & IOCB_HIPRI)
279281
bio_set_polled(&bio, iocb);
280282

@@ -428,6 +430,8 @@ static ssize_t __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
428430
bio->bi_opf = dio_bio_write_op(iocb);
429431
task_io_account_write(bio->bi_iter.bi_size);
430432
}
433+
if (iocb->ki_flags & IOCB_NOWAIT)
434+
bio->bi_opf |= REQ_NOWAIT;
431435

432436
dio->size += bio->bi_iter.bi_size;
433437
pos += bio->bi_iter.bi_size;

0 commit comments

Comments
 (0)