Multishot read tweaks
Subsystems (2)
Jens Axboe
maintainercover Multishot read tweaks
Hi,
We can't properly support multishot reads unless one of the following conditions are true:
1) The file supports proper FMODE_NOWAIT
2) Barring proper FMODE_NOWAIT support, the file must be opened in non-blocking O_NONBLOCK mode
Without either one of those, non-blocking retries cannot be attempted. And without that, it's pointless to support multishot reads.
If this is attempted, fall back to singleshot mode. This will properly do the initial CQE posting, but will not set IORING_CQE_F_MORE as we can't reliably perform the retries that multishot requires.
io_uring/io_uring.c | 13 +++++++++---- io_uring/rw.c | 9 ++++++++- 2 files changed, 17 insertions(+), 5 deletions(-)
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerPATCH 1/2 io_uring/rw: don't allow multishot reads without NOWAIT support
Supporting multishot reads requires support for NOWAIT, as the alternative would be always having io-wq execute the work item whenever the poll readiness triggered. Any fast file type will have NOWAIT support (eg it understands both O_NONBLOCK and IOCB_NOWAIT). If the given file type does not, then simply resort to single shot execution.
--- io_uring/rw.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
io_uring/rw.c +8 -1
@@ -936,6 +936,13 @@ int io_read_mshot(struct io_kiocb *req, unsigned int issue_flags) ret =__io_read (req, issue_flags); +/* +* If the file doesn't support proper NOWAIT, then disable multishot +* and stay in single shot mode. +*/ +if (!io_file_supports_nowait (req)) + req->flags &= ~REQ_F_APOLL_MULTISHOT ; +/* * If we get -EAGAIN, recycle our buffer and just let normal poll * handling arm it.
@@ -955,7 +962,7 @@ int io_read_mshot(struct io_kiocb *req, unsigned int issue_flags)/* * Any successful return value will keep the multishot read armed. */ -if (ret >0 ) { +if (ret >0 && req->flags &REQ_F_APOLL_MULTISHOT ) {/* * Put our buffer and post a CQE. If we fail to post a CQE, then * jump to the termination path. This request is then done.
Signature · 1 line
2.43.0
Jens Axboe
maintainerPATCH 2/2 io_uring: disable io-wq execution of multishot NOWAIT requests
In reply to Jens AxboeDo the same check for direct io-wq execution for multishot requests that commit 2a975d426c82 did for the inline execution, and disable multishot mode (and revert to single shot) if the file type doesn't support NOWAIT, and isn't opened in O_NONBLOCK mode. For multishot to work properly, it's a requirement that nonblocking read attempts can be done.
--- io_uring/io_uring.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
io_uring/io_uring.c +9 -4
@@ -1982,10 +1982,15 @@ void io_wq_submit_work(struct io_wq_work *work) err = -EBADFD ;if (!io_file_can_poll (req)) goto fail; - err = -ECANCELED ; -if (io_arm_poll_handler (req, issue_flags) !=IO_APOLL_OK ) - goto fail; -return ; +if (req->file->f_flags &O_NONBLOCK || + req->file->f_mode &FMODE_NOWAIT ) { + err = -ECANCELED ; +if (io_arm_poll_handler (req, issue_flags) !=IO_APOLL_OK ) + goto fail; +return ; + }else { + req->flags &= ~REQ_F_APOLL_MULTISHOT ; + } }if (req->flags &REQ_F_FORCE_ASYNC ) {
Signature · 1 line
2.43.0