diff mbox series

[2/2] io_uring: assume read_iter/write_iter are safe for nonblocking

Message ID 20230307154533.11164-3-axboe@kernel.dk (mailing list archive)
State New
Headers show
Series Make pipe honor IOCB_NOWAIT | expand

Commit Message

Jens Axboe March 7, 2023, 3:45 p.m. UTC 
All read_iter/write_iter must check IOCB_NOWAIT like they check for
O_NONBLOCK, and return -EAGAIN if we need to be sleeping.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
 io_uring/filetable.h |  4 ++--
 io_uring/io_uring.c  | 13 +++++++++----
 io_uring/rw.c        |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/io_uring/filetable.h b/io_uring/filetable.h
index 351111ff8882..e221b5b9134f 100644
--- a/io_uring/filetable.h
+++ b/io_uring/filetable.h
@@ -21,7 +21,7 @@  int io_fixed_fd_remove(struct io_ring_ctx *ctx, unsigned int offset);
 int io_register_file_alloc_range(struct io_ring_ctx *ctx,
 				 struct io_uring_file_index_range __user *arg);
 
-unsigned int io_file_get_flags(struct file *file);
+unsigned int io_file_get_flags(struct file *file, fmode_t fmode);
 
 static inline void io_file_bitmap_clear(struct io_file_table *table, int bit)
 {
@@ -56,7 +56,7 @@  static inline void io_fixed_file_set(struct io_fixed_file *file_slot,
 {
 	unsigned long file_ptr = (unsigned long) file;
 
-	file_ptr |= io_file_get_flags(file);
+	file_ptr |= io_file_get_flags(file, file->f_mode);
 	file_slot->file_ptr = file_ptr;
 }
 
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index fd1cc35a1c00..1592faec41e2 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -422,7 +422,7 @@  static void io_prep_async_work(struct io_kiocb *req)
 		req->work.flags |= IO_WQ_WORK_CONCURRENT;
 
 	if (req->file && !io_req_ffs_set(req))
-		req->flags |= io_file_get_flags(req->file) << REQ_F_SUPPORT_NOWAIT_BIT;
+		req->flags |= io_file_get_flags(req->file, 0) << REQ_F_SUPPORT_NOWAIT_BIT;
 
 	if (req->flags & REQ_F_ISREG) {
 		if (def->hash_reg_file || (ctx->flags & IORING_SETUP_IOPOLL))
@@ -1719,7 +1719,8 @@  static bool io_bdev_nowait(struct block_device *bdev)
  * any file. For now, just ensure that anything potentially problematic is done
  * inline.
  */
-static bool __io_file_supports_nowait(struct file *file, umode_t mode)
+static bool __io_file_supports_nowait(struct file *file, umode_t mode,
+				      fmode_t fmode)
 {
 	if (S_ISBLK(mode)) {
 		if (IS_ENABLED(CONFIG_BLOCK) &&
@@ -1740,6 +1741,10 @@  static bool __io_file_supports_nowait(struct file *file, umode_t mode)
 	/* any ->read/write should understand O_NONBLOCK */
 	if (file->f_flags & O_NONBLOCK)
 		return true;
+	if (fmode & FMODE_READ && file->f_op->read_iter)
+		return true;
+	if (fmode & FMODE_WRITE && file->f_op->write_iter)
+		return true;
 	return file->f_mode & FMODE_NOWAIT;
 }
 
@@ -1748,14 +1753,14 @@  static bool __io_file_supports_nowait(struct file *file, umode_t mode)
  * any file. For now, just ensure that anything potentially problematic is done
  * inline.
  */
-unsigned int io_file_get_flags(struct file *file)
+unsigned int io_file_get_flags(struct file *file, fmode_t fmode)
 {
 	umode_t mode = file_inode(file)->i_mode;
 	unsigned int res = 0;
 
 	if (S_ISREG(mode))
 		res |= FFS_ISREG;
-	if (__io_file_supports_nowait(file, mode))
+	if (__io_file_supports_nowait(file, mode, fmode))
 		res |= FFS_NOWAIT;
 	return res;
 }
diff --git a/io_uring/rw.c b/io_uring/rw.c
index 4c233910e200..33c87eb061d2 100644
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -668,7 +668,7 @@  static int io_rw_init_file(struct io_kiocb *req, fmode_t mode)
 		return -EBADF;
 
 	if (!io_req_ffs_set(req))
-		req->flags |= io_file_get_flags(file) << REQ_F_SUPPORT_NOWAIT_BIT;
+		req->flags |= io_file_get_flags(file, mode) << REQ_F_SUPPORT_NOWAIT_BIT;
 
 	kiocb->ki_flags = file->f_iocb_flags;
 	ret = kiocb_set_rw_flags(kiocb, rw->flags);