From: Jens Axboe <axboe@kernel.dk>
To: Pavel Begunkov <asml.silence@gmail.com>,
Jiri Slaby <jirislaby@kernel.org>,
io-uring@vger.kernel.org
Subject: Re: [PATCH 2/7] io_uring/net: don't overflow multishot recv
Date: Thu, 14 Sep 2023 08:15:15 -0600 [thread overview]
Message-ID: <b765714b-b520-4339-8b30-920e0d6cb3dd@kernel.dk> (raw)
In-Reply-To: <a7d1a399-8f4a-19de-a20e-5ce76a55a781@gmail.com>
On 9/14/23 7:02 AM, Pavel Begunkov wrote:
> On 9/14/23 09:34, Jiri Slaby wrote:
>> On 11. 08. 23, 14:53, Pavel Begunkov wrote:
>>> Don't allow overflowing multishot recv CQEs, it might get out of
>>> hand, hurt performanece, and in the worst case scenario OOM the task.
>>>
>>> Cc: stable@vger.kernel.org
>>> Fixes: b3fdea6ecb55c ("io_uring: multishot recv")
>>> Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
>>> ---
>>> io_uring/net.c | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/io_uring/net.c b/io_uring/net.c
>>> index 1599493544a5..8c419c01a5db 100644
>>> --- a/io_uring/net.c
>>> +++ b/io_uring/net.c
>>> @@ -642,7 +642,7 @@ static inline bool io_recv_finish(struct io_kiocb *req, int *ret,
>>> if (!mshot_finished) {
>>> if (io_aux_cqe(req, issue_flags & IO_URING_F_COMPLETE_DEFER,
>>> - *ret, cflags | IORING_CQE_F_MORE, true)) {
>>> + *ret, cflags | IORING_CQE_F_MORE, false)) {
>>
>> This one breaks iouring's recv-multishot.t test:
>> Running test recv-multishot.t MORE flag not set
>> test stream=0 wait_each=0 recvmsg=0 early_error=4 defer=0 failed
>> Test recv-multishot.t failed with ret 1
>>
>> Is the commit or the test broken ;)?
>
> The test is not right. I fixed it up while sending the kernel patch,
> but a new liburing version hasn't been cut yet and I assume you're
> not using upstream version?
I'll probably cut a new release soonish, we're after the merge window
now so whatever went into 6.6-rc should be solid/sane API wise.
--
Jens Axboe
next prev parent reply other threads:[~2023-09-14 14:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-11 12:53 [PATCH 0/7] random fixes and cleanups Pavel Begunkov
2023-08-11 12:53 ` [PATCH 1/7] io_uring/net: don't overflow multishot accept Pavel Begunkov
2023-08-11 12:53 ` [PATCH 2/7] io_uring/net: don't overflow multishot recv Pavel Begunkov
2023-09-14 8:34 ` Jiri Slaby
2023-09-14 13:02 ` Pavel Begunkov
2023-09-14 14:15 ` Jens Axboe [this message]
2023-08-11 12:53 ` [PATCH 3/7] io_uring: open code io_fill_cqe_req() Pavel Begunkov
2023-08-11 12:53 ` [PATCH 4/7] io_uring: remove return from io_req_cqe_overflow() Pavel Begunkov
2023-08-11 12:53 ` [PATCH 5/7] io_uring: never overflow io_aux_cqe Pavel Begunkov
2023-08-11 12:53 ` [PATCH 6/7] io_uring/rsrc: keep one global dummy_ubuf Pavel Begunkov
2023-08-11 12:53 ` [PATCH 7/7] io_uring: simplify io_run_task_work_sig return Pavel Begunkov
2023-08-11 16:43 ` [PATCH 0/7] random fixes and cleanups Jens Axboe
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=b765714b-b520-4339-8b30-920e0d6cb3dd@kernel.dk \
--to=axboe@kernel.dk \
--cc=asml.silence@gmail.com \
--cc=io-uring@vger.kernel.org \
--cc=jirislaby@kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.