X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsctp%2Fsctp.c;h=e27ddb6e11bb257844277d2f9d44c688f4c144c1;hb=1cfcb78940580c8e3645fca0419d32f9286e942d;hp=cc70f7ccd8de58758c126fcdeb87efdf8c8c100d;hpb=465c087c58e356426588e5387fff133715a8762d;p=vpp.git diff --git a/src/vnet/sctp/sctp.c b/src/vnet/sctp/sctp.c index cc70f7ccd8d..e27ddb6e11b 100644 --- a/src/vnet/sctp/sctp.c +++ b/src/vnet/sctp/sctp.c @@ -23,15 +23,16 @@ sctp_connection_bind (u32 session_index, transport_endpoint_t * tep) sctp_main_t *tm = &sctp_main; sctp_connection_t *listener; void *iface_ip; + u32 mtu = 1460; pool_get (tm->listener_pool, listener); - memset (listener, 0, sizeof (*listener)); + clib_memset (listener, 0, sizeof (*listener)); - listener->sub_conn[MAIN_SCTP_SUB_CONN_IDX].subconn_idx = - MAIN_SCTP_SUB_CONN_IDX; - listener->sub_conn[MAIN_SCTP_SUB_CONN_IDX].c_c_index = + listener->sub_conn[SCTP_PRIMARY_PATH_IDX].subconn_idx = + SCTP_PRIMARY_PATH_IDX; + listener->sub_conn[SCTP_PRIMARY_PATH_IDX].c_c_index = listener - tm->listener_pool; - listener->sub_conn[MAIN_SCTP_SUB_CONN_IDX].connection.lcl_port = tep->port; + listener->sub_conn[SCTP_PRIMARY_PATH_IDX].connection.lcl_port = tep->port; /* If we are provided a sw_if_index, bind using one of its IPs */ if (ip_is_zero (&tep->ip, 1) && tep->sw_if_index != ENDPOINT_INVALID_INDEX) @@ -40,22 +41,28 @@ sctp_connection_bind (u32 session_index, transport_endpoint_t * tep) tep->is_ip4))) ip_set (&tep->ip, iface_ip, tep->is_ip4); } - ip_copy (&listener->sub_conn[MAIN_SCTP_SUB_CONN_IDX].connection.lcl_ip, + ip_copy (&listener->sub_conn[SCTP_PRIMARY_PATH_IDX].connection.lcl_ip, &tep->ip, tep->is_ip4); - listener->sub_conn[MAIN_SCTP_SUB_CONN_IDX].PMTU = - vnet_sw_interface_get_mtu (vnet_get_main (), tep->sw_if_index, VLIB_TX); - listener->sub_conn[MAIN_SCTP_SUB_CONN_IDX].connection.is_ip4 = tep->is_ip4; - listener->sub_conn[MAIN_SCTP_SUB_CONN_IDX].connection.proto = + if (tep->sw_if_index != ENDPOINT_INVALID_INDEX) + mtu = tep->is_ip4 ? vnet_sw_interface_get_mtu (vnet_get_main (), + tep->sw_if_index, + VNET_MTU_IP4) : + vnet_sw_interface_get_mtu (vnet_get_main (), tep->sw_if_index, + VNET_MTU_IP6); + + listener->sub_conn[SCTP_PRIMARY_PATH_IDX].PMTU = mtu; + listener->sub_conn[SCTP_PRIMARY_PATH_IDX].connection.is_ip4 = tep->is_ip4; + listener->sub_conn[SCTP_PRIMARY_PATH_IDX].connection.proto = TRANSPORT_PROTO_SCTP; - listener->sub_conn[MAIN_SCTP_SUB_CONN_IDX].c_s_index = session_index; - listener->sub_conn[MAIN_SCTP_SUB_CONN_IDX].connection.fib_index = + listener->sub_conn[SCTP_PRIMARY_PATH_IDX].c_s_index = session_index; + listener->sub_conn[SCTP_PRIMARY_PATH_IDX].connection.fib_index = tep->fib_index; listener->state = SCTP_STATE_CLOSED; sctp_connection_timers_init (listener); - return listener->sub_conn[MAIN_SCTP_SUB_CONN_IDX].c_c_index; + return listener->sub_conn[SCTP_PRIMARY_PATH_IDX].c_c_index; } u32 @@ -74,7 +81,7 @@ sctp_connection_unbind (u32 listener_index) /* Poison the entry */ if (CLIB_DEBUG > 0) - memset (sctp_conn, 0xFA, sizeof (*sctp_conn)); + clib_memset (sctp_conn, 0xFA, sizeof (*sctp_conn)); pool_put_index (tm->listener_pool, listener_index); } @@ -188,12 +195,13 @@ format_sctp_connection_id (u8 * s, va_list * args) u8 i; for (i = 0; i < MAX_SCTP_CONNECTIONS; i++) { + if (i > 0 && sctp_conn->sub_conn[i].state == SCTP_SUBCONN_STATE_DOWN) + continue; if (sctp_conn->sub_conn[i].connection.is_ip4) { - s = format (s, "%U[#%d][%s] %U:%d->%U:%d", - s, + s = format (s, "[#%d][%s] %U:%d->%U:%d", sctp_conn->sub_conn[i].connection.thread_index, - "T", + "S", format_ip4_address, &sctp_conn->sub_conn[i].connection.lcl_ip.ip4, clib_net_to_host_u16 (sctp_conn->sub_conn[i]. @@ -205,10 +213,9 @@ format_sctp_connection_id (u8 * s, va_list * args) } else { - s = format (s, "%U[#%d][%s] %U:%d->%U:%d", - s, + s = format (s, "[#%d][%s] %U:%d->%U:%d", sctp_conn->sub_conn[i].connection.thread_index, - "T", + "S", format_ip6_address, &sctp_conn->sub_conn[i].connection.lcl_ip.ip6, clib_net_to_host_u16 (sctp_conn->sub_conn[i]. @@ -234,6 +241,8 @@ format_sctp_connection (u8 * s, va_list * args) if (verbose) { s = format (s, "%-15U", format_sctp_state, sctp_conn->state); + if (verbose > 1) + s = format (s, "\n"); } return s; @@ -275,7 +284,7 @@ sctp_sub_connection_add (u8 thread_index) ASSERT (subconn_idx < MAX_SCTP_CONNECTIONS); sctp_conn->sub_conn[subconn_idx].connection.c_index = - sctp_conn->sub_conn[MAIN_SCTP_SUB_CONN_IDX].connection.c_index; + sctp_conn->sub_conn[SCTP_PRIMARY_PATH_IDX].connection.c_index; sctp_conn->sub_conn[subconn_idx].connection.thread_index = thread_index; sctp_conn->sub_conn[subconn_idx].subconn_idx = subconn_idx; @@ -398,6 +407,21 @@ sctp_sub_connection_del_ip6 (ip6_address_t * lcl_addr, return SCTP_ERROR_NONE; } +u8 +sctp_configure (sctp_user_configuration_t config) +{ + sctp_main_t *sctp_main = vnet_get_sctp_main (); + + u32 thread_idx = vlib_get_thread_index (); + + sctp_main->connections[thread_idx]->conn_config.never_delay_sack = + config.never_delay_sack; + sctp_main->connections[thread_idx]->conn_config.never_bundle = + config.never_bundle; + + return 0; +} + sctp_connection_t * sctp_connection_new (u8 thread_index) { @@ -405,12 +429,12 @@ sctp_connection_new (u8 thread_index) sctp_connection_t *sctp_conn; pool_get (sctp_main->connections[thread_index], sctp_conn); - memset (sctp_conn, 0, sizeof (*sctp_conn)); - sctp_conn->sub_conn[MAIN_SCTP_SUB_CONN_IDX].subconn_idx = - MAIN_SCTP_SUB_CONN_IDX; - sctp_conn->sub_conn[MAIN_SCTP_SUB_CONN_IDX].c_c_index = + clib_memset (sctp_conn, 0, sizeof (*sctp_conn)); + sctp_conn->sub_conn[SCTP_PRIMARY_PATH_IDX].subconn_idx = + SCTP_PRIMARY_PATH_IDX; + sctp_conn->sub_conn[SCTP_PRIMARY_PATH_IDX].c_c_index = sctp_conn - sctp_main->connections[thread_index]; - sctp_conn->sub_conn[MAIN_SCTP_SUB_CONN_IDX].c_thread_index = thread_index; + sctp_conn->sub_conn[SCTP_PRIMARY_PATH_IDX].c_thread_index = thread_index; sctp_conn->local_tag = 0; return sctp_conn; @@ -423,25 +447,26 @@ sctp_half_open_connection_new (u8 thread_index) sctp_connection_t *sctp_conn = 0; ASSERT (vlib_get_thread_index () == 0); pool_get (tm->half_open_connections, sctp_conn); - memset (sctp_conn, 0, sizeof (*sctp_conn)); - sctp_conn->sub_conn[MAIN_SCTP_SUB_CONN_IDX].c_c_index = + clib_memset (sctp_conn, 0, sizeof (*sctp_conn)); + sctp_conn->sub_conn[SCTP_PRIMARY_PATH_IDX].c_c_index = sctp_conn - tm->half_open_connections; - sctp_conn->sub_conn[MAIN_SCTP_SUB_CONN_IDX].subconn_idx = - MAIN_SCTP_SUB_CONN_IDX; + sctp_conn->sub_conn[SCTP_PRIMARY_PATH_IDX].subconn_idx = + SCTP_PRIMARY_PATH_IDX; return sctp_conn; } static inline int -sctp_connection_open (transport_endpoint_t * rmt) +sctp_connection_open (transport_endpoint_cfg_t * rmt) { sctp_main_t *tm = vnet_get_sctp_main (); sctp_connection_t *sctp_conn; ip46_address_t lcl_addr; u16 lcl_port; uword thread_id; + u32 mtu = 1460; int rv; - u8 idx = MAIN_SCTP_SUB_CONN_IDX; + u8 idx = SCTP_PRIMARY_PATH_IDX; /* * Allocate local endpoint @@ -465,8 +490,13 @@ sctp_connection_open (transport_endpoint_t * rmt) clib_spinlock_lock_if_init (&tm->half_open_lock); sctp_conn = sctp_half_open_connection_new (thread_id); - sctp_conn->sub_conn[idx].PMTU = - vnet_sw_interface_get_mtu (vnet_get_main (), rmt->sw_if_index, VLIB_TX); + if (rmt->peer.sw_if_index != ENDPOINT_INVALID_INDEX) + mtu = rmt->is_ip4 ? vnet_sw_interface_get_mtu (vnet_get_main (), + rmt->peer.sw_if_index, + VNET_MTU_IP4) : + vnet_sw_interface_get_mtu (vnet_get_main (), rmt->peer.sw_if_index, + VNET_MTU_IP6); + sctp_conn->sub_conn[idx].PMTU = mtu; transport_connection_t *trans_conn = &sctp_conn->sub_conn[idx].connection; ip_copy (&trans_conn->rmt_ip, &rmt->ip, rmt->is_ip4); @@ -507,19 +537,19 @@ sctp_connection_cleanup (sctp_connection_t * sctp_conn) sctp_conn->sub_conn[i].connection.lcl_port); int thread_index = - sctp_conn->sub_conn[MAIN_SCTP_SUB_CONN_IDX].connection.thread_index; + sctp_conn->sub_conn[SCTP_PRIMARY_PATH_IDX].connection.thread_index; /* Make sure all timers are cleared */ sctp_connection_timers_reset (sctp_conn); /* Poison the entry */ if (CLIB_DEBUG > 0) - memset (sctp_conn, 0xFA, sizeof (*sctp_conn)); + clib_memset (sctp_conn, 0xFA, sizeof (*sctp_conn)); pool_put (tm->connections[thread_index], sctp_conn); } int -sctp_session_open (transport_endpoint_t * tep) +sctp_session_open (transport_endpoint_cfg_t * tep) { return sctp_connection_open (tep); } @@ -550,7 +580,7 @@ void sctp_connection_close (sctp_connection_t * sctp_conn) { SCTP_DBG ("Closing connection %u...", - sctp_conn->sub_conn[MAIN_SCTP_SUB_CONN_IDX].connection.c_index); + sctp_conn->sub_conn[SCTP_PRIMARY_PATH_IDX].connection.c_index); sctp_conn->state = SCTP_STATE_SHUTDOWN_PENDING; @@ -600,14 +630,29 @@ sctp_session_send_mss (transport_connection_t * trans_conn) update_cwnd (sctp_conn); update_smallest_pmtu_idx (sctp_conn); - return sctp_conn->sub_conn[sctp_conn->smallest_PMTU_idx].cwnd; + u8 idx = sctp_data_subconn_select (sctp_conn); + return sctp_conn->sub_conn[idx].cwnd; } u16 sctp_snd_space (sctp_connection_t * sctp_conn) { + /* RFC 4096 Section 6.1; point (A) */ + if (sctp_conn->peer_rwnd == 0) + return 0; + + u8 idx = sctp_data_subconn_select (sctp_conn); + + u32 available_wnd = + clib_min (sctp_conn->peer_rwnd, sctp_conn->sub_conn[idx].cwnd); + int flight_size = (int) (sctp_conn->next_tsn - sctp_conn->last_unacked_tsn); + + if (available_wnd <= flight_size) + return 0; + /* Finally, let's subtract the DATA chunk headers overhead */ - return sctp_conn->sub_conn[sctp_conn->smallest_PMTU_idx].cwnd - + return available_wnd - + flight_size - sizeof (sctp_payload_data_chunk_t) - sizeof (sctp_full_hdr_t); } @@ -630,7 +675,7 @@ sctp_session_get_transport (u32 conn_index, u32 thread_index) sctp_connection_get (conn_index, thread_index); if (PREDICT_TRUE (sctp_conn != NULL)) - return &sctp_conn->sub_conn[MAIN_SCTP_SUB_CONN_IDX].connection; + return &sctp_conn->sub_conn[SCTP_PRIMARY_PATH_IDX].connection; return NULL; } @@ -641,7 +686,7 @@ sctp_session_get_listener (u32 listener_index) sctp_main_t *tm = vnet_get_sctp_main (); sctp_connection_t *sctp_conn; sctp_conn = pool_elt_at_index (tm->listener_pool, listener_index); - return &sctp_conn->sub_conn[MAIN_SCTP_SUB_CONN_IDX].connection; + return &sctp_conn->sub_conn[SCTP_PRIMARY_PATH_IDX].connection; } u8 * @@ -673,26 +718,13 @@ sctp_expired_timers_cb (u32 conn_index, u32 timer_id) { sctp_connection_t *sctp_conn; + SCTP_DBG ("%s expired", sctp_timer_to_string (timer_id)); + sctp_conn = sctp_connection_get (conn_index, vlib_get_thread_index ()); /* note: the connection may have already disappeared */ if (PREDICT_FALSE (sctp_conn == 0)) return; - SCTP_DBG ("%s expired", sctp_timer_to_string (timer_id)); - - switch (timer_id) - { - case SCTP_TIMER_T1_INIT: - case SCTP_TIMER_T1_COOKIE: - case SCTP_TIMER_T2_SHUTDOWN: - case SCTP_TIMER_T3_RXTX: - sctp_timer_reset (sctp_conn, conn_index, timer_id); - break; - case SCTP_TIMER_T4_HEARTBEAT: - sctp_timer_reset (sctp_conn, conn_index, timer_id); - goto heartbeat; - } - if (sctp_conn->sub_conn[conn_index].unacknowledged_hb > SCTP_PATH_MAX_RETRANS) { @@ -715,13 +747,35 @@ sctp_expired_timers_cb (u32 conn_index, u32 timer_id) { /* Start cleanup. App wasn't notified yet so use delete notify as * opposed to delete to cleanup session layer state. */ - stream_session_delete_notify (&sctp_conn->sub_conn - [MAIN_SCTP_SUB_CONN_IDX].connection); + session_transport_delete_notify (&sctp_conn->sub_conn + [SCTP_PRIMARY_PATH_IDX].connection); sctp_connection_timers_reset (sctp_conn); sctp_connection_cleanup (sctp_conn); } + return; + } + + switch (timer_id) + { + case SCTP_TIMER_T1_INIT: + sctp_send_init (sctp_conn); + break; + case SCTP_TIMER_T1_COOKIE: + sctp_send_cookie_echo (sctp_conn); + break; + case SCTP_TIMER_T2_SHUTDOWN: + sctp_send_shutdown (sctp_conn); + break; + case SCTP_TIMER_T3_RXTX: + sctp_timer_reset (sctp_conn, conn_index, timer_id); + sctp_conn->flags |= SCTP_CONN_RECOVERY; + sctp_data_retransmit (sctp_conn); + break; + case SCTP_TIMER_T4_HEARTBEAT: + sctp_timer_reset (sctp_conn, conn_index, timer_id); + goto heartbeat; } return; @@ -838,15 +892,14 @@ sctp_main_enable (vlib_main_t * vm) vec_validate (tm->ip_lookup_tx_frames[0], num_threads - 1); vec_validate (tm->ip_lookup_tx_frames[1], num_threads - 1); - tm->bytes_per_buffer = vlib_buffer_free_list_buffer_size - (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX); + tm->bytes_per_buffer = vlib_buffer_get_default_data_size (vm); vec_validate (tm->time_now, num_threads - 1); return error; } clib_error_t * -sctp_enable_disable (vlib_main_t * vm, u8 is_en) +sctp_transport_enable_disable (vlib_main_t * vm, u8 is_en) { if (is_en) { @@ -867,7 +920,7 @@ transport_connection_t * sctp_half_open_session_get_transport (u32 conn_index) { sctp_connection_t *sctp_conn = sctp_half_open_connection_get (conn_index); - return &sctp_conn->sub_conn[MAIN_SCTP_SUB_CONN_IDX].connection; + return &sctp_conn->sub_conn[SCTP_PRIMARY_PATH_IDX].connection; } u8 * @@ -887,12 +940,12 @@ sctp_update_time (f64 now, u8 thread_index) sctp_flush_frames_to_output (thread_index); } -/* *INDENT OFF* */ -const static transport_proto_vft_t sctp_proto = { - .enable = sctp_enable_disable, - .bind = sctp_session_bind, - .unbind = sctp_session_unbind, - .open = sctp_session_open, +/* *INDENT-OFF* */ +static const transport_proto_vft_t sctp_proto = { + .enable = sctp_transport_enable_disable, + .start_listen = sctp_session_bind, + .stop_listen = sctp_session_unbind, + .connect = sctp_session_open, .close = sctp_session_close, .cleanup = sctp_session_cleanup, .push_header = sctp_push_header, @@ -905,31 +958,57 @@ const static transport_proto_vft_t sctp_proto = { .format_connection = format_sctp_session, .format_listener = format_sctp_listener_session, .format_half_open = format_sctp_half_open, + .transport_options = { + .tx_type = TRANSPORT_TX_DEQUEUE, + .service_type = TRANSPORT_SERVICE_VC, + }, }; - -/* *INDENT ON* */ +/* *INDENT-ON* */ clib_error_t * -sctp_init (vlib_main_t * vm) +sctp_enable_disable (vlib_main_t * vm, u8 is_en) { - sctp_main_t *tm = vnet_get_sctp_main (); + sctp_main_t *sm = vnet_get_sctp_main (); ip_main_t *im = &ip_main; ip_protocol_info_t *pi; - /* Session layer, and by implication SCTP, are disabled by default */ - tm->is_enabled = 0; + vlib_node_t *node; - /* Register with IP for header parsing */ - pi = ip_get_protocol_info (im, IP_PROTOCOL_SCTP); - if (pi == 0) - return clib_error_return (0, "SCTP protocol info AWOL"); - pi->format_header = format_sctp_header; - pi->unformat_pg_edit = unformat_pg_sctp_header; + if (!sm->is_init && is_en) + { + node = vlib_get_node_by_name (vm, (u8 *) "sctp4-established"); + sm->sctp4_established_phase_node_index = node->index; + + node = vlib_get_node_by_name (vm, (u8 *) "sctp6-established"); + sm->sctp6_established_phase_node_index = node->index; + + sm->is_init = 1; + + /* Register with IP for header parsing */ + pi = ip_get_protocol_info (im, IP_PROTOCOL_SCTP); + if (pi == 0) + return clib_error_return (0, "SCTP protocol info AWOL"); + pi->format_header = format_sctp_header; + pi->unformat_pg_edit = unformat_pg_sctp_header; + + /* Register as transport with session layer */ + transport_register_protocol (TRANSPORT_PROTO_SCTP, &sctp_proto, + FIB_PROTOCOL_IP4, sctp4_output_node.index); + transport_register_protocol (TRANSPORT_PROTO_SCTP, &sctp_proto, + FIB_PROTOCOL_IP6, sctp6_output_node.index); + } - /* Register as transport with session layer */ - transport_register_protocol (TRANSPORT_PROTO_SCTP, &sctp_proto, - FIB_PROTOCOL_IP4, sctp4_output_node.index); - transport_register_protocol (TRANSPORT_PROTO_SCTP, &sctp_proto, - FIB_PROTOCOL_IP6, sctp6_output_node.index); + sctp_transport_enable_disable (vm, is_en); + return 0; +} + +clib_error_t * +sctp_init (vlib_main_t * vm) +{ + sctp_main_t *sm = vnet_get_sctp_main (); + + /* Session layer, and by implication SCTP, are disabled by default */ + sm->is_enabled = 0; + sm->is_init = 0; sctp_api_reference (); @@ -938,6 +1017,69 @@ sctp_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (sctp_init); +static clib_error_t * +show_sctp_punt_fn (vlib_main_t * vm, unformat_input_t * input, + vlib_cli_command_t * cmd_arg) +{ + sctp_main_t *tm = &sctp_main; + if (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + return clib_error_return (0, "unknown input `%U'", format_unformat_error, + input); + vlib_cli_output (vm, "IPv4 UDP punt: %s", + tm->punt_unknown4 ? "enabled" : "disabled"); + vlib_cli_output (vm, "IPv6 UDP punt: %s", + tm->punt_unknown6 ? "enabled" : "disabled"); + return 0; +} +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (show_tcp_punt_command, static) = +{ + .path = "show sctp punt", + .short_help = "show sctp punt", + .function = show_sctp_punt_fn, +}; +/* *INDENT-ON* */ + +static clib_error_t * +sctp_fn (vlib_main_t * vm, unformat_input_t * input, + vlib_cli_command_t * cmd_arg) +{ + unformat_input_t _line_input, *line_input = &_line_input; + clib_error_t *error; + u8 is_en; + + if (!unformat_user (input, unformat_line_input, line_input)) + return clib_error_return (0, "expected enable | disable"); + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "enable")) + is_en = 1; + else if (unformat (line_input, "disable")) + is_en = 0; + else + { + error = clib_error_return (0, "unknown input `%U'", + format_unformat_error, line_input); + unformat_free (line_input); + return error; + } + } + + unformat_free (line_input); + + return sctp_enable_disable (vm, is_en); +} + +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (show_sctp_command, static) = +{ + .path = "sctp", + .short_help = "sctp [enable | disable]", + .function = sctp_fn, +}; +/* *INDENT-ON* */ + /* * fd.io coding-style-patch-verification: ON *