openharmony/third_party_liburing
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_liburing.git synced 2026-07-19 18:54:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix recv-multishot test skipping in 6.1

Browse Source 
This test was skipping in IORING_SETUP_DEFER_TASKRUN as it was not
flushing the work queue before checking for completions.

Additionally fix the test to only skip if it is the first loop.

Fixes: eaf8ff7ca9 ("update existing tests for defer taskrun")
Signed-off-by: Dylan Yudaken <dylany@meta.com>
Link: https://lore.kernel.org/r/20221021081207.2607808-1-dylany@meta.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Dylan Yudaken
2022-10-21 01:12:07 -07:00
committed by Jens Axboe
parent ee2825e9e5
commit d2b58aa77c
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/recv-multishot.c
+16 -7
View File
@@ -13,7 +13,7 @@
#include "liburing.h"
#include "helpers.h"
static int no_recv_mshot;
#define ENORECVMULTISHOT 9999
enum early_error_t {
ERROR_NONE = 0,
@@ -139,6 +139,7 @@ static int test(struct args *args)
sqe = io_uring_get_sqe(&ring);
io_uring_prep_provide_buffers(sqe, recv_buffs[i],
buffer_size, 1, 7, i);
io_uring_sqe_set_data64(sqe, 0x999);
memset(recv_buffs[i], 0xcc, buffer_size);
if (io_uring_submit_and_wait_timeout(&ring, &cqe, 1, &timeout, NULL) != 0) {
fprintf(stderr, "provide buffers failed: %d\n", ret);
@@ -186,13 +187,19 @@ static int test(struct args *args)
if (args->early_error == ERROR_EARLY_CLOSE_RECEIVER) {
/* allow previous sends to complete */
usleep(1000);
io_uring_get_events(&ring);
sqe = io_uring_get_sqe(&ring);
io_uring_prep_recv(sqe, fds[0], NULL, 0, 0);
io_uring_prep_cancel64(sqe, 1234, 0);
io_uring_sqe_set_data64(sqe, 0x888);
sqe->flags |= IOSQE_CQE_SKIP_SUCCESS;
io_uring_submit(&ring);
early_error_started = true;
/* allow the cancel to complete */
usleep(1000);
io_uring_get_events(&ring);
}
if (args->early_error == ERROR_EARLY_CLOSE_SENDER) {
early_error_started = true;
@@ -246,12 +253,10 @@ static int test(struct args *args)
at = &send_buff[0];
if (recv_cqes < min_cqes) {
if (recv_cqes > 0 && recv_cqe[0].res == -EINVAL) {
no_recv_mshot = 1;
return 0;
return -ENORECVMULTISHOT;
}
/* some kernels apparently don't check ->ioprio, skip */
ret = 0;
no_recv_mshot = 1;
ret = -ENORECVMULTISHOT;
goto cleanup;
}
for (i = 0; i < recv_cqes; i++) {
@@ -481,14 +486,18 @@ int main(int argc, char *argv[])
a.early_error = (enum early_error_t)early_error;
ret = test(&a);
if (ret) {
if (ret == -ENORECVMULTISHOT) {
if (loop == 0)
return T_EXIT_SKIP;
fprintf(stderr,
"ENORECVMULTISHOT received but loop>0\n");
}
fprintf(stderr,
"test stream=%d wait_each=%d recvmsg=%d early_error=%d "
" defer=%d failed\n",
a.stream, a.wait_each, a.recvmsg, a.early_error, a.defer);
return T_EXIT_FAIL;
}
if (no_recv_mshot)
return T_EXIT_SKIP;
}
}