Add support for multiple microarchitectures in single binary

[vpp.git] / vnet / vnet / devices / dpdk / init.c

diff --git a/vnet/vnet/devices/dpdk/init.c b/vnet/vnet/devices/dpdk/init.c
index a94dc21..8ee59ff 100644 (file)
--- a/vnet/vnet/devices/dpdk/init.c
+++ b/vnet/vnet/devices/dpdk/init.c
@@ -22,7 +22,6 @@
 #include <vnet/devices/dpdk/dpdk.h>
 #include <vlib/unix/physmem.h>
 #include <vlib/pci/pci.h>
-#include <vlib/unix/pci.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -744,7 +743,7 @@ dpdk_lib_init (dpdk_main_t * dm)
 static void
 dpdk_bind_devices_to_uio (dpdk_main_t * dm)
 {
-  linux_pci_main_t * pm = &linux_pci_main;
+  vlib_pci_main_t * pm = &pci_main;
   clib_error_t * error;
   vlib_pci_device_t * d;
   pci_config_header_t * c;
@@ -805,6 +804,7 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
   clib_error_t * error = 0;
   dpdk_main_t * dm = &dpdk_main;
   vlib_thread_main_t * tm = vlib_get_thread_main();
+  vlib_node_runtime_t * rt = vlib_node_get_runtime (vm, dpdk_input_node.index);
   u8 * s, * tmp = 0;
   u8 * pci_dev_id = 0;
   u8 * rte_cmd = 0, * ethname = 0;
@@ -1022,16 +1022,35 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
         {
          u32 pages_avail, page_size, mem;
          u8 *s = 0;
-         char * path = "/sys/devices/system/node/node%u/hugepages/"
-                       "hugepages-%ukB/free_hugepages%c";
+          u8 *p = 0;
+         char * numa_path = "/sys/devices/system/node/node%u/";
+          char * nonnuma_path = "/sys/kernel/mm/";
+          char * suffix = "hugepages/hugepages-%ukB/free_hugepages%c";
+          char * path = NULL;
+          struct stat sb_numa, sb_nonnuma;
+
+          p = format(p, numa_path, c);
+          stat(numa_path, &sb_numa);
+          stat(nonnuma_path, &sb_nonnuma);
+
+          if (S_ISDIR(sb_numa.st_mode)) {
+            path = (char*)format((u8*)path, "%s%s", p, suffix);
+          } else if (S_ISDIR(sb_nonnuma.st_mode)) {
+            path = (char*)format((u8*)path, "%s%s", nonnuma_path, suffix);
+          } else {
+            use_1g = 0;
+            use_2m = 0;
+            vec_free(p);
+            break;
+          }
 
          vec_validate(mem_by_socket, c);
          mem = mem_by_socket[c];
 
          page_size = 1024;
          pages_avail = 0;
-         s = format (s, path, c, page_size * 1024, 0);
-         read_sys_fs ((char *) s, "%u", &pages_avail);
+         s = format (s, path, page_size * 1024, 0);
+         vlib_sysfs_read ((char *) s, "%u", &pages_avail);
          vec_reset_length (s);
 
          if (page_size * pages_avail < mem)
@@ -1039,14 +1058,16 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
 
          page_size = 2;
          pages_avail = 0;
-         s = format (s, path, c, page_size * 1024, 0);
-         read_sys_fs ((char *) s, "%u", &pages_avail);
+         s = format (s, path, page_size * 1024, 0);
+         vlib_sysfs_read ((char *) s, "%u", &pages_avail);
          vec_reset_length (s);
 
          if (page_size * pages_avail < mem)
            use_2m = 0;
 
          vec_free(s);
+         vec_free(p);
+         vec_free(path);
       }));
       _vec_len (mem_by_socket) = c + 1;
 
@@ -1231,10 +1252,9 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
     }
 
   if (dm->use_rss)
-    {
-      vlib_node_runtime_t * rt = vlib_node_get_runtime (vm, dpdk_input_node.index);
-      rt->function = dpdk_input_rss;
-    }
+    rt->function = dpdk_input_rss_multiarch_select();
+  else
+    rt->function = dpdk_input_multiarch_select();
  done:
   return error;
 }