From 7752b39af3b4d99e6ff649ec7c294ad56665b1f9 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Tue, 3 Jul 2018 17:24:45 +0200
Subject: Set main thread affinity before main heap is allocated

Change-Id: I524909570fc1736f51fd437d6d30566c461139bd
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 src/vpp/vnet/main.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'src/vpp')

diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c
index 6e136e19201..9a804eb3641 100644
--- a/src/vpp/vnet/main.c
+++ b/src/vpp/vnet/main.c
@@ -13,6 +13,10 @@
  * limitations under the License.
  */
 
+#define _GNU_SOURCE
+#include <pthread.h>
+#include <sched.h>
+
 #include <vppinfra/cpu.h>
 #include <vlib/vlib.h>
 #include <vlib/unix/unix.h>
@@ -103,6 +107,8 @@ main (int argc, char *argv[])
   uword main_heap_size = (1ULL << 30);
   u8 *sizep;
   u32 size;
+  int main_core = 1;
+  cpu_set_t cpuset;
 
 #if __x86_64__
   CLIB_UNUSED (const char *msg)
@@ -234,10 +240,25 @@ main (int argc, char *argv[])
 	  else if (*sizep == 'm' || *sizep == 'M')
 	    main_heap_size <<= 20;
 	}
+      else if (!strncmp (argv[i], "main-core", 9))
+	{
+	  if (i < (argc - 1))
+	    {
+	      errno = 0;
+	      unsigned long x = strtol (argv[++i], 0, 0);
+	      if (errno == 0)
+		main_core = x;
+	    }
+	}
     }
 
 defaulted:
 
+  /* set process affinity for main thread */
+  CPU_ZERO (&cpuset);
+  CPU_SET (main_core, &cpuset);
+  pthread_setaffinity_np (pthread_self (), sizeof (cpu_set_t), &cpuset);
+
   /* Set up the plugin message ID allocator right now... */
   vl_msg_api_set_first_available_msg_id (VL_MSG_FIRST_AVAILABLE);
 
-- 
cgit 1.2.3-korg