diff options
| author |   Damjan Marion <damarion@cisco.com> | 2018-09-27 14:54:49 +0200 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2018-09-27 18:35:35 +0000 |
| commit | 7d426535b4e98731193cc0265b83f2336dcdf5b3 (patch) | |
| tree | 4b279f368e43f01778756414b6ab75b0f182f0b9 | |
| parent | c263e48bdb5b1c05ad6fdba536a2cbbaf80405e7 (diff) | |
Add logging to vfio code
Change-Id: Iacdff0a5006a0617e3c9559ce7b258f26e256abb
Signed-off-by: Damjan Marion <damarion@cisco.com>
| -rw-r--r-- | src/vlib/linux/vfio.c | 24 | ||||
| -rw-r--r-- | src/vlib/linux/vfio.h | 2 |
2 files changed, 23 insertions, 3 deletions
diff --git a/src/vlib/linux/vfio.c b/src/vlib/linux/vfio.c index 956b4ab2e48..53eed8bfbe9 100644 --- a/src/vlib/linux/vfio.c +++ b/src/vlib/linux/vfio.c @@ -38,6 +38,7 @@ static int map_regions (vlib_main_t * vm, int fd) { vlib_physmem_main_t *vpm = &physmem_main; + linux_vfio_main_t *lvm = &vfio_main; vlib_physmem_region_t *pr; struct vfio_iommu_type1_dma_map dm = { 0 }; int i; @@ -54,8 +55,17 @@ map_regions (vlib_main_t * vm, int fd) dm.vaddr = pointer_to_uword (pr->mem) + (i << pr->log2_page_size); dm.size = 1 << pr->log2_page_size; dm.iova = dm.vaddr; + vlib_log_debug (lvm->log_default, "map DMA va:0x%lx iova:%lx " + "size:0x%lx", dm.vaddr, dm.iova, dm.size); + if ((rv = ioctl (fd, VFIO_IOMMU_MAP_DMA, &dm))) - return rv; + { + vlib_log_err (lvm->log_default, "map DMA va:0x%lx iova:%lx " + "size:0x%lx failed, error %s (errno %d)", + dm.vaddr, dm.iova, dm.size, strerror (errno), + errno); + return rv; + } } }); /* *INDENT-ON* */ @@ -220,6 +230,8 @@ linux_vfio_init (vlib_main_t * vm) linux_vfio_main_t *lvm = &vfio_main; int fd; + lvm->log_default = vlib_log_register_class ("vfio", 0); + fd = open ("/dev/vfio/vfio", O_RDWR); /* check if iommu is available */ @@ -233,9 +245,15 @@ linux_vfio_init (vlib_main_t * vm) else { if (ioctl (fd, VFIO_CHECK_EXTENSION, VFIO_TYPE1_IOMMU) == 1) - lvm->flags |= LINUX_VFIO_F_HAVE_IOMMU; + { + lvm->flags |= LINUX_VFIO_F_HAVE_IOMMU; + vlib_log_info (lvm->log_default, "type 1 IOMMU mode supported"); + } if (ioctl (fd, VFIO_CHECK_EXTENSION, VFIO_NOIOMMU_IOMMU) == 1) - lvm->flags |= LINUX_VFIO_F_HAVE_NOIOMMU; + { + lvm->flags |= LINUX_VFIO_F_HAVE_NOIOMMU; + vlib_log_info (lvm->log_default, "NOIOMMU mode supported"); + } } } diff --git a/src/vlib/linux/vfio.h b/src/vlib/linux/vfio.h index 82490d805a8..7fe3ef8dc0e 100644 --- a/src/vlib/linux/vfio.h +++ b/src/vlib/linux/vfio.h @@ -39,6 +39,8 @@ typedef struct /* iommu group pool index by group id hash */ uword *iommu_pool_index_by_group; + /* logging */ + vlib_log_class_t log_default; } linux_vfio_main_t; extern linux_vfio_main_t vfio_main; |