vcl/session: apps with process workers

[vpp.git] / src / vnet / session / session_lookup.c

diff --git a/src/vnet/session/session_lookup.c b/src/vnet/session/session_lookup.c
index 83f95be..c410dab 100644 (file)
--- a/src/vnet/session/session_lookup.c
+++ b/src/vnet/session/session_lookup.c
@@ -86,14 +86,8 @@ always_inline void
 make_v4_ss_kv (session_kv4_t * kv, ip4_address_t * lcl, ip4_address_t * rmt,
               u16 lcl_port, u16 rmt_port, u8 proto)
 {
-  v4_connection_key_t *key = (v4_connection_key_t *) kv->key;
-
-  key->src.as_u32 = lcl->as_u32;
-  key->dst.as_u32 = rmt->as_u32;
-  key->src_port = lcl_port;
-  key->dst_port = rmt_port;
-  key->proto = proto;
-
+  kv->key[0] = (u64) rmt->as_u32 << 32 | (u64) lcl->as_u32;
+  kv->key[1] = (u64) proto << 32 | (u64) rmt_port << 16 | (u64) lcl_port;
   kv->value = ~0ULL;
 }
 
@@ -101,28 +95,16 @@ always_inline void
 make_v4_listener_kv (session_kv4_t * kv, ip4_address_t * lcl, u16 lcl_port,
                     u8 proto)
 {
-  v4_connection_key_t *key = (v4_connection_key_t *) kv->key;
-
-  key->src.as_u32 = lcl->as_u32;
-  key->dst.as_u32 = 0;
-  key->src_port = lcl_port;
-  key->dst_port = 0;
-  key->proto = proto;
-
+  kv->key[0] = (u64) lcl->as_u32;
+  kv->key[1] = (u64) proto << 32 | (u64) lcl_port;
   kv->value = ~0ULL;
 }
 
 always_inline void
 make_v4_proxy_kv (session_kv4_t * kv, ip4_address_t * lcl, u8 proto)
 {
-  v4_connection_key_t *key = (v4_connection_key_t *) kv->key;
-
-  key->src.as_u32 = lcl->as_u32;
-  key->dst.as_u32 = 0;
-  key->src_port = 0;
-  key->dst_port = 0;
-  key->proto = proto;
-
+  kv->key[0] = (u64) lcl->as_u32;
+  kv->key[1] = (u64) proto << 32;
   kv->value = ~0ULL;
 }
 
@@ -137,17 +119,12 @@ always_inline void
 make_v6_ss_kv (session_kv6_t * kv, ip6_address_t * lcl, ip6_address_t * rmt,
               u16 lcl_port, u16 rmt_port, u8 proto)
 {
-  v6_connection_key_t *key = (v6_connection_key_t *) kv->key;
-
-  key->src.as_u64[0] = lcl->as_u64[0];
-  key->src.as_u64[1] = lcl->as_u64[1];
-  key->dst.as_u64[0] = rmt->as_u64[0];
-  key->dst.as_u64[1] = rmt->as_u64[1];
-  key->src_port = lcl_port;
-  key->dst_port = rmt_port;
-  key->proto = proto;
-  key->unused = 0;
-
+  kv->key[0] = lcl->as_u64[0];
+  kv->key[1] = lcl->as_u64[1];
+  kv->key[2] = rmt->as_u64[0];
+  kv->key[3] = rmt->as_u64[1];
+  kv->key[4] = (u64) proto << 32 | (u64) rmt_port << 16 | (u64) lcl_port;
+  kv->key[5] = 0;
   kv->value = ~0ULL;
 }
 
@@ -155,34 +132,24 @@ always_inline void
 make_v6_listener_kv (session_kv6_t * kv, ip6_address_t * lcl, u16 lcl_port,
                     u8 proto)
 {
-  v6_connection_key_t *key = (v6_connection_key_t *) kv->key;
-
-  key->src.as_u64[0] = lcl->as_u64[0];
-  key->src.as_u64[1] = lcl->as_u64[1];
-  key->dst.as_u64[0] = 0;
-  key->dst.as_u64[1] = 0;
-  key->src_port = lcl_port;
-  key->dst_port = 0;
-  key->proto = proto;
-  key->unused = 0;
-
+  kv->key[0] = lcl->as_u64[0];
+  kv->key[1] = lcl->as_u64[1];
+  kv->key[2] = 0;
+  kv->key[3] = 0;
+  kv->key[4] = (u64) proto << 32 | (u64) lcl_port;
+  kv->key[5] = 0;
   kv->value = ~0ULL;
 }
 
 always_inline void
 make_v6_proxy_kv (session_kv6_t * kv, ip6_address_t * lcl, u8 proto)
 {
-  v6_connection_key_t *key = (v6_connection_key_t *) kv->key;
-
-  key->src.as_u64[0] = lcl->as_u64[0];
-  key->src.as_u64[1] = lcl->as_u64[1];
-  key->dst.as_u64[0] = 0;
-  key->dst.as_u64[1] = 0;
-  key->src_port = 0;
-  key->dst_port = 0;
-  key->proto = proto;
-  key->unused = 0;
-
+  kv->key[0] = lcl->as_u64[0];
+  kv->key[1] = lcl->as_u64[1];
+  kv->key[2] = 0;
+  kv->key[3] = 0;
+  kv->key[4] = (u64) proto << 32;
+  kv->key[5] = 0;
   kv->value = ~0ULL;
 }
 
@@ -413,7 +380,8 @@ session_lookup_app_listen_session (u32 app_index, u8 fib_proto,
   if (!app)
     return 0;
 
-  return application_first_listener (app, fib_proto, transport_proto);
+  return app_worker_first_listener (application_get_default_worker (app),
+                                   fib_proto, transport_proto);
 }
 
 static stream_session_t *
@@ -492,7 +460,7 @@ session_lookup_endpoint_listener (u32 table_index, session_endpoint_t * sep,
        return kv4.value;
       if (use_rules)
        {
-         memset (&lcl4, 0, sizeof (lcl4));
+         clib_memset (&lcl4, 0, sizeof (lcl4));
          srt = &st->session_rules[sep->transport_proto];
          ai = session_rules_table_lookup4 (srt, &lcl4, &sep->ip.ip4, 0,
                                            sep->port);
@@ -513,7 +481,7 @@ session_lookup_endpoint_listener (u32 table_index, session_endpoint_t * sep,
 
       if (use_rules)
        {
-         memset (&lcl6, 0, sizeof (lcl6));
+         clib_memset (&lcl6, 0, sizeof (lcl6));
          srt = &st->session_rules[sep->transport_proto];
          ai = session_rules_table_lookup6 (srt, &lcl6, &sep->ip.ip6, 0,
                                            sep->port);
@@ -561,7 +529,7 @@ session_lookup_local_endpoint (u32 table_index, session_endpoint_t * sep)
       /*
        * Check if endpoint has special rules associated
        */
-      memset (&lcl4, 0, sizeof (lcl4));
+      clib_memset (&lcl4, 0, sizeof (lcl4));
       srt = &st->session_rules[sep->transport_proto];
       ai = session_rules_table_lookup4 (srt, &lcl4, &sep->ip.ip4, 0,
                                        sep->port);
@@ -606,7 +574,7 @@ session_lookup_local_endpoint (u32 table_index, session_endpoint_t * sep)
       session_kv6_t kv6;
       ip6_address_t lcl6;
 
-      memset (&lcl6, 0, sizeof (lcl6));
+      clib_memset (&lcl6, 0, sizeof (lcl6));
       srt = &st->session_rules[sep->transport_proto];
       ai = session_rules_table_lookup6 (srt, &lcl6, &sep->ip.ip6, 0,
                                        sep->port);
@@ -1299,7 +1267,7 @@ vnet_session_rule_add_del (session_rule_add_del_args_t * args)
     }
   if (args->scope & SESSION_RULE_SCOPE_LOCAL)
     {
-      memset (&args->table_args.lcl, 0, sizeof (args->table_args.lcl));
+      clib_memset (&args->table_args.lcl, 0, sizeof (args->table_args.lcl));
       args->table_args.lcl.fp_proto = args->table_args.rmt.fp_proto;
       args->table_args.lcl_port = 0;
       st = app_namespace_get_local_table (app_ns);
@@ -1332,15 +1300,18 @@ u8 *
 format_ip4_session_lookup_kvp (u8 * s, va_list * args)
 {
   clib_bihash_kv_16_8_t *kvp = va_arg (*args, clib_bihash_kv_16_8_t *);
-  u32 is_local = va_arg (*args, u32);
-  u8 *app_name, *str = 0;
-  stream_session_t *session;
+  u32 is_local = va_arg (*args, u32), app_wrk_index, session_index;
   v4_connection_key_t *key = (v4_connection_key_t *) kvp->key;
+  stream_session_t *session;
+  app_worker_t *app_wrk;
+  const u8 *app_name;
+  u8 *str = 0;
 
   if (!is_local)
     {
       session = session_get_from_handle (kvp->value);
-      app_name = application_name_from_index (session->app_index);
+      app_wrk = app_worker_get (session->app_wrk_index);
+      app_name = application_name_from_index (app_wrk->app_index);
       str = format (0, "[%U] %U:%d->%U:%d", format_transport_proto_short,
                    key->proto, format_ip4_address, &key->src,
                    clib_net_to_host_u16 (key->src_port), format_ip4_address,
@@ -1349,13 +1320,14 @@ format_ip4_session_lookup_kvp (u8 * s, va_list * args)
     }
   else
     {
-      app_name = application_name_from_index (kvp->value);
+      local_session_parse_handle (kvp->value, &app_wrk_index, &session_index);
+      app_wrk = app_worker_get (app_wrk_index);
+      app_name = application_name_from_index (app_wrk->app_index);
       str = format (0, "[%U] %U:%d", format_transport_proto_short, key->proto,
                    format_ip4_address, &key->src,
                    clib_net_to_host_u16 (key->src_port));
       s = format (s, "%-30v%-30v", str, app_name);
     }
-  vec_free (app_name);
   return s;
 }
 
@@ -1411,8 +1383,8 @@ session_rule_command_fn (vlib_main_t * vm, unformat_input_t * input,
   app_namespace_t *app_ns;
   clib_error_t *error;
 
-  memset (&lcl_ip, 0, sizeof (lcl_ip));
-  memset (&rmt_ip, 0, sizeof (rmt_ip));
+  clib_memset (&lcl_ip, 0, sizeof (lcl_ip));
+  clib_memset (&rmt_ip, 0, sizeof (rmt_ip));
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
       if (unformat (input, "del"))
@@ -1558,8 +1530,8 @@ show_session_rules_command_fn (vlib_main_t * vm, unformat_input_t * input,
   session_table_t *st;
   u8 *ns_id = 0, fib_proto;
 
-  memset (&lcl_ip, 0, sizeof (lcl_ip));
-  memset (&rmt_ip, 0, sizeof (rmt_ip));
+  clib_memset (&lcl_ip, 0, sizeof (lcl_ip));
+  clib_memset (&rmt_ip, 0, sizeof (rmt_ip));
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
       if (unformat (input, "%U", unformat_transport_proto, &transport_proto))