X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Ftests%2Fvnet%2Fsession%2Ftcp_echo.c;h=6e41e4b2c1a2e7c649047c8742cd3c6a59d774e5;hb=6a5adc369591fcac2447e9809deaa22f56b53911;hp=30eb54dcddab55957a4596dc47fd8a115c15c284;hpb=90a63988fa01685626b6d6a01b79ea5370f7fbac;p=vpp.git diff --git a/src/tests/vnet/session/tcp_echo.c b/src/tests/vnet/session/tcp_echo.c index 30eb54dcdda..6e41e4b2c1a 100644 --- a/src/tests/vnet/session/tcp_echo.c +++ b/src/tests/vnet/session/tcp_echo.c @@ -38,13 +38,23 @@ #include #undef vl_printfun +#define TCP_ECHO_DBG 0 +#define DBG(_fmt,_args...) \ + if (TCP_ECHO_DBG) \ + clib_warning (_fmt, _args) + typedef struct { svm_fifo_t *server_rx_fifo; svm_fifo_t *server_tx_fifo; + svm_msg_q_t *vpp_evt_q; + u64 vpp_session_handle; - u64 bytes_received; + u64 bytes_sent; + u64 bytes_to_send; + volatile u64 bytes_received; + volatile u64 bytes_to_receive; f64 start; } session_t; @@ -52,15 +62,17 @@ typedef enum { STATE_START, STATE_ATTACHED, + STATE_LISTEN, STATE_READY, STATE_DISCONNECTING, - STATE_FAILED + STATE_FAILED, + STATE_DETACHED } connection_state_t; typedef struct { /* vpe input queue */ - unix_shared_memory_queue_t *vl_input_queue; + svm_queue_t *vl_input_queue; /* API client handle */ u32 my_client_index; @@ -85,13 +97,10 @@ typedef struct int i_am_master; /* drop all packets */ - int drop_packets; + int no_return; /* Our event queue */ - unix_shared_memory_queue_t *our_event_queue; - - /* $$$ single thread only for the moment */ - unix_shared_memory_queue_t *vpp_event_queue; + svm_msg_q_t *our_event_queue; u8 *socket_name; @@ -113,10 +122,20 @@ typedef struct uword *error_string_by_error_number; u8 *connect_test_data; - pthread_t client_rx_thread_handle; + pthread_t *client_thread_handles; + u32 *thread_args; u32 client_bytes_received; u8 test_return_packets; u64 bytes_to_send; + u32 fifo_size; + + u32 n_clients; + u64 tx_total; + u64 rx_total; + + volatile u32 n_clients_connected; + volatile u32 n_active_clients; + /** Flag that decides if socket, instead of svm, api is used to connect to * vpp. If sock api is used, shm binary api is subsequently bootstrapped @@ -125,9 +144,9 @@ typedef struct /* convenience */ svm_fifo_segment_main_t *segment_main; -} uri_tcp_test_main_t; +} echo_main_t; -uri_tcp_test_main_t uri_tcp_test_main; +echo_main_t echo_main; #if CLIB_DEBUG > 0 #define NITER 10000 @@ -135,14 +154,70 @@ uri_tcp_test_main_t uri_tcp_test_main; #define NITER 4000000 #endif +const char test_srv_crt_rsa[] = + "-----BEGIN CERTIFICATE-----\r\n" + "MIID5zCCAs+gAwIBAgIJALeMYCEHrTtJMA0GCSqGSIb3DQEBCwUAMIGJMQswCQYD\r\n" + "VQQGEwJVUzELMAkGA1UECAwCQ0ExETAPBgNVBAcMCFNhbiBKb3NlMQ4wDAYDVQQK\r\n" + "DAVDaXNjbzEOMAwGA1UECwwFZmQuaW8xFjAUBgNVBAMMDXRlc3R0bHMuZmQuaW8x\r\n" + "IjAgBgkqhkiG9w0BCQEWE3ZwcC1kZXZAbGlzdHMuZmQuaW8wHhcNMTgwMzA1MjEx\r\n" + "NTEyWhcNMjgwMzAyMjExNTEyWjCBiTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNB\r\n" + "MREwDwYDVQQHDAhTYW4gSm9zZTEOMAwGA1UECgwFQ2lzY28xDjAMBgNVBAsMBWZk\r\n" + "LmlvMRYwFAYDVQQDDA10ZXN0dGxzLmZkLmlvMSIwIAYJKoZIhvcNAQkBFhN2cHAt\r\n" + "ZGV2QGxpc3RzLmZkLmlvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\r\n" + "4C1k8a1DuStgggqT4o09fP9sJ2dC54bxhS/Xk2VEfaIZ222WSo4X/syRVfVy9Yah\r\n" + "cpI1zJ/RDxaZSFhgA+nPZBrFMsrULkrdAOpOVj8eDEp9JuWdO2ODSoFnCvLxcYWB\r\n" + "Yc5kHryJpEaGJl1sFQSesnzMFty/59ta0stk0Fp8r5NhIjWvSovGzPo6Bhz+VS2c\r\n" + "ebIZh4x1t2hHaFcgm0qJoJ6DceReWCW8w+yOVovTolGGq+bpb2Hn7MnRSZ2K2NdL\r\n" + "+aLXpkZbS/AODP1FF2vTO1mYL290LO7/51vJmPXNKSDYMy5EvILr5/VqtjsFCwRL\r\n" + "Q4jcM/+GeHSAFWx4qIv0BwIDAQABo1AwTjAdBgNVHQ4EFgQUWa1SOB37xmT53tZQ\r\n" + "aXuLLhRI7U8wHwYDVR0jBBgwFoAUWa1SOB37xmT53tZQaXuLLhRI7U8wDAYDVR0T\r\n" + "BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAoUht13W4ya27NVzQuCMvqPWL3VM4\r\n" + "3xbPFk02FaGz/WupPu276zGlzJAZrbuDcQowwwU1Ni1Yygxl96s1c2M5rHDTrOKG\r\n" + "rK0hbkSFBo+i6I8u4HiiQ4rYmG0Hv6+sXn3of0HsbtDPGgWZoipPWDljPYEURu3e\r\n" + "3HRe/Dtsj9CakBoSDzs8ndWaBR+f4sM9Tk1cjD46Gq2T/qpSPXqKxEUXlzhdCAn4\r\n" + "twub17Bq2kykHpppCwPg5M+v30tHG/R2Go15MeFWbEJthFk3TZMjKL7UFs7fH+x2\r\n" + "wSonXb++jY+KmCb93C+soABBizE57g/KmiR2IxQ/LMjDik01RSUIaM0lLA==\r\n" + "-----END CERTIFICATE-----\r\n"; +const u32 test_srv_crt_rsa_len = sizeof (test_srv_crt_rsa); + +const char test_srv_key_rsa[] = + "-----BEGIN PRIVATE KEY-----\r\n" + "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDgLWTxrUO5K2CC\r\n" + "CpPijT18/2wnZ0LnhvGFL9eTZUR9ohnbbZZKjhf+zJFV9XL1hqFykjXMn9EPFplI\r\n" + "WGAD6c9kGsUyytQuSt0A6k5WPx4MSn0m5Z07Y4NKgWcK8vFxhYFhzmQevImkRoYm\r\n" + "XWwVBJ6yfMwW3L/n21rSy2TQWnyvk2EiNa9Ki8bM+joGHP5VLZx5shmHjHW3aEdo\r\n" + "VyCbSomgnoNx5F5YJbzD7I5Wi9OiUYar5ulvYefsydFJnYrY10v5otemRltL8A4M\r\n" + "/UUXa9M7WZgvb3Qs7v/nW8mY9c0pINgzLkS8guvn9Wq2OwULBEtDiNwz/4Z4dIAV\r\n" + "bHioi/QHAgMBAAECggEBAMzGipP8+oT166U+NlJXRFifFVN1DvdhG9PWnOxGL+c3\r\n" + "ILmBBC08WQzmHshPemBvR6DZkA1H23cV5JTiLWrFtC00CvhXsLRMrE5+uWotI6yE\r\n" + "iofybMroHvD6/X5R510UX9hQ6MHu5ShLR5VZ9zXHz5MpTmB/60jG5dLx+jgcwBK8\r\n" + "LuGv2YB/WCUwT9QJ3YU2eaingnXtz/MrFbkbltrqlnBdlD+kTtw6Yac9y1XuuQXc\r\n" + "BPeulLNDuPolJVWbUvDBZrpt2dXTgz8ws1sv+wCNE0xwQJsqW4Nx3QkpibUL9RUr\r\n" + "CVbKlNfa9lopT6nGKlgX69R/uH35yh9AOsfasro6w0ECgYEA82UJ8u/+ORah+0sF\r\n" + "Q0FfW5MTdi7OAUHOz16pUsGlaEv0ERrjZxmAkHA/VRwpvDBpx4alCv0Hc39PFLIk\r\n" + "nhSsM2BEuBkTAs6/GaoNAiBtQVE/hN7awNRWVmlieS0go3Y3dzaE9IUMyj8sPOFT\r\n" + "5JdJ6BM69PHKCkY3dKdnnfpFEuECgYEA68mRpteunF1mdZgXs+WrN+uLlRrQR20F\r\n" + "ZyMYiUCH2Dtn26EzA2moy7FipIIrQcX/j+KhYNGM3e7MU4LymIO29E18mn8JODnH\r\n" + "sQOXzBTsf8A4yIVMkcuQD3bfb0JiUGYUPOidTp2N7IJA7+6Yc3vQOyb74lnKnJoO\r\n" + "gougPT2wS+cCgYAn7muzb6xFsXDhyW0Tm6YJYBfRS9yAWEuVufINobeBZPSl2cN1\r\n" + "Jrnw+HlrfTNbrJWuJmjtZJXUXQ6cVp2rUbjutNyRV4vG6iRwEXYQ40EJdkr1gZpi\r\n" + "CHQhuShuuPih2MNAy7EEbM+sXrDjTBR3bFqzuHPzu7dp+BshCFX3lRfAAQKBgGQt\r\n" + "K5i7IhCFDjb/+3IPLgOAK7mZvsvZ4eXD33TQ2eZgtut1PXtBtNl17/b85uv293Fm\r\n" + "VDISVcsk3eLNS8zIiT6afUoWlxAwXEs0v5WRfjl4radkGvgGiJpJYvyeM67877RB\r\n" + "EDSKc/X8ESLfOB44iGvZUEMG6zJFscx9DgN25iQZAoGAbyd+JEWwdVH9/K3IH1t2\r\n" + "PBkZX17kNWv+iVM1WyFjbe++vfKZCrOJiyiqhDeEqgrP3AuNMlaaduC3VRC3G5oV\r\n" + "Mj1tlhDWQ/qhvKdCKNdIVQYDE75nw+FRWV8yYkHAnXYW3tNoweDIwixE0hkPR1bc\r\n" + "oEjPLVNtx8SOj/M4rhaPT3I=\r\n" "-----END PRIVATE KEY-----\r\n"; +const u32 test_srv_key_rsa_len = sizeof (test_srv_key_rsa); + static u8 * format_api_error (u8 * s, va_list * args) { - uri_tcp_test_main_t *utm = &uri_tcp_test_main; + echo_main_t *em = &echo_main; i32 error = va_arg (*args, u32); uword *p; - p = hash_get (utm->error_string_by_error_number, -error); + p = hash_get (em->error_string_by_error_number, -error); if (p) s = format (s, "%s", p[0]); @@ -152,67 +227,103 @@ format_api_error (u8 * s, va_list * args) } static void -init_error_string_table (uri_tcp_test_main_t * utm) +init_error_string_table (echo_main_t * em) { - utm->error_string_by_error_number = hash_create (0, sizeof (uword)); + em->error_string_by_error_number = hash_create (0, sizeof (uword)); -#define _(n,v,s) hash_set (utm->error_string_by_error_number, -v, s); +#define _(n,v,s) hash_set (em->error_string_by_error_number, -v, s); foreach_vnet_api_error; #undef _ - hash_set (utm->error_string_by_error_number, 99, "Misc"); + hash_set (em->error_string_by_error_number, 99, "Misc"); } -int -wait_for_state_change (uri_tcp_test_main_t * utm, connection_state_t state) +static void handle_mq_event (session_event_t * e); + +static int +wait_for_state_change (echo_main_t * em, connection_state_t state) { + svm_msg_q_msg_t msg; + session_event_t *e; + f64 timeout; + #if CLIB_DEBUG > 0 #define TIMEOUT 600.0 #else #define TIMEOUT 600.0 #endif - f64 timeout = clib_time_now (&utm->clib_time) + TIMEOUT; + timeout = clib_time_now (&em->clib_time) + TIMEOUT; - while (clib_time_now (&utm->clib_time) < timeout) + while (clib_time_now (&em->clib_time) < timeout) { - if (utm->state == state) + if (em->state == state) return 0; - if (utm->state == STATE_FAILED) + if (em->state == STATE_FAILED) return -1; - if (utm->time_to_stop == 1) + if (em->time_to_stop == 1) return 0; + if (!em->our_event_queue) + continue; + + if (svm_msg_q_sub (em->our_event_queue, &msg, SVM_Q_NOWAIT, 0)) + continue; + e = svm_msg_q_msg_data (em->our_event_queue, &msg); + handle_mq_event (e); + svm_msg_q_free_msg (em->our_event_queue, &msg); } - clib_warning ("timeout waiting for STATE_READY"); + clib_warning ("timeout waiting for state %d", state); return -1; } void -application_send_attach (uri_tcp_test_main_t * utm) +application_send_attach (echo_main_t * em) { vl_api_application_attach_t *bmp; - u32 fifo_size = 4 << 20; + vl_api_application_tls_cert_add_t *cert_mp; + vl_api_application_tls_key_add_t *key_mp; + bmp = vl_msg_api_alloc (sizeof (*bmp)); memset (bmp, 0, sizeof (*bmp)); bmp->_vl_msg_id = ntohs (VL_API_APPLICATION_ATTACH); - bmp->client_index = utm->my_client_index; + bmp->client_index = em->my_client_index; bmp->context = ntohl (0xfeedface); - bmp->options[APP_OPTIONS_FLAGS] = - APP_OPTIONS_FLAGS_ACCEPT_REDIRECT | APP_OPTIONS_FLAGS_ADD_SEGMENT; + bmp->options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_ACCEPT_REDIRECT; + bmp->options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_ADD_SEGMENT; + bmp->options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_MQ_FOR_CTRL_MSGS; bmp->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] = 16; - bmp->options[APP_OPTIONS_RX_FIFO_SIZE] = fifo_size; - bmp->options[APP_OPTIONS_TX_FIFO_SIZE] = fifo_size; + bmp->options[APP_OPTIONS_RX_FIFO_SIZE] = em->fifo_size; + bmp->options[APP_OPTIONS_TX_FIFO_SIZE] = em->fifo_size; bmp->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = 128 << 20; bmp->options[APP_OPTIONS_SEGMENT_SIZE] = 256 << 20; - vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & bmp); + bmp->options[APP_OPTIONS_EVT_QUEUE_SIZE] = 256; + vl_msg_api_send_shmem (em->vl_input_queue, (u8 *) & bmp); + + cert_mp = vl_msg_api_alloc (sizeof (*cert_mp) + test_srv_crt_rsa_len); + memset (cert_mp, 0, sizeof (*cert_mp)); + cert_mp->_vl_msg_id = ntohs (VL_API_APPLICATION_TLS_CERT_ADD); + cert_mp->client_index = em->my_client_index; + cert_mp->context = ntohl (0xfeedface); + cert_mp->cert_len = clib_host_to_net_u16 (test_srv_crt_rsa_len); + clib_memcpy (cert_mp->cert, test_srv_crt_rsa, test_srv_crt_rsa_len); + vl_msg_api_send_shmem (em->vl_input_queue, (u8 *) & cert_mp); + + key_mp = vl_msg_api_alloc (sizeof (*key_mp) + test_srv_key_rsa_len); + memset (key_mp, 0, sizeof (*key_mp) + test_srv_key_rsa_len); + key_mp->_vl_msg_id = ntohs (VL_API_APPLICATION_TLS_KEY_ADD); + key_mp->client_index = em->my_client_index; + key_mp->context = ntohl (0xfeedface); + key_mp->key_len = clib_host_to_net_u16 (test_srv_key_rsa_len); + clib_memcpy (key_mp->key, test_srv_key_rsa, test_srv_key_rsa_len); + vl_msg_api_send_shmem (em->vl_input_queue, (u8 *) & key_mp); } -int -application_attach (uri_tcp_test_main_t * utm) +static int +application_attach (echo_main_t * em) { - application_send_attach (utm); - if (wait_for_state_change (utm, STATE_ATTACHED)) + application_send_attach (em); + if (wait_for_state_change (em, STATE_ATTACHED)) { clib_warning ("timeout waiting for STATE_ATTACHED"); return -1; @@ -221,31 +332,81 @@ application_attach (uri_tcp_test_main_t * utm) } void -application_detach (uri_tcp_test_main_t * utm) +application_detach (echo_main_t * em) { vl_api_application_detach_t *bmp; bmp = vl_msg_api_alloc (sizeof (*bmp)); memset (bmp, 0, sizeof (*bmp)); bmp->_vl_msg_id = ntohs (VL_API_APPLICATION_DETACH); - bmp->client_index = utm->my_client_index; + bmp->client_index = em->my_client_index; bmp->context = ntohl (0xfeedface); - vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & bmp); + vl_msg_api_send_shmem (em->vl_input_queue, (u8 *) & bmp); + + DBG ("%s", "Sent detach"); +} + +static int +memfd_segment_attach (void) +{ + ssvm_private_t _ssvm = { 0 }, *ssvm = &_ssvm; + clib_error_t *error; + int rv; + + if ((error = vl_socket_client_recv_fd_msg (&ssvm->fd, 5))) + { + clib_error_report (error); + return -1; + } + + if ((rv = ssvm_slave_init_memfd (ssvm))) + return rv; + + return 0; +} + +static int +fifo_segment_attach (char *name, u32 size, ssvm_segment_type_t type) +{ + svm_fifo_segment_create_args_t _a, *a = &_a; + clib_error_t *error; + int rv; + + memset (a, 0, sizeof (*a)); + a->segment_name = (char *) name; + a->segment_size = size; + a->segment_type = type; + + if (type == SSVM_SEGMENT_MEMFD) + { + if ((error = vl_socket_client_recv_fd_msg (&a->memfd_fd, 5))) + { + clib_error_report (error); + return -1; + } + } + + if ((rv = svm_fifo_segment_attach (a))) + { + clib_warning ("svm_fifo_segment_attach ('%s') failed", name); + return rv; + } + + return 0; } static void vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t * mp) { - uri_tcp_test_main_t *utm = &uri_tcp_test_main; - svm_fifo_segment_create_args_t _a, *a = &_a; - int rv; + echo_main_t *em = &echo_main; + ssvm_segment_type_t seg_type; if (mp->retval) { clib_warning ("attach failed: %U", format_api_error, clib_net_to_host_u32 (mp->retval)); - utm->state = STATE_FAILED; + em->state = STATE_FAILED; return; } @@ -255,25 +416,31 @@ vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t * return; } - memset (a, 0, sizeof (*a)); - a->segment_name = (char *) mp->segment_name; - a->segment_size = mp->segment_size; - - ASSERT (mp->app_event_queue_address); + seg_type = em->use_sock_api ? SSVM_SEGMENT_MEMFD : SSVM_SEGMENT_SHM; - /* Attach to the segment vpp created */ - rv = svm_fifo_segment_attach (a); - if (rv) + /* Attach to fifo segment */ + if (fifo_segment_attach ((char *) mp->segment_name, mp->segment_size, + seg_type)) { - clib_warning ("svm_fifo_segment_attach ('%s') failed", - mp->segment_name); + em->state = STATE_FAILED; return; } - utm->our_event_queue = - uword_to_pointer (mp->app_event_queue_address, - unix_shared_memory_queue_t *); - utm->state = STATE_ATTACHED; + /* If we're using memfd segments, read and attach to event qs segment */ + if (seg_type == SSVM_SEGMENT_MEMFD) + { + if (memfd_segment_attach ()) + { + clib_warning ("failed to attach to evt q segment"); + em->state = STATE_FAILED; + return; + } + } + + ASSERT (mp->app_event_queue_address); + em->our_event_queue = uword_to_pointer (mp->app_event_queue_address, + svm_msg_q_t *); + em->state = STATE_ATTACHED; } static void @@ -282,12 +449,13 @@ vl_api_application_detach_reply_t_handler (vl_api_application_detach_reply_t * { if (mp->retval) clib_warning ("detach returned with err: %d", mp->retval); + echo_main.state = STATE_DETACHED; } static void stop_signal (int signum) { - uri_tcp_test_main_t *um = &uri_tcp_test_main; + echo_main_t *um = &echo_main; um->time_to_stop = 1; } @@ -295,7 +463,7 @@ stop_signal (int signum) static void stats_signal (int signum) { - uri_tcp_test_main_t *um = &uri_tcp_test_main; + echo_main_t *um = &echo_main; um->time_to_print_stats = 1; } @@ -319,31 +487,41 @@ vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...) int connect_to_vpp (char *name) { - uri_tcp_test_main_t *utm = &uri_tcp_test_main; + echo_main_t *em = &echo_main; api_main_t *am = &api_main; - if (utm->use_sock_api) + if (em->use_sock_api) { - if (vl_socket_client_connect ((char *) utm->socket_name, name, + if (vl_socket_client_connect ((char *) em->socket_name, name, 0 /* default rx, tx buffer */ )) - return -1; + { + clib_warning ("socket connect failed"); + return -1; + } - return vl_socket_client_init_shm (0); + if (vl_socket_client_init_shm (0)) + { + clib_warning ("init shm api failed"); + return -1; + } } else { if (vl_client_connect_to_vlib ("/vpe-api", name, 32) < 0) - return -1; - utm->vl_input_queue = am->shmem_hdr->vl_input_queue; - utm->my_client_index = am->my_client_index; + { + clib_warning ("shmem connect failed"); + return -1; + } } + em->vl_input_queue = am->shmem_hdr->vl_input_queue; + em->my_client_index = am->my_client_index; return 0; } void -disconnect_from_vpp (uri_tcp_test_main_t * utm) +disconnect_from_vpp (echo_main_t * em) { - if (utm->use_sock_api) + if (em->use_sock_api) vl_socket_client_disconnect (); else vl_client_disconnect_from_vlib (); @@ -371,193 +549,273 @@ vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp) } static void -session_print_stats (uri_tcp_test_main_t * utm, session_t * session) +session_print_stats (echo_main_t * em, session_t * session) { f64 deltat; u64 bytes; - deltat = clib_time_now (&utm->clib_time) - session->start; - bytes = utm->i_am_master ? session->bytes_received : utm->bytes_to_send; + deltat = clib_time_now (&em->clib_time) - session->start; + bytes = em->i_am_master ? session->bytes_received : em->bytes_to_send; fformat (stdout, "Finished in %.6f\n", deltat); fformat (stdout, "%.4f Gbit/second\n", (bytes * 8.0) / deltat / 1e9); } static void -vl_api_disconnect_session_t_handler (vl_api_disconnect_session_t * mp) +test_recv_bytes (session_t * s, u8 * rx_buf, u32 n_read) { - uri_tcp_test_main_t *utm = &uri_tcp_test_main; - session_t *session = 0; - vl_api_disconnect_session_reply_t *rmp; - uword *p; - int rv = 0; - - p = hash_get (utm->session_index_by_vpp_handles, mp->handle); - - if (p) - { - session = pool_elt_at_index (utm->sessions, p[0]); - hash_unset (utm->session_index_by_vpp_handles, mp->handle); - pool_put (utm->sessions, session); - } - else + int i; + for (i = 0; i < n_read; i++) { - clib_warning ("couldn't find session key %llx", mp->handle); - rv = -11; + if (rx_buf[i] != ((s->bytes_received + i) & 0xff)) + { + clib_warning ("error at byte %lld, 0x%x not 0x%x", + s->bytes_received + i, rx_buf[i], + ((s->bytes_received + i) & 0xff)); + } } - -// utm->time_to_stop = 1; - - rmp = vl_msg_api_alloc (sizeof (*rmp)); - memset (rmp, 0, sizeof (*rmp)); - - rmp->_vl_msg_id = ntohs (VL_API_DISCONNECT_SESSION_REPLY); - rmp->retval = rv; - rmp->handle = mp->handle; - vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & rmp); - - if (session) - session_print_stats (utm, session); } static void -vl_api_reset_session_t_handler (vl_api_reset_session_t * mp) +recv_test_chunk (echo_main_t * em, session_t * s, u8 * rx_buf) { - uri_tcp_test_main_t *utm = &uri_tcp_test_main; - vl_api_reset_session_reply_t *rmp; - uword *p; - int rv = 0; + svm_fifo_t *rx_fifo = s->server_rx_fifo; + u32 n_read_now, n_to_read; + int n_read; - p = hash_get (utm->session_index_by_vpp_handles, mp->handle); + n_to_read = svm_fifo_max_dequeue (rx_fifo); + svm_fifo_unset_event (rx_fifo); - if (p) - { - clib_warning ("got reset"); - /* Cleanup later */ - utm->time_to_stop = 1; - } - else + do { - clib_warning ("couldn't find session key %llx", mp->handle); - rv = -11; - } + n_read_now = clib_min (vec_len (rx_buf), n_to_read); + n_read = svm_fifo_dequeue_nowait (rx_fifo, n_read_now, rx_buf); + if (n_read <= 0) + break; - rmp = vl_msg_api_alloc (sizeof (*rmp)); - memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_RESET_SESSION_REPLY); - rmp->retval = rv; - rmp->handle = mp->handle; - vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & rmp); + if (n_read_now != n_read) + clib_warning ("huh?"); + + if (em->test_return_packets) + test_recv_bytes (s, rx_buf, n_read); + + n_to_read -= n_read; + s->bytes_received += n_read; + s->bytes_to_receive -= n_read; + } + while (n_to_read > 0); } void -client_handle_fifo_event_rx (uri_tcp_test_main_t * utm, - session_fifo_event_t * e) +client_handle_fifo_event_rx (echo_main_t * em, session_event_t * e, + u8 * rx_buf) { - svm_fifo_t *rx_fifo; - int n_read, bytes, i; + session_t *s; - rx_fifo = e->fifo; + s = pool_elt_at_index (em->sessions, e->fifo->client_session_index); + recv_test_chunk (em, s, rx_buf); +} - bytes = svm_fifo_max_dequeue (rx_fifo); - /* Allow enqueuing of new event */ - svm_fifo_unset_event (rx_fifo); +static void +send_test_chunk (echo_main_t * em, session_t * s) +{ + u64 test_buf_len, bytes_this_chunk, test_buf_offset; + svm_fifo_t *tx_fifo = s->server_tx_fifo; + u8 *test_data = em->connect_test_data; + u32 enq_space, min_chunk = 16 << 10; + int written; + + test_buf_len = vec_len (test_data); + test_buf_offset = s->bytes_sent % test_buf_len; + bytes_this_chunk = clib_min (test_buf_len - test_buf_offset, + s->bytes_to_send); + enq_space = svm_fifo_max_enqueue (tx_fifo); + if (enq_space < clib_min (bytes_this_chunk, min_chunk)) + return; - /* Read the bytes */ - do + bytes_this_chunk = clib_min (bytes_this_chunk, enq_space); + written = svm_fifo_enqueue_nowait (tx_fifo, bytes_this_chunk, + test_data + test_buf_offset); + + if (written > 0) { - n_read = svm_fifo_dequeue_nowait (rx_fifo, - clib_min (vec_len (utm->rx_buf), - bytes), utm->rx_buf); - if (n_read > 0) - { - bytes -= n_read; - if (utm->test_return_packets) - { - for (i = 0; i < n_read; i++) - { - if (utm->rx_buf[i] - != ((utm->client_bytes_received + i) & 0xff)) - { - clib_warning ("error at byte %lld, 0x%x not 0x%x", - utm->client_bytes_received + i, - utm->rx_buf[i], - ((utm->client_bytes_received + - i) & 0xff)); - } - } - } - utm->client_bytes_received += n_read; - } - else - { - if (n_read == -2) - { -// clib_warning ("weird!"); - break; - } - } + s->bytes_to_send -= written; + s->bytes_sent += written; + if (svm_fifo_set_event (tx_fifo)) + app_send_io_evt_to_vpp (s->vpp_evt_q, tx_fifo, FIFO_EVENT_APP_TX, + 0 /* do wait for mutex */ ); } - while (bytes > 0); } -void -client_handle_event_queue (uri_tcp_test_main_t * utm) +/* + * Rx/Tx polling thread per connection + */ +static void * +client_thread_fn (void *arg) { - session_fifo_event_t _e, *e = &_e;; + echo_main_t *em = &echo_main; + static u8 *rx_buf = 0; + u32 session_index = *(u32 *) arg; + session_t *s; - unix_shared_memory_queue_sub (utm->our_event_queue, (u8 *) e, - 0 /* nowait */ ); - switch (e->event_type) - { - case FIFO_EVENT_APP_RX: - client_handle_fifo_event_rx (utm, e); - break; + vec_validate (rx_buf, 1 << 20); - case FIFO_EVENT_DISCONNECT: - return; + while (!em->time_to_stop && em->state != STATE_READY) + ; - default: - clib_warning ("unknown event type %d", e->event_type); - break; + s = pool_elt_at_index (em->sessions, session_index); + while (!em->time_to_stop) + { + send_test_chunk (em, s); + recv_test_chunk (em, s, rx_buf); + if (!s->bytes_to_send && !s->bytes_to_receive) + break; } + + DBG ("session %d done", session_index); + em->tx_total += s->bytes_sent; + em->rx_total += s->bytes_received; + em->n_active_clients--; + + pthread_exit (0); } -static void * +/* + * Rx thread that handles all connections. + * + * Not used. + */ +void * client_rx_thread_fn (void *arg) { - session_fifo_event_t _e, *e = &_e; - uri_tcp_test_main_t *utm = &uri_tcp_test_main; + session_event_t _e, *e = &_e; + echo_main_t *em = &echo_main; + static u8 *rx_buf = 0; + svm_msg_q_msg_t msg; - utm->client_bytes_received = 0; - while (1) + vec_validate (rx_buf, 1 << 20); + + while (!em->time_to_stop && em->state != STATE_READY) + ; + + while (!em->time_to_stop) { - unix_shared_memory_queue_sub (utm->our_event_queue, (u8 *) e, - 0 /* nowait */ ); + svm_msg_q_sub (em->our_event_queue, &msg, SVM_Q_WAIT, 0); + e = svm_msg_q_msg_data (em->our_event_queue, &msg); switch (e->event_type) { case FIFO_EVENT_APP_RX: - client_handle_fifo_event_rx (utm, e); + client_handle_fifo_event_rx (em, e, rx_buf); break; - - case FIFO_EVENT_DISCONNECT: - return 0; default: clib_warning ("unknown event type %d", e->event_type); break; } - - if (PREDICT_FALSE (utm->time_to_stop == 1)) - break; + svm_msg_q_free_msg (em->our_event_queue, &msg); } pthread_exit (0); } +void +client_send_connect (echo_main_t * em) +{ + vl_api_connect_uri_t *cmp; + cmp = vl_msg_api_alloc (sizeof (*cmp)); + memset (cmp, 0, sizeof (*cmp)); + + cmp->_vl_msg_id = ntohs (VL_API_CONNECT_URI); + cmp->client_index = em->my_client_index; + cmp->context = ntohl (0xfeedface); + memcpy (cmp->uri, em->connect_uri, vec_len (em->connect_uri)); + vl_msg_api_send_shmem (em->vl_input_queue, (u8 *) & cmp); +} + +void +client_send_disconnect (echo_main_t * em, session_t * s) +{ + vl_api_disconnect_session_t *dmp; + dmp = vl_msg_api_alloc (sizeof (*dmp)); + memset (dmp, 0, sizeof (*dmp)); + dmp->_vl_msg_id = ntohs (VL_API_DISCONNECT_SESSION); + dmp->client_index = em->my_client_index; + dmp->handle = s->vpp_session_handle; + vl_msg_api_send_shmem (em->vl_input_queue, (u8 *) & dmp); +} + +int +client_disconnect (echo_main_t * em, session_t * s) +{ + client_send_disconnect (em, s); + pool_put (em->sessions, s); + memset (s, 0xfe, sizeof (*s)); + return 0; +} static void -vl_api_connect_session_reply_t_handler (vl_api_connect_session_reply_t * mp) +session_accepted_handler (session_accepted_msg_t * mp) { - uri_tcp_test_main_t *utm = &uri_tcp_test_main; + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_accepted_reply_msg_t *rmp; + svm_fifo_t *rx_fifo, *tx_fifo; + echo_main_t *em = &echo_main; + session_t *session; + static f64 start_time; + u32 session_index; + u8 *ip_str; + + if (start_time == 0.0) + start_time = clib_time_now (&em->clib_time); + + ip_str = format (0, "%U", format_ip46_address, &mp->ip, mp->is_ip4); + clib_warning ("Accepted session from: %s:%d", ip_str, + clib_net_to_host_u16 (mp->port)); + + /* Allocate local session and set it up */ + pool_get (em->sessions, session); + session_index = session - em->sessions; + + rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); + rx_fifo->client_session_index = session_index; + tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *); + tx_fifo->client_session_index = session_index; + + session->server_rx_fifo = rx_fifo; + session->server_tx_fifo = tx_fifo; + session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, + svm_msg_q_t *); + + /* Add it to lookup table */ + hash_set (em->session_index_by_vpp_handles, mp->handle, session_index); + + em->state = STATE_READY; + + /* Stats printing */ + if (pool_elts (em->sessions) && (pool_elts (em->sessions) % 20000) == 0) + { + f64 now = clib_time_now (&em->clib_time); + fformat (stdout, "%d active sessions in %.2f seconds, %.2f/sec...\n", + pool_elts (em->sessions), now - start_time, + (f64) pool_elts (em->sessions) / (now - start_time)); + } + + /* + * Send accept reply to vpp + */ + app_alloc_ctrl_evt_to_vpp (session->vpp_evt_q, app_evt, + SESSION_CTRL_EVT_ACCEPTED_REPLY); + rmp = (session_accepted_reply_msg_t *) app_evt->evt->data; + rmp->handle = mp->handle; + rmp->context = mp->context; + app_send_ctrl_evt_to_vpp (session->vpp_evt_q, app_evt); + + session->bytes_received = 0; + session->start = clib_time_now (&em->clib_time); +} + +static void +session_connected_handler (session_connected_msg_t * mp) +{ + echo_main_t *em = &echo_main; session_t *session; u32 session_index; svm_fifo_t *rx_fifo, *tx_fifo; @@ -567,26 +825,17 @@ vl_api_connect_session_reply_t_handler (vl_api_connect_session_reply_t * mp) { clib_warning ("connection failed with code: %U", format_api_error, clib_net_to_host_u32 (mp->retval)); - utm->state = STATE_FAILED; + em->state = STATE_FAILED; return; } - else - { - clib_warning ("connected with local ip %U port %d", format_ip46_address, - mp->lcl_ip, mp->is_ip4, - clib_net_to_host_u16 (mp->lcl_port)); - } - - utm->vpp_event_queue = - uword_to_pointer (mp->vpp_event_queue_address, - unix_shared_memory_queue_t *); /* * Setup session */ - pool_get (utm->sessions, session); - session_index = session - utm->sessions; + pool_get (em->sessions, session); + memset (session, 0, sizeof (*session)); + session_index = session - em->sessions; rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); rx_fifo->client_session_index = session_index; @@ -596,222 +845,238 @@ vl_api_connect_session_reply_t_handler (vl_api_connect_session_reply_t * mp) session->server_rx_fifo = rx_fifo; session->server_tx_fifo = tx_fifo; session->vpp_session_handle = mp->handle; - session->start = clib_time_now (&utm->clib_time); + session->start = clib_time_now (&em->clib_time); + session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, + svm_msg_q_t *); - /* Save handle */ - utm->connected_session_index = session_index; - utm->state = STATE_READY; + hash_set (em->session_index_by_vpp_handles, mp->handle, session_index); - /* Add it to lookup table */ - hash_set (utm->session_index_by_vpp_handles, mp->handle, session_index); - - /* Start RX thread */ - rv = pthread_create (&utm->client_rx_thread_handle, - NULL /*attr */ , client_rx_thread_fn, 0); + /* + * Start RX thread + */ + em->thread_args[em->n_clients_connected] = session_index; + rv = pthread_create (&em->client_thread_handles[em->n_clients_connected], + NULL /*attr */ , client_thread_fn, + (void *) &em->thread_args[em->n_clients_connected]); if (rv) { clib_warning ("pthread_create returned %d", rv); - rv = VNET_API_ERROR_SYSCALL_ERROR_1; + return; } + + em->n_clients_connected += 1; + clib_warning ("session %u (0x%llx) connected with local ip %U port %d", + session_index, mp->handle, format_ip46_address, mp->lcl_ip, + mp->is_ip4, clib_net_to_host_u16 (mp->lcl_port)); } static void -send_test_chunk (uri_tcp_test_main_t * utm, svm_fifo_t * tx_fifo, int mypid, - u32 bytes) +session_disconnected_handler (session_disconnected_msg_t * mp) { - u8 *test_data = utm->connect_test_data; - u64 bytes_sent = 0; - int test_buf_offset = 0; - u32 bytes_to_snd; - u32 queue_max_chunk = 128 << 10, actual_write; - session_fifo_event_t evt; - int rv; + app_session_evt_t _app_evt, *app_evt = &_app_evt; + session_disconnected_reply_msg_t *rmp; + echo_main_t *em = &echo_main; + session_t *session = 0; + uword *p; + int rv = 0; - bytes_to_snd = (bytes == 0) ? vec_len (test_data) : bytes; - if (bytes_to_snd > vec_len (test_data)) - bytes_to_snd = vec_len (test_data); + p = hash_get (em->session_index_by_vpp_handles, mp->handle); - while (bytes_to_snd > 0 && !utm->time_to_stop) + if (p) { - actual_write = (bytes_to_snd > queue_max_chunk) ? - queue_max_chunk : bytes_to_snd; - rv = svm_fifo_enqueue_nowait (tx_fifo, actual_write, - test_data + test_buf_offset); - - if (rv > 0) - { - bytes_to_snd -= rv; - test_buf_offset += rv; - bytes_sent += rv; - - if (svm_fifo_set_event (tx_fifo)) - { - /* Fabricate TX event, send to vpp */ - evt.fifo = tx_fifo; - evt.event_type = FIFO_EVENT_APP_TX; - - unix_shared_memory_queue_add (utm->vpp_event_queue, - (u8 *) & evt, - 0 /* do wait for mutex */ ); - } - } + clib_warning ("disconnected"); + session = pool_elt_at_index (em->sessions, p[0]); + hash_unset (em->session_index_by_vpp_handles, mp->handle); + pool_put (em->sessions, session); } -} - -void -client_send_data (uri_tcp_test_main_t * utm) -{ - u8 *test_data = utm->connect_test_data; - int mypid = getpid (); - session_t *session; - svm_fifo_t *tx_fifo; - u32 n_iterations, leftover; - int i; - - session = pool_elt_at_index (utm->sessions, utm->connected_session_index); - tx_fifo = session->server_tx_fifo; - - ASSERT (vec_len (test_data) > 0); - - vec_validate (utm->rx_buf, vec_len (test_data) - 1); - n_iterations = utm->bytes_to_send / vec_len (test_data); - - for (i = 0; i < n_iterations; i++) + else { - send_test_chunk (utm, tx_fifo, mypid, 0); - if (utm->time_to_stop) - break; + clib_warning ("couldn't find session key %llx", mp->handle); + rv = -11; } - leftover = utm->bytes_to_send % vec_len (test_data); - if (leftover) - send_test_chunk (utm, tx_fifo, mypid, leftover); - - if (!utm->drop_packets) - { - f64 timeout = clib_time_now (&utm->clib_time) + 10; + app_alloc_ctrl_evt_to_vpp (session->vpp_evt_q, app_evt, + SESSION_CTRL_EVT_DISCONNECTED_REPLY); + rmp = (session_disconnected_reply_msg_t *) app_evt->evt->data; + rmp->retval = rv; + rmp->handle = mp->handle; + rmp->context = mp->context; + app_send_ctrl_evt_to_vpp (session->vpp_evt_q, app_evt); - /* Wait for the outstanding packets */ - while (utm->client_bytes_received < - vec_len (test_data) * n_iterations + leftover) - { - if (clib_time_now (&utm->clib_time) > timeout) - { - clib_warning ("timed out waiting for the missing packets"); - break; - } - } - } - utm->time_to_stop = 1; + if (session) + session_print_stats (em, session); } -void -client_send_connect (uri_tcp_test_main_t * utm) +static void +session_reset_handler (session_reset_msg_t * mp) { - vl_api_connect_uri_t *cmp; - cmp = vl_msg_api_alloc (sizeof (*cmp)); - memset (cmp, 0, sizeof (*cmp)); + app_session_evt_t _app_evt, *app_evt = &_app_evt; + echo_main_t *em = &echo_main; + session_reset_reply_msg_t *rmp; + session_t *session = 0; + uword *p; + int rv = 0; - cmp->_vl_msg_id = ntohs (VL_API_CONNECT_URI); - cmp->client_index = utm->my_client_index; - cmp->context = ntohl (0xfeedface); - memcpy (cmp->uri, utm->connect_uri, vec_len (utm->connect_uri)); - vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & cmp); -} + p = hash_get (em->session_index_by_vpp_handles, mp->handle); -int -client_connect (uri_tcp_test_main_t * utm) -{ - client_send_connect (utm); - if (wait_for_state_change (utm, STATE_READY)) + if (p) { - clib_warning ("Connect failed"); - return -1; + session = pool_elt_at_index (em->sessions, p[0]); + clib_warning ("got reset"); + /* Cleanup later */ + em->time_to_stop = 1; + } + else + { + clib_warning ("couldn't find session key %llx", mp->handle); + return; } - return 0; -} -void -client_send_disconnect (uri_tcp_test_main_t * utm) -{ - session_t *connected_session; - vl_api_disconnect_session_t *dmp; - connected_session = pool_elt_at_index (utm->sessions, - utm->connected_session_index); - dmp = vl_msg_api_alloc (sizeof (*dmp)); - memset (dmp, 0, sizeof (*dmp)); - dmp->_vl_msg_id = ntohs (VL_API_DISCONNECT_SESSION); - dmp->client_index = utm->my_client_index; - dmp->handle = connected_session->vpp_session_handle; - vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & dmp); + app_alloc_ctrl_evt_to_vpp (session->vpp_evt_q, app_evt, + SESSION_CTRL_EVT_RESET_REPLY); + rmp = (session_reset_reply_msg_t *) app_evt->evt->data; + rmp->retval = rv; + rmp->handle = mp->handle; + app_send_ctrl_evt_to_vpp (session->vpp_evt_q, app_evt); } -int -client_disconnect (uri_tcp_test_main_t * utm) +static void +handle_mq_event (session_event_t * e) { - client_send_disconnect (utm); - clib_warning ("Sent disconnect"); - if (wait_for_state_change (utm, STATE_START)) + switch (e->event_type) { - clib_warning ("Disconnect failed"); - return -1; + case SESSION_CTRL_EVT_ACCEPTED: + session_accepted_handler ((session_accepted_msg_t *) e->data); + break; + case SESSION_CTRL_EVT_CONNECTED: + session_connected_handler ((session_connected_msg_t *) e->data); + break; + case SESSION_CTRL_EVT_DISCONNECTED: + session_disconnected_handler ((session_disconnected_msg_t *) e->data); + break; + case SESSION_CTRL_EVT_RESET: + session_reset_handler ((session_reset_msg_t *) e->data); + break; + default: + clib_warning ("unhandled %u", e->event_type); } - return 0; } static void -client_run (uri_tcp_test_main_t * utm) +clients_run (echo_main_t * em) { + f64 start_time, deltat, timeout = 100.0; + svm_msg_q_msg_t msg; + session_event_t *e; + session_t *s; int i; - if (application_attach (utm)) + /* Init test data */ + vec_validate (em->connect_test_data, 1024 * 1024 - 1); + for (i = 0; i < vec_len (em->connect_test_data); i++) + em->connect_test_data[i] = i & 0xff; + + /* + * Attach and connect the clients + */ + if (application_attach (em)) return; - if (client_connect (utm)) + for (i = 0; i < em->n_clients; i++) + client_send_connect (em); + + start_time = clib_time_now (&em->clib_time); + while (em->n_clients_connected < em->n_clients + && (clib_time_now (&em->clib_time) - start_time < timeout) + && em->state != STATE_FAILED) + { - application_detach (utm); + svm_msg_q_sub (em->our_event_queue, &msg, SVM_Q_WAIT, 0); + e = svm_msg_q_msg_data (em->our_event_queue, &msg); + handle_mq_event (e); + svm_msg_q_free_msg (em->our_event_queue, &msg); + } + + if (em->n_clients_connected != em->n_clients) + { + clib_warning ("failed to initialize all connections"); return; } - /* Init test data */ - vec_validate (utm->connect_test_data, 128 * 1024 - 1); - for (i = 0; i < vec_len (utm->connect_test_data); i++) - utm->connect_test_data[i] = i & 0xff; + /* + * Initialize connections + */ + for (i = 0; i < em->n_clients; i++) + { + s = pool_elt_at_index (em->sessions, i); + s->bytes_to_send = em->bytes_to_send; + if (!em->no_return) + s->bytes_to_receive = em->bytes_to_send; + } + em->n_active_clients = em->n_clients_connected; - /* Start send */ - client_send_data (utm); + /* + * Wait for client threads to send the data + */ + start_time = clib_time_now (&em->clib_time); + em->state = STATE_READY; + while (em->n_active_clients) + if (!svm_msg_q_is_empty (em->our_event_queue)) + { + if (svm_msg_q_sub (em->our_event_queue, &msg, SVM_Q_WAIT, 0)) + { + clib_warning ("svm msg q returned"); + continue; + } + e = svm_msg_q_msg_data (em->our_event_queue, &msg); + if (e->event_type != FIFO_EVENT_APP_RX) + handle_mq_event (e); + svm_msg_q_free_msg (em->our_event_queue, &msg); + } + + for (i = 0; i < em->n_clients; i++) + { + s = pool_elt_at_index (em->sessions, i); + client_disconnect (em, s); + } - /* Disconnect */ - client_disconnect (utm); + /* + * Stats and detach + */ + deltat = clib_time_now (&em->clib_time) - start_time; + fformat (stdout, "%lld bytes (%lld mbytes, %lld gbytes) in %.2f seconds\n", + em->tx_total, em->tx_total / (1ULL << 20), + em->tx_total / (1ULL << 30), deltat); + fformat (stdout, "%.4f Gbit/second\n", (em->tx_total * 8.0) / deltat / 1e9); - application_detach (utm); + application_detach (em); } static void vl_api_bind_uri_reply_t_handler (vl_api_bind_uri_reply_t * mp) { - uri_tcp_test_main_t *utm = &uri_tcp_test_main; + echo_main_t *em = &echo_main; if (mp->retval) { clib_warning ("bind failed: %U", format_api_error, clib_net_to_host_u32 (mp->retval)); - utm->state = STATE_FAILED; + em->state = STATE_FAILED; return; } - utm->state = STATE_READY; + em->state = STATE_READY; } static void vl_api_unbind_uri_reply_t_handler (vl_api_unbind_uri_reply_t * mp) { - uri_tcp_test_main_t *utm = &uri_tcp_test_main; + echo_main_t *em = &echo_main; if (mp->retval != 0) clib_warning ("returned %d", ntohl (mp->retval)); - utm->state = STATE_START; + em->state = STATE_START; } u8 * @@ -898,186 +1163,112 @@ format_ip46_address (u8 * s, va_list * args) } static void -vl_api_accept_session_t_handler (vl_api_accept_session_t * mp) -{ - uri_tcp_test_main_t *utm = &uri_tcp_test_main; - vl_api_accept_session_reply_t *rmp; - svm_fifo_t *rx_fifo, *tx_fifo; - session_t *session; - static f64 start_time; - u32 session_index; - u8 *ip_str; - - if (start_time == 0.0) - start_time = clib_time_now (&utm->clib_time); - - ip_str = format (0, "%U", format_ip46_address, &mp->ip, mp->is_ip4); - clib_warning ("Accepted session from: %s:%d", ip_str, - clib_net_to_host_u16 (mp->port)); - utm->vpp_event_queue = - uword_to_pointer (mp->vpp_event_queue_address, - unix_shared_memory_queue_t *); - - /* Allocate local session and set it up */ - pool_get (utm->sessions, session); - session_index = session - utm->sessions; - - rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); - rx_fifo->client_session_index = session_index; - tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *); - tx_fifo->client_session_index = session_index; - - session->server_rx_fifo = rx_fifo; - session->server_tx_fifo = tx_fifo; - - /* Add it to lookup table */ - hash_set (utm->session_index_by_vpp_handles, mp->handle, session_index); - - utm->state = STATE_READY; - - /* Stats printing */ - if (pool_elts (utm->sessions) && (pool_elts (utm->sessions) % 20000) == 0) - { - f64 now = clib_time_now (&utm->clib_time); - fformat (stdout, "%d active sessions in %.2f seconds, %.2f/sec...\n", - pool_elts (utm->sessions), now - start_time, - (f64) pool_elts (utm->sessions) / (now - start_time)); - } - - /* - * Send accept reply to vpp - */ - rmp = vl_msg_api_alloc (sizeof (*rmp)); - memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_ACCEPT_SESSION_REPLY); - rmp->handle = mp->handle; - rmp->context = mp->context; - vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & rmp); - - session->bytes_received = 0; - session->start = clib_time_now (&utm->clib_time); -} - -void -server_handle_fifo_event_rx (uri_tcp_test_main_t * utm, - session_fifo_event_t * e) +server_handle_fifo_event_rx (echo_main_t * em, session_event_t * e) { svm_fifo_t *rx_fifo, *tx_fifo; int n_read; - session_fifo_event_t evt; - unix_shared_memory_queue_t *q; session_t *session; int rv; u32 max_dequeue, offset, max_transfer, rx_buf_len; - rx_buf_len = vec_len (utm->rx_buf); + rx_buf_len = vec_len (em->rx_buf); rx_fifo = e->fifo; - session = &utm->sessions[rx_fifo->client_session_index]; + session = pool_elt_at_index (em->sessions, rx_fifo->client_session_index); tx_fifo = session->server_tx_fifo; max_dequeue = svm_fifo_max_dequeue (rx_fifo); /* Allow enqueuing of a new event */ svm_fifo_unset_event (rx_fifo); - if (PREDICT_FALSE (max_dequeue == 0)) - { - return; - } + if (PREDICT_FALSE (!max_dequeue)) + return; /* Read the max_dequeue */ do { max_transfer = clib_min (rx_buf_len, max_dequeue); - n_read = svm_fifo_dequeue_nowait (rx_fifo, max_transfer, utm->rx_buf); + n_read = svm_fifo_dequeue_nowait (rx_fifo, max_transfer, em->rx_buf); if (n_read > 0) { max_dequeue -= n_read; session->bytes_received += n_read; + session->bytes_to_receive -= n_read; } /* Reflect if a non-drop session */ - if (!utm->drop_packets && n_read > 0) + if (!em->no_return && n_read > 0) { offset = 0; do { rv = svm_fifo_enqueue_nowait (tx_fifo, n_read, - &utm->rx_buf[offset]); + &em->rx_buf[offset]); if (rv > 0) { n_read -= rv; offset += rv; } } - while ((rv <= 0 || n_read > 0) && !utm->time_to_stop); + while ((rv <= 0 || n_read > 0) && !em->time_to_stop); /* If event wasn't set, add one */ if (svm_fifo_set_event (tx_fifo)) - { - /* Fabricate TX event, send to vpp */ - evt.fifo = tx_fifo; - evt.event_type = FIFO_EVENT_APP_TX; - - q = utm->vpp_event_queue; - unix_shared_memory_queue_add (q, (u8 *) & evt, - 1 /* do wait for mutex */ ); - } + app_send_io_evt_to_vpp (session->vpp_evt_q, tx_fifo, + FIFO_EVENT_APP_TX, SVM_Q_WAIT); } } - while ((n_read < 0 || max_dequeue > 0) && !utm->time_to_stop); + while ((n_read < 0 || max_dequeue > 0) && !em->time_to_stop); } -void -server_handle_event_queue (uri_tcp_test_main_t * utm) +static void +server_handle_event_queue (echo_main_t * em) { - session_fifo_event_t _e, *e = &_e; + svm_msg_q_msg_t msg; + session_event_t *e; while (1) { - unix_shared_memory_queue_sub (utm->our_event_queue, (u8 *) e, - 0 /* nowait */ ); + svm_msg_q_sub (em->our_event_queue, &msg, SVM_Q_WAIT, 0); + e = svm_msg_q_msg_data (em->our_event_queue, &msg); switch (e->event_type) { case FIFO_EVENT_APP_RX: - server_handle_fifo_event_rx (utm, e); + server_handle_fifo_event_rx (em, e); break; - - case FIFO_EVENT_DISCONNECT: - return; - default: - clib_warning ("unknown event type %d", e->event_type); + handle_mq_event (e); break; } - if (PREDICT_FALSE (utm->time_to_stop == 1)) + if (PREDICT_FALSE (em->time_to_stop == 1)) break; - if (PREDICT_FALSE (utm->time_to_print_stats == 1)) + if (PREDICT_FALSE (em->time_to_print_stats == 1)) { - utm->time_to_print_stats = 0; - fformat (stdout, "%d connections\n", pool_elts (utm->sessions)); + em->time_to_print_stats = 0; + fformat (stdout, "%d connections\n", pool_elts (em->sessions)); } + svm_msg_q_free_msg (em->our_event_queue, &msg); } } void -server_send_listen (uri_tcp_test_main_t * utm) +server_send_listen (echo_main_t * em) { vl_api_bind_uri_t *bmp; bmp = vl_msg_api_alloc (sizeof (*bmp)); memset (bmp, 0, sizeof (*bmp)); bmp->_vl_msg_id = ntohs (VL_API_BIND_URI); - bmp->client_index = utm->my_client_index; + bmp->client_index = em->my_client_index; bmp->context = ntohl (0xfeedface); - memcpy (bmp->uri, utm->uri, vec_len (utm->uri)); - vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & bmp); + memcpy (bmp->uri, em->uri, vec_len (em->uri)); + vl_msg_api_send_shmem (em->vl_input_queue, (u8 *) & bmp); } int -server_listen (uri_tcp_test_main_t * utm) +server_listen (echo_main_t * em) { - server_send_listen (utm); - if (wait_for_state_change (utm, STATE_READY)) + server_send_listen (em); + if (wait_for_state_change (em, STATE_READY)) { clib_warning ("timeout waiting for STATE_READY"); return -1; @@ -1086,7 +1277,7 @@ server_listen (uri_tcp_test_main_t * utm) } void -server_send_unbind (uri_tcp_test_main_t * utm) +server_send_unbind (echo_main_t * em) { vl_api_unbind_uri_t *ump; @@ -1094,16 +1285,16 @@ server_send_unbind (uri_tcp_test_main_t * utm) memset (ump, 0, sizeof (*ump)); ump->_vl_msg_id = ntohs (VL_API_UNBIND_URI); - ump->client_index = utm->my_client_index; - memcpy (ump->uri, utm->uri, vec_len (utm->uri)); - vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & ump); + ump->client_index = em->my_client_index; + memcpy (ump->uri, em->uri, vec_len (em->uri)); + vl_msg_api_send_shmem (em->vl_input_queue, (u8 *) & ump); } int -server_unbind (uri_tcp_test_main_t * utm) +server_unbind (echo_main_t * em) { - server_send_unbind (utm); - if (wait_for_state_change (utm, STATE_START)) + server_send_unbind (em); + if (wait_for_state_change (em, STATE_START)) { clib_warning ("timeout waiting for STATE_START"); return -1; @@ -1112,7 +1303,7 @@ server_unbind (uri_tcp_test_main_t * utm) } void -server_run (uri_tcp_test_main_t * utm) +server_run (echo_main_t * em) { session_t *session; int i; @@ -1120,26 +1311,26 @@ server_run (uri_tcp_test_main_t * utm) /* $$$$ hack preallocation */ for (i = 0; i < 200000; i++) { - pool_get (utm->sessions, session); + pool_get (em->sessions, session); memset (session, 0, sizeof (*session)); } for (i = 0; i < 200000; i++) - pool_put_index (utm->sessions, i); + pool_put_index (em->sessions, i); - if (application_attach (utm)) + if (application_attach (em)) return; /* Bind to uri */ - if (server_listen (utm)) + if (server_listen (em)) return; /* Enter handle event loop */ - server_handle_event_queue (utm); + server_handle_event_queue (em); /* Cleanup */ - server_send_unbind (utm); + server_send_unbind (em); - application_detach (utm); + application_detach (em); fformat (stdout, "Test complete...\n"); } @@ -1148,35 +1339,57 @@ static void vl_api_disconnect_session_reply_t_handler (vl_api_disconnect_session_reply_t * mp) { - uri_tcp_test_main_t *utm = &uri_tcp_test_main; - session_t *session; + echo_main_t *em = &echo_main; + uword *p; if (mp->retval) { clib_warning ("vpp complained about disconnect: %d", ntohl (mp->retval)); + return; } - utm->state = STATE_START; - session = pool_elt_at_index (utm->sessions, utm->connected_session_index); - if (session) - session_print_stats (utm, session); + em->state = STATE_START; + + p = hash_get (em->session_index_by_vpp_handles, mp->handle); + if (p) + { + hash_unset (em->session_index_by_vpp_handles, mp->handle); + } + else + { + clib_warning ("couldn't find session key %llx", mp->handle); + } } -#define foreach_uri_msg \ -_(BIND_URI_REPLY, bind_uri_reply) \ -_(UNBIND_URI_REPLY, unbind_uri_reply) \ -_(ACCEPT_SESSION, accept_session) \ -_(CONNECT_SESSION_REPLY, connect_session_reply) \ -_(DISCONNECT_SESSION, disconnect_session) \ -_(DISCONNECT_SESSION_REPLY, disconnect_session_reply) \ -_(RESET_SESSION, reset_session) \ -_(APPLICATION_ATTACH_REPLY, application_attach_reply) \ -_(APPLICATION_DETACH_REPLY, application_detach_reply) \ -_(MAP_ANOTHER_SEGMENT, map_another_segment) \ +static void + vl_api_application_tls_cert_add_reply_t_handler + (vl_api_application_tls_cert_add_reply_t * mp) +{ + if (mp->retval) + clib_warning ("failed to add tls cert"); +} + +static void + vl_api_application_tls_key_add_reply_t_handler + (vl_api_application_tls_key_add_reply_t * mp) +{ + if (mp->retval) + clib_warning ("failed to add tls key"); +} + +#define foreach_tcp_echo_msg \ +_(BIND_URI_REPLY, bind_uri_reply) \ +_(UNBIND_URI_REPLY, unbind_uri_reply) \ +_(DISCONNECT_SESSION_REPLY, disconnect_session_reply) \ +_(APPLICATION_ATTACH_REPLY, application_attach_reply) \ +_(APPLICATION_DETACH_REPLY, application_detach_reply) \ +_(MAP_ANOTHER_SEGMENT, map_another_segment) \ +_(APPLICATION_TLS_CERT_ADD_REPLY, application_tls_cert_add_reply) \ +_(APPLICATION_TLS_KEY_ADD_REPLY, application_tls_key_add_reply) \ void -uri_api_hookup (uri_tcp_test_main_t * utm) +tcp_echo_api_hookup (echo_main_t * em) { #define _(N,n) \ vl_msg_api_set_handlers(VL_API_##N, #n, \ @@ -1185,44 +1398,38 @@ uri_api_hookup (uri_tcp_test_main_t * utm) vl_api_##n##_t_endian, \ vl_api_##n##_t_print, \ sizeof(vl_api_##n##_t), 1); - foreach_uri_msg; + foreach_tcp_echo_msg; #undef _ } int main (int argc, char **argv) { - uri_tcp_test_main_t *utm = &uri_tcp_test_main; + int i_am_server = 1, test_return_packets = 0; + echo_main_t *em = &echo_main; unformat_input_t _argv, *a = &_argv; u8 *chroot_prefix; - u8 *heap, *uri = 0; + u8 *uri = 0; u8 *bind_uri = (u8 *) "tcp://0.0.0.0/1234"; - u8 *connect_uri = (u8 *) "tcp://6.0.1.2/1234"; + u8 *connect_uri = (u8 *) "tcp://6.0.1.1/1234"; u64 bytes_to_send = 64 << 10, mbytes; + char *app_name; u32 tmp; - mheap_t *h; - int i_am_master = 1, drop_packets = 0, test_return_packets = 0; - clib_mem_init (0, 256 << 20); + clib_mem_init_thread_safe (0, 256 << 20); - heap = clib_mem_get_per_cpu_heap (); - h = mheap_header (heap); + memset (em, 0, sizeof (*em)); + em->session_index_by_vpp_handles = hash_create (0, sizeof (uword)); + em->my_pid = getpid (); + em->configured_segment_size = 1 << 20; + em->socket_name = 0; + em->use_sock_api = 1; + em->fifo_size = 64 << 10; + em->n_clients = 1; - /* make the main heap thread-safe */ - h->flags |= MHEAP_FLAG_THREAD_SAFE; - - vec_validate (utm->rx_buf, 128 << 10); - - utm->session_index_by_vpp_handles = hash_create (0, sizeof (uword)); - - utm->my_pid = getpid (); - utm->configured_segment_size = 1 << 20; - utm->socket_name = 0; - utm->use_sock_api = 1; - - clib_time_init (&utm->clib_time); - init_error_string_table (utm); - svm_fifo_segment_init (0x200000000ULL, 20); + clib_time_init (&em->clib_time); + init_error_string_table (em); + svm_fifo_segment_main_init (0x200000000ULL, 20); unformat_init_command_line (a, argv); while (unformat_check_input (a) != UNFORMAT_END_OF_INPUT) @@ -1234,15 +1441,15 @@ main (int argc, char **argv) else if (unformat (a, "uri %s", &uri)) ; else if (unformat (a, "segment-size %dM", &tmp)) - utm->configured_segment_size = tmp << 20; + em->configured_segment_size = tmp << 20; else if (unformat (a, "segment-size %dG", &tmp)) - utm->configured_segment_size = tmp << 30; - else if (unformat (a, "master")) - i_am_master = 1; - else if (unformat (a, "slave")) - i_am_master = 0; - else if (unformat (a, "drop")) - drop_packets = 1; + em->configured_segment_size = tmp << 30; + else if (unformat (a, "server")) + i_am_server = 1; + else if (unformat (a, "client")) + i_am_server = 0; + else if (unformat (a, "no-return")) + em->no_return = 1; else if (unformat (a, "test")) test_return_packets = 1; else if (unformat (a, "mbytes %lld", &mbytes)) @@ -1253,55 +1460,64 @@ main (int argc, char **argv) { bytes_to_send = mbytes << 30; } - else if (unformat (a, "socket-name %s", &utm->socket_name)) + else if (unformat (a, "socket-name %s", &em->socket_name)) ; else if (unformat (a, "use-svm-api")) - utm->use_sock_api = 0; + em->use_sock_api = 0; + else if (unformat (a, "fifo-size %d", &tmp)) + em->fifo_size = tmp << 10; + else if (unformat (a, "nclients %d", &em->n_clients)) + ; else { - fformat (stderr, "%s: usage [master|slave]\n"); + fformat (stderr, "%s: usage [master|slave]\n", argv[0]); exit (1); } } - if (!utm->socket_name) - utm->socket_name = format (0, "%s%c", API_SOCKET_FILE, 0); + if (!em->socket_name) + em->socket_name = format (0, "%s%c", API_SOCKET_FILE, 0); if (uri) { - utm->uri = format (0, "%s%c", uri, 0); - utm->connect_uri = format (0, "%s%c", uri, 0); + em->uri = format (0, "%s%c", uri, 0); + em->connect_uri = format (0, "%s%c", uri, 0); } else { - utm->uri = format (0, "%s%c", bind_uri, 0); - utm->connect_uri = format (0, "%s%c", connect_uri, 0); + em->uri = format (0, "%s%c", bind_uri, 0); + em->connect_uri = format (0, "%s%c", connect_uri, 0); } - utm->i_am_master = i_am_master; - utm->segment_main = &svm_fifo_segment_main; - utm->drop_packets = drop_packets; - utm->test_return_packets = test_return_packets; - utm->bytes_to_send = bytes_to_send; - utm->time_to_stop = 0; + em->i_am_master = i_am_server; + em->segment_main = &svm_fifo_segment_main; + em->test_return_packets = test_return_packets; + em->bytes_to_send = bytes_to_send; + em->time_to_stop = 0; + vec_validate (em->rx_buf, 128 << 10); + vec_validate (em->client_thread_handles, em->n_clients - 1); + vec_validate (em->thread_args, em->n_clients - 1); setup_signal_handlers (); - uri_api_hookup (utm); + tcp_echo_api_hookup (em); - if (connect_to_vpp (i_am_master ? "tcp_echo_server" : "tcp_echo_client") < - 0) + app_name = i_am_server ? "tcp_echo_server" : "tcp_echo_client"; + if (connect_to_vpp (app_name) < 0) { svm_region_exit (); fformat (stderr, "Couldn't connect to vpe, exiting...\n"); exit (1); } - if (i_am_master == 0) - client_run (utm); + if (i_am_server == 0) + clients_run (em); else - server_run (utm); + server_run (em); + + /* Make sure detach finishes */ + wait_for_state_change (em, STATE_DETACHED); - disconnect_from_vpp (utm); + disconnect_from_vpp (em); exit (0); }