All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hao Xu <haoxu@linux.alibaba.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: io-uring@vger.kernel.org, Pavel Begunkov <asml.silence@gmail.com>,
	Joseph Qi <joseph.qi@linux.alibaba.com>
Subject: [PATCH liburing] io-cancel: add check for -ECANCELED
Date: Tue, 19 Oct 2021 17:23:52 +0800	[thread overview]
Message-ID: <20211019092352.29782-1-haoxu@linux.alibaba.com> (raw)

The req to be async cancelled will most likely return -ECANCELED after
cancellation with the new async bybrid optimization applied. And -EINTR
is impossible to be returned anymore since we won't be in INTERRUPTABLE
sleep when reading, so remove it.

Signed-off-by: Hao Xu <haoxu@linux.alibaba.com>
---
 test/io-cancel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/io-cancel.c b/test/io-cancel.c
index b5b443dc467b..c761e126be0c 100644
--- a/test/io-cancel.c
+++ b/test/io-cancel.c
@@ -341,7 +341,7 @@ static int test_cancel_req_across_fork(void)
 				fprintf(stderr, "wait_cqe=%d\n", ret);
 				return 1;
 			}
-			if ((cqe->user_data == 1 && cqe->res != -EINTR) ||
+			if ((cqe->user_data == 1 && cqe->res != -ECANCELED) ||
 			    (cqe->user_data == 2 && cqe->res != -EALREADY && cqe->res)) {
 				fprintf(stderr, "%i %i\n", (int)cqe->user_data, cqe->res);
 				exit(1);
-- 
2.24.4


             reply	other threads:[~2021-10-19  9:24 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-19  9:23 Hao Xu [this message]
2021-10-29 12:27 ` [PATCH liburing] io-cancel: add check for -ECANCELED Hao Xu
2021-10-29 13:57   ` Pavel Begunkov
2021-10-29 15:40     ` 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=20211019092352.29782-1-haoxu@linux.alibaba.com \
    --to=haoxu@linux.alibaba.com \
    --cc=asml.silence@gmail.com \
    --cc=axboe@kernel.dk \
    --cc=io-uring@vger.kernel.org \
    --cc=joseph.qi@linux.alibaba.com \
    /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.