X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Funittest%2Fsession_test.c;h=68605b2cbd7b5f1c401165d833d93e7a19fb6f99;hb=b46241889;hp=00a70b878dc099882c21134df264940885d555b5;hpb=c930cda331cad99444a22e6b673c869bc8748f7f;p=vpp.git diff --git a/src/plugins/unittest/session_test.c b/src/plugins/unittest/session_test.c index 00a70b878dc..68605b2cbd7 100644 --- a/src/plugins/unittest/session_test.c +++ b/src/plugins/unittest/session_test.c @@ -45,7 +45,7 @@ fformat(stderr, _comment "\n", ##_args); \ void -dummy_session_reset_callback (session_t * s) +placeholder_session_reset_callback (session_t * s) { clib_warning ("called..."); } @@ -53,8 +53,8 @@ dummy_session_reset_callback (session_t * s) volatile u32 connected_session_index = ~0; volatile u32 connected_session_thread = ~0; int -dummy_session_connected_callback (u32 app_index, u32 api_context, - session_t * s, u8 is_fail) +placeholder_session_connected_callback (u32 app_index, u32 api_context, + session_t * s, session_error_t err) { if (s) { @@ -64,36 +64,36 @@ dummy_session_connected_callback (u32 app_index, u32 api_context, return 0; } -static u32 dummy_segment_count; +static u32 placeholder_segment_count; int -dummy_add_segment_callback (u32 client_index, u64 segment_handle) +placeholder_add_segment_callback (u32 client_index, u64 segment_handle) { - dummy_segment_count = 1; + placeholder_segment_count = 1; return 0; } int -dummy_del_segment_callback (u32 client_index, u64 segment_handle) +placeholder_del_segment_callback (u32 client_index, u64 segment_handle) { - dummy_segment_count = 0; + placeholder_segment_count = 0; return 0; } void -dummy_session_disconnect_callback (session_t * s) +placeholder_session_disconnect_callback (session_t * s) { clib_warning ("called..."); } -static u32 dummy_accept; +static u32 placeholder_accept; volatile u32 accepted_session_index; volatile u32 accepted_session_thread; int -dummy_session_accept_callback (session_t * s) +placeholder_session_accept_callback (session_t * s) { - dummy_accept = 1; + placeholder_accept = 1; accepted_session_index = s->session_index; accepted_session_thread = s->thread_index; s->session_state = SESSION_STATE_READY; @@ -101,21 +101,21 @@ dummy_session_accept_callback (session_t * s) } int -dummy_server_rx_callback (session_t * s) +placeholder_server_rx_callback (session_t * s) { clib_warning ("called..."); return -1; } /* *INDENT-OFF* */ -static session_cb_vft_t dummy_session_cbs = { - .session_reset_callback = dummy_session_reset_callback, - .session_connected_callback = dummy_session_connected_callback, - .session_accept_callback = dummy_session_accept_callback, - .session_disconnect_callback = dummy_session_disconnect_callback, - .builtin_app_rx_callback = dummy_server_rx_callback, - .add_segment_callback = dummy_add_segment_callback, - .del_segment_callback = dummy_del_segment_callback, +static session_cb_vft_t placeholder_session_cbs = { + .session_reset_callback = placeholder_session_reset_callback, + .session_connected_callback = placeholder_session_connected_callback, + .session_accept_callback = placeholder_session_accept_callback, + .session_disconnect_callback = placeholder_session_disconnect_callback, + .builtin_app_rx_callback = placeholder_server_rx_callback, + .add_segment_callback = placeholder_add_segment_callback, + .del_segment_callback = placeholder_del_segment_callback, }; /* *INDENT-ON* */ @@ -178,7 +178,7 @@ session_test_basic (vlib_main_t * vm, unformat_input_t * input) .api_client_index = ~0, .options = options, .namespace_id = 0, - .session_cb_vft = &dummy_session_cbs, + .session_cb_vft = &placeholder_session_cbs, .name = format (0, "session_test"), }; @@ -278,8 +278,8 @@ session_test_endpoint_cfg (vlib_main_t * vm, unformat_input_t * input) { session_endpoint_cfg_t client_sep = SESSION_ENDPOINT_CFG_NULL; u32 server_index, client_index, sw_if_index[2], tries = 0; - u64 options[APP_OPTIONS_N_OPTIONS], dummy_secret = 1234; - u16 dummy_server_port = 1234, dummy_client_port = 5678; + u64 options[APP_OPTIONS_N_OPTIONS], placeholder_secret = 1234; + u16 placeholder_server_port = 1234, placeholder_client_port = 5678; session_endpoint_cfg_t server_sep = SESSION_ENDPOINT_CFG_NULL; ip4_address_t intf_addr[3]; transport_connection_t *tc; @@ -307,7 +307,7 @@ session_test_endpoint_cfg (vlib_main_t * vm, unformat_input_t * input) appns_id = format (0, "appns1"); vnet_app_namespace_add_del_args_t ns_args = { .ns_id = appns_id, - .secret = dummy_secret, + .secret = placeholder_secret, .sw_if_index = sw_if_index[1], .ip4_fib_id = 0, .is_add = 1 @@ -326,7 +326,7 @@ session_test_endpoint_cfg (vlib_main_t * vm, unformat_input_t * input) .api_client_index = ~0, .options = options, .namespace_id = 0, - .session_cb_vft = &dummy_session_cbs, + .session_cb_vft = &placeholder_session_cbs, .name = format (0, "session_test_client"), }; @@ -337,7 +337,7 @@ session_test_endpoint_cfg (vlib_main_t * vm, unformat_input_t * input) attach_args.name = format (0, "session_test_server"); attach_args.namespace_id = appns_id; - attach_args.options[APP_OPTIONS_NAMESPACE_SECRET] = dummy_secret; + attach_args.options[APP_OPTIONS_NAMESPACE_SECRET] = placeholder_secret; error = vnet_application_attach (&attach_args); SESSION_TEST ((error == 0), "server app attached: %U", format_clib_error, error); @@ -345,7 +345,7 @@ session_test_endpoint_cfg (vlib_main_t * vm, unformat_input_t * input) server_index = attach_args.app_index; server_sep.is_ip4 = 1; - server_sep.port = dummy_server_port; + server_sep.port = placeholder_server_port; vnet_listen_args_t bind_args = { .sep_ext = server_sep, .app_index = server_index, @@ -358,10 +358,10 @@ session_test_endpoint_cfg (vlib_main_t * vm, unformat_input_t * input) */ client_sep.is_ip4 = 1; client_sep.ip.ip4.as_u32 = clib_host_to_net_u32 (0x02020202); - client_sep.port = dummy_server_port; + client_sep.port = placeholder_server_port; client_sep.peer.is_ip4 = 1; client_sep.peer.ip.ip4.as_u32 = clib_host_to_net_u32 (0x01010101); - client_sep.peer.port = dummy_client_port; + client_sep.peer.port = placeholder_client_port; client_sep.transport_proto = TRANSPORT_PROTO_TCP; vnet_connect_args_t connect_args = { @@ -375,9 +375,19 @@ session_test_endpoint_cfg (vlib_main_t * vm, unformat_input_t * input) SESSION_TEST ((error == 0), "connect should work"); /* wait for stuff to happen */ - while ((connected_session_index == ~0 - || vec_len (tcp_main.wrk_ctx[0].pending_acks)) && ++tries < 100) - vlib_process_suspend (vm, 100e-3); + while (connected_session_index == ~0 && ++tries < 100) + { + vlib_worker_thread_barrier_release (vm); + vlib_process_suspend (vm, 100e-3); + vlib_worker_thread_barrier_sync (vm); + } + while (accepted_session_index == ~0 && ++tries < 100) + { + vlib_worker_thread_barrier_release (vm); + vlib_process_suspend (vm, 100e-3); + vlib_worker_thread_barrier_sync (vm); + } + clib_warning ("waited %.1f seconds for connections", tries / 10.0); SESSION_TEST ((connected_session_index != ~0), "session should exist"); SESSION_TEST ((connected_session_thread != ~0), "thread should exist"); @@ -388,7 +398,8 @@ session_test_endpoint_cfg (vlib_main_t * vm, unformat_input_t * input) SESSION_TEST ((tc != 0), "transport should exist"); SESSION_TEST ((memcmp (&tc->lcl_ip, &client_sep.peer.ip, sizeof (tc->lcl_ip)) == 0), "ips should be equal"); - SESSION_TEST ((tc->lcl_port == dummy_client_port), "ports should be equal"); + SESSION_TEST ((tc->lcl_port == placeholder_client_port), + "ports should be equal"); /* These sessions, because of the way they're established are pinned to * main thread, even when we have workers and we avoid polling main thread, @@ -422,25 +433,29 @@ session_test_endpoint_cfg (vlib_main_t * vm, unformat_input_t * input) static int session_test_namespace (vlib_main_t * vm, unformat_input_t * input) { - u64 options[APP_OPTIONS_N_OPTIONS], dummy_secret = 1234; + u64 options[APP_OPTIONS_N_OPTIONS], placeholder_secret = 1234, tries; u32 server_index, server_st_index, server_local_st_index; - u32 dummy_port = 1234, client_index, server_wrk_index; - u32 dummy_api_context = 4321, dummy_client_api_index = ~0; - u32 dummy_server_api_index = ~0, sw_if_index = 0; + u32 placeholder_port = 1234, client_index, server_wrk_index; + u32 placeholder_api_context = 4321, placeholder_client_api_index = ~0; + u32 placeholder_server_api_index = ~0, sw_if_index = 0; session_endpoint_t server_sep = SESSION_ENDPOINT_NULL; session_endpoint_t client_sep = SESSION_ENDPOINT_NULL; session_endpoint_t intf_sep = SESSION_ENDPOINT_NULL; - u8 *ns_id = format (0, "appns1"); + u8 *ns_id, *server_name, *client_name; app_namespace_t *app_ns; application_t *server; session_t *s; u64 handle; int error = 0; + ns_id = format (0, "appns1"); + server_name = format (0, "session_test"); + client_name = format (0, "session_test_client"); + server_sep.is_ip4 = 1; - server_sep.port = dummy_port; + server_sep.port = placeholder_port; client_sep.is_ip4 = 1; - client_sep.port = dummy_port; + client_sep.port = placeholder_port; clib_memset (options, 0, sizeof (options)); options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN; @@ -448,8 +463,8 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) .api_client_index = ~0, .options = options, .namespace_id = 0, - .session_cb_vft = &dummy_session_cbs, - .name = format (0, "session_test"), + .session_cb_vft = &placeholder_session_cbs, + .name = server_name, }; vnet_listen_args_t bind_args = { @@ -479,7 +494,7 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) intf_sep.ip.ip4 = intf_addr; intf_sep.is_ip4 = 1; - intf_sep.port = dummy_port; + intf_sep.port = placeholder_port; /* * Insert namespace and lookup @@ -487,7 +502,7 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) vnet_app_namespace_add_del_args_t ns_args = { .ns_id = ns_id, - .secret = dummy_secret, + .secret = placeholder_secret, .sw_if_index = APP_NAMESPACE_INVALID_INDEX, .is_add = 1 }; @@ -496,8 +511,8 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) app_ns = app_namespace_get_from_id (ns_id); SESSION_TEST ((app_ns != 0), "should find ns %v status", ns_id); - SESSION_TEST ((app_ns->ns_secret == dummy_secret), "secret should be %d", - dummy_secret); + SESSION_TEST ((app_ns->ns_secret == placeholder_secret), + "secret should be %d", placeholder_secret); SESSION_TEST ((app_ns->sw_if_index == APP_NAMESPACE_INVALID_INDEX), "sw_if_index should be invalid"); @@ -507,9 +522,9 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE; options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE; - options[APP_OPTIONS_NAMESPACE_SECRET] = dummy_secret - 1; + options[APP_OPTIONS_NAMESPACE_SECRET] = placeholder_secret - 1; attach_args.namespace_id = ns_id; - attach_args.api_client_index = dummy_server_api_index; + attach_args.api_client_index = placeholder_server_api_index; error = vnet_application_attach (&attach_args); SESSION_TEST ((error != 0), "app attachment should fail"); @@ -523,7 +538,7 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) options[APP_OPTIONS_FLAGS] &= ~APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE; options[APP_OPTIONS_NAMESPACE_SECRET] = 0; attach_args.namespace_id = 0; - attach_args.api_client_index = dummy_server_api_index; + attach_args.api_client_index = placeholder_server_api_index; error = vnet_application_attach (&attach_args); SESSION_TEST ((error == 0), "server attachment should work"); server_index = attach_args.app_index; @@ -561,9 +576,9 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) */ options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE; options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE; - options[APP_OPTIONS_NAMESPACE_SECRET] = dummy_secret; + options[APP_OPTIONS_NAMESPACE_SECRET] = placeholder_secret; attach_args.namespace_id = ns_id; - attach_args.api_client_index = dummy_server_api_index; + attach_args.api_client_index = placeholder_server_api_index; error = vnet_application_attach (&attach_args); SESSION_TEST ((error == 0), "server attachment should work"); server_index = attach_args.app_index; @@ -589,35 +604,50 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) * Try client connect with 1) local scope 2) global scope */ options[APP_OPTIONS_FLAGS] &= ~APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE; - attach_args.api_client_index = dummy_client_api_index; + attach_args.name = client_name; + attach_args.api_client_index = placeholder_client_api_index; error = vnet_application_attach (&attach_args); SESSION_TEST ((error == 0), "client attachment should work"); client_index = attach_args.app_index; - connect_args.api_context = dummy_api_context; + connect_args.api_context = placeholder_api_context; connect_args.app_index = client_index; error = vnet_connect (&connect_args); SESSION_TEST ((error != 0), "client connect should return error code"); - SESSION_TEST ((error == VNET_API_ERROR_INVALID_VALUE), + SESSION_TEST ((error == SESSION_E_INVALID_RMT_IP), "error code should be invalid value (zero ip)"); - SESSION_TEST ((dummy_segment_count == 0), + SESSION_TEST ((placeholder_segment_count == 0), "shouldn't have received request to map new segment"); connect_args.sep.ip.ip4.as_u8[0] = 127; error = vnet_connect (&connect_args); SESSION_TEST ((error == 0), "client connect should not return error code"); - SESSION_TEST ((dummy_segment_count == 1), + + /* wait for accept */ + if (vlib_num_workers ()) + { + tries = 0; + while (!placeholder_accept && ++tries < 100) + { + vlib_worker_thread_barrier_release (vm); + vlib_process_suspend (vm, 100e-3); + vlib_worker_thread_barrier_sync (vm); + } + } + + SESSION_TEST ((placeholder_segment_count == 1), "should've received request to map new segment"); - SESSION_TEST ((dummy_accept == 1), "should've received accept request"); + SESSION_TEST ((placeholder_accept == 1), + "should've received accept request"); detach_args.app_index = client_index; vnet_application_detach (&detach_args); options[APP_OPTIONS_FLAGS] &= ~APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE; options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE; - attach_args.api_client_index = dummy_client_api_index; + attach_args.api_client_index = placeholder_client_api_index; error = vnet_application_attach (&attach_args); SESSION_TEST ((error == 0), "client attachment should work"); error = vnet_connect (&connect_args); SESSION_TEST ((error != 0), "client connect should return error code"); - SESSION_TEST ((error == VNET_API_ERROR_SESSION_CONNECT), + SESSION_TEST ((error == SESSION_E_NOINTF), "error code should be connect (nothing in local scope)"); detach_args.app_index = client_index; vnet_application_detach (&detach_args); @@ -641,7 +671,8 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) options[APP_OPTIONS_FLAGS] &= ~APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE; options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE; - attach_args.api_client_index = dummy_server_api_index; + attach_args.api_client_index = placeholder_server_api_index; + attach_args.name = server_name; error = vnet_application_attach (&attach_args); SESSION_TEST ((error == 0), "app attachment should work"); server_index = attach_args.app_index; @@ -675,12 +706,13 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) options[APP_OPTIONS_FLAGS] &= ~APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE; options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE; attach_args.namespace_id = 0; - attach_args.api_client_index = dummy_client_api_index; + attach_args.api_client_index = placeholder_client_api_index; + attach_args.name = client_name; vnet_application_attach (&attach_args); error = vnet_connect (&connect_args); SESSION_TEST ((error != 0), "client connect should return error code"); - SESSION_TEST ((error == VNET_API_ERROR_SESSION_CONNECT), - "error code should be connect (not in same ns)"); + SESSION_TEST ((error == SESSION_E_NOROUTE), + "error code should be noroute (not in same ns)"); detach_args.app_index = client_index; vnet_application_detach (&detach_args); @@ -707,9 +739,10 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) */ options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE; options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE; - options[APP_OPTIONS_NAMESPACE_SECRET] = dummy_secret; + options[APP_OPTIONS_NAMESPACE_SECRET] = placeholder_secret; attach_args.namespace_id = ns_id; - attach_args.api_client_index = dummy_server_api_index; + attach_args.api_client_index = placeholder_server_api_index; + attach_args.name = server_name; error = vnet_application_attach (&attach_args); SESSION_TEST ((error == 0), "server attachment should work"); server_index = attach_args.app_index; @@ -736,7 +769,8 @@ session_test_namespace (vlib_main_t * vm, unformat_input_t * input) /* * Cleanup */ - vec_free (attach_args.name); + vec_free (server_name); + vec_free (client_name); vec_free (ns_id); session_delete_loopback (sw_if_index); return 0; @@ -1017,9 +1051,9 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) u64 options[APP_OPTIONS_N_OPTIONS]; u16 lcl_port = 1234, rmt_port = 4321; u32 server_index, server_index2; - u32 dummy_server_api_index = ~0; + u32 placeholder_server_api_index = ~0; transport_connection_t *tc; - u32 dummy_port = 1111; + u32 placeholder_port = 1111; u8 is_filtered = 0, *ns_id = format (0, "appns1"); session_t *listener, *s; app_namespace_t *default_ns = app_namespace_get_default (); @@ -1043,14 +1077,14 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) } server_sep.is_ip4 = 1; - server_sep.port = dummy_port; + server_sep.port = placeholder_port; clib_memset (options, 0, sizeof (options)); vnet_app_attach_args_t attach_args = { .api_client_index = ~0, .options = options, .namespace_id = 0, - .session_cb_vft = &dummy_session_cbs, + .session_cb_vft = &placeholder_session_cbs, .name = format (0, "session_test"), }; @@ -1066,7 +1100,7 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE; options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE; attach_args.namespace_id = 0; - attach_args.api_client_index = dummy_server_api_index; + attach_args.api_client_index = placeholder_server_api_index; error = vnet_application_attach (&attach_args); SESSION_TEST ((error == 0), "server attached"); server_index = attach_args.app_index; @@ -1256,8 +1290,7 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) /* Try connecting */ error = vnet_connect (&connect_args); SESSION_TEST ((error != 0), "connect should fail"); - SESSION_TEST ((error == VNET_API_ERROR_APP_CONNECT_FILTERED), - "connect should be filtered"); + SESSION_TEST ((error == SESSION_E_FILTERED), "connect should be filtered"); sep.ip.ip4.as_u32 -= 1 << 24; @@ -1491,7 +1524,9 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) app_ns = app_namespace_get_from_id (ns_id); attach_args.namespace_id = ns_id; - attach_args.api_client_index = dummy_server_api_index; + attach_args.api_client_index = placeholder_server_api_index; + vec_free (attach_args.name); + attach_args.name = format (0, "server_test2"); error = vnet_application_attach (&attach_args); SESSION_TEST ((error == 0), "server2 attached"); server_index2 = attach_args.app_index; @@ -1530,8 +1565,7 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) error = vnet_connect (&connect_args); SESSION_TEST ((error != 0), "connect should fail"); - SESSION_TEST ((error == VNET_API_ERROR_APP_CONNECT_FILTERED), - "connect should be filtered"); + SESSION_TEST ((error == SESSION_E_FILTERED), "connect should be filtered"); /* * Lookup test namespace @@ -1543,8 +1577,7 @@ session_test_rules (vlib_main_t * vm, unformat_input_t * input) connect_args.app_index = server_index; error = vnet_connect (&connect_args); SESSION_TEST ((error != 0), "connect should fail"); - SESSION_TEST ((error == VNET_API_ERROR_APP_CONNECT_FILTERED), - "connect should be filtered"); + SESSION_TEST ((error == SESSION_E_FILTERED), "connect should be filtered"); args.table_args.is_add = 0; vnet_session_rule_add_del (&args); @@ -1581,7 +1614,7 @@ session_test_proxy (vlib_main_t * vm, unformat_input_t * input) char *show_local_listeners = "sh app ns table default"; unformat_input_t tmp_input; u32 server_index, app_index; - u32 dummy_server_api_index = ~0, sw_if_index = 0; + u32 placeholder_server_api_index = ~0, sw_if_index = 0; u8 is_filtered = 0; session_t *s; transport_connection_t *tc; @@ -1638,11 +1671,11 @@ session_test_proxy (vlib_main_t * vm, unformat_input_t * input) .api_client_index = ~0, .options = options, .namespace_id = 0, - .session_cb_vft = &dummy_session_cbs, + .session_cb_vft = &placeholder_session_cbs, .name = format (0, "session_test"), }; - attach_args.api_client_index = dummy_server_api_index; + attach_args.api_client_index = placeholder_server_api_index; error = vnet_application_attach (&attach_args); SESSION_TEST ((error == 0), "server attachment should work"); server_index = attach_args.app_index; @@ -1788,14 +1821,12 @@ session_test_mq_speed (vlib_main_t * vm, unformat_input_t * input) /* Shut up coverity */ if (reg == 0) abort (); - if (!session_main.evt_qs_use_memfd_seg) - reg->clib_file_index = VL_API_INVALID_FI; vnet_app_attach_args_t attach_args = { .api_client_index = api_index, .options = options, .namespace_id = 0, - .session_cb_vft = &dummy_session_cbs, + .session_cb_vft = &placeholder_session_cbs, .name = format (0, "session_mq_test"), }; error = vnet_application_attach (&attach_args); @@ -1815,11 +1846,11 @@ session_test_mq_speed (vlib_main_t * vm, unformat_input_t * input) } sm = app_worker_get_or_alloc_connect_segment_manager (app_wrk); - segment_manager_alloc_session_fifos (sm, &rx_fifo, &tx_fifo); + segment_manager_alloc_session_fifos (sm, 0, &rx_fifo, &tx_fifo); s.rx_fifo = rx_fifo; s.tx_fifo = tx_fifo; s.session_state = SESSION_STATE_READY; - counter = (u64 *) rx_fifo->head_chunk->data; + counter = (u64 *) f_head_cptr (rx_fifo)->data; start = vlib_time_now (vm); pid = fork (); @@ -1878,8 +1909,9 @@ session_test_mq_basic (vlib_main_t * vm, unformat_input_t * input) svm_msg_q_cfg_t _cfg, *cfg = &_cfg; svm_msg_q_msg_t msg1, msg2, msg[12]; int __clib_unused verbose, i, rv; - svm_msg_q_t *mq; + svm_msg_q_shared_t *smq; svm_msg_q_ring_t *ring; + svm_msg_q_t _mq = { 0 }, *mq = &_mq; u8 *rings_ptr; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) @@ -1902,28 +1934,30 @@ session_test_mq_basic (vlib_main_t * vm, unformat_input_t * input) cfg->q_nitems = 16; cfg->ring_cfgs = rc; - mq = svm_msg_q_alloc (cfg); + smq = svm_msg_q_alloc (cfg); + svm_msg_q_attach (mq, smq); SESSION_TEST (mq != 0, "svm_msg_q_alloc"); SESSION_TEST (vec_len (mq->rings) == 2, "ring allocation"); - rings_ptr = (u8 *) mq->rings + vec_bytes (mq->rings); + rings_ptr = (u8 *) mq->rings[0].shr->data; vec_foreach (ring, mq->rings) { - SESSION_TEST (ring->data == rings_ptr, "ring data"); + SESSION_TEST (ring->shr->data == rings_ptr, "ring data"); rings_ptr += (uword) ring->nitems * ring->elsize; + rings_ptr += sizeof (svm_msg_q_ring_shared_t); } msg1 = svm_msg_q_alloc_msg (mq, 8); - rv = (mq->rings[0].cursize != 1 - || msg1.ring_index != 0 || msg1.elt_index != 0); + rv = (mq->rings[0].shr->cursize != 1 || msg1.ring_index != 0 || + msg1.elt_index != 0); SESSION_TEST (rv == 0, "msg alloc1"); msg2 = svm_msg_q_alloc_msg (mq, 15); - rv = (mq->rings[1].cursize != 1 - || msg2.ring_index != 1 || msg2.elt_index != 0); + rv = (mq->rings[1].shr->cursize != 1 || msg2.ring_index != 1 || + msg2.elt_index != 0); SESSION_TEST (rv == 0, "msg alloc2"); svm_msg_q_free_msg (mq, &msg1); - SESSION_TEST (mq->rings[0].cursize == 0, "free msg"); + SESSION_TEST (mq->rings[0].shr->cursize == 0, "free msg"); for (i = 0; i < 12; i++) { @@ -1931,7 +1965,7 @@ session_test_mq_basic (vlib_main_t * vm, unformat_input_t * input) *(u32 *) svm_msg_q_msg_data (mq, &msg[i]) = i; } - rv = (mq->rings[0].cursize != 8 || mq->rings[1].cursize != 5); + rv = (mq->rings[0].shr->cursize != 8 || mq->rings[1].shr->cursize != 5); SESSION_TEST (rv == 0, "msg alloc3"); *(u32 *) svm_msg_q_msg_data (mq, &msg2) = 123; @@ -1967,7 +2001,7 @@ session_test_mq_basic (vlib_main_t * vm, unformat_input_t * input) SESSION_TEST (0, "dequeue2 wrong data"); svm_msg_q_free_msg (mq, &msg[i]); } - rv = (mq->rings[0].cursize == 0 && mq->rings[1].cursize == 0); + rv = (mq->rings[0].shr->cursize == 0 && mq->rings[1].shr->cursize == 0); SESSION_TEST (rv, "post dequeue"); return 0;