From: Pavel Begunkov <asml.silence@gmail.com> To: Hao Xu <haoxu@linux.alibaba.com>, Jens Axboe <axboe@kernel.dk> Cc: io-uring@vger.kernel.org, Joseph Qi <joseph.qi@linux.alibaba.com> Subject: Re: [PATCH 5/6] io_uring: implement multishot mode for accept Date: Sat, 4 Sep 2021 23:40:59 +0100 [thread overview] Message-ID: <64734f7c-aaee-7ac7-752e-2d81a475d3d8@gmail.com> (raw) In-Reply-To: <3070a597-3326-5cac-253e-e2b58eebd3a2@gmail.com> On 9/4/21 11:39 PM, Pavel Begunkov wrote: > On 9/3/21 12:00 PM, Hao Xu wrote: >> Refactor io_accept() to support multishot mode. > > Multishot with the fixed/direct mode sounds weird (considering that > the slot index is specified by userspace), let's forbid them. > > io_accept_prep() { > if (accept->file_slot && (flags & MULTISHOT)) > return -EINVAL; > ... > } Ah, never mind, it's already there in 6/6 > >> theoretical analysis: >> 1) when connections come in fast >> - singleshot: >> add accept sqe(userpsace) --> accept inline >> ^ | >> |-----------------| >> - multishot: >> add accept sqe(userspace) --> accept inline >> ^ | >> |--*--| >> >> we do accept repeatedly in * place until get EAGAIN >> >> 2) when connections come in at a low pressure >> similar thing like 1), we reduce a lot of userspace-kernel context >> switch and useless vfs_poll() >> >> tests: >> Did some tests, which goes in this way: >> >> server client(multiple) >> accept connect >> read write >> write read >> close close >> >> Basically, raise up a number of clients(on same machine with server) to >> connect to the server, and then write some data to it, the server will >> write those data back to the client after it receives them, and then >> close the connection after write return. Then the client will read the >> data and then close the connection. Here I test 10000 clients connect >> one server, data size 128 bytes. And each client has a go routine for >> it, so they come to the server in short time. >> test 20 times before/after this patchset, time spent:(unit cycle, which >> is the return value of clock()) >> before: >> 1930136+1940725+1907981+1947601+1923812+1928226+1911087+1905897+1941075 >> +1934374+1906614+1912504+1949110+1908790+1909951+1941672+1969525+1934984 >> +1934226+1914385)/20.0 = 1927633.75 >> after: >> 1858905+1917104+1895455+1963963+1892706+1889208+1874175+1904753+1874112 >> +1874985+1882706+1884642+1864694+1906508+1916150+1924250+1869060+1889506 >> +1871324+1940803)/20.0 = 1894750.45 >> >> (1927633.75 - 1894750.45) / 1927633.75 = 1.65% >> >> Signed-off-by: Hao Xu <haoxu@linux.alibaba.com> >> --- >> >> not sure if we should cancel it when io_cqring_fill_event() reurn false >> >> fs/io_uring.c | 34 +++++++++++++++++++++++++++++----- >> 1 file changed, 29 insertions(+), 5 deletions(-) >> >> diff --git a/fs/io_uring.c b/fs/io_uring.c >> index dae7044e0c24..eb81d37dce78 100644 >> --- a/fs/io_uring.c >> +++ b/fs/io_uring.c >> @@ -4885,16 +4885,18 @@ static int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) >> >> static int io_accept(struct io_kiocb *req, unsigned int issue_flags) >> { >> + struct io_ring_ctx *ctx = req->ctx; >> struct io_accept *accept = &req->accept; >> bool force_nonblock = issue_flags & IO_URING_F_NONBLOCK; >> unsigned int file_flags = force_nonblock ? O_NONBLOCK : 0; >> bool fixed = !!accept->file_slot; >> struct file *file; >> - int ret, fd; >> + int ret, ret2 = 0, fd; >> >> if (req->file->f_flags & O_NONBLOCK) >> req->flags |= REQ_F_NOWAIT; >> >> +retry: >> if (!fixed) { >> fd = __get_unused_fd_flags(accept->flags, accept->nofile); >> if (unlikely(fd < 0)) >> @@ -4906,20 +4908,42 @@ static int io_accept(struct io_kiocb *req, unsigned int issue_flags) >> if (!fixed) >> put_unused_fd(fd); >> ret = PTR_ERR(file); >> - if (ret == -EAGAIN && force_nonblock) >> - return -EAGAIN; >> + if (ret == -EAGAIN && force_nonblock) { >> + if ((req->flags & (REQ_F_APOLL_MULTISHOT | REQ_F_POLLED)) == >> + (REQ_F_APOLL_MULTISHOT | REQ_F_POLLED)) >> + ret = 0; >> + return ret; >> + } >> if (ret == -ERESTARTSYS) >> ret = -EINTR; >> req_set_fail(req); >> } else if (!fixed) { >> fd_install(fd, file); >> ret = fd; >> + /* >> + * if it's in multishot mode, let's return -EAGAIN to make it go >> + * into fast poll path >> + */ >> + if ((req->flags & REQ_F_APOLL_MULTISHOT) && force_nonblock && >> + !(req->flags & REQ_F_POLLED)) >> + ret2 = -EAGAIN; >> } else { >> ret = io_install_fixed_file(req, file, issue_flags, >> accept->file_slot - 1); >> } >> - __io_req_complete(req, issue_flags, ret, 0); >> - return 0; >> + >> + if (req->flags & REQ_F_APOLL_MULTISHOT) { >> + spin_lock(&ctx->completion_lock); >> + if (io_cqring_fill_event(ctx, req->user_data, ret, 0)) { >> + io_commit_cqring(ctx); >> + ctx->cq_extra++; >> + } >> + spin_unlock(&ctx->completion_lock); >> + goto retry; >> + } else { >> + __io_req_complete(req, issue_flags, ret, 0); >> + } >> + return ret2; >> } >> >> static int io_connect_prep_async(struct io_kiocb *req) >> > -- Pavel Begunkov
next prev parent reply other threads:[~2021-09-04 22:41 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-03 11:00 [RFC 0/6] fast poll multishot mode Hao Xu 2021-09-03 11:00 ` [PATCH 1/6] io_uring: enhance flush completion logic Hao Xu 2021-09-03 11:42 ` Pavel Begunkov 2021-09-03 12:08 ` Hao Xu 2021-09-03 12:27 ` Pavel Begunkov 2021-09-03 13:38 ` Hao Xu 2021-09-17 18:49 ` Hao Xu 2021-09-03 11:00 ` [PATCH 2/6] io_uring: add IORING_ACCEPT_MULTISHOT for accept Hao Xu 2021-09-03 11:00 ` [PATCH 3/6] io_uring: add REQ_F_APOLL_MULTISHOT for requests Hao Xu 2021-09-03 11:00 ` [PATCH 4/6] io_uring: let fast poll support multishot Hao Xu 2021-09-06 15:56 ` Pavel Begunkov 2021-09-06 17:40 ` Hao Xu 2021-09-06 19:09 ` Pavel Begunkov 2021-09-07 6:38 ` Hao Xu 2021-09-06 19:04 ` Pavel Begunkov 2021-09-07 6:48 ` Hao Xu 2021-09-08 11:21 ` Hao Xu 2021-09-08 12:03 ` Pavel Begunkov 2021-09-08 13:13 ` Pavel Begunkov 2021-09-09 7:01 ` Hao Xu 2021-09-09 8:29 ` Hao Xu 2021-09-11 10:49 ` Pavel Begunkov 2021-09-11 20:19 ` Hao Xu 2021-09-03 11:00 ` [PATCH 5/6] io_uring: implement multishot mode for accept Hao Xu 2021-09-04 22:39 ` Pavel Begunkov 2021-09-04 22:40 ` Pavel Begunkov [this message] 2021-09-06 15:34 ` Pavel Begunkov 2021-09-03 11:00 ` [PATCH 6/6] io_uring: enable " Hao Xu 2021-09-03 16:29 ` Jens Axboe 2021-09-04 15:34 ` Hao Xu 2021-09-04 18:40 ` Jens Axboe 2021-09-04 22:46 ` Pavel Begunkov 2021-09-05 7:29 ` Hao Xu 2021-09-05 19:44 ` Jens Axboe 2021-09-06 8:26 ` Hao Xu 2021-09-06 8:28 ` Hao Xu 2021-09-06 13:24 ` Jens Axboe 2021-09-06 12:35 ` Hao Xu 2021-09-06 13:31 ` Jens Axboe 2021-09-06 15:00 ` Hao Xu 2021-09-06 15:32 ` Pavel Begunkov 2021-09-06 16:42 ` Jens Axboe 2021-09-04 22:43 ` Pavel Begunkov 2021-09-05 6:25 ` Hao Xu 2021-09-05 8:27 ` Pavel Begunkov 2021-09-03 11:02 ` [RFC 0/6] fast poll multishot mode Hao Xu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=64734f7c-aaee-7ac7-752e-2d81a475d3d8@gmail.com \ --to=asml.silence@gmail.com \ --cc=axboe@kernel.dk \ --cc=haoxu@linux.alibaba.com \ --cc=io-uring@vger.kernel.org \ --cc=joseph.qi@linux.alibaba.com \ --subject='Re: [PATCH 5/6] io_uring: implement multishot mode for accept' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).