X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvppcom.c;h=a0bbae170f8e46be41d570ac63bc6faa4b9b3ae0;hb=8ae63db02066a2b5ac18a89fd63dc0dd2a811ab3;hp=aa5bf5cf00f12345f0d2ffba051be2e41ce4f071;hpb=5ffb9649bff4107d28b59198bfeed445ddf6ec64;p=vpp.git diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index aa5bf5cf00f..a0bbae170f8 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -51,8 +51,8 @@ vcl_msg_add_ext_config (vcl_session_t *s, uword *offset) clib_memcpy_fast (c->data, s->ext_config, s->ext_config->len); } -static void -vcl_send_session_listen (vcl_worker_t * wrk, vcl_session_t * s) +void +vcl_send_session_listen (vcl_worker_t *wrk, vcl_session_t *s) { app_session_evt_t _app_evt, *app_evt = &_app_evt; session_listen_msg_t *mp; @@ -80,6 +80,7 @@ vcl_send_session_listen (vcl_worker_t * wrk, vcl_session_t * s) clib_mem_free (s->ext_config); s->ext_config = 0; } + s->flags |= VCL_SESSION_F_PENDING_LISTEN; } static void @@ -289,10 +290,17 @@ vcl_session_transport_attr (vcl_worker_t *wrk, vcl_session_t *s, u8 is_get, f64 timeout; ASSERT (!wrk->session_attr_op); + mq = s->vpp_evt_q; + if (PREDICT_FALSE (!mq)) + { + /* FIXME: attribute should be stored and sent once session is + * bound/connected to vpp */ + return 0; + } + wrk->session_attr_op = 1; wrk->session_attr_op_rv = -1; - mq = s->vpp_evt_q; app_alloc_ctrl_evt_to_vpp (mq, app_evt, SESSION_CTRL_EVT_TRANSPORT_ATTR); mp = (session_transport_attr_msg_t *) app_evt->evt->data; memset (mp, 0, sizeof (*mp)); @@ -343,6 +351,11 @@ vcl_session_accepted_handler (vcl_worker_t * wrk, session_accepted_msg_t * mp, session->vpp_handle = mp->handle; session->session_state = VCL_STATE_READY; + if (mp->rmt.is_ip4) + { + session->original_dst_ip4 = mp->original_dst_ip4; + session->original_dst_port = mp->original_dst_port; + } session->transport.rmt_port = mp->rmt.port; session->transport.is_ip4 = mp->rmt.is_ip4; clib_memcpy_fast (&session->transport.rmt_ip, &mp->rmt.ip, @@ -353,6 +366,8 @@ vcl_session_accepted_handler (vcl_worker_t * wrk, session_accepted_msg_t * mp, session->transport.lcl_ip = mp->lcl.ip; session->session_type = listen_session->session_type; session->is_dgram = vcl_proto_is_dgram (session->session_type); + if (session->is_dgram) + session->flags |= (listen_session->flags & VCL_SESSION_F_CONNECTED); session->listener_index = listen_session->session_index; listen_session->n_accepted_sessions++; @@ -404,6 +419,7 @@ vcl_session_connected_handler (vcl_worker_t * wrk, format_session_error, mp->retval); session->session_state = VCL_STATE_DETACHED; session->vpp_handle = VCL_INVALID_SESSION_HANDLE; + session->vpp_error = mp->retval; return session_index; } @@ -497,9 +513,9 @@ vcl_session_reset_handler (vcl_worker_t * wrk, } /* Caught a reset before actually accepting the session */ - if (session->session_state == VCL_STATE_LISTEN) + if (session->session_state == VCL_STATE_LISTEN || + session->session_state == VCL_STATE_LISTEN_NO_MQ) { - if (!vcl_flag_accepted_session (session, reset_msg->handle, VCL_ACCEPTED_F_RESET)) VDBG (0, "session was not accepted!"); @@ -508,6 +524,8 @@ vcl_session_reset_handler (vcl_worker_t * wrk, if (session->session_state != VCL_STATE_CLOSED) session->session_state = VCL_STATE_DISCONNECT; + + session->flags |= (VCL_SESSION_F_RD_SHUTDOWN | VCL_SESSION_F_WR_SHUTDOWN); VDBG (0, "session %u [0x%llx]: reset", sid, reset_msg->handle); return sid; } @@ -527,6 +545,7 @@ vcl_session_bound_handler (vcl_worker_t * wrk, session_bound_msg_t * mp) { session->session_state = VCL_STATE_DETACHED; session->vpp_handle = mp->handle; + session->vpp_error = mp->retval; return sid; } else @@ -544,6 +563,7 @@ vcl_session_bound_handler (vcl_worker_t * wrk, session_bound_msg_t * mp) session->transport.lcl_port = mp->lcl_port; vcl_session_table_add_listener (wrk, mp->handle, sid); session->session_state = VCL_STATE_LISTEN; + session->flags &= ~VCL_SESSION_F_PENDING_LISTEN; if (vcl_session_is_cl (session)) { @@ -687,7 +707,8 @@ vcl_session_disconnected_handler (vcl_worker_t * wrk, return 0; /* Caught a disconnect before actually accepting the session */ - if (session->session_state == VCL_STATE_LISTEN) + if (session->session_state == VCL_STATE_LISTEN || + session->session_state == VCL_STATE_LISTEN_NO_MQ) { if (!vcl_flag_accepted_session (session, msg->handle, VCL_ACCEPTED_F_CLOSED)) @@ -790,7 +811,8 @@ vppcom_session_disconnect (u32 session_handle) if (session->listener_index != VCL_INVALID_SESSION_INDEX) { listen_session = vcl_session_get (wrk, session->listener_index); - listen_session->n_accepted_sessions--; + if (listen_session) + listen_session->n_accepted_sessions--; } return VPPCOM_OK; @@ -954,7 +976,7 @@ vcl_session_app_del_segment_handler (vcl_worker_t * wrk, void *data) { session_app_del_segment_msg_t *msg = (session_app_del_segment_msg_t *) data; vcl_segment_detach (msg->segment_handle); - VDBG (1, "Unmapped segment: %d", msg->segment_handle); + VDBG (1, "Unmapped segment: %lx", msg->segment_handle); } static void @@ -1033,7 +1055,15 @@ vcl_handle_mq_event (vcl_worker_t * wrk, session_event_t * e) break; if (s->session_state == VCL_STATE_CLOSED) break; - if (vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK)) + /* We do not postpone for blocking sessions or listen sessions because: + * 1. Blocking sessions are not part of epoll instead they're used in a + * synchronous manner, such as read/write and etc. + * 2. Listen sessions that have not yet been accepted can't change to + * VPP_CLOSING state instead can been marked as ACCEPTED_F_CLOSED. + */ + if (vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK) && + !(s->session_state == VCL_STATE_LISTEN || + s->session_state == VCL_STATE_LISTEN_NO_MQ)) { s->session_state = VCL_STATE_VPP_CLOSING; s->flags |= VCL_SESSION_F_PENDING_DISCONNECT; @@ -1054,10 +1084,19 @@ vcl_handle_mq_event (vcl_worker_t * wrk, session_event_t * e) break; if (s->session_state == VCL_STATE_CLOSED) break; - if (vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK)) + /* We do not postpone for blocking sessions or listen sessions because: + * 1. Blocking sessions are not part of epoll instead they're used in a + * synchronous manner, such as read/write and etc. + * 2. Listen sessions that have not yet been accepted can't change to + * DISCONNECT state instead can been marked as ACCEPTED_F_RESET. + */ + if (vcl_session_has_attr (s, VCL_SESS_ATTR_NONBLOCK) && + !(s->session_state == VCL_STATE_LISTEN || + s->session_state == VCL_STATE_LISTEN_NO_MQ)) { s->flags |= VCL_SESSION_F_PENDING_DISCONNECT; s->session_state = VCL_STATE_DISCONNECT; + s->flags |= (VCL_SESSION_F_RD_SHUTDOWN | VCL_SESSION_F_WR_SHUTDOWN); vec_add2 (wrk->unhandled_evts_vector, ecpy, 1); *ecpy = *e; ecpy->postponed = 1; @@ -1123,7 +1162,10 @@ vppcom_wait_for_session_state_change (u32 session_index, } if (session->session_state == VCL_STATE_DETACHED) { - return VPPCOM_ECONNREFUSED; + if (session->vpp_error == SESSION_E_ALREADY_LISTENING) + return VPPCOM_EADDRINUSE; + else + return VPPCOM_ECONNREFUSED; } if (svm_msg_q_sub (wrk->app_event_queue, &msg, SVM_Q_NOWAIT, 0)) @@ -1220,7 +1262,7 @@ vppcom_session_unbind (u32 session_handle) vcl_send_session_unlisten (wrk, session); - VDBG (1, "session %u [0x%llx]: sending unbind!", session->session_index, + VDBG (0, "session %u [0x%llx]: sending unbind!", session->session_index, session->vpp_handle); vcl_evt (VCL_EVT_UNBIND, session); @@ -1256,9 +1298,82 @@ vcl_api_attach (void) return vcl_bapi_attach (); } +int +vcl_is_first_reattach_to_execute () +{ + if (vcm->reattach_count == 0) + return 1; + + return 0; +} + +void +vcl_set_reattach_counter () +{ + ++vcm->reattach_count; + + if (vcm->reattach_count == vec_len (vcm->workers)) + vcm->reattach_count = 0; +} + +/** + * Reattach vcl to vpp after it has previously been disconnected. + * + * The logic should be: + * - first worker to hit `vcl_api_retry_attach` should attach to vpp, + * to reproduce the `vcl_api_attach` in `vppcom_app_create`. + * - the rest of the workers should `reproduce vcl_worker_register_with_vpp` + * from `vppcom_worker_register` since they were already allocated. + */ + +static void +vcl_api_retry_attach (vcl_worker_t *wrk) +{ + vcl_session_t *s; + + clib_spinlock_lock (&vcm->workers_lock); + if (vcl_is_first_reattach_to_execute ()) + { + if (vcl_api_attach ()) + { + clib_spinlock_unlock (&vcm->workers_lock); + return; + } + vcl_set_reattach_counter (); + clib_spinlock_unlock (&vcm->workers_lock); + } + else + { + vcl_set_reattach_counter (); + clib_spinlock_unlock (&vcm->workers_lock); + vcl_worker_register_with_vpp (); + } + + /* Treat listeners as configuration that needs to be re-added to vpp */ + pool_foreach (s, wrk->sessions) + { + if (s->flags & VCL_SESSION_F_IS_VEP) + continue; + if (s->session_state == VCL_STATE_LISTEN_NO_MQ) + vppcom_session_listen (vcl_session_handle (s), 10); + else + VDBG (0, "internal error: unexpected state %d", s->session_state); + } +} + +static void +vcl_api_handle_disconnect (vcl_worker_t *wrk) +{ + wrk->api_client_handle = ~0; + vcl_worker_detach_sessions (wrk); +} + static void vcl_api_detach (vcl_worker_t * wrk) { + if (wrk->api_client_handle == ~0) + return; + vcl_send_app_detach (wrk); if (vcm->cfg.vpp_app_socket_api) @@ -1301,7 +1416,10 @@ vppcom_app_create (const char *app_name) vcl_worker_alloc_and_init (); if ((rv = vcl_api_attach ())) - return rv; + { + vppcom_app_destroy (); + return rv; + } VDBG (0, "app_name '%s', my_client_index %d (0x%x)", app_name, vcm->workers[0].api_client_handle, vcm->workers[0].api_client_handle); @@ -1322,15 +1440,14 @@ vppcom_app_destroy (void) current_wrk = vcl_worker_get_current (); - /* *INDENT-OFF* */ pool_foreach (wrk, vcm->workers) { if (current_wrk != wrk) vcl_worker_cleanup (wrk, 0 /* notify vpp */ ); } - /* *INDENT-ON* */ vcl_api_detach (current_wrk); vcl_worker_cleanup (current_wrk, 0 /* notify vpp */ ); + vcl_set_worker_index (~0); vcl_elog_stop (vcm); @@ -1356,6 +1473,7 @@ vppcom_session_create (u8 proto, u8 is_nonblocking) session->session_state = VCL_STATE_CLOSED; session->vpp_handle = ~0; session->is_dgram = vcl_proto_is_dgram (proto); + session->vpp_error = SESSION_E_NONE; if (is_nonblocking) vcl_session_set_attr (session, VCL_SESS_ATTR_NONBLOCK); @@ -1373,6 +1491,8 @@ vcl_epoll_lt_add (vcl_worker_t *wrk, vcl_session_t *s) { vcl_session_t *cur, *prev; + ASSERT (s->vep.lt_next == VCL_INVALID_SESSION_INDEX); + if (wrk->ep_lt_current == VCL_INVALID_SESSION_INDEX) { wrk->ep_lt_current = s->session_index; @@ -1396,10 +1516,13 @@ vcl_epoll_lt_del (vcl_worker_t *wrk, vcl_session_t *s) { vcl_session_t *prev, *next; + ASSERT (s->vep.lt_next != VCL_INVALID_SESSION_INDEX); + if (s->vep.lt_next == s->session_index) { wrk->ep_lt_current = VCL_INVALID_SESSION_INDEX; s->vep.lt_next = VCL_INVALID_SESSION_INDEX; + s->vep.lt_prev = VCL_INVALID_SESSION_INDEX; return; } @@ -1413,6 +1536,7 @@ vcl_epoll_lt_del (vcl_worker_t *wrk, vcl_session_t *s) wrk->ep_lt_current = s->vep.lt_next; s->vep.lt_next = VCL_INVALID_SESSION_INDEX; + s->vep.lt_prev = VCL_INVALID_SESSION_INDEX; } int @@ -1556,7 +1680,7 @@ vppcom_session_bind (uint32_t session_handle, vppcom_endpt_t * ep) vcl_evt (VCL_EVT_BIND, session); if (session->session_type == VPPCOM_PROTO_UDP) - vppcom_session_listen (session_handle, 10); + return vppcom_session_listen (session_handle, 10); return VPPCOM_OK; } @@ -1603,29 +1727,6 @@ vppcom_session_listen (uint32_t listen_sh, uint32_t q_len) return VPPCOM_OK; } -static int -validate_args_session_accept_ (vcl_worker_t * wrk, vcl_session_t * ls) -{ - if (ls->flags & VCL_SESSION_F_IS_VEP) - { - VDBG (0, "ERROR: cannot accept on epoll session %u!", - ls->session_index); - return VPPCOM_EBADFD; - } - - if ((ls->session_state != VCL_STATE_LISTEN) - && (!vcl_session_is_connectable_listener (wrk, ls))) - { - VDBG (0, - "ERROR: session [0x%llx]: not in listen state! state 0x%x" - " (%s)", - ls->vpp_handle, ls->session_state, - vcl_session_state_str (ls->session_state)); - return VPPCOM_EBADFD; - } - return VPPCOM_OK; -} - int vppcom_unformat_proto (uint8_t * proto, char *proto_str) { @@ -1659,38 +1760,41 @@ vppcom_unformat_proto (uint8_t * proto, char *proto_str) } int -vppcom_session_accept (uint32_t listen_session_handle, vppcom_endpt_t * ep, - uint32_t flags) +vppcom_session_accept (uint32_t ls_handle, vppcom_endpt_t *ep, uint32_t flags) { - u32 client_session_index = ~0, listen_session_index, accept_flags = 0; + u32 client_session_index = ~0, ls_index, accept_flags = 0; vcl_worker_t *wrk = vcl_worker_get_current (); session_accepted_msg_t accepted_msg; - vcl_session_t *listen_session = 0; - vcl_session_t *client_session = 0; + vcl_session_t *ls, *client_session = 0; vcl_session_msg_t *evt; u8 is_nonblocking; - int rv; again: - listen_session = vcl_session_get_w_handle (wrk, listen_session_handle); - if (!listen_session) + ls = vcl_session_get_w_handle (wrk, ls_handle); + if (!ls) return VPPCOM_EBADFD; - listen_session_index = listen_session->session_index; - if ((rv = validate_args_session_accept_ (wrk, listen_session))) - return rv; + if ((ls->session_state != VCL_STATE_LISTEN) && + (ls->session_state != VCL_STATE_LISTEN_NO_MQ) && + (!vcl_session_is_connectable_listener (wrk, ls))) + { + VDBG (0, "ERROR: session [0x%llx]: not in listen state! state (%s)", + ls->vpp_handle, vcl_session_state_str (ls->session_state)); + return VPPCOM_EBADFD; + } + + ls_index = ls->session_index; - if (clib_fifo_elts (listen_session->accept_evts_fifo)) + if (clib_fifo_elts (ls->accept_evts_fifo)) { - clib_fifo_sub2 (listen_session->accept_evts_fifo, evt); + clib_fifo_sub2 (ls->accept_evts_fifo, evt); accept_flags = evt->flags; accepted_msg = evt->accepted_msg; goto handle; } - is_nonblocking = vcl_session_has_attr (listen_session, - VCL_SESS_ATTR_NONBLOCK); + is_nonblocking = vcl_session_has_attr (ls, VCL_SESS_ATTR_NONBLOCK); while (1) { if (svm_msg_q_is_empty (wrk->app_event_queue) && is_nonblocking) @@ -1703,20 +1807,21 @@ again: handle: - client_session_index = vcl_session_accepted_handler (wrk, &accepted_msg, - listen_session_index); + client_session_index = + vcl_session_accepted_handler (wrk, &accepted_msg, ls_index); if (client_session_index == VCL_INVALID_SESSION_INDEX) return VPPCOM_ECONNABORTED; - listen_session = vcl_session_get (wrk, listen_session_index); + ls = vcl_session_get (wrk, ls_index); client_session = vcl_session_get (wrk, client_session_index); if (flags & O_NONBLOCK) vcl_session_set_attr (client_session, VCL_SESS_ATTR_NONBLOCK); - VDBG (1, "listener %u [0x%llx]: Got a connect request! session %u [0x%llx]," - " flags %d, is_nonblocking %u", listen_session->session_index, - listen_session->vpp_handle, client_session_index, + VDBG (1, + "listener %u [0x%llx]: Got a connect request! session %u [0x%llx]," + " flags %d, is_nonblocking %u", + ls->session_index, ls->vpp_handle, client_session_index, client_session->vpp_handle, flags, vcl_session_has_attr (client_session, VCL_SESS_ATTR_NONBLOCK)); @@ -1735,16 +1840,15 @@ handle: VDBG (0, "listener %u [0x%llx] accepted %u [0x%llx] peer: %U:%u " "local: %U:%u", - listen_session_handle, listen_session->vpp_handle, - client_session_index, client_session->vpp_handle, - vcl_format_ip46_address, &client_session->transport.rmt_ip, + ls_handle, ls->vpp_handle, client_session_index, + client_session->vpp_handle, vcl_format_ip46_address, + &client_session->transport.rmt_ip, client_session->transport.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, clib_net_to_host_u16 (client_session->transport.rmt_port), vcl_format_ip46_address, &client_session->transport.lcl_ip, client_session->transport.is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, clib_net_to_host_u16 (client_session->transport.lcl_port)); - vcl_evt (VCL_EVT_ACCEPT, client_session, listen_session, - client_session_index); + vcl_evt (VCL_EVT_ACCEPT, client_session, ls, client_session_index); /* * Session might have been closed already @@ -1950,13 +2054,13 @@ vppcom_session_read_internal (uint32_t session_handle, void *buf, int n, if (svm_fifo_is_empty_cons (rx_fifo)) { + if (is_ct) + svm_fifo_unset_event (s->rx_fifo); + svm_fifo_unset_event (rx_fifo); if (is_nonblocking) { if (vcl_session_is_closing (s)) return vcl_session_closing_error (s); - if (is_ct) - svm_fifo_unset_event (s->rx_fifo); - svm_fifo_unset_event (rx_fifo); return VPPCOM_EWOULDBLOCK; } while (svm_fifo_is_empty_cons (rx_fifo)) @@ -2062,11 +2166,13 @@ vppcom_session_read_segments (uint32_t session_handle, if (svm_fifo_is_empty_cons (rx_fifo)) { + if (is_ct) + svm_fifo_unset_event (s->rx_fifo); + svm_fifo_unset_event (rx_fifo); if (is_nonblocking) { - if (is_ct) - svm_fifo_unset_event (s->rx_fifo); - svm_fifo_unset_event (rx_fifo); + if (vcl_session_is_closing (s)) + return vcl_session_closing_error (s); return VPPCOM_EWOULDBLOCK; } while (svm_fifo_is_empty_cons (rx_fifo)) @@ -2084,7 +2190,7 @@ vppcom_session_read_segments (uint32_t session_handle, } n_read = svm_fifo_segments (rx_fifo, s->rx_bytes_pending, - (svm_fifo_seg_t *) ds, n_segments, max_bytes); + (svm_fifo_seg_t *) ds, &n_segments, max_bytes); if (n_read < 0) return VPPCOM_EAGAIN; @@ -2137,7 +2243,7 @@ vcl_fifo_is_writeable (svm_fifo_t * f, u32 len, u8 is_dgram) } always_inline int -vppcom_session_write_inline (vcl_worker_t * wrk, vcl_session_t * s, void *buf, +vppcom_session_write_inline (vcl_worker_t *wrk, vcl_session_t *s, void *buf, size_t n, u8 is_flush, u8 is_dgram) { int n_write, is_nonblocking; @@ -2203,12 +2309,17 @@ vppcom_session_write_inline (vcl_worker_t * wrk, vcl_session_t * s, void *buf, et = SESSION_IO_EVT_TX_FLUSH; if (is_dgram) - n_write = app_send_dgram_raw (tx_fifo, &s->transport, - s->vpp_evt_q, buf, n, et, - 0 /* do_evt */ , SVM_Q_WAIT); + { + et = vcl_session_dgram_tx_evt (s, et); + n_write = + app_send_dgram_raw_gso (tx_fifo, &s->transport, s->vpp_evt_q, buf, n, + s->gso_size, et, 0 /* do_evt */, SVM_Q_WAIT); + } else - n_write = app_send_stream_raw (tx_fifo, s->vpp_evt_q, buf, n, et, - 0 /* do_evt */ , SVM_Q_WAIT); + { + n_write = app_send_stream_raw (tx_fifo, s->vpp_evt_q, buf, n, et, + 0 /* do_evt */, SVM_Q_WAIT); + } if (svm_fifo_set_event (s->tx_fifo)) app_send_io_evt_to_vpp ( @@ -2234,8 +2345,8 @@ vppcom_session_write (uint32_t session_handle, void *buf, size_t n) if (PREDICT_FALSE (!s)) return VPPCOM_EBADFD; - return vppcom_session_write_inline (wrk, s, buf, n, - 0 /* is_flush */ , s->is_dgram ? 1 : 0); + return vppcom_session_write_inline (wrk, s, buf, n, 0 /* is_flush */, + s->is_dgram ? 1 : 0); } int @@ -2248,8 +2359,8 @@ vppcom_session_write_msg (uint32_t session_handle, void *buf, size_t n) if (PREDICT_FALSE (!s)) return VPPCOM_EBADFD; - return vppcom_session_write_inline (wrk, s, buf, n, - 1 /* is_flush */ , s->is_dgram ? 1 : 0); + return vppcom_session_write_inline (wrk, s, buf, n, 1 /* is_flush */, + s->is_dgram ? 1 : 0); } #define vcl_fifo_rx_evt_valid_or_break(_s) \ @@ -2331,17 +2442,33 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, sid = e->session_index; if (sid == VCL_INVALID_SESSION_INDEX) break; - if (sid < n_bits && write_map) - { - clib_bitmap_set_no_check ((uword *) write_map, sid, 1); - *bits_set += 1; - } + if (!(sid < n_bits && write_map)) + break; + clib_bitmap_set_no_check ((uword *) write_map, sid, 1); + *bits_set += 1; + s = vcl_session_get (wrk, sid); + /* We didn't have a fifo when the event was added */ + vcl_session_add_want_deq_ntf (s, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); break; case SESSION_CTRL_EVT_DISCONNECTED: - disconnected_msg = (session_disconnected_msg_t *) e->data; - s = vcl_session_disconnected_handler (wrk, disconnected_msg); - if (!s) - break; + if (!e->postponed) + { + disconnected_msg = (session_disconnected_msg_t *) e->data; + s = vcl_session_disconnected_handler (wrk, disconnected_msg); + if (!s) + break; + } + else + { + s = vcl_session_get (wrk, e->session_index); + s->flags &= ~VCL_SESSION_F_PENDING_DISCONNECT; + } + if (vcl_session_is_closed (s)) + { + if (s && (s->flags & VCL_SESSION_F_PENDING_FREE)) + vcl_session_free (wrk, s); + break; + } sid = s->session_index; if (sid < n_bits && except_map) { @@ -2350,7 +2477,24 @@ vcl_select_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, } break; case SESSION_CTRL_EVT_RESET: - sid = vcl_session_reset_handler (wrk, (session_reset_msg_t *) e->data); + if (!e->postponed) + { + sid = + vcl_session_reset_handler (wrk, (session_reset_msg_t *) e->data); + s = vcl_session_get (wrk, sid); + } + else + { + sid = e->session_index; + s = vcl_session_get (wrk, sid); + s->flags &= ~VCL_SESSION_F_PENDING_DISCONNECT; + } + if (vcl_session_is_closed (s)) + { + if (s && (s->flags & VCL_SESSION_F_PENDING_FREE)) + vcl_session_free (wrk, s); + break; + } if (sid < n_bits && except_map) { clib_bitmap_set_no_check ((uword *) except_map, sid, 1); @@ -2468,11 +2612,23 @@ vppcom_select_eventfd (vcl_worker_t * wrk, int n_bits, int n_mq_evts, i; u64 buf; + if (PREDICT_FALSE (wrk->api_client_handle == ~0)) + { + vcl_api_retry_attach (wrk); + return 0; + } + vec_validate (wrk->mq_events, pool_elts (wrk->mq_evt_conns)); n_mq_evts = epoll_wait (wrk->mqs_epfd, wrk->mq_events, vec_len (wrk->mq_events), time_to_wait); for (i = 0; i < n_mq_evts; i++) { + if (PREDICT_FALSE (wrk->mq_events[i].data.u32 == ~0)) + { + vcl_api_handle_disconnect (wrk); + continue; + } + mqc = vcl_mq_evt_conn_get (wrk, wrk->mq_events[i].data.u32); n_read = read (mqc->mq_fd, &buf, sizeof (buf)); vcl_select_handle_mq (wrk, mqc->mq, n_bits, read_map, write_map, @@ -2535,8 +2691,7 @@ vppcom_select (int n_bits, vcl_si_set * read_map, vcl_si_set * write_map, } else { - svm_fifo_t *txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; - svm_fifo_add_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF); + vcl_session_add_want_deq_ntf (s, SVM_FIFO_WANT_DEQ_NOTIF); } } @@ -2586,7 +2741,7 @@ vep_verify_epoll_chain (vcl_worker_t * wrk, u32 vep_handle) u32 sh = vep_handle; vcl_session_t *s; - if (VPPCOM_DEBUG <= 2) + if (VPPCOM_DEBUG <= 3) return; s = vcl_session_get_w_handle (wrk, vep_handle); @@ -2671,6 +2826,25 @@ vppcom_epoll_create (void) return vcl_session_handle (vep_session); } +static void +vcl_epoll_ctl_add_unhandled_event (vcl_worker_t *wrk, vcl_session_t *s, + u32 is_epollet, session_evt_type_t evt) +{ + if (!is_epollet) + { + if (s->vep.lt_next == VCL_INVALID_SESSION_INDEX) + vcl_epoll_lt_add (wrk, s); + return; + } + + session_event_t e = { 0 }; + e.session_index = s->session_index; + e.event_type = evt; + if (evt == SESSION_IO_EVT_RX) + s->flags &= ~VCL_SESSION_F_HAS_RX_EVT; + vec_add1 (wrk->unhandled_evts_vector, e); +} + int vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, struct epoll_event *event) @@ -2679,7 +2853,6 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, int rv = VPPCOM_OK, add_evt = 0; vcl_session_t *vep_session; vcl_session_t *s; - svm_fifo_t *txf; if (vep_handle == session_handle) { @@ -2748,31 +2921,33 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, s->vep.et_mask = VEP_DEFAULT_ET_MASK; s->vep.lt_next = VCL_INVALID_SESSION_INDEX; s->vep.ev = *event; + s->vep.ev.events |= EPOLLHUP | EPOLLERR; s->flags &= ~VCL_SESSION_F_IS_VEP; s->flags |= VCL_SESSION_F_IS_VEP_SESSION; vep_session->vep.next_sh = session_handle; - txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; - if (txf && (event->events & EPOLLOUT)) - svm_fifo_add_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); - - /* Generate EPOLLOUT if tx fifo not full */ - if ((event->events & EPOLLOUT) && (vcl_session_write_ready (s) > 0)) + if ((event->events & EPOLLOUT)) { - session_event_t e = { 0 }; - e.event_type = SESSION_IO_EVT_TX; - e.session_index = s->session_index; - vec_add1 (wrk->unhandled_evts_vector, e); - add_evt = 1; + int write_ready = vcl_session_write_ready (s); + + vcl_session_add_want_deq_ntf (s, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); + if (write_ready > 0) + { + /* Generate EPOLLOUT if tx fifo not full */ + vcl_epoll_ctl_add_unhandled_event ( + wrk, s, event->events & EPOLLET, SESSION_IO_EVT_TX); + add_evt = 1; + } + else + { + vcl_session_add_want_deq_ntf (s, SVM_FIFO_WANT_DEQ_NOTIF); + } } /* Generate EPOLLIN if rx fifo has data */ if ((event->events & EPOLLIN) && (vcl_session_read_ready (s) > 0)) { - session_event_t e = { 0 }; - e.event_type = SESSION_IO_EVT_RX; - e.session_index = s->session_index; - vec_add1 (wrk->unhandled_evts_vector, e); - s->flags &= ~VCL_SESSION_F_HAS_RX_EVT; + vcl_epoll_ctl_add_unhandled_event (wrk, s, event->events & EPOLLET, + SESSION_IO_EVT_RX); add_evt = 1; } if (!add_evt && vcl_session_is_closing (s)) @@ -2812,35 +2987,34 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, goto done; } - /* Generate EPOLLOUT if session write ready nd event was not on */ - if ((event->events & EPOLLOUT) && !(s->vep.ev.events & EPOLLOUT) && - (vcl_session_write_ready (s) > 0)) + /* Generate EPOLLOUT if session write ready and event was not on */ + if ((event->events & EPOLLOUT) && !(s->vep.ev.events & EPOLLOUT)) { - session_event_t e = { 0 }; - e.event_type = SESSION_IO_EVT_TX; - e.session_index = s->session_index; - vec_add1 (wrk->unhandled_evts_vector, e); + /* Fifo size load acq synchronized with update store rel */ + int write_ready = vcl_session_write_ready (s); + + vcl_session_add_want_deq_ntf (s, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); + if (write_ready > 0) + vcl_epoll_ctl_add_unhandled_event (wrk, s, event->events & EPOLLET, + SESSION_IO_EVT_TX); + else + /* Request deq ntf in case dequeue happened while updating flag */ + vcl_session_add_want_deq_ntf (s, SVM_FIFO_WANT_DEQ_NOTIF); } + else if (!(event->events & EPOLLOUT)) + vcl_session_del_want_deq_ntf (s, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); + /* Generate EPOLLIN if session read ready and event was not on */ if ((event->events & EPOLLIN) && !(s->vep.ev.events & EPOLLIN) && (vcl_session_read_ready (s) > 0)) { - session_event_t e = { 0 }; - e.event_type = SESSION_IO_EVT_RX; - e.session_index = s->session_index; - vec_add1 (wrk->unhandled_evts_vector, e); - s->flags &= ~VCL_SESSION_F_HAS_RX_EVT; + vcl_epoll_ctl_add_unhandled_event (wrk, s, event->events & EPOLLET, + SESSION_IO_EVT_RX); } s->vep.et_mask = VEP_DEFAULT_ET_MASK; s->vep.ev = *event; - txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; - if (txf) - { - if (event->events & EPOLLOUT) - svm_fifo_add_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); - else - svm_fifo_del_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); - } + s->vep.ev.events |= EPOLLHUP | EPOLLERR; + VDBG (1, "EPOLL_CTL_MOD: vep_sh %u, sh %u, events 0x%x, data 0x%llx!", vep_handle, session_handle, event->events, event->data.u64); break; @@ -2900,11 +3074,7 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle, s->flags &= ~VCL_SESSION_F_IS_VEP_SESSION; if (vcl_session_is_open (s)) - { - txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo; - if (txf) - svm_fifo_del_want_deq_ntf (txf, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); - } + vcl_session_del_want_deq_ntf (s, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); VDBG (1, "EPOLL_CTL_DEL: vep_idx %u, sh %u!", vep_handle, session_handle); @@ -2922,6 +3092,14 @@ done: return rv; } +always_inline u8 +vcl_ep_session_needs_evt (vcl_session_t *s, u32 evt) +{ + /* No event if not epolled / events reset on hup or level-trigger on */ + return ((s->vep.ev.events & evt) && + s->vep.lt_next == VCL_INVALID_SESSION_INDEX); +} + static inline void vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, struct epoll_event *events, u32 * num_ev) @@ -2941,11 +3119,10 @@ vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, if (vcl_session_is_closed (s)) break; vcl_fifo_rx_evt_valid_or_break (s); - session_events = s->vep.ev.events; - if (!(EPOLLIN & s->vep.ev.events) || - (s->flags & VCL_SESSION_F_HAS_RX_EVT) || - (s->vep.lt_next != VCL_INVALID_SESSION_INDEX)) + if (!vcl_ep_session_needs_evt (s, EPOLLIN) || + (s->flags & VCL_SESSION_F_HAS_RX_EVT)) break; + session_events = s->vep.ev.events; add_event = 1; events[*num_ev].events = EPOLLIN; session_evt_data = s->vep.ev.data.u64; @@ -2956,27 +3133,24 @@ vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, s = vcl_session_get (wrk, sid); if (!s || !vcl_session_is_open (s)) break; - session_events = s->vep.ev.events; - if (!(EPOLLOUT & session_events)) + svm_fifo_reset_has_deq_ntf (vcl_session_is_ct (s) ? s->ct_tx_fifo : + s->tx_fifo); + if (!vcl_ep_session_needs_evt (s, EPOLLOUT)) break; + session_events = s->vep.ev.events; add_event = 1; events[*num_ev].events = EPOLLOUT; session_evt_data = s->vep.ev.data.u64; - svm_fifo_reset_has_deq_ntf (vcl_session_is_ct (s) ? - s->ct_tx_fifo : s->tx_fifo); break; case SESSION_CTRL_EVT_ACCEPTED: if (!e->postponed) s = vcl_session_accepted (wrk, (session_accepted_msg_t *) e->data); else s = vcl_session_get (wrk, e->session_index); - if (!s) + if (!s || !vcl_ep_session_needs_evt (s, EPOLLIN)) break; - session_events = s->vep.ev.events; sid = s->session_index; - if (!(EPOLLIN & session_events) || - (s->vep.lt_next != VCL_INVALID_SESSION_INDEX)) - break; + session_events = s->vep.ev.events; add_event = 1; events[*num_ev].events = EPOLLIN; session_evt_data = s->vep.ev.data.u64; @@ -2990,17 +3164,20 @@ vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, else sid = e->session_index; s = vcl_session_get (wrk, sid); - if (vcl_session_is_closed (s)) + if (vcl_session_is_closed (s) || !vcl_ep_session_needs_evt (s, EPOLLOUT)) break; + /* We didn't have a fifo when the event was added */ + vcl_session_add_want_deq_ntf (s, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL); + add_event = 1; session_events = s->vep.ev.events; /* Generate EPOLLOUT because there's no connected event */ - if (!(EPOLLOUT & session_events)) - break; - add_event = 1; events[*num_ev].events = EPOLLOUT; session_evt_data = s->vep.ev.data.u64; if (s->session_state == VCL_STATE_DETACHED) - events[*num_ev].events |= EPOLLHUP; + { + events[*num_ev].events |= EPOLLHUP; + s->vep.ev.events = 0; + } break; case SESSION_CTRL_EVT_DISCONNECTED: if (!e->postponed) @@ -3013,10 +3190,9 @@ vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, s = vcl_session_get (wrk, e->session_index); s->flags &= ~VCL_SESSION_F_PENDING_DISCONNECT; } - if (vcl_session_is_closed (s) || - !(s->flags & VCL_SESSION_F_IS_VEP_SESSION)) + if (vcl_session_is_closed (s) || !vcl_ep_session_needs_evt (s, EPOLLHUP)) { - if (s->flags & VCL_SESSION_F_PENDING_FREE) + if (s && (s->flags & VCL_SESSION_F_PENDING_FREE)) vcl_session_free (wrk, s); break; } @@ -3038,7 +3214,10 @@ vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, events[*num_ev].events = EPOLLHUP; } session_evt_data = s->vep.ev.data.u64; - + s->vep.ev.events = 0; + break; + case SESSION_CTRL_EVT_BOUND: + vcl_session_bound_handler (wrk, (session_bound_msg_t *) e->data); break; case SESSION_CTRL_EVT_RESET: if (!e->postponed) @@ -3053,17 +3232,26 @@ vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, s = vcl_session_get (wrk, sid); s->flags &= ~VCL_SESSION_F_PENDING_DISCONNECT; } - if (vcl_session_is_closed (s) || - !(s->flags & VCL_SESSION_F_IS_VEP_SESSION)) + if (vcl_session_is_closed (s) || !vcl_ep_session_needs_evt (s, EPOLLHUP)) { - if (s->flags & VCL_SESSION_F_PENDING_FREE) + if (s && (s->flags & VCL_SESSION_F_PENDING_FREE)) vcl_session_free (wrk, s); break; } session_events = s->vep.ev.events; add_event = 1; - events[*num_ev].events = EPOLLHUP | EPOLLRDHUP; + events[*num_ev].events = EPOLLERR | EPOLLHUP; + if ((EPOLLRDHUP & session_events) && + (s->flags & VCL_SESSION_F_RD_SHUTDOWN)) + { + events[*num_ev].events |= EPOLLRDHUP; + } + if ((EPOLLIN & session_events) && (s->flags & VCL_SESSION_F_RD_SHUTDOWN)) + { + events[*num_ev].events |= EPOLLIN; + } session_evt_data = s->vep.ev.data.u64; + s->vep.ev.events = 0; break; case SESSION_CTRL_EVT_UNLISTEN_REPLY: vcl_session_unlisten_reply_handler (wrk, e->data); @@ -3096,11 +3284,13 @@ vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e, if (add_event) { + ASSERT (s->flags & VCL_SESSION_F_IS_VEP_SESSION); events[*num_ev].data.u64 = session_evt_data; if (EPOLLONESHOT & session_events) { s = vcl_session_get (wrk, sid); - s->vep.ev.events = 0; + if (!(events[*num_ev].events & EPOLLHUP)) + s->vep.ev.events = EPOLLHUP | EPOLLERR; } else if (!(EPOLLET & session_events)) { @@ -3189,6 +3379,12 @@ vppcom_epoll_wait_eventfd (vcl_worker_t *wrk, struct epoll_event *events, double end = -1; u64 buf; + if (PREDICT_FALSE (wrk->api_client_handle == ~0)) + { + vcl_api_retry_attach (wrk); + return n_evts; + } + vec_validate (wrk->mq_events, pool_elts (wrk->mq_evt_conns)); if (!n_evts) { @@ -3208,6 +3404,13 @@ vppcom_epoll_wait_eventfd (vcl_worker_t *wrk, struct epoll_event *events, for (i = 0; i < n_mq_evts; i++) { + if (PREDICT_FALSE (wrk->mq_events[i].data.u32 == ~0)) + { + /* api socket was closed */ + vcl_api_handle_disconnect (wrk); + continue; + } + mqc = vcl_mq_evt_conn_get (wrk, wrk->mq_events[i].data.u32); n_read = read (mqc->mq_fd, &buf, sizeof (buf)); vcl_epoll_wait_handle_mq (wrk, mqc->mq, events, maxevents, 0, @@ -3226,7 +3429,7 @@ static void vcl_epoll_wait_handle_lt (vcl_worker_t *wrk, struct epoll_event *events, int maxevents, u32 *n_evts) { - u32 add_event = 0, next; + u32 add_event = 0, evt_flags = 0, next, *to_remove = 0, *si; vcl_session_t *s; u64 evt_data; int rv; @@ -3241,31 +3444,40 @@ vcl_epoll_wait_handle_lt (vcl_worker_t *wrk, struct epoll_event *events, s = vcl_session_get (wrk, next); next = s->vep.lt_next; + if (s->vep.ev.events == 0) + { + vec_add1 (to_remove, s->session_index); + continue; + } if ((s->vep.ev.events & EPOLLIN) && (rv = vcl_session_read_ready (s))) { add_event = 1; - events[*n_evts].events |= rv > 0 ? EPOLLIN : EPOLLHUP | EPOLLRDHUP; + evt_flags |= rv > 0 ? EPOLLIN : EPOLLHUP | EPOLLRDHUP; evt_data = s->vep.ev.data.u64; } if ((s->vep.ev.events & EPOLLOUT) && (rv = vcl_session_write_ready (s))) { add_event = 1; - events[*n_evts].events |= rv > 0 ? EPOLLOUT : EPOLLHUP | EPOLLRDHUP; + evt_flags |= rv > 0 ? EPOLLOUT : EPOLLHUP | EPOLLRDHUP; evt_data = s->vep.ev.data.u64; } if (!add_event && s->session_state > VCL_STATE_READY) { add_event = 1; - events[*n_evts].events |= EPOLLHUP | EPOLLRDHUP; + evt_flags |= EPOLLHUP | EPOLLRDHUP; evt_data = s->vep.ev.data.u64; } if (add_event) { + events[*n_evts].events = evt_flags; events[*n_evts].data.u64 = evt_data; - *n_evts += 1; - add_event = 0; if (EPOLLONESHOT & s->vep.ev.events) + s->vep.ev.events = EPOLLHUP | EPOLLERR; + if (evt_flags & EPOLLHUP) s->vep.ev.events = 0; + *n_evts += 1; + add_event = 0; + evt_flags = 0; if (*n_evts == maxevents) { wrk->ep_lt_current = next; @@ -3274,12 +3486,17 @@ vcl_epoll_wait_handle_lt (vcl_worker_t *wrk, struct epoll_event *events, } else { - vcl_epoll_lt_del (wrk, s); - if (wrk->ep_lt_current == VCL_INVALID_SESSION_INDEX) - break; + vec_add1 (to_remove, s->session_index); } } while (next != wrk->ep_lt_current); + + vec_foreach (si, to_remove) + { + s = vcl_session_get (wrk, *si); + vcl_epoll_lt_del (wrk, s); + } + vec_free (to_remove); } int @@ -3368,7 +3585,19 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, VDBG (2, "VPPCOM_ATTR_GET_NWRITE: sh %u, nwrite = %d", session_handle, rv); break; - + case VPPCOM_ATTR_GET_NWRITEQ: + if (PREDICT_FALSE (!buffer || !buflen || *buflen != sizeof (int))) + { + rv = VPPCOM_EINVAL; + break; + } + if (!session->tx_fifo || session->session_state == VCL_STATE_DETACHED) + { + rv = VPPCOM_EINVAL; + break; + } + *(int *) buffer = svm_fifo_max_dequeue (session->tx_fifo); + break; case VPPCOM_ATTR_GET_FLAGS: if (PREDICT_TRUE (buffer && buflen && (*buflen >= sizeof (*flags)))) { @@ -3451,6 +3680,33 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, rv = VPPCOM_EINVAL; break; + case VPPCOM_ATTR_GET_ORIGINAL_DST: + if (!session->transport.is_ip4) + { + /* now original dst only support ipv4*/ + rv = VPPCOM_EAFNOSUPPORT; + break; + } + if (PREDICT_TRUE (buffer && buflen && (*buflen >= sizeof (*ep)) && + ep->ip)) + { + ep->is_ip4 = session->transport.is_ip4; + ep->port = session->original_dst_port; + clib_memcpy_fast (ep->ip, &session->original_dst_ip4, + sizeof (ip4_address_t)); + *buflen = sizeof (*ep); + VDBG (1, + "VPPCOM_ATTR_GET_ORIGINAL_DST: sh %u, is_ip4 = %u, addr = %U" + " port %d", + session_handle, ep->is_ip4, vcl_format_ip4_address, + (ip4_address_t *) (&session->original_dst_ip4), + ep->is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6, + clib_net_to_host_u16 (ep->port)); + } + else + rv = VPPCOM_EINVAL; + break; + case VPPCOM_ATTR_SET_LCL_ADDR: if (PREDICT_TRUE (buffer && buflen && (*buflen >= sizeof (*ep)) && ep->ip)) @@ -3884,7 +4140,6 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, VDBG (2, "VPPCOM_ATTR_GET_TCP_USER_MSS: %d, buflen %d", *(int *) buffer, *buflen); break; - case VPPCOM_ATTR_SET_TCP_USER_MSS: if (!(buffer && buflen && (*buflen == sizeof (u32)))) { @@ -3978,6 +4233,36 @@ vppcom_session_attr (uint32_t session_handle, uint32_t op, clib_memcpy (session->ext_config->data, buffer, *buflen); session->ext_config->len = *buflen; break; + case VPPCOM_ATTR_SET_IP_PKTINFO: + if (buffer && buflen && (*buflen == sizeof (int)) && + !vcl_session_has_attr (session, VCL_SESS_ATTR_IP_PKTINFO)) + { + if (*(int *) buffer) + vcl_session_set_attr (session, VCL_SESS_ATTR_IP_PKTINFO); + else + vcl_session_clear_attr (session, VCL_SESS_ATTR_IP_PKTINFO); + + VDBG (2, "VCL_SESS_ATTR_IP_PKTINFO: %d, buflen %d", + vcl_session_has_attr (session, VCL_SESS_ATTR_IP_PKTINFO), + *buflen); + } + else + rv = VPPCOM_EINVAL; + break; + + case VPPCOM_ATTR_GET_IP_PKTINFO: + if (buffer && buflen && (*buflen >= sizeof (int))) + { + *(int *) buffer = + vcl_session_has_attr (session, VCL_SESS_ATTR_IP_PKTINFO); + *buflen = sizeof (int); + + VDBG (2, "VCL_SESS_ATTR_IP_PKTINFO: %d, buflen %d", *(int *) buffer, + *buflen); + } + else + rv = VPPCOM_EINVAL; + break; default: rv = VPPCOM_EINVAL; @@ -4021,6 +4306,31 @@ vppcom_session_recvfrom (uint32_t session_handle, void *buffer, return rv; } +static void +vcl_handle_ep_app_tlvs (vcl_session_t *s, vppcom_endpt_t *ep) +{ + vppcom_endpt_tlv_t *tlv = ep->app_tlvs; + + do + { + switch (tlv->data_type) + { + case VCL_UDP_SEGMENT: + s->gso_size = *(u16 *) tlv->data; + break; + case VCL_IP_PKTINFO: + clib_memcpy_fast (&s->transport.lcl_ip, (ip4_address_t *) tlv->data, + sizeof (ip4_address_t)); + break; + default: + VDBG (0, "Ignorning unsupported app tlv %u", tlv->data_type); + break; + } + tlv = VCL_EP_NEXT_APP_TLV (ep, tlv); + } + while (tlv); +} + int vppcom_session_sendto (uint32_t session_handle, void *buffer, uint32_t buflen, int flags, vppcom_endpt_t * ep) @@ -4041,6 +4351,9 @@ vppcom_session_sendto (uint32_t session_handle, void *buffer, s->transport.rmt_port = ep->port; vcl_ip_copy_from_ep (&s->transport.rmt_ip, ep); + if (ep->app_tlvs) + vcl_handle_ep_app_tlvs (s, ep); + /* Session not connected/bound in vpp. Create it by 'connecting' it */ if (PREDICT_FALSE (s->session_state == VCL_STATE_CLOSED)) { @@ -4353,6 +4666,10 @@ vppcom_retval_str (int retval) st = "VPPCOM_ETIMEDOUT"; break; + case VPPCOM_EADDRINUSE: + st = "VPPCOM_EADDRINUSE"; + break; + default: st = "UNKNOWN_STATE"; break; @@ -4379,6 +4696,43 @@ vppcom_del_cert_key_pair (uint32_t ckpair_index) return vcl_bapi_del_cert_key_pair (ckpair_index); } +int +vppcom_session_get_error (uint32_t session_handle) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + vcl_session_t *session = 0; + + session = vcl_session_get_w_handle (wrk, session_handle); + if (!session) + return VPPCOM_EBADFD; + + if (PREDICT_FALSE (session->flags & VCL_SESSION_F_IS_VEP)) + { + VWRN ("epoll session %u! will not have connect", session->session_index); + return VPPCOM_EBADFD; + } + + if (session->vpp_error == SESSION_E_PORTINUSE) + return VPPCOM_EADDRINUSE; + else if (session->vpp_error == SESSION_E_REFUSED) + return VPPCOM_ECONNREFUSED; + else if (session->vpp_error != SESSION_E_NONE) + return VPPCOM_EFAULT; + else + return VPPCOM_OK; +} + +int +vppcom_worker_is_detached (void) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + + if (!vcm->cfg.use_mq_eventfd) + return VPPCOM_ENOTSUP; + + return wrk->api_client_handle == ~0; +} + /* * fd.io coding-style-patch-verification: ON *