From: Dylan Yudaken <[email protected]>
To: Jens Axboe <[email protected]>, Pavel Begunkov <[email protected]>
Cc: <[email protected]>, <[email protected]>,
Dylan Yudaken <[email protected]>
Subject: [PATCH for-next 2/4] io_uring: revert "io_uring: fix multishot poll on overflow"
Date: Mon, 7 Nov 2022 04:52:34 -0800 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
This is no longer needed after commit aa1df3a360a0 ("io_uring: fix CQE
reordering"), since all reordering is now taken care of.
This reverts commit a2da676376fe ("io_uring: fix multishot poll on
overflow").
Signed-off-by: Dylan Yudaken <[email protected]>
---
io_uring/poll.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/io_uring/poll.c b/io_uring/poll.c
index 589b60fc740a..e1b8652b670f 100644
--- a/io_uring/poll.c
+++ b/io_uring/poll.c
@@ -244,10 +244,8 @@ static int io_poll_check_events(struct io_kiocb *req, bool *locked)
req->apoll_events);
if (!io_post_aux_cqe(ctx, req->cqe.user_data,
- mask, IORING_CQE_F_MORE, false)) {
- io_req_set_res(req, mask, 0);
- return IOU_POLL_REMOVE_POLL_USE_RES;
- }
+ mask, IORING_CQE_F_MORE, true))
+ return -ECANCELED;
} else {
ret = io_poll_issue(req, locked);
if (ret == IOU_STOP_MULTISHOT)
--
2.30.2
next prev parent reply other threads:[~2022-11-07 12:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-07 12:52 [PATCH for-next 0/4] io_uring: cleanup allow_overflow on post_cqe Dylan Yudaken
2022-11-07 12:52 ` [PATCH for-next 1/4] io_uring: revert "io_uring fix multishot accept ordering" Dylan Yudaken
2022-11-07 12:52 ` Dylan Yudaken [this message]
2022-11-07 12:52 ` [PATCH for-next 3/4] io_uring: allow multishot recv CQEs to overflow Dylan Yudaken
2022-11-07 12:52 ` [PATCH for-next 4/4] io_uring: remove allow_overflow parameter Dylan Yudaken
2022-11-07 20:18 ` [PATCH for-next 0/4] io_uring: cleanup allow_overflow on post_cqe 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 \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox