public inbox for [email protected]
 help / color / mirror / Atom feed
* [PATCH liburing] tests: test close with fixed file table
@ 2021-09-24 19:07 Pavel Begunkov
  2021-09-24 19:14 ` Pavel Begunkov
  2021-09-24 20:33 ` Jens Axboe
  0 siblings, 2 replies; 3+ messages in thread
From: Pavel Begunkov @ 2021-09-24 19:07 UTC (permalink / raw)
  To: Jens Axboe, io-uring

Test IO_CLOSE closing files in the fixed file table.

Signed-off-by: Pavel Begunkov <[email protected]>
---

P.S. not tested with kernels not supporting the feature

 test/open-close.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)

diff --git a/test/open-close.c b/test/open-close.c
index 648737c..d5c116b 100644
--- a/test/open-close.c
+++ b/test/open-close.c
@@ -9,10 +9,119 @@
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
+#include <assert.h>
 
 #include "helpers.h"
 #include "liburing.h"
 
+static int submit_wait(struct io_uring *ring)
+{
+	struct io_uring_cqe *cqe;
+	int ret;
+
+	ret = io_uring_submit(ring);
+	if (ret <= 0) {
+		fprintf(stderr, "sqe submit failed: %d\n", ret);
+		return 1;
+	}
+	ret = io_uring_wait_cqe(ring, &cqe);
+	if (ret < 0) {
+		fprintf(stderr, "wait completion %d\n", ret);
+		return 1;
+	}
+
+	ret = cqe->res;
+	io_uring_cqe_seen(ring, cqe);
+	return ret;
+}
+
+static inline int try_close(struct io_uring *ring, int fd, int slot)
+{
+	struct io_uring_sqe *sqe;
+
+	sqe = io_uring_get_sqe(ring);
+	io_uring_prep_close(sqe, fd);
+	__io_uring_set_target_fixed_file(sqe, slot);
+	return submit_wait(ring);
+}
+
+static int test_close_fixed(void)
+{
+	struct io_uring ring;
+	struct io_uring_sqe *sqe;
+	int ret, fds[2];
+	char buf[1];
+
+	ret = io_uring_queue_init(8, &ring, 0);
+	if (ret) {
+		fprintf(stderr, "ring setup failed\n");
+		return -1;
+	}
+	if (pipe(fds)) {
+		perror("pipe");
+		return -1;
+	}
+
+	ret = try_close(&ring, 0, 0);
+	if (ret == -EINVAL) {
+		fprintf(stderr, "close for fixed files is not supported\n");
+		return 0;
+	} else if (ret != -ENXIO) {
+		fprintf(stderr, "no table failed %i\n", ret);
+		return -1;
+	}
+
+	ret = try_close(&ring, 1, 0);
+	if (ret != -EINVAL) {
+		fprintf(stderr, "set fd failed %i\n", ret);
+		return -1;
+	}
+
+	ret = io_uring_register_files(&ring, fds, 2);
+	if (ret) {
+		fprintf(stderr, "file_register: %d\n", ret);
+		return ret;
+	}
+
+	ret = try_close(&ring, 0, 2);
+	if (ret != -EINVAL) {
+		fprintf(stderr, "out of table failed %i\n", ret);
+		return -1;
+	}
+
+	ret = try_close(&ring, 0, 0);
+	if (ret != 0) {
+		fprintf(stderr, "close failed %i\n", ret);
+		return -1;
+	}
+
+	sqe = io_uring_get_sqe(&ring);
+	io_uring_prep_read(sqe, 0, buf, sizeof(buf), 0);
+	sqe->flags |= IOSQE_FIXED_FILE;
+	ret = submit_wait(&ring);
+	if (ret != -EBADF) {
+		fprintf(stderr, "read failed %i\n", ret);
+		return -1;
+	}
+
+	ret = try_close(&ring, 0, 1);
+	if (ret != 0) {
+		fprintf(stderr, "close 2 failed %i\n", ret);
+		return -1;
+	}
+
+	ret = try_close(&ring, 0, 0);
+	if (ret != -EBADF) {
+		fprintf(stderr, "empty slot failed %i\n", ret);
+		return -1;
+	}
+
+	close(fds[0]);
+	close(fds[1]);
+	io_uring_queue_exit(&ring);
+	return 0;
+}
+
 static int test_close(struct io_uring *ring, int fd, int is_ring_fd)
 {
 	struct io_uring_cqe *cqe;
@@ -133,6 +242,12 @@ int main(int argc, char *argv[])
 		goto err;
 	}
 
+	ret = test_close_fixed();
+	if (ret) {
+		fprintf(stderr, "test_close_fixed failed\n");
+		goto err;
+	}
+
 done:
 	unlink(path);
 	if (do_unlink)
-- 
2.33.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH liburing] tests: test close with fixed file table
  2021-09-24 19:07 [PATCH liburing] tests: test close with fixed file table Pavel Begunkov
@ 2021-09-24 19:14 ` Pavel Begunkov
  2021-09-24 20:33 ` Jens Axboe
  1 sibling, 0 replies; 3+ messages in thread
From: Pavel Begunkov @ 2021-09-24 19:14 UTC (permalink / raw)
  To: Jens Axboe, io-uring

On 9/24/21 8:07 PM, Pavel Begunkov wrote:
> Test IO_CLOSE closing files in the fixed file table.

s/IO_CLOSE/OP_CLOSE/

