Hi Jens,
On 7/15/2022 11:58 PM, Jens Axboe wrote:
> In terms of making this more obvious, does the below also fix it for
> you?
The regression is still there after applied the change you posted.
Your change can't be applied to v5.18 (the latest commit on master branch).
I changed it a little bit to be applied:
diff --git a/fs/io_uring.c b/fs/io_uring.c
index e0823f58f7959..0bf7f3d18d46e 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -3762,9 +3762,6 @@ static int io_rw_init_file(struct io_kiocb *req, fmode_t mode)
if (unlikely(!file || !(file->f_mode & mode)))
return -EBADF;
- if (!io_req_ffs_set(req))
- req->flags |= io_file_get_flags(file) << REQ_F_SUPPORT_NOWAIT_BIT;
-
kiocb->ki_flags = iocb_flags(file);
ret = kiocb_set_rw_flags(kiocb, req->rw.flags);
if (unlikely(ret))
@@ -7114,8 +7111,13 @@ static bool io_assign_file(struct io_kiocb *req, unsigned int issue_flags)
req->file = io_file_get_fixed(req, req->fd, issue_flags);
else
req->file = io_file_get_normal(req, req->fd);
- if (req->file)
+ if (req->file) {
+ if (!io_req_ffs_set(req))
+ req->flags |= io_file_get_flags(req->file) <<
+ REQ_F_SUPPORT_NOWAIT_BIT;
+
return true;
+ }
req_set_fail(req);
req->result = -EBADF;
Regards
Yin, Fengwei
