public inbox for [email protected]
 help / color / mirror / Atom feed
* [PATCH v1] liburing: add test for stable statx api
@ 2022-02-09 19:04 Stefan Roesch
  2022-02-10  0:43 ` Ammar Faizi
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Stefan Roesch @ 2022-02-09 19:04 UTC (permalink / raw)
  To: io-uring, kernel-team; +Cc: viro, shr

This adds a test for the statx api to verify that io-uring statx api is
stable.

Signed-off-by: Stefan Roesch <[email protected]>
---
 test/statx.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/test/statx.c b/test/statx.c
index c0f9e9c..61268d4 100644
--- a/test/statx.c
+++ b/test/statx.c
@@ -77,6 +77,61 @@ err:
 	return -1;
 }
 
+static int test_statx_stable(struct io_uring *ring, const char *path)
+{
+	struct io_uring_cqe *cqe;
+	struct io_uring_sqe *sqe;
+	struct statx x1, x2;
+	char path1[PATH_MAX];
+	char path2[PATH_MAX];
+	int ret = -1;
+
+	strcpy(path2, path);
+	strcpy(path1, path);
+
+	sqe = io_uring_get_sqe(ring);
+	if (!sqe) {
+		fprintf(stderr, "get sqe failed\n");
+		goto err;
+	}
+
+	io_uring_prep_statx(sqe, -1, path1, 0, STATX_ALL, &x1);
+
+	ret = io_uring_submit(ring);
+	if (ret <= 0) {
+		fprintf(stderr, "sqe submit failed: %d\n", ret);
+		goto err;
+	}
+	memset(path1, 0, sizeof(path1));
+
+	ret = io_uring_wait_cqe(ring, &cqe);
+	if (ret < 0) {
+		fprintf(stderr, "wait completion %d\n", ret);
+		goto err;
+	}
+
+	ret = cqe->res;
+	io_uring_cqe_seen(ring, cqe);
+	if (ret) {
+		fprintf(stderr, "statx res = %d\n", ret);
+		goto err;
+	}
+
+	ret = do_statx(-1, path2, 0, STATX_ALL, &x2);
+	if (ret < 0)
+		return statx_syscall_supported();
+
+	if (memcmp(&x1, &x2, sizeof(x1))) {
+		fprintf(stderr, "Miscompare between io_uring and statx\n");
+		goto err;
+	}
+
+	ret = 0;
+
+err:
+	return ret;
+}
+
 static int test_statx_fd(struct io_uring *ring, const char *path)
 {
 	struct io_uring_cqe *cqe;
@@ -156,6 +211,16 @@ int main(int argc, char *argv[])
 		goto err;
 	}
 
+	ret = test_statx_stable(&ring, fname);
+	if (ret) {
+		if (ret == -EINVAL) {
+			fprintf(stdout, "statx not supported, skipping\n");
+			goto done;
+		}
+		fprintf(stderr, "test_statx_loop failed: %d\n", ret);
+		goto err;
+	}
+
 	ret = test_statx_fd(&ring, fname);
 	if (ret) {
 		fprintf(stderr, "test_statx_fd failed: %d\n", ret);

base-commit: d9b0a424471f5c584f1d3f370e1746925733c01a
-- 
2.30.2


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

* Re: [PATCH v1] liburing: add test for stable statx api
  2022-02-09 19:04 [PATCH v1] liburing: add test for stable statx api Stefan Roesch
@ 2022-02-10  0:43 ` Ammar Faizi
  2022-02-10  0:53 ` Ammar Faizi
  2022-02-10  2:06 ` Ammar Faizi
  2 siblings, 0 replies; 4+ messages in thread
From: Ammar Faizi @ 2022-02-10  0:43 UTC (permalink / raw)
  To: Stefan Roesch, io-uring, kernel-team; +Cc: viro

