zig

commit 52651ae7a0deaffff1ecfd47b503ebb1c95aee32 (tree)
parent 62453496bac17f13e1e129de5cf08accddc02302
Author: Brian Gold <brian.t.gold@gmail.com>
Date:   Mon,  9 May 2022 20:52:09 -0700

io_uring cancel test must tolerate CQ reordering

Fixes #11382. Tested on ArchLinux 5.17.5-arch1-1.

Diffstat:
M
lib/std/os/linux/io_uring.zig
 | 
14
++++++++++++--

1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/lib/std/os/linux/io_uring.zig b/lib/std/os/linux/io_uring.zig
@@ -2400,15 +2400,25 @@ test "accept/connect/recv/cancel" {
     try testing.expectEqual(@as(u64, 0x99999999), sqe_cancel.user_data);
     try testing.expectEqual(@as(u32, 1), try ring.submit());
 
-    const cqe_recv = try ring.copy_cqe();
+    var cqe_recv = try ring.copy_cqe();
     if (cqe_recv.err() == .INVAL) return error.SkipZigTest;
+    var cqe_cancel = try ring.copy_cqe();
+    if (cqe_cancel.err() == .INVAL) return error.SkipZigTest;
+
+    // The recv/cancel CQEs may arrive in any order, the recv CQE will sometimes come first:
+    if (cqe_recv.user_data == 0x99999999 and cqe_cancel.user_data == 0xffffffff) {
+        const a = cqe_recv;
+        const b = cqe_cancel;
+        cqe_recv = b;
+        cqe_cancel = a;
+    }
+
     try testing.expectEqual(linux.io_uring_cqe{
         .user_data = 0xffffffff,
         .res = -@as(i32, @enumToInt(linux.E.CANCELED)),
         .flags = 0,
     }, cqe_recv);
 
-    const cqe_cancel = try ring.copy_cqe();
     try testing.expectEqual(linux.io_uring_cqe{
         .user_data = 0x99999999,
         .res = 0,