From 20a773677230374ffa2d5d140f7d46032fb7bc9d Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Fri, 18 Sep 2020 17:39:03 +0200 Subject: Revert to [HICN-638] Check if systemd is running before enabling hicn-light service Signed-off-by: Mauro Sardara Change-Id: I1810d96e001a4e6e097e1efa331b682af750925d --- hicn-plugin/src/host_stack/test/hicn_hs_client.c | 804 ----------------------- hicn-plugin/src/host_stack/test/hicn_hs_client.h | 127 ---- hicn-plugin/src/host_stack/test/hicn_hs_server.c | 505 -------------- 3 files changed, 1436 deletions(-) delete mode 100644 hicn-plugin/src/host_stack/test/hicn_hs_client.c delete mode 100644 hicn-plugin/src/host_stack/test/hicn_hs_client.h delete mode 100644 hicn-plugin/src/host_stack/test/hicn_hs_server.c (limited to 'hicn-plugin/src/host_stack/test') diff --git a/hicn-plugin/src/host_stack/test/hicn_hs_client.c b/hicn-plugin/src/host_stack/test/hicn_hs_client.c deleted file mode 100644 index b5f27ee12..000000000 --- a/hicn-plugin/src/host_stack/test/hicn_hs_client.c +++ /dev/null @@ -1,804 +0,0 @@ -/* - * hicn_hs_client.c - vpp built-in hicn client - * - * Copyright (c) 2017-2019 by Cisco and/or its affiliates. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -#include "hicn_hs_client.h" -#include "../host_stack.h" - -hicn_client_main_t hicn_client_main; - -#define HICN_CLIENT_DBG (0) -#define DBG(_fmt, _args...) \ - if (HICN_CLIENT_DBG) \ - clib_warning (_fmt, ##_args) - -#define ec_cli_output(_fmt, _args...) \ - if (!hcm->no_output) \ - vlib_cli_output(vm, _fmt, ##_args) - -f64 t0; - -static void -signal_evt_to_cli_i (int *code) -{ - hicn_client_main_t *hcm = &hicn_client_main; - ASSERT (vlib_get_thread_index () == 0); - vlib_process_signal_event (hcm->vlib_main, hcm->cli_node_index, *code, 0); -} - -static void -signal_evt_to_cli (int code) -{ - if (vlib_get_thread_index () != 0) - vl_api_rpc_call_main_thread (signal_evt_to_cli_i, (u8 *) & code, - sizeof (code)); - else - signal_evt_to_cli_i (&code); -} - -static void -receive_data_chunk (hicn_client_main_t * hcm, eclient_session_t * s) -{ - svm_fifo_t *rx_fifo = s->data.rx_fifo; - u32 thread_index = vlib_get_thread_index (); - int n_read, i; - - if (hcm->test_bytes) - { - if (!hcm->is_dgram) - n_read = app_recv_stream (&s->data, hcm->rx_buf[thread_index], - vec_len (hcm->rx_buf[thread_index])); - else - n_read = app_recv_dgram (&s->data, hcm->rx_buf[thread_index], - vec_len (hcm->rx_buf[thread_index])); - } - else - { - n_read = svm_fifo_max_dequeue_cons (rx_fifo); - svm_fifo_dequeue_drop (rx_fifo, n_read); - } - - if (n_read > 0) - { - if (HICN_CLIENT_DBG) - { - /* *INDENT-OFF* */ - ELOG_TYPE_DECLARE (e) = - { - .format = "rx-deq: %d bytes", - .format_args = "i4", - }; - /* *INDENT-ON* */ - struct - { - u32 data[1]; - } *ed; - ed = ELOG_DATA (&vlib_global_main.elog_main, e); - ed->data[0] = n_read; - } - - if (hcm->test_bytes) - { - for (i = 0; i < n_read; i++) - { - if (hcm->rx_buf[thread_index][i] - != ((s->bytes_received + i) & 0xff)) - { - clib_warning ("read %d error at byte %lld, 0x%x not 0x%x", - n_read, s->bytes_received + i, - hcm->rx_buf[thread_index][i], - ((s->bytes_received + i) & 0xff)); - hcm->test_failed = 1; - } - } - } - vlib_main_t *vm = vlib_get_main(); - hcm->test_end_time = vlib_time_now (vm); - f64 delta = hcm->test_end_time - hcm->test_start_time; - - ec_cli_output ("Throughput (%d, %.20f): %.2f b/s", n_read, delta, ((f64)(n_read)) / delta); - - s->bytes_to_receive -= n_read; - s->bytes_received += n_read; - } -} - -// static uword -// hicn_client_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, -// vlib_frame_t * frame) -// { -// hicns_client_main_t *hcm = &hicn_client_main; -// int my_thread_index = vlib_get_thread_index (); -// eclient_session_t *sp; -// int i; -// int delete_session; -// u32 *connection_indices; -// u32 *connections_this_batch; -// u32 nconnections_this_batch; - -// connection_indices = hcm->connection_index_by_thread[my_thread_index]; -// connections_this_batch = -// hcm->connections_this_batch_by_thread[my_thread_index]; - -// if ((hcm->run_test != HICN_CLIENT_RUNNING) || -// ((vec_len (connection_indices) == 0) -// && vec_len (connections_this_batch) == 0)) -// return 0; - -// /* Grab another pile of connections */ -// if (PREDICT_FALSE (vec_len (connections_this_batch) == 0)) -// { -// nconnections_this_batch = -// clib_min (hcm->connections_per_batch, vec_len (connection_indices)); - -// ASSERT (nconnections_this_batch > 0); -// vec_validate (connections_this_batch, nconnections_this_batch - 1); -// clib_memcpy_fast (connections_this_batch, -// connection_indices + vec_len (connection_indices) -// - nconnections_this_batch, -// nconnections_this_batch * sizeof (u32)); -// _vec_len (connection_indices) -= nconnections_this_batch; -// } - -// if (PREDICT_FALSE (hcm->prev_conns != hcm->connections_per_batch -// && hcm->prev_conns == vec_len (connections_this_batch))) -// { -// hcm->repeats++; -// hcm->prev_conns = vec_len (connections_this_batch); -// if (hcm->repeats == 500000) -// { -// clib_warning ("stuck clients"); -// } -// } -// else -// { -// hcm->prev_conns = vec_len (connections_this_batch); -// hcm->repeats = 0; -// } - -// for (i = 0; i < vec_len (connections_this_batch); i++) -// { -// delete_session = 1; - -// sp = pool_elt_at_index (hcm->sessions, connections_this_batch[i]); - -// if (sp->bytes_to_send > 0) -// { -// send_data_chunk (hcm, sp); -// delete_session = 0; -// } -// if (sp->bytes_to_receive > 0) -// { -// delete_session = 0; -// } -// if (PREDICT_FALSE (delete_session == 1)) -// { -// session_t *s; - -// clib_atomic_fetch_add (&hcm->tx_total, sp->bytes_sent); -// clib_atomic_fetch_add (&hcm->rx_total, sp->bytes_received); -// s = session_get_from_handle_if_valid (sp->vpp_session_handle); - -// if (s) -// { -// vnet_disconnect_args_t _a, *a = &_a; -// a->handle = session_handle (s); -// a->app_index = hcm->app_index; -// vnet_disconnect_session (a); - -// vec_delete (connections_this_batch, 1, i); -// i--; -// clib_atomic_fetch_add (&hcm->ready_connections, -1); -// } -// else -// { -// clib_warning ("session AWOL?"); -// vec_delete (connections_this_batch, 1, i); -// } - -// /* Kick the debug CLI process */ -// if (hcm->ready_connections == 0) -// { -// signal_evt_to_cli (2); -// } -// } -// } - -// hcm->connection_index_by_thread[my_thread_index] = connection_indices; -// hcm->connections_this_batch_by_thread[my_thread_index] = -// connections_this_batch; -// return 0; -// } - -// /* *INDENT-OFF* */ -// VLIB_REGISTER_NODE (hicn_clients_node) = -// { -// .function = hicn_client_node_fn, -// .name = "hicn-client", -// .type = VLIB_NODE_TYPE_INPUT, -// .state = VLIB_NODE_STATE_DISABLED, -// }; -// /* *INDENT-ON* */ - -static int -create_api_loopback (hicn_client_main_t * hcm) -{ - api_main_t *am = vlibapi_get_main (); - vl_shmem_hdr_t *shmem_hdr; - - shmem_hdr = am->shmem_hdr; - hcm->vl_input_queue = shmem_hdr->vl_input_queue; - hcm->my_client_index = vl_api_memclnt_create_internal ("hicn_client", - hcm->vl_input_queue); - return 0; -} - -static int -hicn_client_init (vlib_main_t * vm) -{ - hicn_client_main_t *hcm = &hicn_client_main; - vlib_thread_main_t *vtm = vlib_get_thread_main (); - u32 num_threads; - int i; - - if (create_api_loopback (hcm)) - return -1; - - num_threads = 1 /* main thread */ + vtm->n_threads; - - /* Init test data. Big buffer */ - vec_validate (hcm->connect_test_data, 4 * 1024 * 1024 - 1); - for (i = 0; i < vec_len (hcm->connect_test_data); i++) - hcm->connect_test_data[i] = i & 0xff; - - vec_validate (hcm->rx_buf, num_threads - 1); - for (i = 0; i < num_threads; i++) - vec_validate (hcm->rx_buf[i], vec_len (hcm->connect_test_data) - 1); - - hcm->is_init = 1; - - vec_validate (hcm->connection_index_by_thread, vtm->n_vlib_mains); - vec_validate (hcm->connections_this_batch_by_thread, vtm->n_vlib_mains); - vec_validate (hcm->vpp_event_queue, vtm->n_vlib_mains); - - return 0; -} - -static int -hicn_client_session_connected_callback (u32 app_wrk_index, u32 opaque, - session_t * s, session_error_t code) -{ - hicn_client_main_t *hcm = &hicn_client_main; - eclient_session_t *session; - u32 session_index; - u8 thread_index; - - if (PREDICT_FALSE (hcm->run_test != HICN_CLIENT_STARTING)) - return -1; - - if (code) - { - clib_warning ("connection %d failed!", opaque); - hcm->run_test = HICN_CLIENT_EXITING; - signal_evt_to_cli (-1); - return 0; - } - - thread_index = s->thread_index; - ASSERT (thread_index == vlib_get_thread_index () - || session_transport_service_type (s) == TRANSPORT_SERVICE_CL); - - if (!hcm->vpp_event_queue[thread_index]) - hcm->vpp_event_queue[thread_index] = - session_main_get_vpp_event_queue (thread_index); - - /* - * Setup session - */ - clib_spinlock_lock_if_init (&hcm->sessions_lock); - pool_get (hcm->sessions, session); - clib_spinlock_unlock_if_init (&hcm->sessions_lock); - - clib_memset (session, 0, sizeof (*session)); - session_index = session - hcm->sessions; - session->bytes_to_send = hcm->bytes_to_send; - session->bytes_to_receive = hcm->no_return ? 0ULL : hcm->bytes_to_send; - session->data.rx_fifo = s->rx_fifo; - session->data.rx_fifo->client_session_index = session_index; - session->data.tx_fifo = s->tx_fifo; - session->data.tx_fifo->client_session_index = session_index; - session->data.vpp_evt_q = hcm->vpp_event_queue[thread_index]; - session->vpp_session_handle = session_handle (s); - - if (hcm->is_dgram) - { - transport_connection_t *tc; - tc = session_get_transport (s); - clib_memcpy_fast (&session->data.transport, tc, - sizeof (session->data.transport)); - session->data.is_dgram = 1; - } - - vec_add1 (hcm->connection_index_by_thread[thread_index], session_index); - clib_atomic_fetch_add (&hcm->ready_connections, 1); - if (hcm->ready_connections == hcm->expected_connections) - { - hcm->run_test = HICN_CLIENT_RUNNING; - /* Signal the CLI process that the action is starting... */ - signal_evt_to_cli (1); - } - - return 0; -} - -static void -hicn_client_session_reset_callback (session_t * s) -{ - hicn_client_main_t *hcm = &hicn_client_main; - vnet_disconnect_args_t _a = { 0 }, *a = &_a; - - if (s->session_state == SESSION_STATE_READY) - clib_warning ("Reset active connection %U", format_session, s, 2); - - a->handle = session_handle (s); - a->app_index = hcm->app_index; - vnet_disconnect_session (a); - return; -} - -static int -hicn_client_session_create_callback (session_t * s) -{ - return 0; -} - -static void -hicn_client_session_disconnect_callback (session_t * s) -{ - hicn_client_main_t *hcm = &hicn_client_main; - vnet_disconnect_args_t _a = { 0 }, *a = &_a; - a->handle = session_handle (s); - a->app_index = hcm->app_index; - vnet_disconnect_session (a); - return; -} - -void -hicn_client_session_disconnect (session_t * s) -{ - hicn_client_main_t *hcm = &hicn_client_main; - vnet_disconnect_args_t _a = { 0 }, *a = &_a; - a->handle = session_handle (s); - a->app_index = hcm->app_index; - vnet_disconnect_session (a); -} - -static int -hicn_client_rx_callback (session_t * s) -{ - hicn_client_main_t *hcm = &hicn_client_main; - eclient_session_t *sp; - - if (PREDICT_FALSE (hcm->run_test != HICN_CLIENT_RUNNING)) - { - hicn_client_session_disconnect (s); - return -1; - } - - sp = pool_elt_at_index (hcm->sessions, s->rx_fifo->client_session_index); - receive_data_chunk (hcm, sp); - - if (svm_fifo_max_dequeue_cons (s->rx_fifo)) - { - if (svm_fifo_set_event (s->rx_fifo)) - session_send_io_evt_to_thread (s->rx_fifo, SESSION_IO_EVT_BUILTIN_RX); - } - return 0; -} - -int -hicn_client_add_segment_callback (u32 client_index, u64 segment_handle) -{ - /* New heaps may be added */ - return 0; -} - -/* *INDENT-OFF* */ -static session_cb_vft_t hicn_client = { - .session_reset_callback = hicn_client_session_reset_callback, - .session_connected_callback = hicn_client_session_connected_callback, - .session_accept_callback = hicn_client_session_create_callback, - .session_disconnect_callback = hicn_client_session_disconnect_callback, - .builtin_app_rx_callback = hicn_client_rx_callback, - .add_segment_callback = hicn_client_add_segment_callback -}; -/* *INDENT-ON* */ - -static clib_error_t * -hicn_client_attach (u8 * appns_id, u64 appns_flags, u64 appns_secret) -{ - vnet_app_add_tls_cert_args_t _a_cert, *a_cert = &_a_cert; - vnet_app_add_tls_key_args_t _a_key, *a_key = &_a_key; - u32 prealloc_fifos, segment_size = 256 << 20; - hicn_client_main_t *hcm = &hicn_client_main; - vnet_app_attach_args_t _a, *a = &_a; - u64 options[17]; - int rv; - - clib_memset (a, 0, sizeof (*a)); - clib_memset (options, 0, sizeof (options)); - - a->api_client_index = hcm->my_client_index; - a->session_cb_vft = &hicn_client; - - prealloc_fifos = hcm->prealloc_fifos ? hcm->expected_connections : 1; - - if (hcm->private_segment_size) - segment_size = hcm->private_segment_size; - - options[APP_OPTIONS_ACCEPT_COOKIE] = 0x12345678; - options[APP_OPTIONS_SEGMENT_SIZE] = segment_size; - options[APP_OPTIONS_ADD_SEGMENT_SIZE] = segment_size; - options[APP_OPTIONS_RX_FIFO_SIZE] = hcm->fifo_size; - options[APP_OPTIONS_TX_FIFO_SIZE] = hcm->fifo_size; - options[APP_OPTIONS_PRIVATE_SEGMENT_COUNT] = hcm->private_segment_count; - options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] = prealloc_fifos; - options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN; - options[APP_OPTIONS_TLS_ENGINE] = hcm->tls_engine; - options[APP_OPTIONS_PCT_FIRST_ALLOC] = 100; - if (appns_id) - { - options[APP_OPTIONS_FLAGS] |= appns_flags; - options[APP_OPTIONS_NAMESPACE_SECRET] = appns_secret; - } - a->options = options; - a->namespace_id = appns_id; - - if ((rv = vnet_application_attach (a))) - return clib_error_return (0, "attach returned %d", rv); - - hcm->app_index = a->app_index; - - clib_memset (a_cert, 0, sizeof (*a_cert)); - a_cert->app_index = a->app_index; - vec_validate (a_cert->cert, test_srv_crt_rsa_len); - clib_memcpy_fast (a_cert->cert, test_srv_crt_rsa, test_srv_crt_rsa_len); - vnet_app_add_tls_cert (a_cert); - - clib_memset (a_key, 0, sizeof (*a_key)); - a_key->app_index = a->app_index; - vec_validate (a_key->key, test_srv_key_rsa_len); - clib_memcpy_fast (a_key->key, test_srv_key_rsa, test_srv_key_rsa_len); - vnet_app_add_tls_key (a_key); - return 0; -} - -static int -hicn_client_detach () -{ - hicn_client_main_t *hcm = &hicn_client_main; - vnet_app_detach_args_t _da, *da = &_da; - int rv; - - da->app_index = hcm->app_index; - da->api_client_index = ~0; - rv = vnet_application_detach (da); - hcm->test_client_attached = 0; - hcm->app_index = ~0; - return rv; -} - -static void * -hicn_client_thread_fn (void *arg) -{ - return 0; -} - -/** Start a transmit thread */ -int -hicn_client_start_tx_pthread (hicn_client_main_t * hcm) -{ - if (hcm->client_thread_handle == 0) - { - int rv = pthread_create (&hcm->client_thread_handle, - NULL /*attr */ , - hicn_client_thread_fn, 0); - if (rv) - { - hcm->client_thread_handle = 0; - return -1; - } - } - return 0; -} - -clib_error_t * -hicn_client_connect (vlib_main_t * vm, u32 n_clients) -{ - hicn_client_main_t *hcm = &hicn_client_main; - vnet_connect_args_t _a, *a = &_a; - int i, rv; - - clib_memset (a, 0, sizeof (*a)); - - for (i = 0; i < n_clients; i++) - { - a->uri = (char *) hcm->connect_uri; - a->api_context = i; - a->app_index = hcm->app_index; - - vlib_worker_thread_barrier_sync (vm); - if ((rv = vnet_connect_uri (a))) - { - vlib_worker_thread_barrier_release (vm); - return clib_error_return (0, "connect returned: %d", rv); - } - vlib_worker_thread_barrier_release (vm); - - /* Crude pacing for call setups */ - if ((i % 16) == 0) - vlib_process_suspend (vm, 100e-6); - ASSERT (i + 1 >= hcm->ready_connections); - while (i + 1 - hcm->ready_connections > 128) - vlib_process_suspend (vm, 1e-3); - } - - return 0; -} - -static clib_error_t * -hicn_client_command_fn (vlib_main_t * vm, - unformat_input_t * input, vlib_cli_command_t * cmd) -{ - hicn_client_main_t *hcm = &hicn_client_main; - vlib_thread_main_t *thread_main = vlib_get_thread_main (); - u64 total_bytes, appns_flags = 0, appns_secret = 0; - f64 test_timeout = 20.0, syn_timeout = 20.0, delta; - char *default_uri = "hicn://b001::1"; - uword *event_data = 0, event_type; - f64 time_before_connects; - u32 n_clients = 1; - int preallocate_sessions = 0; - char *transfer_type; - clib_error_t *error = 0; - u8 *appns_id = 0; - int i; - session_endpoint_cfg_t sep = SESSION_ENDPOINT_CFG_NULL; - int rv; - - hcm->bytes_to_send = 8192; - hcm->no_return = 0; - hcm->fifo_size = 128 << 20; - hcm->connections_per_batch = 1000; - hcm->private_segment_count = 0; - hcm->private_segment_size = 0; - hcm->no_output = 0; - hcm->test_bytes = 0; - hcm->test_failed = 0; - hcm->vlib_main = vm; - hcm->tls_engine = CRYPTO_ENGINE_OPENSSL; - hcm->no_copy = 0; - hcm->run_test = HICN_CLIENT_STARTING; - - if (thread_main->n_vlib_mains > 1) - clib_spinlock_init (&hcm->sessions_lock); - vec_free (hcm->connect_uri); - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "uri %s", &hcm->connect_uri)) - ; - else - return clib_error_return (0, "failed: unknown input `%U'", - format_unformat_error, input); - } - - /* Store cli process node index for signalling */ - hcm->cli_node_index = - vlib_get_current_process (vm)->node_runtime.node_index; - - if (hcm->is_init == 0) - { - if (hicn_client_init (vm)) - return clib_error_return (0, "failed init"); - } - - - hcm->ready_connections = 0; - hcm->expected_connections = n_clients; - hcm->rx_total = 0; - hcm->tx_total = 0; - - if (!hcm->connect_uri) - { - clib_warning ("No uri provided. Using default: %s", default_uri); - hcm->connect_uri = format (0, "%s%c", default_uri, 0); - } - - vlib_worker_thread_barrier_sync (vm); - vnet_session_enable_disable (vm, 1 /* turn on session and transports */ ); - hicn_hs_enable_disable(vm, 1 /* enable hicn transport */); - vlib_worker_thread_barrier_release (vm); - - if ((rv = parse_uri ((char *) hcm->connect_uri, &sep))) - return clib_error_return (0, "Uri parse error: %d", rv); - hcm->transport_proto = sep.transport_proto; - hcm->is_dgram = (sep.transport_proto == TRANSPORT_PROTO_UDP); - -#if HICN_CLIENT_PTHREAD - hicn_client_start_tx_pthread (); -#endif - - if (hcm->test_client_attached == 0) - { - if ((error = hicn_client_attach (appns_id, appns_flags, appns_secret))) - { - vec_free (appns_id); - clib_error_report (error); - return error; - } - vec_free (appns_id); - } - hcm->test_client_attached = 1; - - /* Turn on the builtin client input nodes */ - for (i = 0; i < thread_main->n_vlib_mains; i++) - vlib_node_set_state (vlib_mains[i], hicn_client_node.index, - VLIB_NODE_STATE_POLLING); - - if (preallocate_sessions) - pool_init_fixed (hcm->sessions, 1.1 * n_clients); - - /* Fire off connect requests */ - time_before_connects = vlib_time_now (vm); - if ((error = hicn_client_connect (vm, n_clients))) - { - goto cleanup; - } - - /* Park until the sessions come up, or ten seconds elapse... */ - vlib_process_wait_for_event_or_clock (vm, syn_timeout); - event_type = vlib_process_get_events (vm, &event_data); - switch (event_type) - { - case ~0: - ec_cli_output ("Timeout with only %d sessions active...", - hcm->ready_connections); - error = clib_error_return (0, "failed: syn timeout with %d sessions", - hcm->ready_connections); - goto cleanup; - - case 1: - delta = vlib_time_now (vm) - time_before_connects; - if (delta != 0.0) - ec_cli_output ("%d three-way handshakes in %.2f seconds %.2f/s", - n_clients, delta, ((f64) n_clients) / delta); - - hcm->test_start_time = vlib_time_now (hcm->vlib_main); - break; - - default: - ec_cli_output ("unexpected event(1): %d", event_type); - error = clib_error_return (0, "failed: unexpected event(1): %d", - event_type); - goto cleanup; - } - - /* Now wait for the sessions to finish... */ - vlib_process_wait_for_event_or_clock (vm, test_timeout); - event_type = vlib_process_get_events (vm, &event_data); - switch (event_type) - { - case ~0: - ec_cli_output ("Timeout with %d sessions still active...", - hcm->ready_connections); - error = clib_error_return (0, "failed: timeout with %d sessions", - hcm->ready_connections); - goto cleanup; - - case 2: - hcm->test_end_time = vlib_time_now (vm); - ec_cli_output ("Test finished at %.6f", hcm->test_end_time); - break; - - default: - ec_cli_output ("unexpected event(2): %d", event_type); - error = clib_error_return (0, "failed: unexpected event(2): %d", - event_type); - goto cleanup; - } - - delta = hcm->test_end_time - hcm->test_start_time; - if (delta != 0.0) - { - total_bytes = (hcm->no_return ? hcm->tx_total : hcm->rx_total); - transfer_type = hcm->no_return ? "half-duplex" : "full-duplex"; - ec_cli_output ("%lld bytes (%lld mbytes, %lld gbytes) in %.2f seconds", - total_bytes, total_bytes / (1ULL << 20), - total_bytes / (1ULL << 30), delta); - ec_cli_output ("%.2f bytes/second %s", ((f64) total_bytes) / (delta), - transfer_type); - ec_cli_output ("%.4f gbit/second %s", - (((f64) total_bytes * 8.0) / delta / 1e9), - transfer_type); - } - else - { - ec_cli_output ("zero delta-t?"); - error = clib_error_return (0, "failed: zero delta-t"); - goto cleanup; - } - - if (hcm->test_bytes && hcm->test_failed) - error = clib_error_return (0, "failed: test bytes"); - -cleanup: - hcm->run_test = HICN_CLIENT_EXITING; - vlib_process_wait_for_event_or_clock (vm, 10e-3); - for (i = 0; i < vec_len (hcm->connection_index_by_thread); i++) - { - vec_reset_length (hcm->connection_index_by_thread[i]); - vec_reset_length (hcm->connections_this_batch_by_thread[i]); - } - - pool_free (hcm->sessions); - - /* Detach the application, so we can use different fifo sizes next time */ - if (hcm->test_client_attached) - { - if (hicn_client_detach ()) - { - error = clib_error_return (0, "failed: app detach"); - ec_cli_output ("WARNING: app detach failed..."); - } - } - if (error) - ec_cli_output ("test failed"); - vec_free (hcm->connect_uri); - return error; -} - -/* *INDENT-OFF* */ -VLIB_CLI_COMMAND (hicn_client_command, static) = -{ - .path = "test hicn hs client", - .short_help = "test hicn hs client [uri ]", - .function = hicn_client_command_fn, - .is_mp_safe = 1, -}; -/* *INDENT-ON* */ - -clib_error_t * -hicn_client_main_init (vlib_main_t * vm) -{ - hicn_client_main_t *hcm = &hicn_client_main; - hcm->is_init = 0; - return 0; -} - -VLIB_INIT_FUNCTION (hicn_client_main_init); - -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ diff --git a/hicn-plugin/src/host_stack/test/hicn_hs_client.h b/hicn-plugin/src/host_stack/test/hicn_hs_client.h deleted file mode 100644 index 6600608e3..000000000 --- a/hicn-plugin/src/host_stack/test/hicn_hs_client.h +++ /dev/null @@ -1,127 +0,0 @@ - -/* - * echo_client.h - built-in application layer echo client - * - * Copyright (c) 2017-2019 Cisco and/or its affiliates. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#ifndef __included_hicn_hs_client_h__ -#define __included_hicn_hs_client_h__ - -#include -#include -#include - -#include -#include -#include -#include - -typedef struct -{ - CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); - app_session_t data; - u64 bytes_to_send; - u64 bytes_sent; - u64 bytes_to_receive; - u64 bytes_received; - u64 vpp_session_handle; - u8 thread_index; -} eclient_session_t; - -typedef struct -{ - /* - * Application setup parameters - */ - svm_queue_t *vl_input_queue; /**< vpe input queue */ - svm_msg_q_t **vpp_event_queue; - - u32 cli_node_index; /**< cli process node index */ - u32 my_client_index; /**< loopback API client handle */ - u32 app_index; /**< app index after attach */ - - /* - * Configuration params - */ - u8 *connect_uri; /**< URI for slave's connect */ - u64 bytes_to_send; /**< Bytes to send */ - u32 configured_segment_size; - u32 fifo_size; - u32 expected_connections; /**< Number of clients/connections */ - u32 connections_per_batch; /**< Connections to rx/tx at once */ - u32 private_segment_count; /**< Number of private fifo segs */ - u32 private_segment_size; /**< size of private fifo segs */ - u32 tls_engine; /**< TLS engine mbedtls/openssl */ - u8 is_dgram; - u32 no_copy; /**< Don't memcpy data to tx fifo */ - - /* - * Test state variables - */ - eclient_session_t *sessions; /**< Session pool, shared */ - clib_spinlock_t sessions_lock; - u8 **rx_buf; /**< intermediate rx buffers */ - u8 *connect_test_data; /**< Pre-computed test data */ - u32 **connection_index_by_thread; - u32 **connections_this_batch_by_thread; /**< active connection batch */ - pthread_t client_thread_handle; - - volatile u32 ready_connections; - volatile u32 finished_connections; - volatile u64 rx_total; - volatile u64 tx_total; - volatile int run_test; /**< Signal start of test */ - - f64 test_start_time; - f64 test_end_time; - u32 prev_conns; - u32 repeats; - /* - * Flags - */ - u8 is_init; - u8 test_client_attached; - u8 no_return; - u8 test_return_packets; - int i_am_master; - int drop_packets; /**< drop all packets */ - u8 prealloc_fifos; /**< Request fifo preallocation */ - u8 no_output; - u8 test_bytes; - u8 test_failed; - u8 transport_proto; - - vlib_main_t *vlib_main; -} hicn_client_main_t; - -enum -{ - HICN_CLIENT_STARTING, - HICN_CLIENT_RUNNING, - HICN_CLIENT_EXITING -} hicn_client_state_e; - -extern hicn_client_main_t hicn_client_main; - -vlib_node_registration_t hicn_client_node; - -#endif /* __included_hicn_hs_client_h__ */ - -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ diff --git a/hicn-plugin/src/host_stack/test/hicn_hs_server.c b/hicn-plugin/src/host_stack/test/hicn_hs_server.c deleted file mode 100644 index cab73adb0..000000000 --- a/hicn-plugin/src/host_stack/test/hicn_hs_server.c +++ /dev/null @@ -1,505 +0,0 @@ -/* -* Copyright (c) 2020 Cisco and/or its affiliates. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at: -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -#include -#include -#include -#include -#include - -#include "../host_stack.h" -#include "../route.h" - -#define HICN_SERVER_DGB (0) -#define DBG(_fmt, _args...) \ - if (HICN_SERVER_DGB) \ - clib_warning (_fmt, ##_args) - -typedef struct -{ - /* - * Server app parameters - */ - svm_msg_q_t **vpp_queue; - svm_queue_t *vl_input_queue; /**< Sever's event queue */ - - u32 app_index; /**< Server app index */ - u32 my_client_index; /**< API client handle */ - u32 node_index; /**< process node index for event scheduling */ - - /* - * Config params - */ - u32 fifo_size; /**< Fifo size */ - u32 rcv_buffer_size; /**< Rcv buffer size */ - u32 prealloc_fifos; /**< Preallocate fifos */ - u32 private_segment_count; /**< Number of private segments */ - u32 private_segment_size; /**< Size of private segments */ - char *server_uri; /**< Server URI */ - u32 tls_engine; /**< TLS engine: mbedtls/openssl */ - u8 is_dgram; /**< set if transport is dgram */ - /* - * Test state - */ - u8 **rx_buf; /**< Per-thread RX buffer */ - u64 byte_index; - u32 **rx_retries; - u8 transport_proto; - u64 listener_handle; /**< Session handle of the root listener */ - - vlib_main_t *vlib_main; -} hicn_server_main_t; - -hicn_server_main_t hicn_server_main; - -extern f64 t0; - -#define DEFAULT_PRODUCE_SIZE 64 << 20 -static u8 bytes[DEFAULT_PRODUCE_SIZE]; - -int -hicn_server_session_accept_callback (session_t * s) -{ - hicn_server_main_t *esm = &hicn_server_main; - esm->vpp_queue[s->thread_index] = - session_main_get_vpp_event_queue (s->thread_index); - s->session_state = SESSION_STATE_READY; - esm->byte_index = 0; - ASSERT (vec_len (esm->rx_retries) > s->thread_index); - vec_validate (esm->rx_retries[s->thread_index], s->session_index); - esm->rx_retries[s->thread_index][s->session_index] = 0; - return 0; -} - -void -hicn_server_session_disconnect_callback (session_t * s) -{ - hicn_server_main_t *esm = &hicn_server_main; - vnet_disconnect_args_t _a = { 0 }, *a = &_a; - - a->handle = session_handle (s); - a->app_index = esm->app_index; - vnet_disconnect_session (a); -} - -void -hicn_server_session_reset_callback (session_t * s) -{ - hicn_server_main_t *esm = &hicn_server_main; - vnet_disconnect_args_t _a = { 0 }, *a = &_a; - clib_warning ("Reset session %U", format_session, s, 2); - a->handle = session_handle (s); - a->app_index = esm->app_index; - vnet_disconnect_session (a); -} - -int -hicn_server_session_connected_callback (u32 app_wrk_index, u32 opaque, - session_t * s, session_error_t code) -{ - clib_warning ("called..."); - return -1; -} - -int -hicn_server_add_segment_callback (u32 client_index, u64 segment_handle) -{ - /* New heaps may be added */ - return 0; -} - -int -hicn_server_redirect_connect_callback (u32 client_index, void *mp) -{ - clib_warning ("called..."); - return -1; -} - -void -test_bytes (hicn_server_main_t * esm, int actual_transfer) -{ - int i; - u32 my_thread_id = vlib_get_thread_index (); - - for (i = 0; i < actual_transfer; i++) - { - if (esm->rx_buf[my_thread_id][i] != ((esm->byte_index + i) & 0xff)) - { - clib_warning ("at %lld expected %d got %d", esm->byte_index + i, - (esm->byte_index + i) & 0xff, - esm->rx_buf[my_thread_id][i]); - } - } - esm->byte_index += actual_transfer; -} - -/* - * If no-echo, just drop the data and be done with it. - */ -int -hicn_server_builtin_server_rx_callback_no_echo (session_t * s) -{ - svm_fifo_t *rx_fifo = s->rx_fifo; - svm_fifo_dequeue_drop (rx_fifo, svm_fifo_max_dequeue_cons (rx_fifo)); - return 0; -} - -int hicn_server_enqueue (session_t * s, svm_fifo_t *tx_fifo, u32 thread_index) -{ - hicn_server_main_t *esm = &hicn_server_main; - CLIB_UNUSED(u32 n_written); - transport_connection_t *transport = session_get_transport(s); - hicn_hs_ctx_t *ctx = (hicn_hs_ctx_t *) (transport); - hicn_hs_set_next_prod_size (ctx, DEFAULT_PRODUCE_SIZE); - - n_written = app_send_stream_raw (tx_fifo, - esm->vpp_queue[thread_index], - bytes, - DEFAULT_PRODUCE_SIZE, - SESSION_IO_EVT_TX, - 1 /* do_evt */ , 0); - - return 0; -} - -int -hicn_server_rx_callback (session_t * s) -{ - u32 max_dequeue, max_enqueue; - svm_fifo_t *tx_fifo, *rx_fifo; - hicn_server_main_t *esm = &hicn_server_main; - u32 thread_index = vlib_get_thread_index (); - - ASSERT (s->thread_index == thread_index); - - rx_fifo = s->rx_fifo; - tx_fifo = s->tx_fifo; - - ASSERT (rx_fifo->master_thread_index == thread_index); - ASSERT (tx_fifo->master_thread_index == thread_index); - - max_enqueue = svm_fifo_max_enqueue_prod (tx_fifo); - if (!esm->is_dgram) - { - max_dequeue = svm_fifo_max_dequeue_cons (rx_fifo); - } - else - { - session_dgram_pre_hdr_t ph; - svm_fifo_peek (rx_fifo, 0, sizeof (ph), (u8 *) & ph); - max_dequeue = ph.data_length - ph.data_offset; - if (!esm->vpp_queue[s->thread_index]) - { - svm_msg_q_t *mq; - mq = session_main_get_vpp_event_queue (s->thread_index); - esm->vpp_queue[s->thread_index] = mq; - } - max_enqueue -= sizeof (session_dgram_hdr_t); - } - - if (max_dequeue == 0) - { - return hicn_server_enqueue (s, tx_fifo, thread_index); - } - - return 0; -} - -static session_cb_vft_t hicn_server_session_cb_vft = { - .session_accept_callback = hicn_server_session_accept_callback, - .session_disconnect_callback = hicn_server_session_disconnect_callback, - .session_connected_callback = hicn_server_session_connected_callback, - .add_segment_callback = hicn_server_add_segment_callback, - .builtin_app_rx_callback = hicn_server_rx_callback, - .session_reset_callback = hicn_server_session_reset_callback -}; - -/* Abuse VPP's input queue */ -static int -create_api_loopback (vlib_main_t * vm) -{ - hicn_server_main_t *esm = &hicn_server_main; - api_main_t *am = vlibapi_get_main (); - vl_shmem_hdr_t *shmem_hdr; - - shmem_hdr = am->shmem_hdr; - esm->vl_input_queue = shmem_hdr->vl_input_queue; - esm->my_client_index = vl_api_memclnt_create_internal ("hicn_server", - esm->vl_input_queue); - return 0; -} - -static int -hicn_server_attach (u8 * appns_id, u64 appns_flags, u64 appns_secret) -{ - vnet_app_add_tls_cert_args_t _a_cert, *a_cert = &_a_cert; - vnet_app_add_tls_key_args_t _a_key, *a_key = &_a_key; - hicn_server_main_t *esm = &hicn_server_main; - vnet_app_attach_args_t _a, *a = &_a; - u64 options[APP_OPTIONS_N_OPTIONS]; - u32 segment_size = 512 << 20; - - clib_memset (a, 0, sizeof (*a)); - clib_memset (options, 0, sizeof (options)); - - hicn_server_session_cb_vft.builtin_app_rx_callback = - hicn_server_rx_callback; - - if (esm->private_segment_size) - segment_size = esm->private_segment_size; - - a->api_client_index = esm->my_client_index; - a->session_cb_vft = &hicn_server_session_cb_vft; - a->options = options; - a->options[APP_OPTIONS_SEGMENT_SIZE] = segment_size; - a->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = segment_size; - a->options[APP_OPTIONS_RX_FIFO_SIZE] = esm->fifo_size; - a->options[APP_OPTIONS_TX_FIFO_SIZE] = esm->fifo_size; - a->options[APP_OPTIONS_PRIVATE_SEGMENT_COUNT] = esm->private_segment_count; - a->options[APP_OPTIONS_TLS_ENGINE] = esm->tls_engine; - a->options[APP_OPTIONS_PCT_FIRST_ALLOC] = 100; - a->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] = - esm->prealloc_fifos ? esm->prealloc_fifos : 1; - - a->options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN; - if (appns_id) - { - a->namespace_id = appns_id; - a->options[APP_OPTIONS_FLAGS] |= appns_flags; - a->options[APP_OPTIONS_NAMESPACE_SECRET] = appns_secret; - } - - if (vnet_application_attach (a)) - { - clib_warning ("failed to attach server"); - return -1; - } - esm->app_index = a->app_index; - - clib_memset (a_cert, 0, sizeof (*a_cert)); - a_cert->app_index = a->app_index; - vec_validate (a_cert->cert, test_srv_crt_rsa_len); - clib_memcpy_fast (a_cert->cert, test_srv_crt_rsa, test_srv_crt_rsa_len); - vnet_app_add_tls_cert (a_cert); - - clib_memset (a_key, 0, sizeof (*a_key)); - a_key->app_index = a->app_index; - vec_validate (a_key->key, test_srv_key_rsa_len); - clib_memcpy_fast (a_key->key, test_srv_key_rsa, test_srv_key_rsa_len); - vnet_app_add_tls_key (a_key); - return 0; -} - -static int -hicn_server_detach (void) -{ - hicn_server_main_t *esm = &hicn_server_main; - vnet_app_detach_args_t _da, *da = &_da; - int rv; - - da->app_index = esm->app_index; - rv = vnet_application_detach (da); - esm->app_index = ~0; - return rv; -} - -static int -hicn_server_listen () -{ - int rv; - hicn_server_main_t *esm = &hicn_server_main; - vnet_listen_args_t _a, *a = &_a; - clib_memset (a, 0, sizeof (*a)); - a->app_index = esm->app_index; - a->uri = esm->server_uri; - rv = vnet_bind_uri (a); - esm->listener_handle = a->handle; - return rv; -} - -static int -hicn_server_create (vlib_main_t * vm, u8 * appns_id, u64 appns_flags, - u64 appns_secret) -{ - hicn_server_main_t *esm = &hicn_server_main; - vlib_thread_main_t *vtm = vlib_get_thread_main (); - u32 num_threads; - int i; - - if (esm->my_client_index == (u32) ~ 0) - { - if (create_api_loopback (vm)) - { - clib_warning ("failed to create api loopback"); - return -1; - } - } - - num_threads = 1 /* main thread */ + vtm->n_threads; - vec_validate (hicn_server_main.vpp_queue, num_threads - 1); - vec_validate (esm->rx_buf, num_threads - 1); - vec_validate (esm->rx_retries, num_threads - 1); - for (i = 0; i < vec_len (esm->rx_retries); i++) - vec_validate (esm->rx_retries[i], - pool_elts (session_main.wrk[i].sessions)); - esm->rcv_buffer_size = clib_max (esm->rcv_buffer_size, esm->fifo_size); - for (i = 0; i < num_threads; i++) - vec_validate (esm->rx_buf[i], esm->rcv_buffer_size); - - if (hicn_server_attach (appns_id, appns_flags, appns_secret)) - { - clib_warning ("failed to attach server"); - return -1; - } - if (hicn_server_listen ()) - { - clib_warning ("failed to start listening"); - if (hicn_server_detach ()) - clib_warning ("failed to detach"); - return -1; - } - return 0; -} - -static clib_error_t * -hicn_server_create_command_fn (vlib_main_t * vm, unformat_input_t * input, - vlib_cli_command_t * cmd) -{ - hicn_server_main_t *esm = &hicn_server_main; - u8 server_uri_set = 0, *appns_id = 0; - u64 tmp, appns_flags = 0, appns_secret = 0; - char *default_uri = "hicn://b001::1/64"; - int rv, is_stop = 0; - session_endpoint_cfg_t sep = SESSION_ENDPOINT_CFG_NULL; - - esm->fifo_size = 128 << 20; - esm->rcv_buffer_size = 2 << 20; - esm->prealloc_fifos = 0; - esm->private_segment_count = 0; - esm->private_segment_size = 0; - esm->tls_engine = CRYPTO_ENGINE_OPENSSL; - vec_free (esm->server_uri); - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "uri %s", &esm->server_uri)) - server_uri_set = 1; - else if (unformat (input, "fifo-size %d", &esm->fifo_size)) - esm->fifo_size <<= 10; - else if (unformat (input, "rcv-buf-size %d", &esm->rcv_buffer_size)) - ; - else if (unformat (input, "prealloc-fifos %d", &esm->prealloc_fifos)) - ; - else if (unformat (input, "private-segment-count %d", - &esm->private_segment_count)) - ; - else if (unformat (input, "private-segment-size %U", - unformat_memory_size, &tmp)) - { - if (tmp >= 0x100000000ULL) - return clib_error_return - (0, "private segment size %lld (%llu) too large", tmp, tmp); - esm->private_segment_size = tmp; - } - else if (unformat (input, "appns %_%v%_", &appns_id)) - ; - else if (unformat (input, "all-scope")) - appns_flags |= (APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE - | APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE); - else if (unformat (input, "local-scope")) - appns_flags |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE; - else if (unformat (input, "global-scope")) - appns_flags |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE; - else if (unformat (input, "secret %lu", &appns_secret)) - ; - else if (unformat (input, "stop")) - is_stop = 1; - else if (unformat (input, "tls-engine %d", &esm->tls_engine)) - ; - else - return clib_error_return (0, "failed: unknown input `%U'", - format_unformat_error, input); - } - - if (is_stop) - { - if (esm->app_index == (u32) ~ 0) - { - clib_warning ("server not running"); - return clib_error_return (0, "failed: server not running"); - } - rv = hicn_server_detach (); - if (rv) - { - clib_warning ("failed: detach"); - return clib_error_return (0, "failed: server detach %d", rv); - } - return 0; - } - - vnet_session_enable_disable (vm, 1 /* turn on TCP, etc. */ ); - hicn_hs_enable_disable(vm, 1 /* enable hicn transport */); - - if (!server_uri_set) - { - clib_warning ("No uri provided! Using default: %s", default_uri); - esm->server_uri = (char *) format (0, "%s%c", default_uri, 0); - } - - if ((rv = parse_uri ((char *) esm->server_uri, &sep))) - return clib_error_return (0, "Uri parse error: %d", rv); - esm->transport_proto = sep.transport_proto; - esm->is_dgram = 0; - - rv = hicn_server_create (vm, appns_id, appns_flags, appns_secret); - vec_free (appns_id); - if (rv) - { - vec_free (esm->server_uri); - return clib_error_return (0, "failed: server_create returned %d", rv); - } - - return 0; -} - -/* *INDENT-OFF* */ -VLIB_CLI_COMMAND (hicn_server_create_command, static) = -{ - .path = "test hicn hs server", - .short_help = "test echo server proto [no echo][fifo-size ]" - "[rcv-buf-size ][prealloc-fifos ]" - "[private-segment-count ][private-segment-size ]" - "[uri ]", - .function = hicn_server_create_command_fn, -}; -/* *INDENT-ON* */ - -clib_error_t * -hicn_server_main_init (vlib_main_t * vm) -{ - hicn_server_main_t *esm = &hicn_server_main; - esm->my_client_index = ~0; - return 0; -} - -VLIB_INIT_FUNCTION (hicn_server_main_init); - -/* -* fd.io coding-style-patch-verification: ON -* -* Local Variables: -* eval: (c-set-style "gnu") -* End: -*/ -- cgit 1.2.3-korg