svm_fifo_t *f = s->data.tx_fifo;
rv = clib_min (svm_fifo_max_enqueue_prod (f), bytes_this_chunk);
svm_fifo_enqueue_nocopy (f, rv);
- session_send_io_evt_to_thread_custom (&f->master_session_index,
- s->thread_index,
- SESSION_IO_EVT_TX);
+ session_send_io_evt_to_thread_custom (
+ &f->shr->master_session_index, s->thread_index, SESSION_IO_EVT_TX);
}
else
rv = app_send_stream (&s->data, test_data + test_buf_offset,
hdr.lcl_port = at->lcl_port;
svm_fifo_enqueue (f, sizeof (hdr), (u8 *) & hdr);
svm_fifo_enqueue_nocopy (f, rv);
- session_send_io_evt_to_thread_custom (&f->master_session_index,
- s->thread_index,
- SESSION_IO_EVT_TX);
+ session_send_io_evt_to_thread_custom (
+ &f->shr->master_session_index, s->thread_index, SESSION_IO_EVT_TX);
}
else
{
session->bytes_to_send = ecm->bytes_to_send;
session->bytes_to_receive = ecm->no_return ? 0ULL : ecm->bytes_to_send;
session->data.rx_fifo = s->rx_fifo;
- session->data.rx_fifo->client_session_index = session_index;
+ session->data.rx_fifo->shr->client_session_index = session_index;
session->data.tx_fifo = s->tx_fifo;
- session->data.tx_fifo->client_session_index = session_index;
+ session->data.tx_fifo->shr->client_session_index = session_index;
session->data.vpp_evt_q = ecm->vpp_event_queue[thread_index];
session->vpp_session_handle = session_handle (s);
session->bytes_to_send = ecm->bytes_to_send;
session->bytes_to_receive = ecm->no_return ? 0ULL : ecm->bytes_to_send;
session->data.rx_fifo = s->rx_fifo;
- session->data.rx_fifo->client_session_index = session_index;
+ session->data.rx_fifo->shr->client_session_index = session_index;
session->data.tx_fifo = s->tx_fifo;
- session->data.tx_fifo->client_session_index = session_index;
+ session->data.tx_fifo->shr->client_session_index = session_index;
session->data.vpp_evt_q = ecm->vpp_event_queue[thread_index];
session->vpp_session_handle = session_handle (s);
return -1;
}
- sp = pool_elt_at_index (ecm->sessions, s->rx_fifo->client_session_index);
+ sp =
+ pool_elt_at_index (ecm->sessions, s->rx_fifo->shr->client_session_index);
receive_data_chunk (ecm, sp);
if (svm_fifo_max_dequeue_cons (s->rx_fifo))
static clib_error_t *
echo_clients_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;
+ vnet_app_add_cert_key_pair_args_t _ck_pair, *ck_pair = &_ck_pair;
u32 prealloc_fifos, segment_size = 256 << 20;
echo_client_main_t *ecm = &echo_client_main;
vnet_app_attach_args_t _a, *a = &_a;
ecm->app_index = a->app_index;
vec_free (a->name);
- 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);
+ clib_memset (ck_pair, 0, sizeof (*ck_pair));
+ ck_pair->cert = (u8 *) test_srv_crt_rsa;
+ ck_pair->key = (u8 *) test_srv_key_rsa;
+ ck_pair->cert_len = test_srv_crt_rsa_len;
+ ck_pair->key_len = test_srv_key_rsa_len;
+ vnet_app_add_cert_key_pair (ck_pair);
+ ecm->ckpair_index = ck_pair->index;
+
return 0;
}
rv = vnet_application_detach (da);
ecm->test_client_attached = 0;
ecm->app_index = ~0;
+ vnet_app_del_cert_key_pair (ecm->ckpair_index);
+
return rv;
}
clib_error_t *
echo_clients_connect (vlib_main_t * vm, u32 n_clients)
{
+ session_endpoint_cfg_t sep = SESSION_ENDPOINT_CFG_NULL;
echo_client_main_t *ecm = &echo_client_main;
vnet_connect_args_t _a, *a = &_a;
int i, rv;
clib_memset (a, 0, sizeof (*a));
+ if (parse_uri ((char *) ecm->connect_uri, &sep))
+ return clib_error_return (0, "invalid uri");
+
for (i = 0; i < n_clients; i++)
{
- a->uri = (char *) ecm->connect_uri;
+ clib_memcpy (&a->sep_ext, &sep, sizeof (sep));
a->api_context = i;
a->app_index = ecm->app_index;
+ a->sep_ext.ckpair_index = ecm->ckpair_index;
vlib_worker_thread_barrier_sync (vm);
- if ((rv = vnet_connect_uri (a)))
+ if ((rv = vnet_connect (a)))
{
vlib_worker_thread_barrier_release (vm);
return clib_error_return (0, "connect returned: %d", rv);
echo_client_main_t *ecm = &echo_client_main;
vlib_thread_main_t *thread_main = vlib_get_thread_main ();
u64 tmp, total_bytes, appns_flags = 0, appns_secret = 0;
+ session_endpoint_cfg_t sep = SESSION_ENDPOINT_CFG_NULL;
f64 test_timeout = 20.0, syn_timeout = 20.0, delta;
char *default_uri = "tcp://6.0.1.1/1234";
+ u8 *appns_id = 0, barrier_acq_needed = 0;
+ int preallocate_sessions = 0, i, rv;
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;
ecm->quic_streams = 1;
ecm->bytes_to_send = 8192;
ecm->no_copy = 0;
ecm->run_test = ECHO_CLIENTS_STARTING;
+ if (vlib_num_workers ())
+ {
+ /* The request came over the binary api and the inband cli handler
+ * is not mp_safe. Drop the barrier to make sure the workers are not
+ * blocked.
+ */
+ if (vlib_thread_is_main_w_barrier ())
+ {
+ barrier_acq_needed = 1;
+ vlib_worker_thread_barrier_release (vm);
+ }
+ /*
+ * There's a good chance that both the client and the server echo
+ * apps will be enabled so make sure the session queue node polls on
+ * the main thread as connections will probably be established on it.
+ */
+ vlib_node_set_state (vm, session_queue_node.index,
+ VLIB_NODE_STATE_POLLING);
+ }
+
if (thread_main->n_vlib_mains > 1)
clib_spinlock_init (&ecm->sessions_lock);
vec_free (ecm->connect_uri);
unformat_memory_size, &tmp))
{
if (tmp >= 0x100000000ULL)
- return clib_error_return
- (0, "private segment size %lld (%llu) too large", tmp, tmp);
+ {
+ error = clib_error_return (
+ 0, "private segment size %lld (%llu) too large", tmp, tmp);
+ goto cleanup;
+ }
ecm->private_segment_size = tmp;
}
else if (unformat (input, "preallocate-fifos"))
else if (unformat (input, "tls-engine %d", &ecm->tls_engine))
;
else
- return clib_error_return (0, "failed: unknown input `%U'",
- format_unformat_error, input);
+ {
+ error = clib_error_return (0, "failed: unknown input `%U'",
+ format_unformat_error, input);
+ goto cleanup;
+ }
}
/* Store cli process node index for signalling */
if (ecm->is_init == 0)
{
if (echo_clients_init (vm))
- return clib_error_return (0, "failed init");
+ {
+ error = clib_error_return (0, "failed init");
+ goto cleanup;
+ }
}
}
if ((rv = parse_uri ((char *) ecm->connect_uri, &sep)))
- return clib_error_return (0, "Uri parse error: %d", rv);
+ {
+ error = clib_error_return (0, "Uri parse error: %d", rv);
+ goto cleanup;
+ }
ecm->transport_proto = sep.transport_proto;
ecm->is_dgram = (sep.transport_proto == TRANSPORT_PROTO_UDP);
{
vec_free (appns_id);
clib_error_report (error);
- return error;
+ goto cleanup;
}
vec_free (appns_id);
}
if (error)
ec_cli_output ("test failed");
vec_free (ecm->connect_uri);
+ clib_spinlock_free (&ecm->sessions_lock);
+
+ if (barrier_acq_needed)
+ vlib_worker_thread_barrier_sync (vm);
+
return error;
}
Code Review / vpp.git / blobdiff