From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH liburing 2/4] test: fix zc tests
Date: Wed, 21 Sep 2022 12:21:56 +0100 [thread overview]
Message-ID: <1529ac2cc55de274f3cf96aa150f56b5d550a19c.1663759148.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
Decouple result from F_NOTIF/F_MORE, even failed requests may produce a
notification.
Signed-off-by: Pavel Begunkov <[email protected]>
---
test/send-zerocopy.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/test/send-zerocopy.c b/test/send-zerocopy.c
index 39c5c5d..e34e0c1 100644
--- a/test/send-zerocopy.c
+++ b/test/send-zerocopy.c
@@ -117,7 +117,7 @@ static int test_send_faults(struct io_uring *ring, int sock_tx, int sock_rx)
int msg_flags = 0;
unsigned zc_flags = 0;
int payload_size = 100;
- int ret, i;
+ int ret, i, nr_cqes = 2;
sqe = io_uring_get_sqe(ring);
io_uring_prep_send_zc(sqe, sock_tx, (void *)1UL, payload_size,
@@ -125,7 +125,7 @@ static int test_send_faults(struct io_uring *ring, int sock_tx, int sock_rx)
sqe->user_data = 1;
sqe = io_uring_get_sqe(ring);
- io_uring_prep_send_zc(sqe, sock_tx, (void *)1UL, payload_size,
+ io_uring_prep_send_zc(sqe, sock_tx, tx_buffer, payload_size,
msg_flags, zc_flags);
sqe->user_data = 2;
io_uring_prep_send_set_addr(sqe, (const struct sockaddr *)1UL,
@@ -134,12 +134,18 @@ static int test_send_faults(struct io_uring *ring, int sock_tx, int sock_rx)
ret = io_uring_submit(ring);
assert(ret == 2);
- for (i = 0; i < 2; i++) {
+ for (i = 0; i < nr_cqes; i++) {
ret = io_uring_wait_cqe(ring, &cqe);
assert(!ret);
assert(cqe->user_data <= 2);
- assert(cqe->res == -EFAULT);
- assert(!(cqe->flags & IORING_CQE_F_MORE));
+
+ if (cqe->flags & IORING_CQE_F_NOTIF) {
+ assert(ret > 0);
+ } else {
+ assert(cqe->res == -EFAULT);
+ if (cqe->flags & IORING_CQE_F_MORE)
+ nr_cqes++;
+ }
io_uring_cqe_seen(ring, cqe);
}
assert(check_cq_empty(ring));
--
2.37.2
next prev parent reply other threads:[~2022-09-21 11:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-21 11:21 [PATCH liburing 0/4] zc changes Pavel Begunkov
2022-09-21 11:21 ` [PATCH liburing 1/4] examples: fix sendzc notif handling Pavel Begunkov
2022-09-21 11:21 ` Pavel Begunkov [this message]
2022-09-21 11:21 ` [PATCH liburing 3/4] man: note about notification generation Pavel Begunkov
2022-09-21 11:21 ` [PATCH liburing 4/4] tests: add sendmsg_zc tests Pavel Begunkov
2022-09-21 15:00 ` [PATCH liburing 0/4] zc changes 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=1529ac2cc55de274f3cf96aa150f56b5d550a19c.1663759148.git.asml.silence@gmail.com \
[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