session udp: flag for connected udp
Type: improvement
This can be used as alternative to udpc
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: Ic3f7efe6728b25d4a8a0b61ddb36de66b4672c4f
diff --git a/src/vnet/session/application_worker.c b/src/vnet/session/application_worker.c
index 1793998..88ea701 100644
--- a/src/vnet/session/application_worker.c
+++ b/src/vnet/session/application_worker.c
@@ -179,9 +179,14 @@
hash_set (app_wrk->listeners_table, listen_session_get_handle (ls),
segment_manager_index (sm));
- if (session_transport_service_type (ls) == TRANSPORT_SERVICE_CL)
+ if (transport_connection_is_cless (session_get_transport (ls)))
{
- if (!ls->rx_fifo && app_worker_alloc_session_fifos (sm, ls))
+ if (ls->rx_fifo)
+ {
+ clib_warning ("sharing of connectionless listeners not supported");
+ return -1;
+ }
+ if (app_worker_alloc_session_fifos (sm, ls))
return -1;
}
return 0;
@@ -228,6 +233,13 @@
if (PREDICT_FALSE (!sm_indexp))
return;
+ /* Dealloc fifos first, if any, to avoid cleanup attempt lower */
+ if (ls->rx_fifo)
+ {
+ segment_manager_dealloc_fifos (ls->rx_fifo, ls->tx_fifo);
+ ls->tx_fifo = ls->rx_fifo = 0;
+ }
+
sm = segment_manager_get (*sm_indexp);
if (app_wrk->first_segment_manager == *sm_indexp)
{
diff --git a/src/vnet/session/session.h b/src/vnet/session/session.h
index 0a72f97..d72763a 100644
--- a/src/vnet/session/session.h
+++ b/src/vnet/session/session.h
@@ -591,6 +591,7 @@
always_inline void
listen_session_free (session_t * s)
{
+ ASSERT (!s->rx_fifo);
session_free (s);
}
diff --git a/src/vnet/session/transport.h b/src/vnet/session/transport.h
index e5c09cd..53a0dd6 100644
--- a/src/vnet/session/transport.h
+++ b/src/vnet/session/transport.h
@@ -195,6 +195,12 @@
tc->flags |= TRANSPORT_CONNECTION_F_DESCHED;
}
+static inline u8
+transport_connection_is_cless (transport_connection_t * tc)
+{
+ return ((tc->flags & TRANSPORT_CONNECTION_F_CLESS) ? 1 : 0);
+}
+
void transport_connection_reschedule (transport_connection_t * tc);
/**
diff --git a/src/vnet/session/transport_types.h b/src/vnet/session/transport_types.h
index 44934da..b97955f 100644
--- a/src/vnet/session/transport_types.h
+++ b/src/vnet/session/transport_types.h
@@ -52,6 +52,12 @@
* Connection descheduled by the session layer.
*/
TRANSPORT_CONNECTION_F_DESCHED = 1 << 2,
+ /**
+ * Connection is "connection less". Some important implications of that
+ * are that connections are not pinned to workers and listeners will
+ * have fifos associated to them
+ */
+ TRANSPORT_CONNECTION_F_CLESS = 1 << 3,
} transport_connection_flags_t;
typedef struct _spacer
@@ -186,10 +192,16 @@
#undef _
} transport_endpoint_t;
+typedef enum transport_endpt_cfg_flags_
+{
+ TRANSPORT_CFG_F_CONNECTED = 1 << 0,
+} transport_endpt_cfg_flags_t;
+
#define foreach_transport_endpoint_cfg_fields \
foreach_transport_endpoint_fields \
_(transport_endpoint_t, peer) \
_(u16, mss) \
+ _(u8, transport_flags) \
typedef struct transport_endpoint_pair_
{
diff --git a/src/vnet/udp/udp.c b/src/vnet/udp/udp.c
index 8fa1147..b069e72 100644
--- a/src/vnet/udp/udp.c
+++ b/src/vnet/udp/udp.c
@@ -81,13 +81,14 @@
{
udp_main_t *um = vnet_get_udp_main ();
vlib_main_t *vm = vlib_get_main ();
+ transport_endpoint_cfg_t *lcl_ext;
udp_connection_t *listener;
+ udp_dst_port_info_t *pi;
u32 node_index;
void *iface_ip;
- udp_dst_port_info_t *pi;
- pi =
- udp_get_dst_port_info (um, clib_net_to_host_u16 (lcl->port), lcl->is_ip4);
+ pi = udp_get_dst_port_info (um, clib_net_to_host_u16 (lcl->port),
+ lcl->is_ip4);
if (pi)
return -1;
@@ -110,6 +111,11 @@
listener->c_s_index = session_index;
listener->c_fib_index = lcl->fib_index;
listener->flags |= UDP_CONN_F_OWNS_PORT;
+ lcl_ext = (transport_endpoint_cfg_t *) lcl;
+ if (lcl_ext->transport_flags & TRANSPORT_CFG_F_CONNECTED)
+ listener->flags |= UDP_CONN_F_CONNECTED;
+ else
+ listener->c_flags |= TRANSPORT_CONNECTION_F_CLESS;
clib_spinlock_init (&listener->rx_lock);
node_index = lcl->is_ip4 ? udp4_input_node.index : udp6_input_node.index;
@@ -327,6 +333,10 @@
uc->c_proto = TRANSPORT_PROTO_UDP;
uc->c_fib_index = rmt->fib_index;
uc->flags |= UDP_CONN_F_OWNS_PORT;
+ if (rmt->transport_flags & TRANSPORT_CFG_F_CONNECTED)
+ uc->flags |= UDP_CONN_F_CONNECTED;
+ else
+ uc->c_flags |= TRANSPORT_CONNECTION_F_CLESS;
return uc->c_c_index;
}