From 63524340a3f1c4ca7cf03f1b13d2ad5bcb246075 Mon Sep 17 00:00:00 2001 From: Konrad Sztyber Date: Thu, 9 Mar 2023 11:18:49 +0100 Subject: [PATCH] accel: make spdk_accel_sequence_finish() void It always returns 0 and any errors are reported in the callback. Making it void simplifies error handling. Signed-off-by: Konrad Sztyber Change-Id: I0d4299a2789a688eae38d76de46d1baf27cbbd8f Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17194 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Aleksey Marchuk Reviewed-by: Jim Harris Community-CI: Mellanox Build Bot --- include/spdk/accel.h | 6 +- lib/accel/accel.c | 4 +- lib/bdev/bdev.c | 16 +-- test/unit/lib/accel/accel.c/accel_ut.c | 165 +++++++++---------------- test/unit/lib/bdev/bdev.c/bdev_ut.c | 4 +- test/unit/lib/bdev/mt/bdev.c/bdev_ut.c | 4 +- test/unit/lib/bdev/part.c/part_ut.c | 4 +- 7 files changed, 65 insertions(+), 138 deletions(-) diff --git a/include/spdk/accel.h b/include/spdk/accel.h index d1ea9bb6c..a1a6f1933 100644 --- a/include/spdk/accel.h +++ b/include/spdk/accel.h @@ -478,11 +478,9 @@ int spdk_accel_append_decrypt(struct spdk_accel_sequence **seq, struct spdk_io_c * \param seq Sequence to finish. * \param cb_fn Completion callback to be executed once all operations are executed. * \param cb_arg Argument to be passed to `cb_fn`. - * - * \return 0 on success, negative errno otherwise. */ -int spdk_accel_sequence_finish(struct spdk_accel_sequence *seq, - spdk_accel_completion_cb cb_fn, void *cb_arg); +void spdk_accel_sequence_finish(struct spdk_accel_sequence *seq, + spdk_accel_completion_cb cb_fn, void *cb_arg); /** * Reverse a sequence, so that the last operation becomes the first and vice versa. diff --git a/lib/accel/accel.c b/lib/accel/accel.c index f5bed173d..610119b3b 100644 --- a/lib/accel/accel.c +++ b/lib/accel/accel.c @@ -1782,7 +1782,7 @@ accel_sequence_merge_tasks(struct spdk_accel_sequence *seq, struct spdk_accel_ta } } -int +void spdk_accel_sequence_finish(struct spdk_accel_sequence *seq, spdk_accel_completion_cb cb_fn, void *cb_arg) { @@ -1800,8 +1800,6 @@ spdk_accel_sequence_finish(struct spdk_accel_sequence *seq, seq->cb_arg = cb_arg; accel_process_sequence(seq); - - return 0; } void diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index 1005a0ef9..f653bbc52 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -1005,8 +1005,6 @@ bdev_io_submit_sequence_cb(void *ctx, int status) static void bdev_io_exec_sequence(struct spdk_bdev_io *bdev_io, spdk_accel_completion_cb cb_fn) { - int rc; - assert(bdev_io_needs_sequence_exec(bdev_io->internal.desc, bdev_io)); assert(bdev_io->type == SPDK_BDEV_IO_TYPE_WRITE || bdev_io->type == SPDK_BDEV_IO_TYPE_READ); @@ -1019,19 +1017,7 @@ bdev_io_exec_sequence(struct spdk_bdev_io *bdev_io, spdk_accel_completion_cb cb_ } TAILQ_INSERT_TAIL(&bdev_io->internal.ch->io_accel_exec, bdev_io, internal.link); - - rc = spdk_accel_sequence_finish(bdev_io->internal.accel_sequence, cb_fn, bdev_io); - if (spdk_unlikely(rc != 0)) { - SPDK_ERRLOG("Failed to execute accel sequence, status=%d\n", rc); - TAILQ_REMOVE(&bdev_io->internal.ch->io_accel_exec, bdev_io, internal.link); - bdev_io->internal.status = SPDK_BDEV_IO_STATUS_FAILED; - if (bdev_io->type == SPDK_BDEV_IO_TYPE_WRITE) { - /* Writes haven't been submitted at this point yet */ - bdev_io_complete_unsubmitted(bdev_io); - } else { - bdev_io_complete(bdev_io); - } - } + spdk_accel_sequence_finish(bdev_io->internal.accel_sequence, cb_fn, bdev_io); } static void diff --git a/test/unit/lib/accel/accel.c/accel_ut.c b/test/unit/lib/accel/accel.c/accel_ut.c index c77d8e2ec..bd7a11404 100644 --- a/test/unit/lib/accel/accel.c/accel_ut.c +++ b/test/unit/lib/accel/accel.c/accel_ut.c @@ -653,8 +653,7 @@ test_sequence_fill_copy(void) CU_ASSERT_EQUAL(completed, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); CU_ASSERT_EQUAL(completed, 1); @@ -680,8 +679,7 @@ test_sequence_fill_copy(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); CU_ASSERT_EQUAL(completed, 1); @@ -707,8 +705,7 @@ test_sequence_fill_copy(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); CU_ASSERT_EQUAL(completed, 3); @@ -747,8 +744,7 @@ test_sequence_fill_copy(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); CU_ASSERT_EQUAL(completed, 3); @@ -776,8 +772,7 @@ test_sequence_fill_copy(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); CU_ASSERT_EQUAL(completed, 2); @@ -816,8 +811,7 @@ test_sequence_fill_copy(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); CU_ASSERT_EQUAL(completed, 3); @@ -1068,8 +1062,7 @@ test_sequence_completion_error(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); CU_ASSERT_EQUAL(completed, 2); @@ -1095,8 +1088,7 @@ test_sequence_completion_error(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); CU_ASSERT_EQUAL(completed, 2); @@ -1124,8 +1116,7 @@ test_sequence_completion_error(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); CU_ASSERT_EQUAL(completed, 2); @@ -1151,8 +1142,7 @@ test_sequence_completion_error(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); CU_ASSERT_EQUAL(completed, 2); @@ -1218,8 +1208,7 @@ test_sequence_decompress(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -1259,8 +1248,7 @@ test_sequence_decompress(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -1294,8 +1282,7 @@ test_sequence_decompress(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -1350,8 +1337,7 @@ test_sequence_reverse(void) spdk_accel_sequence_reverse(seq); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -1390,8 +1376,7 @@ test_sequence_reverse(void) spdk_accel_sequence_reverse(seq); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -1434,8 +1419,7 @@ test_sequence_reverse(void) spdk_accel_sequence_reverse(seq); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -1476,8 +1460,7 @@ test_sequence_reverse(void) spdk_accel_sequence_reverse(seq); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -1548,8 +1531,7 @@ test_sequence_copy_elision(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -1590,8 +1572,7 @@ test_sequence_copy_elision(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -1641,8 +1622,7 @@ test_sequence_copy_elision(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -1697,8 +1677,7 @@ test_sequence_copy_elision(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -1741,8 +1720,7 @@ test_sequence_copy_elision(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -1777,8 +1755,7 @@ test_sequence_copy_elision(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -1830,8 +1807,7 @@ test_sequence_copy_elision(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -1883,8 +1859,7 @@ test_sequence_copy_elision(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -1989,8 +1964,7 @@ test_sequence_accel_buffers(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -2040,8 +2014,7 @@ test_sequence_accel_buffers(void) ut_sequence_step_cb, &completed); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -2098,8 +2071,7 @@ test_sequence_accel_buffers(void) ut_sequence_step_cb, &completed); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -2146,8 +2118,7 @@ test_sequence_accel_buffers(void) ut_sequence_step_cb, &completed); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -2210,8 +2181,7 @@ test_sequence_accel_buffers(void) ut_sequence_step_cb, &completed); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -2261,8 +2231,7 @@ test_sequence_accel_buffers(void) ut_sequence_step_cb, &completed); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -2332,8 +2301,7 @@ test_sequence_accel_buffers(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -2451,8 +2419,7 @@ test_sequence_memory_domain(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); CU_ASSERT_EQUAL(completed, 1); @@ -2480,8 +2447,7 @@ test_sequence_memory_domain(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); CU_ASSERT_EQUAL(completed, 1); @@ -2522,8 +2488,7 @@ test_sequence_memory_domain(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); CU_ASSERT_EQUAL(completed, 2); @@ -2564,8 +2529,7 @@ test_sequence_memory_domain(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); CU_ASSERT_EQUAL(completed, 2); @@ -2602,8 +2566,7 @@ test_sequence_memory_domain(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); CU_ASSERT_EQUAL(completed, 0); @@ -2664,8 +2627,7 @@ test_sequence_memory_domain(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); CU_ASSERT_EQUAL(completed, 1); CU_ASSERT(ut_seq.complete); @@ -2689,8 +2651,7 @@ test_sequence_memory_domain(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); CU_ASSERT_EQUAL(completed, 1); CU_ASSERT(ut_seq.complete); @@ -2714,8 +2675,7 @@ test_sequence_memory_domain(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); CU_ASSERT_EQUAL(completed, 1); CU_ASSERT(ut_seq.complete); @@ -2739,8 +2699,7 @@ test_sequence_memory_domain(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); CU_ASSERT_EQUAL(completed, 1); CU_ASSERT(ut_seq.complete); @@ -2834,8 +2793,7 @@ test_sequence_module_memory_domain(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -2875,8 +2833,7 @@ test_sequence_module_memory_domain(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -2911,8 +2868,7 @@ test_sequence_module_memory_domain(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -3018,8 +2974,7 @@ test_sequence_crypto(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -3061,8 +3016,7 @@ test_sequence_crypto(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -3114,8 +3068,7 @@ test_sequence_crypto(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -3270,8 +3223,7 @@ test_sequence_driver(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -3330,8 +3282,7 @@ test_sequence_driver(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -3394,8 +3345,7 @@ test_sequence_driver(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -3457,8 +3407,7 @@ test_sequence_driver(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -3510,8 +3459,7 @@ test_sequence_driver(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -3560,8 +3508,7 @@ test_sequence_driver(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -3662,8 +3609,7 @@ test_sequence_same_iovs(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); @@ -3718,8 +3664,7 @@ test_sequence_same_iovs(void) CU_ASSERT_EQUAL(rc, 0); ut_seq.complete = false; - rc = spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); - CU_ASSERT_EQUAL(rc, 0); + spdk_accel_sequence_finish(seq, ut_sequence_complete_cb, &ut_seq); poll_threads(); diff --git a/test/unit/lib/bdev/bdev.c/bdev_ut.c b/test/unit/lib/bdev/bdev.c/bdev_ut.c index 602beecb4..7291f1273 100644 --- a/test/unit/lib/bdev/bdev.c/bdev_ut.c +++ b/test/unit/lib/bdev/bdev.c/bdev_ut.c @@ -21,8 +21,8 @@ DEFINE_STUB(spdk_memory_domain_get_dma_device_id, const char *, (struct spdk_mem "test_domain"); DEFINE_STUB(spdk_memory_domain_get_dma_device_type, enum spdk_dma_device_type, (struct spdk_memory_domain *domain), 0); -DEFINE_STUB(spdk_accel_sequence_finish, int, - (struct spdk_accel_sequence *seq, spdk_accel_completion_cb cb_fn, void *cb_arg), 0); +DEFINE_STUB_V(spdk_accel_sequence_finish, + (struct spdk_accel_sequence *seq, spdk_accel_completion_cb cb_fn, void *cb_arg)); DEFINE_STUB_V(spdk_accel_sequence_abort, (struct spdk_accel_sequence *seq)); DEFINE_STUB_V(spdk_accel_sequence_reverse, (struct spdk_accel_sequence *seq)); DEFINE_STUB(spdk_accel_append_copy, int, diff --git a/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c b/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c index 7f60e7611..471e32045 100644 --- a/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c +++ b/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c @@ -25,8 +25,8 @@ DEFINE_STUB(spdk_memory_domain_get_dma_device_id, const char *, (struct spdk_mem "test_domain"); DEFINE_STUB(spdk_memory_domain_get_dma_device_type, enum spdk_dma_device_type, (struct spdk_memory_domain *domain), 0); -DEFINE_STUB(spdk_accel_sequence_finish, int, - (struct spdk_accel_sequence *seq, spdk_accel_completion_cb cb_fn, void *cb_arg), 0); +DEFINE_STUB_V(spdk_accel_sequence_finish, + (struct spdk_accel_sequence *seq, spdk_accel_completion_cb cb_fn, void *cb_arg)); DEFINE_STUB_V(spdk_accel_sequence_abort, (struct spdk_accel_sequence *seq)); DEFINE_STUB_V(spdk_accel_sequence_reverse, (struct spdk_accel_sequence *seq)); DEFINE_STUB(spdk_accel_append_copy, int, diff --git a/test/unit/lib/bdev/part.c/part_ut.c b/test/unit/lib/bdev/part.c/part_ut.c index e788bb1db..fdbceb048 100644 --- a/test/unit/lib/bdev/part.c/part_ut.c +++ b/test/unit/lib/bdev/part.c/part_ut.c @@ -34,8 +34,8 @@ DEFINE_STUB(spdk_memory_domain_get_dma_device_id, const char *, (struct spdk_mem "test_domain"); DEFINE_STUB(spdk_memory_domain_get_dma_device_type, enum spdk_dma_device_type, (struct spdk_memory_domain *domain), 0); -DEFINE_STUB(spdk_accel_sequence_finish, int, - (struct spdk_accel_sequence *seq, spdk_accel_completion_cb cb_fn, void *cb_arg), 0); +DEFINE_STUB_V(spdk_accel_sequence_finish, + (struct spdk_accel_sequence *seq, spdk_accel_completion_cb cb_fn, void *cb_arg)); DEFINE_STUB_V(spdk_accel_sequence_abort, (struct spdk_accel_sequence *seq)); DEFINE_STUB_V(spdk_accel_sequence_reverse, (struct spdk_accel_sequence *seq)); DEFINE_STUB(spdk_accel_append_copy, int,