diff options
| author |   Damjan Marion <damarion@cisco.com> | 2018-03-09 16:05:56 +0100 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2018-03-09 19:20:32 +0000 |
| commit | 51c52c0adc9bf79ca6508ee1327d3b972e80b5c6 (patch) | |
| tree | 70936cd041b0faf511592c46c5c69948e7a95f91 /src/vlib/linux/vfio.c | |
| parent | fef3f7bd0ae43586540533e7ee1a7cc910ccb16d (diff) | |
dpdk: move DPDK vfio hack to dpdk plugin
Change-Id: I806cbf8c6c49643fe6c317bcceab93c1b9d441ab
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vlib/linux/vfio.c')
| -rw-r--r-- | src/vlib/linux/vfio.c | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/src/vlib/linux/vfio.c b/src/vlib/linux/vfio.c index e39bf01fdc0..621dfb2ce01 100644 --- a/src/vlib/linux/vfio.c +++ b/src/vlib/linux/vfio.c @@ -73,7 +73,7 @@ map_regions (vlib_main_t * vm, int fd) int rv; dm.vaddr = pointer_to_uword (pr->mem) + (i << pr->log2_page_size); dm.size = 1 << pr->log2_page_size; - dm.iova = pr->page_table[i]; + dm.iova = dm.vaddr; if ((rv = ioctl (fd, VFIO_IOMMU_MAP_DMA, &dm))) return rv; } @@ -82,30 +82,6 @@ map_regions (vlib_main_t * vm, int fd) return 0; } -static clib_error_t * -scan_vfio_fd (void *arg, u8 * path_name, u8 * file_name) -{ - linux_vfio_main_t *lvm = &vfio_main; - const char fn[] = "/dev/vfio/vfio"; - char buff[sizeof (fn)] = { 0 }; - int fd; - u8 *path = format (0, "%v%c", path_name, 0); - - if (readlink ((char *) path, buff, sizeof (fn)) + 1 != sizeof (fn)) - goto done; - - if (strncmp (fn, buff, sizeof (fn))) - goto done; - - fd = atoi ((char *) file_name); - if (fd != lvm->container_fd) - lvm->ext_container_fd = atoi ((char *) file_name); - -done: - vec_free (path); - return 0; -} - void linux_vfio_dma_map_regions (vlib_main_t * vm) { @@ -113,12 +89,6 @@ linux_vfio_dma_map_regions (vlib_main_t * vm) if (lvm->container_fd != -1) map_regions (vm, lvm->container_fd); - - if (lvm->ext_container_fd == -1) - foreach_directory_file ("/proc/self/fd", scan_vfio_fd, 0, 0); - - if (lvm->ext_container_fd != -1) - map_regions (vm, lvm->ext_container_fd); } static linux_pci_vfio_iommu_group_t * @@ -252,8 +222,6 @@ linux_vfio_init (vlib_main_t * vm) linux_vfio_main_t *lvm = &vfio_main; int fd; - lvm->ext_container_fd = -1; - fd = open ("/dev/vfio/vfio", O_RDWR); /* check if iommu is available */ |