> 
> Signed-off-by: Pavel Begunkov <[email protected]>
> ---
> 
> P.S. not tested with kernels not supporting the feature
> 
>  test/open-close.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 115 insertions(+)
> 
> diff --git a/test/open-close.c b/test/open-close.c
> index 648737c..d5c116b 100644
> --- a/test/open-close.c
> +++ b/test/open-close.c
> @@ -9,10 +9,119 @@
>  #include <stdlib.h>
>  #include <string.h>
>  #include <fcntl.h>
> +#include <assert.h>
>  
>  #include "helpers.h"
>  #include "liburing.h"
>  
> +static int submit_wait(struct io_uring *ring)
> +{
> +	struct io_uring_cqe *cqe;
> +	int ret;
> +
> +	ret = io_uring_submit(ring);
> +	if (ret <= 0) {
> +		fprintf(stderr, "sqe submit failed: %d\n", ret);
> +		return 1;
> +	}
> +	ret = io_uring_wait_cqe(ring, &cqe);
> +	if (ret < 0) {
> +		fprintf(stderr, "wait completion %d\n", ret);
> +		return 1;
> +	}
> +
> +	ret = cqe->res;
> +	io_uring_cqe_seen(ring, cqe);
> +	return ret;
> +}
> +
> +static inline int try_close(struct io_uring *ring, int fd, int slot)
> +{
> +	struct io_uring_sqe *sqe;
> +
> +	sqe = io_uring_get_sqe(ring);
> +	io_uring_prep_close(sqe, fd);
> +	__io_uring_set_target_fixed_file(sqe, slot);
> +	return submit_wait(ring);
> +}
> +
> +static int test_close_fixed(void)
> +{
> +	struct io_uring ring;
> +	struct io_uring_sqe *sqe;
> +	int ret, fds[2];
> +	char buf[1];
> +
> +	ret = io_uring_queue_init(8, &ring, 0);
> +	if (ret) {
> +		fprintf(stderr, "ring setup failed\n");
> +		return -1;
> +	}
> +	if (pipe(fds)) {
> +		perror("pipe");
> +		return -1;
> +	}
> +
> +	ret = try_close(&ring, 0, 0);
> +	if (ret == -EINVAL) {
> +		fprintf(stderr, "close for fixed files is not supported\n");
> +		return 0;
> +	} else if (ret != -ENXIO) {
> +		fprintf(stderr, "no table failed %i\n", ret);
> +		return -1;
> +	}
> +
> +	ret = try_close(&ring, 1, 0);
> +	if (ret != -EINVAL) {
> +		fprintf(stderr, "set fd failed %i\n", ret);
> +		return -1;
> +	}
> +
> +	ret = io_uring_register_files(&ring, fds, 2);
> +	if (ret) {
> +		fprintf(stderr, "file_register: %d\n", ret);
> +		return ret;
> +	}
> +
> +	ret = try_close(&ring, 0, 2);
> +	if (ret != -EINVAL) {
> +		fprintf(stderr, "out of table failed %i\n", ret);
> +		return -1;
> +	}
> +
> +	ret = try_close(&ring, 0, 0);
> +	if (ret != 0) {
> +		fprintf(stderr, "close failed %i\n", ret);
> +		return -1;
> +	}
> +
> +	sqe = io_uring_get_sqe(&ring);
> +	io_uring_prep_read(sqe, 0, buf, sizeof(buf), 0);
> +	sqe->flags |= IOSQE_FIXED_FILE;
> +	ret = submit_wait(&ring);
> +	if (ret != -EBADF) {
> +		fprintf(stderr, "read failed %i\n", ret);
> +		return -1;
> +	}
> +
> +	ret = try_close(&ring, 0, 1);
> +	if (ret != 0) {
> +		fprintf(stderr, "close 2 failed %i\n", ret);
> +		return -1;
> +	}
> +
> +	ret = try_close(&ring, 0, 0);
> +	if (ret != -EBADF) {
> +		fprintf(stderr, "empty slot failed %i\n", ret);
> +		return -1;
> +	}
> +
> +	close(fds[0]);
> +	close(fds[1]);
> +	io_uring_queue_exit(&ring);
> +	return 0;
> +}
> +
>  static int test_close(struct io_uring *ring, int fd, int is_ring_fd)
>  {
>  	struct io_uring_cqe *cqe;
> @@ -133,6 +242,12 @@ int main(int argc, char *argv[])
>  		goto err;
>  	}
>  
> +	ret = test_close_fixed();
> +	if (ret) {
> +		fprintf(stderr, "test_close_fixed failed\n");
> +		goto err;
> +	}
> +
>  done:
>  	unlink(path);
>  	if (do_unlink)
> 

-- 
Pavel Begunkov

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH liburing] tests: test close with fixed file table
  2021-09-24 19:07 [PATCH liburing] tests: test close with fixed file table Pavel Begunkov
  2021-09-24 19:14 ` Pavel Begunkov
@ 2021-09-24 20:33 ` Jens Axboe
  1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2021-09-24 20:33 UTC (permalink / raw)
  To: Pavel Begunkov, io-uring

On 9/24/21 1:07 PM, Pavel Begunkov wrote:
> Test IO_CLOSE closing files in the fixed file table.

Applied, thanks.

-- 
Jens Axboe


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-09-24 20:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-24 19:07 [PATCH liburing] tests: test close with fixed file table Pavel Begunkov
2021-09-24 19:14 ` Pavel Begunkov
2021-09-24 20:33 ` Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox