commit 29ca16f582d7ca3613a01b91cf209776183ccdae
author Florin Coras <fcoras@cisco.com> Thu Nov 02 18:14:17 2017 -0400
committer Florin Coras <fcoras@cisco.com> Thu Nov 02 18:39:18 2017 -0400
tree a3971b9e226e46f457e170389bb52c8bc78cc77d
parent 774169bd95e1bbe3e27e602acbba88650db44972

session/udp: init rw locks

Change-Id: I68152d7338ce0d7805e50ccf9e9046de02cfd206
Signed-off-by: Florin Coras <fcoras@cisco.com>

src/vnet/session/session.c

diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c
index c214b81..d995eeb 100644
--- a/src/vnet/session/session.c
+++ b/src/vnet/session/session.c
@@ -147,7 +147,6 @@
   s = session_alloc (thread_index);
   s->session_type = session_type_from_proto_and_ip (tc->proto, tc->is_ip4);
   s->session_state = SESSION_STATE_CONNECTING;
-  s->thread_index = thread_index;
 
   /* Attach transport to session and vice versa */
   s->connection_index = tc->c_index;
@@ -166,6 +165,7 @@
   if (alloc_fifos && (rv = session_alloc_fifos (sm, s)))
     {
       session_free (s);
+      *ret_s = 0;
       return rv;
     }
 
@@ -1084,6 +1084,11 @@
       _vec_len (smm->pending_event_vector[i]) = 0;
       vec_validate (smm->pending_disconnects[i], 0);
       _vec_len (smm->pending_disconnects[i]) = 0;
+      if (num_threads > 1)
+	{
+	  clib_spinlock_init (&smm->peekers_readers_locks[i]);
+	  clib_spinlock_init (&smm->peekers_write_locks[i]);
+	}
     }
 
 #if SESSION_DBG

src/vnet/udp/udp.c

diff --git a/src/vnet/udp/udp.c b/src/vnet/udp/udp.c
index c12e837..7009165 100644
--- a/src/vnet/udp/udp.c
+++ b/src/vnet/udp/udp.c
@@ -334,6 +334,7 @@
   u32 num_threads;
   clib_error_t *error = 0;
   ip_protocol_info_t *pi;
+  int i;
 
   if ((error = vlib_call_init_function (vm, ip_main_init)))
     return error;
@@ -367,6 +368,13 @@
   vec_validate (um->connection_peekers, num_threads - 1);
   vec_validate (um->peekers_readers_locks, num_threads - 1);
   vec_validate (um->peekers_write_locks, num_threads - 1);
+
+  if (num_threads > 1)
+    for (i = 0; i < num_threads; i++)
+      {
+	clib_spinlock_init (&um->peekers_readers_locks[i]);
+	clib_spinlock_init (&um->peekers_write_locks[i]);
+      }
   return error;
 }