Add support for AArch32

[vpp.git] / vlib / vlib / threads.c

diff --git a/vlib/vlib/threads.c b/vlib/vlib/threads.c
index 405a4d6..efbef37 100644 (file)
--- a/vlib/vlib/threads.c
+++ b/vlib/vlib/threads.c
@@ -12,16 +12,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#define _GNU_SOURCE
+#include <sched.h>
+
 #include <signal.h>
 #include <math.h>
 #include <vppinfra/format.h>
 #include <vlib/vlib.h>
 
 #include <vlib/threads.h>
-#include <vlib/unix/physmem.h>
-
 #include <vlib/unix/cj.h>
 
+
 #if DPDK==1
 #include <rte_config.h>
 #include <rte_common.h>
@@ -159,7 +161,7 @@ vlib_thread_init (vlib_main_t * vm)
   if (!tm->main_lcore)
     {
       tm->main_lcore = clib_bitmap_first_set(avail_cpu);
-      if (tm->main_lcore == ~0)
+      if (tm->main_lcore == (u8) ~0)
         return clib_error_return (0, "no available cpus to be used for the"
                                   " main thread");
     }
@@ -175,6 +177,16 @@ vlib_thread_init (vlib_main_t * vm)
   if (!tm->cpu_socket_bitmap)
     tm->cpu_socket_bitmap = clib_bitmap_set(0, 0, 1);
 
+  /* pin main thread to main_lcore  */
+#if DPDK==0
+  {
+     cpu_set_t cpuset;
+     CPU_ZERO(&cpuset);
+     CPU_SET(tm->main_lcore, &cpuset);
+     pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
+  }
+#endif
+
   /* as many threads as stacks... */
   vec_validate_aligned (vlib_worker_threads, vec_len(vlib_thread_stacks)-1,
                         CLIB_CACHE_LINE_BYTES);
@@ -486,7 +498,6 @@ void *vlib_worker_thread_bootstrap_fn (void *arg)
 static int
 vlib_launch_thread (void *fp, vlib_worker_thread_t *w, unsigned lcore_id)
 {
-  pthread_t dummy;
   void *(*fp_arg)(void *) = fp;
 
 #if DPDK==1
@@ -497,7 +508,19 @@ vlib_launch_thread (void *fp, vlib_worker_thread_t *w, unsigned lcore_id)
       return -1;
   else
 #endif
-    return pthread_create (&dummy, NULL /* attr */, fp_arg, (void *)w);
+  {
+    int ret;
+    pthread_t worker;
+    cpu_set_t cpuset;
+    CPU_ZERO(&cpuset);
+    CPU_SET(lcore_id, &cpuset);
+
+    ret = pthread_create (&worker, NULL /* attr */, fp_arg, (void *)w);
+    if(ret == 0)
+        return pthread_setaffinity_np(worker, sizeof(cpu_set_t), &cpuset);
+    else
+        return ret;
+  }
 }
 
 static clib_error_t * start_workers (vlib_main_t * vm)
@@ -517,7 +540,7 @@ static clib_error_t * start_workers (vlib_main_t * vm)
 
   /* Set up the main thread */
   vec_add2_aligned (vlib_worker_threads, w, 1, CLIB_CACHE_LINE_BYTES);
-  w->elog_track.name = "thread 0";
+  w->elog_track.name = "main thread";
   elog_track_register (&vm->elog_main, &w->elog_track);
 
   if (vec_len(tm->thread_prefix))
@@ -599,7 +622,8 @@ static clib_error_t * start_workers (vlib_main_t * vm)
             w->instance_id = k;
             w->registration = tr; 
             
-            w->elog_track.name = (char *) format (0, "thread %d", i+1);
+            w->elog_track.name = 
+                (char *) format (0, "%s %d", tr->name, k+1);
             vec_add1 (w->elog_track.name, 0);
             elog_track_register (&vm->elog_main, &w->elog_track);
             
