Commit 0ffae640 authored by Dylan Yudaken's avatar Dylan Yudaken Committed by Jens Axboe
Browse files

io_uring: always go async for unsupported open flags 



No point in issuing -> return -EAGAIN -> go async, when it can be done upfront.

Signed-off-by: default avatarDylan Yudaken <dylany@meta.com>
Link: https://lore.kernel.org/r/20230127135227.3646353-5-dylany@meta.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c31cc60f

io_uring/openclose.c

+12 −6
Original line number Diff line number Diff line
@@ -31,6 +31,15 @@ struct io_close { 
	u32				file_slot;

};



static bool io_openat_force_async(struct io_open *open)

{

	/*

	 * Don't bother trying for O_TRUNC, O_CREAT, or O_TMPFILE open,

	 * it'll always -EAGAIN

	 */

	return open->how.flags & (O_TRUNC | O_CREAT | O_TMPFILE);

}



static int __io_openat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

	struct io_open *open = io_kiocb_to_cmd(req, struct io_open);
@@ -61,6 +70,8 @@ static int __io_openat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe 


	open->nofile = rlimit(RLIMIT_NOFILE);

	req->flags |= REQ_F_NEED_CLEANUP;

	if (io_openat_force_async(open))

		req->flags |= REQ_F_FORCE_ASYNC;

	return 0;

}
@@ -108,12 +119,7 @@ int io_openat2(struct io_kiocb *req, unsigned int issue_flags) 
	nonblock_set = op.open_flag & O_NONBLOCK;

	resolve_nonblock = open->how.resolve & RESOLVE_CACHED;

	if (issue_flags & IO_URING_F_NONBLOCK) {

		/*

		 * Don't bother trying for O_TRUNC, O_CREAT, or O_TMPFILE open,

		 * it'll always -EAGAIN

		 */

		if (open->how.flags & (O_TRUNC | O_CREAT | O_TMPFILE))

			return -EAGAIN;

		WARN_ON_ONCE(io_openat_force_async(open));

		op.lookup_flags |= LOOKUP_CACHED;

		op.open_flag |= O_NONBLOCK;

	}