Add test case for IORING_OP_POLL

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

3 files changed, 143 insertions, 3 deletions

diff --git a/src/io_uring.h b/src/io_uring.h
index 9bb7181..40a5a89 100644
--- a/src/io_uring.h
+++ b/src/io_uring.h
@@ -11,6 +11,8 @@
 #include <linux/fs.h>
 #include <linux/types.h>
 
+#define IORING_MAX_ENTRIES	4096
+
 /*
  * IO submission data structure (Submission Queue Entry)
  */
@@ -51,6 +53,8 @@ struct io_uring_sqe {
 #define IORING_OP_FSYNC		3
 #define IORING_OP_READ_FIXED	4
 #define IORING_OP_WRITE_FIXED	5
+#define IORING_OP_POLL		6
+#define IORING_OP_POLL_CANCEL	7
 
 /*
  * sqe->fsync_flags
diff --git a/test/Makefile b/test/Makefile
index 3ec3c4d..dcf7a56 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,11 +1,11 @@
 CC = gcc
 CFLAGS ?= -g -O2 -Wall -D_GNU_SOURCE -L../src/
 
-all_targets += io_uring-test io_uring-cp
+all_targets += io_uring-test io_uring-cp poll
 
 all: $(all_targets)
 
-test_srcs := io_uring-test.c io_uring-cp.c
+test_srcs := io_uring-test.c io_uring-cp.c poll.c
 
 test_objs := $(patsubst %.c,%.ol,$(test_srcs))
 
@@ -13,6 +13,7 @@ io_uring-test: io_uring-test.c
 	$(CC) $(CFLAGS) -o $@ io_uring-test.c -luring
 io_uring-cp: io_uring-cp.c
 	$(CC) $(CFLAGS) -o $@ io_uring-cp.c -luring
-
+poll: poll.c
+	$(CC) $(CFLAGS) -o $@ poll.c -luring
 clean:
 	rm -f $(all_targets) $(test_objs)
diff --git a/test/poll.c b/test/poll.c
new file mode 100644
index 0000000..3316068
--- /dev/null
+++ b/test/poll.c
@@ -0,0 +1,135 @@
+/*
+ * Description: test io_uring poll handling
+ *
+ * Based on 22.t from libaio
+ */
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/poll.h>
+#include <sys/wait.h>
+
+#include "../src/liburing.h"
+
+int main(int argc, char *argv[])
+{
+	pid_t parent = getpid(), p;
+	int pipe1[2], pipe2[2];
+	struct io_uring cring, pring;
+	struct io_uring_cqe *cqe;
+	struct io_uring_sqe *sqe;
+	int ret;
+
+	if (pipe(pipe1) != 0 || pipe(pipe2) != 0) {
+		printf("pipe failed\n");
+		return 1;
+	}
+
+	p = fork();
+	switch (p) {
+	case -1:
+		printf("fork failed\n");
+		exit(2);
+	case 0:
+		close(pipe1[1]);
+		close(pipe2[0]);
+
+		ret = io_uring_queue_init(1, &cring, 0);
+		if (ret) {
+			printf("child: ring setup failed\n");
+			return 1;
+		}
+
+		sqe = io_uring_get_sqe(&cring);
+		if (!sqe) {
+			printf("child: get sqe failed\n");
+			return 1;
+		}
+
+		sqe->opcode = IORING_OP_POLL;
+		sqe->flags = 0;
+		sqe->ioprio = 0;
+		sqe->fd = pipe1[0];
+		sqe->addr = POLLIN;
+		sqe->off = 0;
+		sqe->len = 0;
+		sqe->buf_index = 0;
+		sqe->user_data = (unsigned long) &sqe;
+
+		ret = io_uring_submit(&cring);
+		if (ret <= 0) {
+			printf("child: sqe submit failed\n");
+			return 1;
+		}
+
+		do {
+			if (getppid() != parent) {
+				printf("parent died\n");
+				exit(2);
+			}
+			ret = io_uring_wait_completion(&cring, &cqe);
+		} while (ret != 0);
+
+		if (ret < 0) {
+			printf("child: completion get failed\n");
+			return 1;
+		}
+
+		do {
+			errno = 0;
+			ret = write(pipe2[1], "foo", 3);
+		} while (ret == -1 && errno == EINTR);
+
+		exit(0);
+	default:
+		close(pipe1[0]);
+		close(pipe2[1]);
+
+		ret = io_uring_queue_init(1, &pring, 0);
+		if (ret) {
+			printf("parent: ring setup failed\n");
+			return 1;
+		}
+
+		sqe = io_uring_get_sqe(&pring);
+		if (!sqe) {
+			printf("parent: get sqe failed\n");
+			return 1;
+		}
+
+		sqe->opcode = IORING_OP_POLL;
+		sqe->flags = 0;
+		sqe->ioprio = 0;
+		sqe->fd = pipe2[0];
+		sqe->addr = POLLIN;
+		sqe->off = 0;
+		sqe->len = 0;
+		sqe->buf_index = 0;
+		sqe->user_data = (unsigned long) &sqe;
+
+		ret = io_uring_submit(&pring);
+		if (ret <= 0) {
+			printf("parent: sqe submit failed\n");
+			return 1;
+		}
+
+		kill(p, SIGUSR1);
+
+		ret = io_uring_wait_completion(&pring, &cqe);
+		if (ret < 0) {
+			printf("parent: cqe get failed\n");
+			return 1;
+		}
+		if (cqe->user_data != (unsigned long) &sqe) {
+			printf("parent: cqe wrong fd\n");
+			return 1;
+		}
+		if ((cqe->res & POLLIN) != POLLIN) {
+			printf("parent: cqe did not report readable fd\n");
+			return 1;
+		}
+
+		return 0;
+	}
+}