1 files changed, 39 insertions, 64 deletions

diff --git a/src/vlib/threads.c b/src/vlib/threads.c
index 3994afc2cea..ef2c5616f21 100644
--- a/src/vlib/threads.c
+++ b/src/vlib/threads.c
@@ -16,6 +16,9 @@
 
 #include <signal.h>
 #include <math.h>
+#ifdef __FreeBSD__
+#include <pthread_np.h>
+#endif /* __FreeBSD__ */
 #include <vppinfra/format.h>
 #include <vppinfra/time_range.h>
 #include <vppinfra/interrupt.h>
@@ -179,9 +182,7 @@ vlib_thread_init (vlib_main_t * vm)
   u32 n_vlib_mains = 1;
   u32 first_index = 1;
   u32 i;
-  pid_t pid;
-  uword *avail_cpu, *affinity_cpu;
-  uword n_cpus;
+  uword *avail_cpu;
   u32 stats_num_worker_threads_dir_index;
 
   stats_num_worker_threads_dir_index =
@@ -192,41 +193,22 @@ vlib_thread_init (vlib_main_t * vm)
   tm->cpu_core_bitmap = os_get_online_cpu_core_bitmap ();
   tm->cpu_socket_bitmap = os_get_online_cpu_node_bitmap ();
 
-  /* get bitmap of active cpu cores vpp has affinity to */
-  pid = getpid ();
-  tm->cpu_affinity_bitmap = os_get_cpu_affinity_bitmap (pid);
-
-  /* if fetching affinity fails, return online cpu core bmp */
-  if (tm->cpu_affinity_bitmap == 0)
-    tm->cpu_affinity_bitmap = os_get_online_cpu_core_bitmap ();
-
   avail_cpu = clib_bitmap_dup (tm->cpu_core_bitmap);
-  affinity_cpu = clib_bitmap_dup (tm->cpu_affinity_bitmap);
 
   /* skip cores */
-  n_cpus = clib_bitmap_count_set_bits (avail_cpu);
-  if (tm->skip_cores >= n_cpus)
-    return clib_error_return (0, "skip-core greater than available cpus");
-  n_cpus = clib_bitmap_count_set_bits (affinity_cpu);
-  if (tm->skip_cores >= n_cpus)
-    return clib_error_return (0, "skip-core greater than affinity cpus");
-
   for (i = 0; i < tm->skip_cores; i++)
     {
-      uword c;
-      c = clib_bitmap_first_set (avail_cpu);
+      uword c = clib_bitmap_first_set (avail_cpu);
       if (c == ~0)
 	return clib_error_return (0, "no available cpus to skip");
 
       avail_cpu = clib_bitmap_set (avail_cpu, c, 0);
-
-      c = clib_bitmap_first_set (affinity_cpu);
-      if (c == ~0)
-	return clib_error_return (0, "no available env cpus to skip");
-
-      affinity_cpu = clib_bitmap_set (affinity_cpu, c, 0);
     }
 
+  /* if main thread affinity is unspecified, set to current running cpu */
+  if (tm->main_lcore == ~0)
+    tm->main_lcore = sched_getcpu ();
+
   /* grab cpu for main thread */
   if (tm->main_lcore != ~0)
     {
@@ -234,17 +216,6 @@ vlib_thread_init (vlib_main_t * vm)
 	return clib_error_return (0, "cpu %u is not available to be used"
 				  " for the main thread", tm->main_lcore);
       avail_cpu = clib_bitmap_set (avail_cpu, tm->main_lcore, 0);
-      affinity_cpu = clib_bitmap_set (affinity_cpu, tm->main_lcore, 0);
-    }
-  /* if auto enabled, grab first cpu vpp has affinity to for main thread */
-  else if (tm->use_main_core_auto)
-    {
-      uword c = clib_bitmap_first_set (affinity_cpu);
-      if (c != ~0)
-	tm->main_lcore = c;
-
-      avail_cpu = clib_bitmap_set (avail_cpu, tm->main_lcore, 0);
-      affinity_cpu = clib_bitmap_set (affinity_cpu, tm->main_lcore, 0);
     }
 
   /* assume that there is socket 0 only if there is no data from sysfs */
@@ -272,7 +243,11 @@ vlib_thread_init (vlib_main_t * vm)
   w->thread_mheap = clib_mem_get_heap ();
   w->thread_stack = vlib_thread_stacks[0];
   w->cpu_id = tm->main_lcore;
+#ifdef __FreeBSD__
+  w->lwp = pthread_getthreadid_np ();
+#else
   w->lwp = syscall (SYS_gettid);
+#endif /* __FreeBSD__ */
   w->thread_id = pthread_self ();
   tm->n_vlib_mains = 1;
 