@@ -630,10 +654,13 @@ static clib_error_t * start_workers (vlib_main_t * vm)
               {
                 vlib_next_frame_t *nf = &nm_clone->next_frames[j];
                 u32 save_node_runtime_index;
+                u32 save_flags;
 
                 save_node_runtime_index = nf->node_runtime_index;
+                save_flags = nf->flags & VLIB_FRAME_NO_FREE_AFTER_DISPATCH;
                 vlib_next_frame_init (nf);
                 nf->node_runtime_index = save_node_runtime_index;
+                nf->flags = save_flags;
               }
 
             /* fork the frame dispatch queue */
@@ -673,8 +700,6 @@ static clib_error_t * start_workers (vlib_main_t * vm)
             clib_mem_set_heap (oldheap);
             vec_add1 (vlib_mains, vm_clone);
 
-            unix_physmem_init (vm_clone, 0 /* physmem not required */);
-
            vm_clone->error_main.counters =
              vec_dup(vlib_mains[0]->error_main.counters);
            vm_clone->error_main.counters_last_clear =
@@ -719,7 +744,8 @@ static clib_error_t * start_workers (vlib_main_t * vm)
               w->thread_function = tr->function;
               w->thread_function_arg = w;
               w->instance_id = j;
-              w->elog_track.name = (char *) format (0, "thread %d", i+1);
+              w->elog_track.name = 
+                  (char *) format (0, "%s %d", tr->name, j+1);
               w->registration = tr;
               vec_add1 (w->elog_track.name, 0);
               elog_track_register (&vm->elog_main, &w->elog_track);
@@ -843,10 +869,13 @@ void vlib_worker_thread_node_runtime_update(void)
         {
           vlib_next_frame_t *nf = &nm_clone->next_frames[j];
           u32 save_node_runtime_index;
+          u32 save_flags;
 
           save_node_runtime_index = nf->node_runtime_index;
+          save_flags = nf->flags & VLIB_FRAME_NO_FREE_AFTER_DISPATCH;
           vlib_next_frame_init (nf);
           nf->node_runtime_index = save_node_runtime_index;
+          nf->flags = save_flags;
         }
 
       old_nodes_clone = nm_clone->nodes;
@@ -1025,7 +1054,7 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
 
 VLIB_EARLY_CONFIG_FUNCTION (cpu_config, "cpu");
 
-#if !defined (__x86_64__)
+#if !defined (__x86_64__) && !defined (__aarch64__) && !defined (__powerpc64__) && !defined(__arm__)
 void __sync_fetch_and_add_8 (void)
 {
   fformat(stderr, "%s called\n", __FUNCTION__);
@@ -1077,6 +1106,8 @@ void vlib_worker_thread_barrier_sync(vlib_main_t *vm)
   if (++vlib_worker_threads[0].recursion_level > 1)
       return;
 
+  vlib_worker_threads[0].barrier_sync_count++;
+
   ASSERT (os_get_cpu_number() == 0);
 
   deadline = vlib_time_now (vm) + BARRIER_SYNC_TIMEOUT;
@@ -1128,6 +1159,7 @@ show_threads_fn (vlib_main_t * vm,
                    "ID", "Name", "Type", "LWP",
                    "lcore", "Core", "Socket", "State");
 
+#if !defined(__powerpc64__)
   for (i = 0; i < vec_len(vlib_worker_threads); i++)
     {
       w = vlib_worker_threads + i;
@@ -1139,6 +1171,7 @@ show_threads_fn (vlib_main_t * vm,
                     w->registration ? w->registration->name : "",
                     w->lwp);
 
+#if DPDK==1
       int lcore = w->dpdk_lcore_id;
       if (lcore > -1)
         {
@@ -1162,10 +1195,11 @@ show_threads_fn (vlib_main_t * vm,
                 line = format(line, "unknown");
             }
         }
-
+#endif
       vlib_cli_output(vm, "%v", line);
       vec_free(line);
     }
+#endif
 
   return 0;
 }