From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: [email protected]
Subject: [PATCH liburing 1/8] test/reg-wait: fix test_regions
Date: Sat, 16 Nov 2024 21:27:41 +0000 [thread overview]
Message-ID: <13bd6e7b30bdaed0d11bdfda409e5369ab8005ec.1731792294.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
Regions for CQ wait arguments are registered to disabled rings, and
test_try_register_region() doesn't do it right. While at it kill the
extra argument as it doesn't do anything useful.
Signed-off-by: Pavel Begunkov <[email protected]>
---
test/reg-wait.c | 43 +++++++++++++++++++------------------------
1 file changed, 19 insertions(+), 24 deletions(-)
diff --git a/test/reg-wait.c b/test/reg-wait.c
index aef4546..eef10e0 100644
--- a/test/reg-wait.c
+++ b/test/reg-wait.c
@@ -222,7 +222,7 @@ err:
}
static int test_try_register_region(struct io_uring_mem_region_reg *pr,
- bool disabled, bool reenable)
+ bool disabled)
{
struct io_uring ring;
int flags = 0;
@@ -237,15 +237,16 @@ static int test_try_register_region(struct io_uring_mem_region_reg *pr,
return 1;
}
- if (reenable) {
+ ret = io_uring_register_region(&ring, pr);
+ if (ret)
+ goto err;
+
+ if (disabled) {
ret = io_uring_enable_rings(&ring);
- if (ret) {
+ if (ret)
fprintf(stderr, "io_uring_enable_rings failure %i\n", ret);
- return 1;
- }
}
-
- ret = io_uring_register_region(&ring, pr);
+err:
io_uring_queue_exit(&ring);
return ret;
}
@@ -270,28 +271,22 @@ static int test_regions(void)
mr.region_uptr = (__u64)(unsigned long)&rd;
mr.flags = IORING_MEM_REGION_REG_WAIT_ARG;
- ret = test_try_register_region(&mr, true, false);
+ ret = test_try_register_region(&mr, true);
if (ret == -EINVAL)
return T_EXIT_SKIP;
if (ret) {
- fprintf(stderr, "test_try_register_region(true, false) fail %i\n", ret);
- return T_EXIT_FAIL;
- }
-
- ret = test_try_register_region(&mr, false, false);
- if (ret != -EINVAL) {
- fprintf(stderr, "test_try_register_region(false, false) fail %i\n", ret);
+ fprintf(stderr, "region: register normal fail %i\n", ret);
return T_EXIT_FAIL;
}
- ret = test_try_register_region(&mr, true, true);
+ ret = test_try_register_region(&mr, false);
if (ret != -EINVAL) {
- fprintf(stderr, "test_try_register_region(true, true) fail %i\n", ret);
+ fprintf(stderr, "region: register with !R_DISABLED fail %i\n", ret);
return T_EXIT_FAIL;
}
rd.size = 4096 * 4;
- ret = test_try_register_region(&mr, true, false);
+ ret = test_try_register_region(&mr, true);
if (ret) {
fprintf(stderr, "test_try_register_region() 16KB fail %i\n", ret);
return T_EXIT_FAIL;
@@ -299,7 +294,7 @@ static int test_regions(void)
rd.size = 4096;
rd.user_addr = 0;
- ret = test_try_register_region(&mr, true, false);
+ ret = test_try_register_region(&mr, true);
if (ret != -EFAULT) {
fprintf(stderr, "test_try_register_region() null uptr fail %i\n", ret);
return T_EXIT_FAIL;
@@ -307,7 +302,7 @@ static int test_regions(void)
rd.user_addr = (__u64)(unsigned long)buffer;
rd.flags = 0;
- ret = test_try_register_region(&mr, true, false);
+ ret = test_try_register_region(&mr, true);
if (!ret) {
fprintf(stderr, "test_try_register_region() kernel alloc with uptr fail %i\n", ret);
return T_EXIT_FAIL;
@@ -315,7 +310,7 @@ static int test_regions(void)
rd.flags = IORING_MEM_REGION_TYPE_USER;
rd.size = 0;
- ret = test_try_register_region(&mr, true, false);
+ ret = test_try_register_region(&mr, true);
if (!ret) {
fprintf(stderr, "test_try_register_region() 0-size fail %i\n", ret);
return T_EXIT_FAIL;
@@ -323,7 +318,7 @@ static int test_regions(void)
rd.size = 4096;
mr.region_uptr = 0;
- ret = test_try_register_region(&mr, true, false);
+ ret = test_try_register_region(&mr, true);
if (!ret) {
fprintf(stderr, "test_try_register_region() NULL region %i\n", ret);
return T_EXIT_FAIL;
@@ -331,14 +326,14 @@ static int test_regions(void)
mr.region_uptr = (__u64)(unsigned long)&rd;
rd.user_addr += 16;
- ret = test_try_register_region(&mr, true, false);
+ ret = test_try_register_region(&mr, true);
if (!ret) {
fprintf(stderr, "test_try_register_region() misaligned region %i\n", ret);
return T_EXIT_FAIL;
}
rd.user_addr = 0x1000;
- ret = test_try_register_region(&mr, true, false);
+ ret = test_try_register_region(&mr, true);
if (!ret) {
fprintf(stderr, "test_try_register_region() bogus uptr %i\n", ret);
return T_EXIT_FAIL;
--
2.46.0
next prev parent reply other threads:[~2024-11-16 21:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-16 21:27 [PATCH liburing 0/8] region test fixes + improvements Pavel Begunkov
2024-11-16 21:27 ` Pavel Begunkov [this message]
2024-11-16 21:27 ` [PATCH liburing 2/8] test/reg-wait: pass right timeout indexes Pavel Begunkov
2024-11-16 21:27 ` [PATCH liburing 3/8] test/reg-wait: use queried page_size Pavel Begunkov
2024-11-16 21:27 ` [PATCH liburing 4/8] test/reg-wait: skip when R_DISABLED is not supported Pavel Begunkov
2024-11-16 21:27 ` [PATCH liburing 5/8] test/reg-wait: dedup regwait init Pavel Begunkov
2024-11-16 21:27 ` [PATCH liburing 6/8] test/reg-wait: parameterise test_offsets Pavel Begunkov
2024-11-16 21:27 ` [PATCH liburing 7/8] test/reg-wait: add registration helper Pavel Begunkov
2024-11-16 21:27 ` [PATCH liburing 8/8] test/reg-wait: test various sized regions Pavel Begunkov
2024-11-17 16:03 ` [PATCH liburing 0/8] region test fixes + improvements Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=13bd6e7b30bdaed0d11bdfda409e5369ab8005ec.1731792294.git.asml.silence@gmail.com \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox