test/sync-cancel: test IORING_ASYNC_CANCEL_OP

Signed-off-by: Jens Axboe <[email protected]>

test/sync-cancel.c

@@ -15,7 +15,7 @@
 
 static int no_sync_cancel;
 
-static int test_sync_cancel_timeout(struct io_uring *ring, int async)
+static int test_sync_cancel_timeout(struct io_uring *ring, int async, int by_op)
 {
 	struct io_uring_sync_cancel_reg reg = { };
 	struct io_uring_sqe *sqe;
@@ -43,7 +43,8 @@ static int test_sync_cancel_timeout(struct io_uring *ring, int async)
 
 	usleep(10000);
 
-	reg.addr = 0x89;
+	reg.flags = IORING_ASYNC_CANCEL_OP;
+	reg.opcode = IORING_OP_READ;
 	reg.timeout.tv_nsec = 1;
 	ret = io_uring_register_sync_cancel(ring, &reg);
 	if (async) {
@@ -80,7 +81,7 @@ static int test_sync_cancel_timeout(struct io_uring *ring, int async)
 }
 
 static int test_sync_cancel(struct io_uring *ring, int async, int nr_all,
-			    int use_fd)
+			    int use_fd, int by_op)
 {
 	struct io_uring_sync_cancel_reg reg = { };
 	struct io_uring_sqe *sqe;
@@ -168,64 +169,90 @@ int main(int argc, char *argv[])
 	else if (ret != T_SETUP_OK)
 		return ret;
 
-	ret = test_sync_cancel(&ring, 0, 0, 0);
+	ret = test_sync_cancel(&ring, 0, 0, 0, 0);
 	if (ret) {
 		fprintf(stderr, "test_sync_cancel 0 0 0 failed\n");
 		return T_EXIT_FAIL;
 	}
 	if (no_sync_cancel)
 		return T_EXIT_SKIP;
 
-	ret = test_sync_cancel(&ring, 1, 0, 0);
+	ret = test_sync_cancel(&ring, 0, 0, 0, 1);
 	if (ret) {
-		fprintf(stderr, "test_sync_cancel 1 0 0 failed\n");
+		fprintf(stderr, "test_sync_cancel 0 0 1 failed\n");
 		return T_EXIT_FAIL;
 	}
 
-	ret = test_sync_cancel(&ring, 0, 1, 0);
+	ret = test_sync_cancel(&ring, 1, 0, 0, 0);
 	if (ret) {
-		fprintf(stderr, "test_sync_cancel 0 1 0 failed\n");
+		fprintf(stderr, "test_sync_cancel 1 0 0 0 failed\n");
 		return T_EXIT_FAIL;
 	}
 
-	ret = test_sync_cancel(&ring, 1, 1, 0);
+	ret = test_sync_cancel(&ring, 1, 0, 0, 1);
 	if (ret) {
-		fprintf(stderr, "test_sync_cancel 1 1 0 failed\n");
+		fprintf(stderr, "test_sync_cancel 1 0 0 1 failed\n");
 		return T_EXIT_FAIL;
 	}
 
-	ret = test_sync_cancel(&ring, 0, 0, 1);
+
+	ret = test_sync_cancel(&ring, 0, 1, 0, 0);
 	if (ret) {
-		fprintf(stderr, "test_sync_cancel 0 0 1 failed\n");
+		fprintf(stderr, "test_sync_cancel 0 1 0 0 failed\n");
+		return T_EXIT_FAIL;
+	}
+
+	ret = test_sync_cancel(&ring, 0, 1, 0, 1);
+	if (ret) {
+		fprintf(stderr, "test_sync_cancel 0 1 0 1 failed\n");
+		return T_EXIT_FAIL;
+	}
+
+
+	ret = test_sync_cancel(&ring, 1, 1, 0, 0);
+	if (ret) {
+		fprintf(stderr, "test_sync_cancel 1 1 0 0 failed\n");
+		return T_EXIT_FAIL;
+	}
+
+	ret = test_sync_cancel(&ring, 0, 0, 1, 0);
+	if (ret) {
+		fprintf(stderr, "test_sync_cancel 0 0 1 0 failed\n");
+		return T_EXIT_FAIL;
+	}
+
+	ret = test_sync_cancel(&ring, 1, 0, 1, 0);
+	if (ret) {
+		fprintf(stderr, "test_sync_cancel 1 0 1 0 failed\n");
 		return T_EXIT_FAIL;
 	}
 
-	ret = test_sync_cancel(&ring, 1, 0, 1);
+	ret = test_sync_cancel(&ring, 0, 1, 1, 0);
 	if (ret) {
-		fprintf(stderr, "test_sync_cancel 1 0 1 failed\n");
+		fprintf(stderr, "test_sync_cancel 0 1 1 0 failed\n");
 		return T_EXIT_FAIL;
 	}
 
-	ret = test_sync_cancel(&ring, 0, 1, 1);
+	ret = test_sync_cancel(&ring, 1, 1, 1, 0);
 	if (ret) {
-		fprintf(stderr, "test_sync_cancel 0 1 1 failed\n");
+		fprintf(stderr, "test_sync_cancel 1 1 1 0 failed\n");
 		return T_EXIT_FAIL;
 	}
 
-	ret = test_sync_cancel(&ring, 1, 1, 1);
+	ret = test_sync_cancel_timeout(&ring, 0, 0);
 	if (ret) {
-		fprintf(stderr, "test_sync_cancel 1 1 1 failed\n");
+		fprintf(stderr, "test_sync_cancel_timeout 0 0\n");
 		return T_EXIT_FAIL;
 	}
 
-	ret = test_sync_cancel_timeout(&ring, 0);
+	ret = test_sync_cancel_timeout(&ring, 0, 1);
 	if (ret) {
-		fprintf(stderr, "test_sync_cancel_timeout 0\n");
+		fprintf(stderr, "test_sync_cancel_timeout 0 1\n");
 		return T_EXIT_FAIL;
 	}
 
 	/* must be last, leaves request */
-	ret = test_sync_cancel_timeout(&ring, 1);
+	ret = test_sync_cancel_timeout(&ring, 1, 0);
 	if (ret) {
 		fprintf(stderr, "test_sync_cancel_timeout 1\n");
 		return T_EXIT_FAIL;