summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2018-04-10 20:45:55 +0200
committerMarco Varlese <marco.varlese@suse.de>2018-04-11 06:55:56 +0000
commite15023889df5bcfda8c23100cac6765636c65eb5 (patch)
tree9edd276d0042b28382b9a68f5b2062fa16c27457 /src/plugins
parentd042194b4bb0512a81924068013ed4e48f021a2b (diff)
dpdk: fail in early init if we cannot alloc hugepages
Change-Id: If536ae142dc0109b587d92981d337bc6f15e070a Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/dpdk/main.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/src/plugins/dpdk/main.c b/src/plugins/dpdk/main.c
index 5437e2fafdc..2c80ff57c26 100644
--- a/src/plugins/dpdk/main.c
+++ b/src/plugins/dpdk/main.c
@@ -102,23 +102,38 @@ 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 done;
+ goto check_hugetlb;
- if ((fd = open ("/dev/vfio/vfio", O_RDWR) == -1))
+ 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 done;
+ 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_free (alloc.addr, 1 << alloc.log2_page_size);
+
+ goto done;
error:
err = clib_error_return (0, "access to physical devices is not allowed");