Attempt to send any queued writes even if the socket is in a group. This will not work if there is a send task already outstanding. Change-Id: Icc0b5884e3d247042194ad26b30340ceb824886c Signed-off-by: Ben Walker <benjamin.walker@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15212 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com> Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
253 lines
7.5 KiB
C
253 lines
7.5 KiB
C
/* SPDX-License-Identifier: BSD-3-Clause
|
|
* Copyright (C) 2019 Intel Corporation.
|
|
* All rights reserved.
|
|
*/
|
|
|
|
#include "spdk/stdinc.h"
|
|
#include "spdk/util.h"
|
|
|
|
#include "spdk_internal/mock.h"
|
|
|
|
#include "spdk_cunit.h"
|
|
|
|
#include "common/lib/test_env.c"
|
|
#include "sock/uring/uring.c"
|
|
|
|
DEFINE_STUB(spdk_sock_map_insert, int, (struct spdk_sock_map *map, int placement_id,
|
|
struct spdk_sock_group_impl *group), 0);
|
|
DEFINE_STUB_V(spdk_sock_map_release, (struct spdk_sock_map *map, int placement_id));
|
|
DEFINE_STUB(spdk_sock_map_lookup, int, (struct spdk_sock_map *map, int placement_id,
|
|
struct spdk_sock_group_impl **group, struct spdk_sock_group_impl *hint), 0);
|
|
DEFINE_STUB(spdk_sock_map_find_free, int, (struct spdk_sock_map *map), -1);
|
|
DEFINE_STUB_V(spdk_sock_map_cleanup, (struct spdk_sock_map *map));
|
|
|
|
DEFINE_STUB_V(spdk_net_impl_register, (struct spdk_net_impl *impl, int priority));
|
|
DEFINE_STUB(spdk_sock_close, int, (struct spdk_sock **s), 0);
|
|
DEFINE_STUB(__io_uring_get_cqe, int, (struct io_uring *ring, struct io_uring_cqe **cqe_ptr,
|
|
unsigned submit,
|
|
unsigned wait_nr, sigset_t *sigmask), 0);
|
|
DEFINE_STUB(io_uring_submit, int, (struct io_uring *ring), 0);
|
|
DEFINE_STUB(io_uring_queue_init, int, (unsigned entries, struct io_uring *ring, unsigned flags), 0);
|
|
DEFINE_STUB_V(io_uring_queue_exit, (struct io_uring *ring));
|
|
|
|
static void
|
|
_req_cb(void *cb_arg, int len)
|
|
{
|
|
*(bool *)cb_arg = true;
|
|
CU_ASSERT(len == 0);
|
|
}
|
|
|
|
static void
|
|
flush_client(void)
|
|
{
|
|
struct spdk_uring_sock_group_impl group = {};
|
|
struct spdk_uring_sock usock = {};
|
|
struct spdk_sock *sock = &usock.base;
|
|
struct spdk_sock_request *req1, *req2;
|
|
bool cb_arg1, cb_arg2;
|
|
int rc;
|
|
|
|
/* Set up data structures */
|
|
TAILQ_INIT(&sock->queued_reqs);
|
|
TAILQ_INIT(&sock->pending_reqs);
|
|
sock->group_impl = &group.base;
|
|
|
|
req1 = calloc(1, sizeof(struct spdk_sock_request) + 3 * sizeof(struct iovec));
|
|
SPDK_CU_ASSERT_FATAL(req1 != NULL);
|
|
SPDK_SOCK_REQUEST_IOV(req1, 0)->iov_base = (void *)100;
|
|
SPDK_SOCK_REQUEST_IOV(req1, 0)->iov_len = 64;
|
|
SPDK_SOCK_REQUEST_IOV(req1, 1)->iov_base = (void *)200;
|
|
SPDK_SOCK_REQUEST_IOV(req1, 1)->iov_len = 64;
|
|
SPDK_SOCK_REQUEST_IOV(req1, 2)->iov_base = (void *)300;
|
|
SPDK_SOCK_REQUEST_IOV(req1, 2)->iov_len = 64;
|
|
req1->iovcnt = 3;
|
|
req1->cb_fn = _req_cb;
|
|
req1->cb_arg = &cb_arg1;
|
|
|
|
req2 = calloc(1, sizeof(struct spdk_sock_request) + 2 * sizeof(struct iovec));
|
|
SPDK_CU_ASSERT_FATAL(req2 != NULL);
|
|
SPDK_SOCK_REQUEST_IOV(req2, 0)->iov_base = (void *)100;
|
|
SPDK_SOCK_REQUEST_IOV(req2, 0)->iov_len = 32;
|
|
SPDK_SOCK_REQUEST_IOV(req2, 1)->iov_base = (void *)200;
|
|
SPDK_SOCK_REQUEST_IOV(req2, 1)->iov_len = 32;
|
|
req2->iovcnt = 2;
|
|
req2->cb_fn = _req_cb;
|
|
req2->cb_arg = &cb_arg2;
|
|
|
|
/* Simple test - a request with a 3 element iovec
|
|
* that gets submitted in a single sendmsg. */
|
|
spdk_sock_request_queue(sock, req1);
|
|
MOCK_SET(sendmsg, 192);
|
|
cb_arg1 = false;
|
|
rc = uring_sock_flush(sock);
|
|
CU_ASSERT(rc == 192);
|
|
CU_ASSERT(cb_arg1 == true);
|
|
CU_ASSERT(TAILQ_EMPTY(&sock->queued_reqs));
|
|
|
|
/* Two requests, where both can fully send. */
|
|
spdk_sock_request_queue(sock, req1);
|
|
spdk_sock_request_queue(sock, req2);
|
|
MOCK_SET(sendmsg, 256);
|
|
cb_arg1 = false;
|
|
cb_arg2 = false;
|
|
rc = uring_sock_flush(sock);
|
|
CU_ASSERT(rc == 256);
|
|
CU_ASSERT(cb_arg1 == true);
|
|
CU_ASSERT(cb_arg2 == true);
|
|
CU_ASSERT(TAILQ_EMPTY(&sock->queued_reqs));
|
|
|
|
/* Two requests. Only first one can send */
|
|
spdk_sock_request_queue(sock, req1);
|
|
spdk_sock_request_queue(sock, req2);
|
|
MOCK_SET(sendmsg, 192);
|
|
cb_arg1 = false;
|
|
cb_arg2 = false;
|
|
rc = uring_sock_flush(sock);
|
|
CU_ASSERT(rc == 192);
|
|
CU_ASSERT(cb_arg1 == true);
|
|
CU_ASSERT(cb_arg2 == false);
|
|
CU_ASSERT(TAILQ_FIRST(&sock->queued_reqs) == req2);
|
|
TAILQ_REMOVE(&sock->queued_reqs, req2, internal.link);
|
|
CU_ASSERT(TAILQ_EMPTY(&sock->queued_reqs));
|
|
|
|
/* One request. Partial send. */
|
|
spdk_sock_request_queue(sock, req1);
|
|
MOCK_SET(sendmsg, 10);
|
|
cb_arg1 = false;
|
|
rc = uring_sock_flush(sock);
|
|
CU_ASSERT(rc == 10);
|
|
CU_ASSERT(cb_arg1 == false);
|
|
CU_ASSERT(TAILQ_FIRST(&sock->queued_reqs) == req1);
|
|
|
|
/* Do a second flush that partial sends again. */
|
|
MOCK_SET(sendmsg, 52);
|
|
cb_arg1 = false;
|
|
rc = uring_sock_flush(sock);
|
|
CU_ASSERT(rc == 52);
|
|
CU_ASSERT(cb_arg1 == false);
|
|
CU_ASSERT(TAILQ_FIRST(&sock->queued_reqs) == req1);
|
|
|
|
/* Flush the rest of the data */
|
|
MOCK_SET(sendmsg, 130);
|
|
cb_arg1 = false;
|
|
rc = uring_sock_flush(sock);
|
|
CU_ASSERT(rc == 130);
|
|
CU_ASSERT(cb_arg1 == true);
|
|
CU_ASSERT(TAILQ_EMPTY(&sock->queued_reqs));
|
|
|
|
free(req1);
|
|
free(req2);
|
|
}
|
|
|
|
static void
|
|
flush_server(void)
|
|
{
|
|
struct spdk_uring_sock_group_impl group = {};
|
|
struct spdk_uring_sock usock = {};
|
|
struct spdk_sock *sock = &usock.base;
|
|
struct spdk_sock_request *req1, *req2;
|
|
bool cb_arg1, cb_arg2;
|
|
int rc;
|
|
|
|
/* Set up data structures */
|
|
TAILQ_INIT(&sock->queued_reqs);
|
|
TAILQ_INIT(&sock->pending_reqs);
|
|
sock->group_impl = &group.base;
|
|
usock.write_task.sock = &usock;
|
|
usock.group = &group;
|
|
|
|
req1 = calloc(1, sizeof(struct spdk_sock_request) + 2 * sizeof(struct iovec));
|
|
SPDK_CU_ASSERT_FATAL(req1 != NULL);
|
|
SPDK_SOCK_REQUEST_IOV(req1, 0)->iov_base = (void *)100;
|
|
SPDK_SOCK_REQUEST_IOV(req1, 0)->iov_len = 64;
|
|
SPDK_SOCK_REQUEST_IOV(req1, 1)->iov_base = (void *)200;
|
|
SPDK_SOCK_REQUEST_IOV(req1, 1)->iov_len = 64;
|
|
req1->iovcnt = 2;
|
|
req1->cb_fn = _req_cb;
|
|
req1->cb_arg = &cb_arg1;
|
|
|
|
req2 = calloc(1, sizeof(struct spdk_sock_request) + 2 * sizeof(struct iovec));
|
|
SPDK_CU_ASSERT_FATAL(req2 != NULL);
|
|
SPDK_SOCK_REQUEST_IOV(req2, 0)->iov_base = (void *)100;
|
|
SPDK_SOCK_REQUEST_IOV(req2, 0)->iov_len = 32;
|
|
SPDK_SOCK_REQUEST_IOV(req2, 1)->iov_base = (void *)200;
|
|
SPDK_SOCK_REQUEST_IOV(req2, 1)->iov_len = 32;
|
|
req2->iovcnt = 2;
|
|
req2->cb_fn = _req_cb;
|
|
req2->cb_arg = &cb_arg2;
|
|
|
|
/* we should not call _sock_flush directly, since it will finally
|
|
* call liburing related functions */
|
|
|
|
/* Simple test - a request with a 2 element iovec
|
|
* that is fully completed. */
|
|
spdk_sock_request_queue(sock, req1);
|
|
cb_arg1 = false;
|
|
rc = spdk_sock_prep_reqs(sock, usock.write_task.iovs, 0, NULL, NULL);
|
|
CU_ASSERT(rc == 2);
|
|
sock_complete_write_reqs(sock, 128, 0);
|
|
CU_ASSERT(cb_arg1 == true);
|
|
CU_ASSERT(TAILQ_EMPTY(&sock->queued_reqs));
|
|
|
|
/* Two requests, where both can be fully completed. */
|
|
spdk_sock_request_queue(sock, req1);
|
|
spdk_sock_request_queue(sock, req2);
|
|
cb_arg1 = false;
|
|
cb_arg2 = false;
|
|
rc = spdk_sock_prep_reqs(sock, usock.write_task.iovs, 0, NULL, NULL);
|
|
CU_ASSERT(rc == 4);
|
|
sock_complete_write_reqs(sock, 192, 0);
|
|
CU_ASSERT(cb_arg1 == true);
|
|
CU_ASSERT(cb_arg2 == true);
|
|
CU_ASSERT(TAILQ_EMPTY(&sock->queued_reqs));
|
|
|
|
|
|
/* One request that is partially sent. */
|
|
spdk_sock_request_queue(sock, req1);
|
|
cb_arg1 = false;
|
|
rc = spdk_sock_prep_reqs(sock, usock.write_task.iovs, 0, NULL, NULL);
|
|
CU_ASSERT(rc == 2);
|
|
sock_complete_write_reqs(sock, 92, 0);
|
|
CU_ASSERT(rc == 2);
|
|
CU_ASSERT(cb_arg1 == false);
|
|
CU_ASSERT(TAILQ_FIRST(&sock->queued_reqs) == req1);
|
|
|
|
/* Get the second time partial sent result. */
|
|
sock_complete_write_reqs(sock, 10, 0);
|
|
CU_ASSERT(cb_arg1 == false);
|
|
CU_ASSERT(TAILQ_FIRST(&sock->queued_reqs) == req1);
|
|
|
|
/* Data is finally sent. */
|
|
sock_complete_write_reqs(sock, 26, 0);
|
|
CU_ASSERT(cb_arg1 == true);
|
|
CU_ASSERT(TAILQ_EMPTY(&sock->queued_reqs));
|
|
|
|
free(req1);
|
|
free(req2);
|
|
}
|
|
|
|
int
|
|
main(int argc, char **argv)
|
|
{
|
|
CU_pSuite suite = NULL;
|
|
unsigned int num_failures;
|
|
|
|
CU_set_error_action(CUEA_ABORT);
|
|
CU_initialize_registry();
|
|
|
|
suite = CU_add_suite("uring", NULL, NULL);
|
|
|
|
|
|
CU_ADD_TEST(suite, flush_client);
|
|
CU_ADD_TEST(suite, flush_server);
|
|
|
|
CU_basic_set_mode(CU_BRM_VERBOSE);
|
|
|
|
CU_basic_run_tests();
|
|
|
|
num_failures = CU_get_number_of_failures();
|
|
CU_cleanup_registry();
|
|
|
|
return num_failures;
|
|
}
|