X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession-apps%2Fecho_client.c;h=51a85c068f8be996ffeea093333734bd4debc34a;hb=fa76a76bf;hp=5b70d4906bcc601ae6c32a0a13f28a16eafd16f7;hpb=8f89dd01289ea9e97405432d2351a19c842dd6d5;p=vpp.git diff --git a/src/vnet/session-apps/echo_client.c b/src/vnet/session-apps/echo_client.c index 5b70d4906bc..51a85c068f8 100644 --- a/src/vnet/session-apps/echo_client.c +++ b/src/vnet/session-apps/echo_client.c @@ -43,26 +43,65 @@ signal_evt_to_cli (int code) } static void -send_data_chunk (echo_client_main_t * ecm, session_t * s) +send_data_chunk (echo_client_main_t * ecm, eclient_session_t * s) { u8 *test_data = ecm->connect_test_data; - int test_buf_offset; + int test_buf_len, test_buf_offset, rv; u32 bytes_this_chunk; - session_fifo_event_t evt; - svm_fifo_t *txf; - int rv; - - ASSERT (vec_len (test_data) > 0); - - test_buf_offset = s->bytes_sent % vec_len (test_data); - bytes_this_chunk = vec_len (test_data) - test_buf_offset; - bytes_this_chunk = bytes_this_chunk < s->bytes_to_send - ? bytes_this_chunk : s->bytes_to_send; + test_buf_len = vec_len (test_data); + ASSERT (test_buf_len > 0); + test_buf_offset = s->bytes_sent % test_buf_len; + bytes_this_chunk = clib_min (test_buf_len - test_buf_offset, + s->bytes_to_send); - txf = s->server_tx_fifo; - rv = svm_fifo_enqueue_nowait (txf, bytes_this_chunk, - test_data + test_buf_offset); + if (!ecm->is_dgram) + { + if (ecm->no_copy) + { + svm_fifo_t *f = s->data.tx_fifo; + rv = clib_min (svm_fifo_max_enqueue (f), bytes_this_chunk); + svm_fifo_enqueue_nocopy (f, rv); + session_send_io_evt_to_thread_custom (f, s->thread_index, + FIFO_EVENT_APP_TX); + } + else + rv = app_send_stream (&s->data, test_data + test_buf_offset, + bytes_this_chunk, 0); + } + else + { + if (ecm->no_copy) + { + session_dgram_hdr_t hdr; + svm_fifo_t *f = s->data.tx_fifo; + app_session_transport_t *at = &s->data.transport; + u32 max_enqueue = svm_fifo_max_enqueue (f); + + if (max_enqueue <= sizeof (session_dgram_hdr_t)) + return; + + max_enqueue -= sizeof (session_dgram_hdr_t); + rv = clib_min (max_enqueue, bytes_this_chunk); + + hdr.data_length = rv; + hdr.data_offset = 0; + clib_memcpy_fast (&hdr.rmt_ip, &at->rmt_ip, + sizeof (ip46_address_t)); + hdr.is_ip4 = at->is_ip4; + hdr.rmt_port = at->rmt_port; + clib_memcpy_fast (&hdr.lcl_ip, &at->lcl_ip, + sizeof (ip46_address_t)); + hdr.lcl_port = at->lcl_port; + svm_fifo_enqueue_nowait (f, sizeof (hdr), (u8 *) & hdr); + svm_fifo_enqueue_nocopy (f, rv); + session_send_io_evt_to_thread_custom (f, s->thread_index, + FIFO_EVENT_APP_TX); + } + else + rv = app_send_dgram (&s->data, test_data + test_buf_offset, + bytes_this_chunk, 0); + } /* If we managed to enqueue data... */ if (rv > 0) @@ -89,35 +128,24 @@ send_data_chunk (echo_client_main_t * ecm, session_t * s) ed->data[1] = s->bytes_sent; ed->data[2] = s->bytes_to_send; } - - /* Poke the session layer */ - if (svm_fifo_set_event (txf)) - { - /* Fabricate TX event, send to vpp */ - evt.fifo = txf; - evt.event_type = FIFO_EVENT_APP_TX; - - if (svm_queue_add - (ecm->vpp_event_queue[txf->master_thread_index], (u8 *) & evt, - 0 /* do wait for mutex */ )) - clib_warning ("could not enqueue event"); - } } } static void -receive_data_chunk (echo_client_main_t * ecm, session_t * s) +receive_data_chunk (echo_client_main_t * ecm, eclient_session_t * s) { - svm_fifo_t *rx_fifo = s->server_rx_fifo; - u32 my_thread_index = vlib_get_thread_index (); + svm_fifo_t *rx_fifo = s->data.rx_fifo; + u32 thread_index = vlib_get_thread_index (); int n_read, i; if (ecm->test_bytes) { - n_read = svm_fifo_dequeue_nowait (rx_fifo, - vec_len (ecm->rx_buf - [my_thread_index]), - ecm->rx_buf[my_thread_index]); + if (!ecm->is_dgram) + n_read = app_recv_stream (&s->data, ecm->rx_buf[thread_index], + vec_len (ecm->rx_buf[thread_index])); + else + n_read = app_recv_dgram (&s->data, ecm->rx_buf[thread_index], + vec_len (ecm->rx_buf[thread_index])); } else { @@ -148,17 +176,18 @@ receive_data_chunk (echo_client_main_t * ecm, session_t * s) { for (i = 0; i < n_read; i++) { - if (ecm->rx_buf[my_thread_index][i] + if (ecm->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, - ecm->rx_buf[my_thread_index][i], + ecm->rx_buf[thread_index][i], ((s->bytes_received + i) & 0xff)); ecm->test_failed = 1; } } } + ASSERT (n_read <= s->bytes_to_receive); s->bytes_to_receive -= n_read; s->bytes_received += n_read; } @@ -170,7 +199,7 @@ echo_client_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, { echo_client_main_t *ecm = &echo_client_main; int my_thread_index = vlib_get_thread_index (); - session_t *sp; + eclient_session_t *sp; int i; int delete_session; u32 *connection_indices; @@ -181,7 +210,7 @@ echo_client_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, connections_this_batch = ecm->connections_this_batch_by_thread[my_thread_index]; - if ((ecm->run_test == 0) || + if ((ecm->run_test != ECHO_CLIENTS_RUNNING) || ((vec_len (connection_indices) == 0) && vec_len (connections_this_batch) == 0)) return 0; @@ -194,10 +223,10 @@ echo_client_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, ASSERT (nconnections_this_batch > 0); vec_validate (connections_this_batch, nconnections_this_batch - 1); - clib_memcpy (connections_this_batch, - connection_indices + vec_len (connection_indices) - - nconnections_this_batch, - nconnections_this_batch * sizeof (u32)); + 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; } @@ -230,20 +259,15 @@ echo_client_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, } if (sp->bytes_to_receive > 0) { - receive_data_chunk (ecm, sp); delete_session = 0; } if (PREDICT_FALSE (delete_session == 1)) { - u32 index, thread_index; stream_session_t *s; - __sync_fetch_and_add (&ecm->tx_total, sp->bytes_sent); - __sync_fetch_and_add (&ecm->rx_total, sp->bytes_received); - - session_parse_handle (sp->vpp_session_handle, - &index, &thread_index); - s = session_get_if_valid (index, thread_index); + clib_atomic_fetch_add (&ecm->tx_total, sp->bytes_sent); + clib_atomic_fetch_add (&ecm->rx_total, sp->bytes_received); + s = session_get_from_handle_if_valid (sp->vpp_session_handle); if (s) { @@ -254,7 +278,7 @@ echo_client_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, vec_delete (connections_this_batch, 1, i); i--; - __sync_fetch_and_add (&ecm->ready_connections, -1); + clib_atomic_fetch_add (&ecm->ready_connections, -1); } else { @@ -312,8 +336,8 @@ echo_clients_init (vlib_main_t * vm) num_threads = 1 /* main thread */ + vtm->n_threads; - /* Init test data. Bigecmuffer */ - vec_validate (ecm->connect_test_data, 1024 * 1024 - 1); + /* Init test data. Big buffer */ + vec_validate (ecm->connect_test_data, 4 * 1024 * 1024 - 1); for (i = 0; i < vec_len (ecm->connect_test_data); i++) ecm->connect_test_data[i] = i & 0xff; @@ -335,18 +359,24 @@ echo_clients_session_connected_callback (u32 app_index, u32 api_context, stream_session_t * s, u8 is_fail) { echo_client_main_t *ecm = &echo_client_main; - session_t *session; + eclient_session_t *session; u32 session_index; - u8 thread_index = vlib_get_thread_index (); + u8 thread_index; + + if (PREDICT_FALSE (ecm->run_test != ECHO_CLIENTS_STARTING)) + return -1; if (is_fail) { clib_warning ("connection %d failed!", api_context); + ecm->run_test = ECHO_CLIENTS_EXITING; signal_evt_to_cli (-1); return 0; } - ASSERT (s->thread_index == thread_index); + thread_index = s->thread_index; + ASSERT (thread_index == vlib_get_thread_index () + || session_transport_service_type (s) == TRANSPORT_SERVICE_CL); if (!ecm->vpp_event_queue[thread_index]) ecm->vpp_event_queue[thread_index] = @@ -359,21 +389,31 @@ echo_clients_session_connected_callback (u32 app_index, u32 api_context, pool_get (ecm->sessions, session); clib_spinlock_unlock_if_init (&ecm->sessions_lock); - memset (session, 0, sizeof (*session)); + clib_memset (session, 0, sizeof (*session)); session_index = session - ecm->sessions; session->bytes_to_send = ecm->bytes_to_send; session->bytes_to_receive = ecm->no_return ? 0ULL : ecm->bytes_to_send; - session->server_rx_fifo = s->server_rx_fifo; - session->server_rx_fifo->client_session_index = session_index; - session->server_tx_fifo = s->server_tx_fifo; - session->server_tx_fifo->client_session_index = session_index; + session->data.rx_fifo = s->server_rx_fifo; + session->data.rx_fifo->client_session_index = session_index; + session->data.tx_fifo = s->server_tx_fifo; + session->data.tx_fifo->client_session_index = session_index; + session->data.vpp_evt_q = ecm->vpp_event_queue[thread_index]; session->vpp_session_handle = session_handle (s); + if (ecm->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 (ecm->connection_index_by_thread[thread_index], session_index); - __sync_fetch_and_add (&ecm->ready_connections, 1); + clib_atomic_fetch_add (&ecm->ready_connections, 1); if (ecm->ready_connections == ecm->expected_connections) { - ecm->run_test = 1; + ecm->run_test = ECHO_CLIENTS_RUNNING; /* Signal the CLI process that the action is starting... */ signal_evt_to_cli (1); } @@ -407,14 +447,43 @@ echo_clients_session_disconnect_callback (stream_session_t * s) return; } +void +echo_clients_session_disconnect (stream_session_t * s) +{ + echo_client_main_t *ecm = &echo_client_main; + vnet_disconnect_args_t _a, *a = &_a; + a->handle = session_handle (s); + a->app_index = ecm->app_index; + vnet_disconnect_session (a); +} + static int echo_clients_rx_callback (stream_session_t * s) { + echo_client_main_t *ecm = &echo_client_main; + eclient_session_t *sp; + + if (PREDICT_FALSE (ecm->run_test != ECHO_CLIENTS_RUNNING)) + { + echo_clients_session_disconnect (s); + return -1; + } + + sp = pool_elt_at_index (ecm->sessions, + s->server_rx_fifo->client_session_index); + receive_data_chunk (ecm, sp); + + if (svm_fifo_max_dequeue (s->server_rx_fifo)) + { + if (svm_fifo_set_event (s->server_rx_fifo)) + session_send_io_evt_to_thread (s->server_rx_fifo, + FIFO_EVENT_BUILTIN_RX); + } return 0; } int -echo_client_add_segment_callback (u32 client_index, const ssvm_private_t * sp) +echo_client_add_segment_callback (u32 client_index, u64 segment_handle) { /* New heaps may be added */ return 0; @@ -440,8 +509,8 @@ echo_clients_attach (u8 * appns_id, u64 appns_flags, u64 appns_secret) u64 options[16]; clib_error_t *error = 0; - memset (a, 0, sizeof (*a)); - memset (options, 0, sizeof (options)); + clib_memset (a, 0, sizeof (*a)); + clib_memset (options, 0, sizeof (options)); a->api_client_index = ecm->my_client_index; a->session_cb_vft = &echo_clients; @@ -458,8 +527,8 @@ echo_clients_attach (u8 * appns_id, u64 appns_flags, u64 appns_secret) options[APP_OPTIONS_TX_FIFO_SIZE] = ecm->fifo_size; options[APP_OPTIONS_PRIVATE_SEGMENT_COUNT] = ecm->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] = ecm->tls_engine; if (appns_id) { options[APP_OPTIONS_FLAGS] |= appns_flags; @@ -521,7 +590,7 @@ echo_clients_connect (vlib_main_t * vm, u32 n_clients) clib_error_t *error = 0; int i; - memset (a, 0, sizeof (*a)); + clib_memset (a, 0, sizeof (*a)); for (i = 0; i < n_clients; i++) { a->uri = (char *) ecm->connect_uri; @@ -544,7 +613,7 @@ echo_clients_connect (vlib_main_t * vm, u32 n_clients) } #define ec_cli_output(_fmt, _args...) \ - if (!ecm->no_output) \ + if (!ecm->no_output) \ vlib_cli_output(vm, _fmt, ##_args) static clib_error_t * @@ -575,6 +644,10 @@ echo_clients_command_fn (vlib_main_t * vm, ecm->test_bytes = 0; ecm->test_failed = 0; ecm->vlib_main = vm; + ecm->tls_engine = TLS_ENGINE_OPENSSL; + ecm->no_copy = 0; + ecm->run_test = ECHO_CLIENTS_STARTING; + if (thread_main->n_vlib_mains > 1) clib_spinlock_init (&ecm->sessions_lock); vec_free (ecm->connect_uri); @@ -632,6 +705,8 @@ echo_clients_command_fn (vlib_main_t * vm, ecm->no_output = 1; else if (unformat (input, "test-bytes")) ecm->test_bytes = 1; + else if (unformat (input, "tls-engine %d", &ecm->tls_engine)) + ; else return clib_error_return (0, "failed: unknown input `%U'", format_unformat_error, input); @@ -659,6 +734,9 @@ echo_clients_command_fn (vlib_main_t * vm, ecm->connect_uri = format (0, "%s%c", default_uri, 0); } + if (ecm->connect_uri[0] == 'u' && ecm->connect_uri[3] != 'c') + ecm->is_dgram = 1; + #if ECHO_CLIENT_PTHREAD echo_clients_start_tx_pthread (); #endif @@ -685,18 +763,12 @@ echo_clients_command_fn (vlib_main_t * vm, VLIB_NODE_STATE_POLLING); if (preallocate_sessions) - { - session_t *sp __attribute__ ((unused)); - for (i = 0; i < n_clients; i++) - pool_get (ecm->sessions, sp); - for (i = 0; i < n_clients; i++) - pool_put_index (ecm->sessions, i); - } + pool_init_fixed (ecm->sessions, 1.1 * n_clients); /* Fire off connect requests */ time_before_connects = vlib_time_now (vm); if ((error = echo_clients_connect (vm, n_clients))) - return error; + goto cleanup; /* Park until the sessions come up, or ten seconds elapse... */ vlib_process_wait_for_event_or_clock (vm, syn_timeout); @@ -776,7 +848,8 @@ echo_clients_command_fn (vlib_main_t * vm, error = clib_error_return (0, "failed: test bytes"); cleanup: - ecm->run_test = 0; + ecm->run_test = ECHO_CLIENTS_EXITING; + vlib_process_wait_for_event_or_clock (vm, 10e-3); for (i = 0; i < vec_len (ecm->connection_index_by_thread); i++) { vec_reset_length (ecm->connection_index_by_thread[i]);