X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Ftests%2Fvnet%2Fsession%2Ftcp_echo.c;h=435a414d0979e756b39317da818ecd7afbaa9a34;hb=6442401c2;hp=6c99294099b8c90237e403e45c0e8637ad86e98b;hpb=52207f1b7b60cb0784d5241f0a4d40eef531c67e;p=vpp.git diff --git a/src/tests/vnet/session/tcp_echo.c b/src/tests/vnet/session/tcp_echo.c index 6c99294099b..435a414d097 100644 --- a/src/tests/vnet/session/tcp_echo.c +++ b/src/tests/vnet/session/tcp_echo.c @@ -45,18 +45,17 @@ typedef struct { - svm_fifo_t *server_rx_fifo; - svm_fifo_t *server_tx_fifo; - - svm_msg_q_t *vpp_evt_q; - + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); +#define _(type, name) type name; + foreach_app_session_field +#undef _ u64 vpp_session_handle; u64 bytes_sent; u64 bytes_to_send; volatile u64 bytes_received; volatile u64 bytes_to_receive; f64 start; -} session_t; +} echo_session_t; typedef enum { @@ -81,7 +80,7 @@ typedef struct u8 *uri; /* Session pool */ - session_t *sessions; + echo_session_t *sessions; /* Hash table for disconnect processing */ uword *session_index_by_vpp_handles; @@ -142,8 +141,7 @@ typedef struct * and all other messages are exchanged using shm IPC. */ u8 use_sock_api; - /* convenience */ - svm_fifo_segment_main_t *segment_main; + svm_fifo_segment_main_t segment_main; } echo_main_t; echo_main_t echo_main; @@ -154,62 +152,6 @@ echo_main_t echo_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) { @@ -263,7 +205,7 @@ wait_for_state_change (echo_main_t * em, connection_state_t state) return -1; if (em->time_to_stop == 1) return 0; - if (!em->our_event_queue) + if (!em->our_event_queue || em->state < STATE_ATTACHED) continue; if (svm_msg_q_sub (em->our_event_queue, &msg, SVM_Q_NOWAIT, 0)) @@ -284,14 +226,13 @@ application_send_attach (echo_main_t * em) vl_api_application_tls_key_add_t *key_mp; bmp = vl_msg_api_alloc (sizeof (*bmp)); - memset (bmp, 0, sizeof (*bmp)); + clib_memset (bmp, 0, sizeof (*bmp)); bmp->_vl_msg_id = ntohs (VL_API_APPLICATION_ATTACH); bmp->client_index = em->my_client_index; bmp->context = ntohl (0xfeedface); 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] = em->fifo_size; bmp->options[APP_OPTIONS_TX_FIFO_SIZE] = em->fifo_size; @@ -301,21 +242,21 @@ application_send_attach (echo_main_t * em) 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)); + clib_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); + clib_memcpy_fast (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); + clib_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); + clib_memcpy_fast (key_mp->key, test_srv_key_rsa, test_srv_key_rsa_len); vl_msg_api_send_shmem (em->vl_input_queue, (u8 *) & key_mp); } @@ -336,7 +277,7 @@ application_detach (echo_main_t * em) { vl_api_application_detach_t *bmp; bmp = vl_msg_api_alloc (sizeof (*bmp)); - memset (bmp, 0, sizeof (*bmp)); + clib_memset (bmp, 0, sizeof (*bmp)); bmp->_vl_msg_id = ntohs (VL_API_APPLICATION_DETACH); bmp->client_index = em->my_client_index; @@ -347,51 +288,26 @@ application_detach (echo_main_t * em) } 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) +ssvm_segment_attach (char *name, ssvm_segment_type_t type, int fd) { svm_fifo_segment_create_args_t _a, *a = &_a; - clib_error_t *error; + svm_fifo_segment_main_t *sm = &echo_main.segment_main; int rv; - memset (a, 0, sizeof (*a)); + clib_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; - } - } + a->memfd_fd = fd; - if ((rv = svm_fifo_segment_attach (a))) + if ((rv = svm_fifo_segment_attach (sm, a))) { clib_warning ("svm_fifo_segment_attach ('%s') failed", name); return rv; } + vec_reset_length (a->new_segment_indices); return 0; } @@ -400,47 +316,57 @@ vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t * mp) { echo_main_t *em = &echo_main; - ssvm_segment_type_t seg_type; + int *fds = 0; + u32 n_fds = 0; if (mp->retval) { clib_warning ("attach failed: %U", format_api_error, clib_net_to_host_u32 (mp->retval)); - em->state = STATE_FAILED; - return; + goto failed; } if (mp->segment_name_length == 0) { clib_warning ("segment_name_length zero"); - return; + goto failed; } - seg_type = em->use_sock_api ? SSVM_SEGMENT_MEMFD : SSVM_SEGMENT_SHM; + ASSERT (mp->app_event_queue_address); + em->our_event_queue = uword_to_pointer (mp->app_event_queue_address, + svm_msg_q_t *); - /* Attach to fifo segment */ - if (fifo_segment_attach ((char *) mp->segment_name, mp->segment_size, - seg_type)) + if (mp->n_fds) { - em->state = STATE_FAILED; - return; - } + vec_validate (fds, mp->n_fds); + vl_socket_client_recv_fd_msg (fds, mp->n_fds, 5); + + if (mp->fd_flags & SESSION_FD_F_VPP_MQ_SEGMENT) + if (ssvm_segment_attach (0, SSVM_SEGMENT_MEMFD, fds[n_fds++])) + goto failed; - /* If we're using memfd segments, read and attach to event qs segment */ - if (seg_type == SSVM_SEGMENT_MEMFD) + if (mp->fd_flags & SESSION_FD_F_MEMFD_SEGMENT) + if (ssvm_segment_attach ((char *) mp->segment_name, + SSVM_SEGMENT_MEMFD, fds[n_fds++])) + goto failed; + + if (mp->fd_flags & SESSION_FD_F_MQ_EVENTFD) + svm_msg_q_set_consumer_eventfd (em->our_event_queue, fds[n_fds++]); + + vec_free (fds); + } + else { - if (memfd_segment_attach ()) - { - clib_warning ("failed to attach to evt q segment"); - em->state = STATE_FAILED; - return; - } + if (ssvm_segment_attach ((char *) mp->segment_name, SSVM_SEGMENT_SHM, + -1)) + goto failed; } - 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; + return; +failed: + em->state = STATE_FAILED; + return; } static void @@ -499,7 +425,7 @@ connect_to_vpp (char *name) return -1; } - if (vl_socket_client_init_shm (0)) + if (vl_socket_client_init_shm (0, 1 /* want_pthread */ )) { clib_warning ("init shm api failed"); return -1; @@ -530,14 +456,15 @@ disconnect_from_vpp (echo_main_t * em) static void vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp) { + svm_fifo_segment_main_t *sm = &echo_main.segment_main; svm_fifo_segment_create_args_t _a, *a = &_a; int rv; - memset (a, 0, sizeof (*a)); + clib_memset (a, 0, sizeof (*a)); a->segment_name = (char *) mp->segment_name; a->segment_size = mp->segment_size; /* Attach to the segment vpp created */ - rv = svm_fifo_segment_attach (a); + rv = svm_fifo_segment_attach (sm, a); if (rv) { clib_warning ("svm_fifo_segment_attach ('%s') failed", @@ -549,7 +476,7 @@ vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp) } static void -session_print_stats (echo_main_t * em, session_t * session) +session_print_stats (echo_main_t * em, echo_session_t * session) { f64 deltat; u64 bytes; @@ -561,7 +488,7 @@ session_print_stats (echo_main_t * em, session_t * session) } static void -test_recv_bytes (session_t * s, u8 * rx_buf, u32 n_read) +test_recv_bytes (echo_session_t * s, u8 * rx_buf, u32 n_read) { int i; for (i = 0; i < n_read; i++) @@ -576,74 +503,63 @@ test_recv_bytes (session_t * s, u8 * rx_buf, u32 n_read) } static void -recv_test_chunk (echo_main_t * em, session_t * s, u8 * rx_buf) +recv_data_chunk (echo_main_t * em, echo_session_t * s, u8 * rx_buf) { - svm_fifo_t *rx_fifo = s->server_rx_fifo; - u32 n_read_now, n_to_read; - int n_read; + int n_to_read, n_read; - n_to_read = svm_fifo_max_dequeue (rx_fifo); - svm_fifo_unset_event (rx_fifo); + n_to_read = svm_fifo_max_dequeue (s->rx_fifo); + if (!n_to_read) + return; do { - 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; + n_read = app_recv_stream ((app_session_t *) s, rx_buf, + vec_len (rx_buf)); - if (n_read_now != n_read) - clib_warning ("huh?"); + if (n_read > 0) + { + if (em->test_return_packets) + test_recv_bytes (s, rx_buf, n_read); - if (em->test_return_packets) - test_recv_bytes (s, rx_buf, n_read); + n_to_read -= n_read; - n_to_read -= n_read; - s->bytes_received += n_read; - s->bytes_to_receive -= n_read; + s->bytes_received += n_read; + s->bytes_to_receive -= n_read; + } + else + break; } while (n_to_read > 0); } void -client_handle_fifo_event_rx (echo_main_t * em, session_event_t * e, - u8 * rx_buf) +client_handle_rx (echo_main_t * em, session_event_t * e, u8 * rx_buf) { - session_t *s; + echo_session_t *s; s = pool_elt_at_index (em->sessions, e->fifo->client_session_index); - recv_test_chunk (em, s, rx_buf); + recv_data_chunk (em, s, rx_buf); } static void -send_test_chunk (echo_main_t * em, session_t * s) +send_data_chunk (echo_main_t * em, echo_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; + int n_sent; 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; - 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); + n_sent = app_send_stream ((app_session_t *) s, test_data + test_buf_offset, + bytes_this_chunk, 0); - if (written > 0) + if (n_sent > 0) { - 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 */ ); + s->bytes_to_send -= n_sent; + s->bytes_sent += n_sent; } } @@ -656,7 +572,7 @@ client_thread_fn (void *arg) echo_main_t *em = &echo_main; static u8 *rx_buf = 0; u32 session_index = *(u32 *) arg; - session_t *s; + echo_session_t *s; vec_validate (rx_buf, 1 << 20); @@ -666,8 +582,8 @@ client_thread_fn (void *arg) 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); + send_data_chunk (em, s); + recv_data_chunk (em, s, rx_buf); if (!s->bytes_to_send && !s->bytes_to_receive) break; } @@ -705,7 +621,7 @@ client_rx_thread_fn (void *arg) switch (e->event_type) { case FIFO_EVENT_APP_RX: - client_handle_fifo_event_rx (em, e, rx_buf); + client_handle_rx (em, e, rx_buf); break; default: clib_warning ("unknown event type %d", e->event_type); @@ -721,7 +637,7 @@ 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)); + clib_memset (cmp, 0, sizeof (*cmp)); cmp->_vl_msg_id = ntohs (VL_API_CONNECT_URI); cmp->client_index = em->my_client_index; @@ -731,11 +647,11 @@ client_send_connect (echo_main_t * em) } void -client_send_disconnect (echo_main_t * em, session_t * s) +client_send_disconnect (echo_main_t * em, echo_session_t * s) { vl_api_disconnect_session_t *dmp; dmp = vl_msg_api_alloc (sizeof (*dmp)); - memset (dmp, 0, sizeof (*dmp)); + clib_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; @@ -743,14 +659,32 @@ client_send_disconnect (echo_main_t * em, session_t * s) } int -client_disconnect (echo_main_t * em, session_t * s) +client_disconnect (echo_main_t * em, echo_session_t * s) { client_send_disconnect (em, s); pool_put (em->sessions, s); - memset (s, 0xfe, sizeof (*s)); + clib_memset (s, 0xfe, sizeof (*s)); return 0; } +static void +session_bound_handler (session_bound_msg_t * mp) +{ + echo_main_t *em = &echo_main; + + if (mp->retval) + { + clib_warning ("bind failed: %U", format_api_error, + clib_net_to_host_u32 (mp->retval)); + em->state = STATE_FAILED; + return; + } + + clib_warning ("listening on %U:%u", format_ip46_address, mp->lcl_ip, + mp->lcl_is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, mp->lcl_port); + em->state = STATE_READY; +} + static void session_accepted_handler (session_accepted_msg_t * mp) { @@ -758,7 +692,7 @@ session_accepted_handler (session_accepted_msg_t * mp) session_accepted_reply_msg_t *rmp; svm_fifo_t *rx_fifo, *tx_fifo; echo_main_t *em = &echo_main; - session_t *session; + echo_session_t *session; static f64 start_time; u32 session_index; u8 *ip_str; @@ -779,8 +713,8 @@ session_accepted_handler (session_accepted_msg_t * mp) 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->rx_fifo = rx_fifo; + session->tx_fifo = tx_fifo; session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, svm_msg_q_t *); @@ -816,7 +750,7 @@ static void session_connected_handler (session_connected_msg_t * mp) { echo_main_t *em = &echo_main; - session_t *session; + echo_session_t *session; u32 session_index; svm_fifo_t *rx_fifo, *tx_fifo; int rv; @@ -834,7 +768,7 @@ session_connected_handler (session_connected_msg_t * mp) */ pool_get (em->sessions, session); - memset (session, 0, sizeof (*session)); + clib_memset (session, 0, sizeof (*session)); session_index = session - em->sessions; rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); @@ -842,8 +776,8 @@ session_connected_handler (session_connected_msg_t * mp) 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->rx_fifo = rx_fifo; + session->tx_fifo = tx_fifo; session->vpp_session_handle = mp->handle; session->start = clib_time_now (&em->clib_time); session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, @@ -876,25 +810,21 @@ session_disconnected_handler (session_disconnected_msg_t * mp) 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; + echo_session_t *session = 0; uword *p; int rv = 0; p = hash_get (em->session_index_by_vpp_handles, mp->handle); - - if (p) - { - 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); - } - else + if (!p) { clib_warning ("couldn't find session key %llx", mp->handle); - rv = -11; + return; } + session = pool_elt_at_index (em->sessions, p[0]); + hash_unset (em->session_index_by_vpp_handles, mp->handle); + pool_put (em->sessions, session); + 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; @@ -903,8 +833,7 @@ session_disconnected_handler (session_disconnected_msg_t * mp) rmp->context = mp->context; app_send_ctrl_evt_to_vpp (session->vpp_evt_q, app_evt); - if (session) - session_print_stats (em, session); + session_print_stats (em, session); } static void @@ -913,7 +842,7 @@ session_reset_handler (session_reset_msg_t * mp) 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; + echo_session_t *session = 0; uword *p; int rv = 0; @@ -945,6 +874,9 @@ handle_mq_event (session_event_t * e) { switch (e->event_type) { + case SESSION_CTRL_EVT_BOUND: + session_bound_handler ((session_bound_msg_t *) e->data); + break; case SESSION_CTRL_EVT_ACCEPTED: session_accepted_handler ((session_accepted_msg_t *) e->data); break; @@ -968,7 +900,7 @@ 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; + echo_session_t *s; int i; /* Init test data */ @@ -1163,37 +1095,38 @@ format_ip46_address (u8 * s, va_list * args) } static void -server_handle_fifo_event_rx (echo_main_t * em, session_event_t * e) +server_handle_rx (echo_main_t * em, session_event_t * e) { - svm_fifo_t *rx_fifo, *tx_fifo; - int n_read; - session_t *session; - int rv; - u32 max_dequeue, offset, max_transfer, rx_buf_len; + int n_read, max_dequeue, n_sent; + u32 offset, to_dequeue; + echo_session_t *s; - rx_buf_len = vec_len (em->rx_buf); - rx_fifo = e->fifo; - session = pool_elt_at_index (em->sessions, rx_fifo->client_session_index); - tx_fifo = session->server_tx_fifo; + s = pool_elt_at_index (em->sessions, e->fifo->client_session_index); - max_dequeue = svm_fifo_max_dequeue (rx_fifo); - /* Allow enqueuing of a new event */ - svm_fifo_unset_event (rx_fifo); + /* Clear event only once. Otherwise, if we do it in the loop by calling + * app_recv_stream, we may end up with a lot of unhandled rx events on the + * message queue */ + svm_fifo_unset_event (s->rx_fifo); + max_dequeue = svm_fifo_max_dequeue (s->rx_fifo); 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, em->rx_buf); + /* The options here are to limit ourselves to max_dequeue or read + * even the data that was enqueued while we were dequeueing and which + * now has an rx event in the mq. Either of the two work. */ + to_dequeue = clib_min (max_dequeue, vec_len (em->rx_buf)); + n_read = app_recv_stream_raw (s->rx_fifo, em->rx_buf, to_dequeue, + 0 /* clear evt */ , 0 /* peek */ ); if (n_read > 0) { max_dequeue -= n_read; - session->bytes_received += n_read; - session->bytes_to_receive -= n_read; + s->bytes_received += n_read; } + else + break; /* Reflect if a non-drop session */ if (!em->no_return && n_read > 0) @@ -1201,27 +1134,23 @@ server_handle_fifo_event_rx (echo_main_t * em, session_event_t * e) offset = 0; do { - rv = svm_fifo_enqueue_nowait (tx_fifo, n_read, - &em->rx_buf[offset]); - if (rv > 0) + n_sent = app_send_stream ((app_session_t *) s, + &em->rx_buf[offset], + n_read, SVM_Q_WAIT); + if (n_sent > 0) { - n_read -= rv; - offset += rv; + n_read -= n_sent; + offset += n_sent; } } - while ((rv <= 0 || n_read > 0) && !em->time_to_stop); - - /* If event wasn't set, add one */ - if (svm_fifo_set_event (tx_fifo)) - app_send_io_evt_to_vpp (session->vpp_evt_q, tx_fifo, - FIFO_EVENT_APP_TX, SVM_Q_WAIT); + while ((n_sent <= 0 || n_read > 0) && !em->time_to_stop); } } - while ((n_read < 0 || max_dequeue > 0) && !em->time_to_stop); + while (max_dequeue > 0 && !em->time_to_stop); } static void -server_handle_event_queue (echo_main_t * em) +server_handle_mq (echo_main_t * em) { svm_msg_q_msg_t msg; session_event_t *e; @@ -1233,7 +1162,7 @@ server_handle_event_queue (echo_main_t * em) switch (e->event_type) { case FIFO_EVENT_APP_RX: - server_handle_fifo_event_rx (em, e); + server_handle_rx (em, e); break; default: handle_mq_event (e); @@ -1255,7 +1184,7 @@ 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)); + clib_memset (bmp, 0, sizeof (*bmp)); bmp->_vl_msg_id = ntohs (VL_API_BIND_URI); bmp->client_index = em->my_client_index; @@ -1282,7 +1211,7 @@ server_send_unbind (echo_main_t * em) vl_api_unbind_uri_t *ump; ump = vl_msg_api_alloc (sizeof (*ump)); - memset (ump, 0, sizeof (*ump)); + clib_memset (ump, 0, sizeof (*ump)); ump->_vl_msg_id = ntohs (VL_API_UNBIND_URI); ump->client_index = em->my_client_index; @@ -1305,14 +1234,14 @@ server_unbind (echo_main_t * em) void server_run (echo_main_t * em) { - session_t *session; + echo_session_t *session; int i; /* $$$$ hack preallocation */ for (i = 0; i < 200000; i++) { pool_get (em->sessions, session); - memset (session, 0, sizeof (*session)); + clib_memset (session, 0, sizeof (*session)); } for (i = 0; i < 200000; i++) pool_put_index (em->sessions, i); @@ -1325,7 +1254,7 @@ server_run (echo_main_t * em) return; /* Enter handle event loop */ - server_handle_event_queue (em); + server_handle_mq (em); /* Cleanup */ server_send_unbind (em); @@ -1407,25 +1336,19 @@ main (int argc, char **argv) { int i_am_server = 1, test_return_packets = 0; echo_main_t *em = &echo_main; + svm_fifo_segment_main_t *sm = &em->segment_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.1/1234"; u64 bytes_to_send = 64 << 10, mbytes; char *app_name; u32 tmp; - mheap_t *h; - - clib_mem_init (0, 256 << 20); - - heap = clib_mem_get_per_cpu_heap (); - h = mheap_header (heap); - /* make the main heap thread-safe */ - h->flags |= MHEAP_FLAG_THREAD_SAFE; + clib_mem_init_thread_safe (0, 256 << 20); - memset (em, 0, sizeof (*em)); + clib_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; @@ -1436,7 +1359,7 @@ main (int argc, char **argv) clib_time_init (&em->clib_time); init_error_string_table (em); - svm_fifo_segment_main_init (0x200000000ULL, 20); + svm_fifo_segment_main_init (sm, HIGH_SEGMENT_BASEVA, 20); unformat_init_command_line (a, argv); while (unformat_check_input (a) != UNFORMAT_END_OF_INPUT) @@ -1497,11 +1420,10 @@ main (int argc, char **argv) } 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->rx_buf, 4 << 20); vec_validate (em->client_thread_handles, em->n_clients - 1); vec_validate (em->thread_args, em->n_clients - 1);