diff mbox series

[for-next,1/1] selftest/net: adjust io_uring sendzc notif handling

Message ID aac948ea753a8bfe1fa3b82fe45debcb54586369.1663953085.git.asml.silence@gmail.com (mailing list archive)
State New
Headers show
Series [for-next,1/1] selftest/net: adjust io_uring sendzc notif handling | expand

Commit Message

Pavel Begunkov Sept. 23, 2022, 5:12 p.m. UTC 
It's not currently possible but in the future we may get
IORING_CQE_F_MORE and so a notification even for a failed request, i.e.
when cqe->res <= 0. That's precisely what the documentation says, so
adjust the test and do IORING_CQE_F_MORE checks regardless of the main
completion cqe->res.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
 .../selftests/net/io_uring_zerocopy_tx.c      | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

Comments

Jens Axboe Sept. 23, 2022, 9:01 p.m. UTC | #1 
On Fri, 23 Sep 2022 18:12:09 +0100, Pavel Begunkov wrote:
> It's not currently possible but in the future we may get
> IORING_CQE_F_MORE and so a notification even for a failed request, i.e.
> when cqe->res <= 0. That's precisely what the documentation says, so
> adjust the test and do IORING_CQE_F_MORE checks regardless of the main
> completion cqe->res.
> 
> 
> [...]

Applied, thanks!

[1/1] selftest/net: adjust io_uring sendzc notif handling
      commit: 4781185da411c0b51ef9b1db557c1ea28ac11de4

Best regards,
diff mbox series

Patch

diff --git a/tools/testing/selftests/net/io_uring_zerocopy_tx.c b/tools/testing/selftests/net/io_uring_zerocopy_tx.c
index 8ce48aca8321..154287740172 100644
--- a/tools/testing/selftests/net/io_uring_zerocopy_tx.c
+++ b/tools/testing/selftests/net/io_uring_zerocopy_tx.c
@@ -400,7 +400,6 @@  static void do_tx(int domain, int type, int protocol)
 						   cfg_payload_len, msg_flags);
 				sqe->user_data = NONZC_TAG;
 			} else {
-				compl_cqes++;
 				io_uring_prep_sendzc(sqe, fd, payload,
 						     cfg_payload_len,
 						     msg_flags, zc_flags);
@@ -430,18 +429,23 @@  static void do_tx(int domain, int type, int protocol)
 			if (cqe->flags & IORING_CQE_F_NOTIF) {
 				if (cqe->flags & IORING_CQE_F_MORE)
 					error(1, -EINVAL, "invalid notif flags");
+				if (compl_cqes <= 0)
+					error(1, -EINVAL, "notification mismatch");
 				compl_cqes--;
 				i--;
-			} else if (cqe->res <= 0) {
-				if (cqe->flags & IORING_CQE_F_MORE)
-					error(1, cqe->res, "more with a failed send");
-				error(1, cqe->res, "send failed");
-			} else {
-				if (cqe->user_data == ZC_TAG &&
-				    !(cqe->flags & IORING_CQE_F_MORE))
-					error(1, cqe->res, "missing more flag");
+				io_uring_cqe_seen(&ring);
+				continue;
+			}
+			if (cqe->flags & IORING_CQE_F_MORE) {
+				if (cqe->user_data != ZC_TAG)
+					error(1, cqe->res, "unexpected F_MORE");
+				compl_cqes++;
+			}
+			if (cqe->res >= 0) {
 				packets++;
 				bytes += cqe->res;
+			} else if (cqe->res != -EAGAIN) {
+				error(1, cqe->res, "send failed");
 			}
 			io_uring_cqe_seen(&ring);
 		}