X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fmain.c;h=2bea10185cd4b1fcc24609af07cb347cf91730d5;hb=642829de7958d5cd9c1c88f9845385882a7c211d;hp=7ee2a785ee60211f064bab053d146cd390e75f62;hpb=1bfb0ddace3ebb9010275e4bdd847c8c493ff4b3;p=vpp.git

diff --git a/src/plugins/dpdk/main.c b/src/plugins/dpdk/main.c
index 7ee2a785ee6..2bea10185cd 100644
--- a/src/plugins/dpdk/main.c
+++ b/src/plugins/dpdk/main.c
@@ -13,6 +13,13 @@
  * limitations under the License.
  */
 
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <linux/vfio.h>
+#include <sys/ioctl.h>
+
 #include <vnet/vnet.h>
 #include <vnet/plugin/plugin.h>
 #include <dpdk/device/dpdk.h>
@@ -24,7 +31,7 @@
  * Return 1 if to skip the delay loop because we are suspending
  * the calling vlib process instead.
  */
-int
+static int
 rte_delay_us_override (unsigned us)
 {
   vlib_main_t *vm;
@@ -39,7 +46,7 @@ rte_delay_us_override (unsigned us)
    * thread then do not intercept. (Must not be called from an
    * independent pthread).
    */
-  if (os_get_cpu_number () == 0)
+  if (vlib_get_thread_index () == 0)
     {
       /*
        * We're in the vlib main thread or a vlib process. Make sure
@@ -51,7 +58,8 @@ rte_delay_us_override (unsigned us)
 	  /* Only suspend for the admin_down_process */
 	  vlib_process_t *proc = vlib_get_current_process (vm);
 	  if (!(proc->flags & VLIB_PROCESS_IS_RUNNING) ||
-	      (proc->node_runtime.function != admin_up_down_process))
+	      (proc->node_runtime.node_index !=
+	       admin_up_down_process_node.index))
 	    return 0;
 
 	  f64 delay = 1e-6 * us;
@@ -88,9 +96,60 @@ static clib_error_t * dpdk_main_init (vlib_main_t * vm)
 
 VLIB_INIT_FUNCTION (dpdk_main_init);
 
+
+clib_error_t *
+dpdk_early_init (vlib_main_t *vm)
+{
+  int fd = -1;
+  u64 *pt = 0;
+  clib_error_t *err = 0;
+  clib_mem_vm_alloc_t alloc = { 0 };
+
+  /* check if pagemap is accessible - if we get zero result
+     dpdk will not be able to get physical memory address and game is over
+     unless we have IOMMU */
+  pt = clib_mem_vm_get_paddr (&pt, min_log2 (sysconf (_SC_PAGESIZE)), 1);
+  if (pt && pt[0])
+    goto check_hugetlb;
+
+  if ((fd = open ("/dev/vfio/vfio", O_RDWR)) == -1)
+      goto error;
+
+  if (ioctl (fd, VFIO_GET_API_VERSION) != VFIO_API_VERSION)
+      goto error;
+
+  /* if we have type 1 IOMMU page map is not needed */
+  if (ioctl (fd, VFIO_CHECK_EXTENSION, VFIO_TYPE1_IOMMU) != 1)
+    goto error;
+
+check_hugetlb:
+  alloc.flags = CLIB_MEM_VM_F_SHARED | CLIB_MEM_VM_F_HUGETLB | CLIB_MEM_VM_F_HUGETLB_PREALLOC;
+  alloc.size = 1;
+
+  if ((err = clib_mem_vm_ext_alloc (&alloc)))
+    {
+      clib_error_free (err);
+      goto error;
+    }
+  else
+    clib_mem_vm_ext_free (&alloc);
+
+  goto done;
+
+error:
+  err = clib_error_return (0, "access to physical devices is not allowed");
+
+done:
+  if (fd != -1)
+    close (fd);
+  vec_free (pt);
+  return err;
+}
+
 /* *INDENT-OFF* */
 VLIB_PLUGIN_REGISTER () = {
     .version = VPP_BUILD_VER,
     .description = "Data Plane Development Kit (DPDK)",
+    .early_init = "dpdk_early_init",
 };
 /* *INDENT-ON* */