On 2/10/22 2:04 AM, Stefan Roesch wrote:
> This adds a test for the statx api to verify that io-uring statx api is
> stable.
> 
> Signed-off-by: Stefan Roesch <[email protected]>
> ---
>   test/statx.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 65 insertions(+)
> 
> diff --git a/test/statx.c b/test/statx.c
> index c0f9e9c..61268d4 100644
> --- a/test/statx.c
> +++ b/test/statx.c
> @@ -77,6 +77,61 @@ err:
>   	return -1;
>   }
>   
> +static int test_statx_stable(struct io_uring *ring, const char *path)
> +{
> +	struct io_uring_cqe *cqe;
> +	struct io_uring_sqe *sqe;
> +	struct statx x1, x2;
> +	char path1[PATH_MAX];
> +	char path2[PATH_MAX];
> +	int ret = -1;
> +
> +	strcpy(path2, path);
> +	strcpy(path1, path);
> +
> +	sqe = io_uring_get_sqe(ring);
> +	if (!sqe) {
> +		fprintf(stderr, "get sqe failed\n");
> +		goto err;
> +	}
> +
> +	io_uring_prep_statx(sqe, -1, path1, 0, STATX_ALL, &x1);
> +
> +	ret = io_uring_submit(ring);
> +	if (ret <= 0) {
> +		fprintf(stderr, "sqe submit failed: %d\n", ret);
> +		goto err;
> +	}
> +	memset(path1, 0, sizeof(path1));
> +
> +	ret = io_uring_wait_cqe(ring, &cqe);
> +	if (ret < 0) {
> +		fprintf(stderr, "wait completion %d\n", ret);
> +		goto err;
> +	}
> +
> +	ret = cqe->res;
> +	io_uring_cqe_seen(ring, cqe);
> +	if (ret) {
> +		fprintf(stderr, "statx res = %d\n", ret);
> +		goto err;
> +	}
> +
> +	ret = do_statx(-1, path2, 0, STATX_ALL, &x2);
> +	if (ret < 0)
> +		return statx_syscall_supported();
> +
> +	if (memcmp(&x1, &x2, sizeof(x1))) {
> +		fprintf(stderr, "Miscompare between io_uring and statx\n");
> +		goto err;
> +	}

If we fail on memcmp() here, the ret should be set to non-zero *explicitly*.
Otherwise, we have zero exit code since statx returns 0 on success.

I think that one can also be simplified like this:

	ret = memcmp(&x1, &x2, sizeof(x1));
	if (ret)
		fprintf(stderr, "Miscompare between io_uring and statx\n");
	return ret;


-- 
Ammar Faizi

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

* Re: [PATCH v1] liburing: add test for stable statx api
  2022-02-09 19:04 [PATCH v1] liburing: add test for stable statx api Stefan Roesch
  2022-02-10  0:43 ` Ammar Faizi
@ 2022-02-10  0:53 ` Ammar Faizi
  2022-02-10  2:06 ` Ammar Faizi
  2 siblings, 0 replies; 4+ messages in thread
From: Ammar Faizi @ 2022-02-10  0:53 UTC (permalink / raw)
  To: Stefan Roesch, io-uring, kernel-team; +Cc: viro

On 2/10/22 2:04 AM, Stefan Roesch wrote:
> @@ -156,6 +211,16 @@ int main(int argc, char *argv[])
>   		goto err;
>   	}
>   
> +	ret = test_statx_stable(&ring, fname);
> +	if (ret) {
> +		if (ret == -EINVAL) {
> +			fprintf(stdout, "statx not supported, skipping\n");
> +			goto done;
> +		}
> +		fprintf(stderr, "test_statx_loop failed: %d\n", ret);
> +		goto err;
> +	}
> +

Why do we call it test_statx_loop? Isn't the function name test_statx_stable?

-- 
Ammar Faizi

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

* Re: [PATCH v1] liburing: add test for stable statx api
  2022-02-09 19:04 [PATCH v1] liburing: add test for stable statx api Stefan Roesch
  2022-02-10  0:43 ` Ammar Faizi
  2022-02-10  0:53 ` Ammar Faizi
@ 2022-02-10  2:06 ` Ammar Faizi
  2 siblings, 0 replies; 4+ messages in thread
From: Ammar Faizi @ 2022-02-10  2:06 UTC (permalink / raw)
  To: Stefan Roesch, io-uring, kernel-team; +Cc: viro

On 2/10/22 2:04 AM, Stefan Roesch wrote:
> This adds a test for the statx api to verify that io-uring statx api is
> stable.
> 
> Signed-off-by: Stefan Roesch <[email protected]>
> ---
>   test/statx.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 65 insertions(+)
> 
> diff --git a/test/statx.c b/test/statx.c
> index c0f9e9c..61268d4 100644
> --- a/test/statx.c
> +++ b/test/statx.c
> @@ -77,6 +77,61 @@ err:
>   	return -1;
>   }
>   
> +static int test_statx_stable(struct io_uring *ring, const char *path)
> +{
> +	struct io_uring_cqe *cqe;
> +	struct io_uring_sqe *sqe;
> +	struct statx x1, x2;
> +	char path1[PATH_MAX];
> +	char path2[PATH_MAX];
> +	int ret = -1;
> +
> +	strcpy(path2, path);
> +	strcpy(path1, path);
> +
> +	sqe = io_uring_get_sqe(ring);
> +	if (!sqe) {
> +		fprintf(stderr, "get sqe failed\n");
> +		goto err;
> +	}
> +
> +	io_uring_prep_statx(sqe, -1, path1, 0, STATX_ALL, &x1);
> +
> +	ret = io_uring_submit(ring);
> +	if (ret <= 0) {
> +		fprintf(stderr, "sqe submit failed: %d\n", ret);
> +		goto err;
> +	}
> +	memset(path1, 0, sizeof(path1));
> +
> +	ret = io_uring_wait_cqe(ring, &cqe);
> +	if (ret < 0) {
> +		fprintf(stderr, "wait completion %d\n", ret);
> +		goto err;
> +	}
> +
> +	ret = cqe->res;
> +	io_uring_cqe_seen(ring, cqe);
> +	if (ret) {
> +		fprintf(stderr, "statx res = %d\n", ret);
> +		goto err;
> +	}
> +
> +	ret = do_statx(-1, path2, 0, STATX_ALL, &x2);
> +	if (ret < 0)
> +		return statx_syscall_supported();
> +
> +	if (memcmp(&x1, &x2, sizeof(x1))) {
> +		fprintf(stderr, "Miscompare between io_uring and statx\n");
> +		goto err;
> +	}

If we fail on memcmp() here, the ret should be set to non-zero *explicitly*.
Otherwise, we have zero exit code since statx returns 0 on success.

I think that one can also be simplified like this:

[...]
	ret = memcmp(&x1, &x2, sizeof(x1));
	if (ret)
		fprintf(stderr, "Miscompare between io_uring and statx\n");

err:
	return ret;
}

> +
> +	ret = 0;
> +
> +err:
> +	return ret;
> +}
> +
>   static int test_statx_fd(struct io_uring *ring, const char *path)
>   {
>   	struct io_uring_cqe *cqe;
> @@ -156,6 +211,16 @@ int main(int argc, char *argv[])
>   		goto err;
>   	}
>   
> +	ret = test_statx_stable(&ring, fname);
> +	if (ret) {
> +		if (ret == -EINVAL) {
> +			fprintf(stdout, "statx not supported, skipping\n");
> +			goto done;
> +		}
> +		fprintf(stderr, "test_statx_loop failed: %d\n", ret);
> +		goto err;
> +	}
> +
>   	ret = test_statx_fd(&ring, fname);
>   	if (ret) {
>   		fprintf(stderr, "test_statx_fd failed: %d\n", ret);
> 
> base-commit: d9b0a424471f5c584f1d3f370e1746925733c01a


-- 
Ammar Faizi

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

end of thread, other threads:[~2022-02-10  2:08 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-09 19:04 [PATCH v1] liburing: add test for stable statx api Stefan Roesch
2022-02-10  0:43 ` Ammar Faizi
2022-02-10  0:53 ` Ammar Faizi
2022-02-10  2:06 ` Ammar Faizi

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