@@ -325,23 +300,13 @@ vlib_thread_init (vlib_main_t * vm)
 	}
       else
 	{
-	  /* for automatic pinning, use cpu affinity list */
-	  uword n_env_cpu = 0;
-	  n_env_cpu = clib_bitmap_count_set_bits (affinity_cpu);
-
-	  if (n_env_cpu < tr->count)
-	    return clib_error_return (0,
-				      "no available cpus to be used for"
-				      " the '%s' thread #%u",
-				      tr->name, n_env_cpu);
-
 	  for (j = 0; j < tr->count; j++)
 	    {
 	      /* Do not use CPU 0 by default - leave it to the host and IRQs */
-	      uword avail_c0 = clib_bitmap_get (affinity_cpu, 0);
-	      affinity_cpu = clib_bitmap_set (affinity_cpu, 0, 0);
+	      uword avail_c0 = clib_bitmap_get (avail_cpu, 0);
+	      avail_cpu = clib_bitmap_set (avail_cpu, 0, 0);
 
-	      uword c = clib_bitmap_first_set (affinity_cpu);
+	      uword c = clib_bitmap_first_set (avail_cpu);
 	      /* Use CPU 0 as a last resort */
 	      if (c == ~0 && avail_c0)
 		{
@@ -355,15 +320,14 @@ vlib_thread_init (vlib_main_t * vm)
 					  " the '%s' thread #%u",
 					  tr->name, tr->count);
 
-	      affinity_cpu = clib_bitmap_set (affinity_cpu, 0, avail_c0);
-	      affinity_cpu = clib_bitmap_set (affinity_cpu, c, 0);
+	      avail_cpu = clib_bitmap_set (avail_cpu, 0, avail_c0);
+	      avail_cpu = clib_bitmap_set (avail_cpu, c, 0);
 	      tr->coremask = clib_bitmap_set (tr->coremask, c, 1);
 	    }
 	}
     }
 
   clib_bitmap_free (avail_cpu);
-  clib_bitmap_free (affinity_cpu);
 
   tm->n_vlib_mains = n_vlib_mains;
   vlib_stats_set_gauge (stats_num_worker_threads_dir_index, n_vlib_mains - 1);
@@ -410,6 +374,8 @@ void
 vlib_worker_thread_init (vlib_worker_thread_t * w)
 {
   vlib_thread_main_t *tm = vlib_get_thread_main ();
+  sigset_t signals;
+  int rv;
 
   /*
    * Note: disabling signals in worker threads as follows
@@ -419,7 +385,17 @@ vlib_worker_thread_init (vlib_worker_thread_t * w)
    *    sigfillset (&s);
    *    pthread_sigmask (SIG_SETMASK, &s, 0);
    *  }
+   * We can still disable signals for SIGINT,SIGHUP and SIGTERM as they don't
+   * trigger post-dump handlers anyway.
    */
+  sigemptyset (&signals);
+  sigaddset (&signals, SIGINT);
+  sigaddset (&signals, SIGHUP);
+  sigaddset (&signals, SIGTERM);
+  rv = pthread_sigmask (SIG_BLOCK, &signals, NULL);
+
+  if (rv)
+    clib_warning ("Failed to set the worker signal mask");
 
   clib_mem_set_heap (w->thread_mheap);
 
@@ -448,7 +424,11 @@ vlib_worker_thread_bootstrap_fn (void *arg)
 {
   vlib_worker_thread_t *w = arg;
 
+#ifdef __FreeBSD__
+  w->lwp = pthread_getthreadid_np ();
+#else
   w->lwp = syscall (SYS_gettid);
+#endif /* __FreeBSD__ */
   w->thread_id = pthread_self ();
 
   __os_thread_index = w - vlib_worker_threads;
@@ -1158,6 +1138,7 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
   u8 *name;
   uword *bitmap;
   u32 count;
+  int use_corelist = 0;
 
   tm->thread_registrations_by_name = hash_create_string (0, sizeof (uword));
 
@@ -1165,7 +1146,6 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
   tm->sched_policy = ~0;
   tm->sched_priority = ~0;
   tm->main_lcore = ~0;
-  tm->use_main_core_auto = 0;
 
   tr = tm->next;
 
@@ -1181,8 +1161,6 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
 	tm->use_pthreads = 1;
       else if (unformat (input, "thread-prefix %v", &tm->thread_prefix))
 	;
-      else if (unformat (input, "main-core auto"))
-	tm->use_main_core_auto = 1;
       else if (unformat (input, "main-core %u", &tm->main_lcore))
 	;
       else if (unformat (input, "skip-cores %u", &tm->skip_cores))
@@ -1212,6 +1190,7 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
 
 	  tr->coremask = bitmap;
 	  tr->count = clib_bitmap_count_set_bits (tr->coremask);
+	  use_corelist = 1;
 	}
       else
 	if (unformat
@@ -1241,13 +1220,9 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
 	break;
     }
 
-  if (tm->main_lcore != ~0 && tm->use_main_core_auto)
-    {
-      return clib_error_return (
-	0, "cannot set both 'main-core %u' and 'main-core auto'",
-	tm->main_lcore);
-    }
-
+  if (use_corelist && tm->main_lcore == ~0)
+    return clib_error_return (0, "main-core must be specified when using "
+				 "corelist-* or coremask-* attribute");
   if (tm->sched_priority != ~0)
     {
       if (tm->sched_policy == SCHED_FIFO || tm->sched_policy == SCHED_RR)