commit ccfe96eb3dca697e58f1dc42f82fb79f01a948b1
author Jens Axboe <axboe@kernel.dk> Sun Feb 07 09:19:14 2021 -0700
committer Jens Axboe <axboe@kernel.dk> Sun Feb 07 09:19:14 2021 -0700
tree d1b1068145eb56042a19125ddb612e2fd52aec44
parent e30b5db259f81e34cd8121012cbb7b43d9e07861

test/poll*: use appropriately sized CQ ring

Signed-off-by: Jens Axboe <axboe@kernel.dk>

test/poll-cancel-ton.c

diff --git a/test/poll-cancel-ton.c b/test/poll-cancel-ton.c
index 1a75463..e9d612e 100644
--- a/test/poll-cancel-ton.c
+++ b/test/poll-cancel-ton.c
@@ -102,6 +102,7 @@
 int main(int argc, char *argv[])
 {
 	struct io_uring ring;
+	struct io_uring_params p = { };
 	int pipe1[2];
 	int ret;
 
@@ -113,10 +114,18 @@
 		return 1;
 	}
 
-	ret = io_uring_queue_init(1024, &ring, 0);
+	p.flags = IORING_SETUP_CQSIZE;
+	p.cq_entries = 16384;
+	ret = io_uring_queue_init_params(1024, &ring, &p);
 	if (ret) {
-		fprintf(stderr, "ring setup failed: %d\n", ret);
-		return 1;
+		if (ret == -EINVAL) {
+			fprintf(stdout, "No CQSIZE, trying without\n");
+			ret = io_uring_queue_init(1024, &ring, 0);
+			if (ret) {
+				fprintf(stderr, "ring setup failed: %d\n", ret);
+				return 1;
+			}
+		}
 	}
 
 	add_polls(&ring, pipe1[0], 30000);

test/poll-many.c

diff --git a/test/poll-many.c b/test/poll-many.c
index 723a353..3f8d08d 100644
--- a/test/poll-many.c
+++ b/test/poll-many.c
@@ -140,6 +140,7 @@
 int main(int argc, char *argv[])
 {
 	struct io_uring ring;
+	struct io_uring_params params = { };
 	struct rlimit rlim;
 	int i, ret;
 
@@ -169,9 +170,18 @@
 		}
 	}
 
-	if (io_uring_queue_init(RING_SIZE, &ring, 0)) {
-		fprintf(stderr, "failed ring init\n");
-		goto err_noring;
+	params.flags = IORING_SETUP_CQSIZE;
+	params.cq_entries = 4096;
+	ret = io_uring_queue_init_params(RING_SIZE, &ring, &params);
+	if (ret) {
+		if (ret == -EINVAL) {
+			fprintf(stdout, "No CQSIZE, trying without\n");
+			ret = io_uring_queue_init(RING_SIZE, &ring, 0);
+			if (ret) {
+				fprintf(stderr, "ring setup failed: %d\n", ret);
+				return 1;
+			}
+		}
 	}
 
 	if (arm_polls(&ring))