aboutsummaryrefslogtreecommitdiffstats
path: root/src/vlib/linux/pci.c
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2020-05-25 19:31:42 +0200
committerMatthew Smith <mgsmith@netgate.com>2020-05-26 12:36:26 +0000
commit0792bb451c68b9f039e88ab5fb4ce3f73988b781 (patch)
tree1db9d8fb62dde74f4ac5a910958595f3d2f54679 /src/vlib/linux/pci.c
parentd1d90f5951df93625594f1904cddd95880838ff0 (diff)
pci: improve vfio logging
Type: improvement Change-Id: Ic49a43651b80b79fa278e29964da5cb2ead2a818 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vlib/linux/pci.c')
-rw-r--r--src/vlib/linux/pci.c39
1 files changed, 19 insertions, 20 deletions
diff --git a/src/vlib/linux/pci.c b/src/vlib/linux/pci.c
index 722fb888117..168acde7288 100644
--- a/src/vlib/linux/pci.c
+++ b/src/vlib/linux/pci.c
@@ -966,13 +966,7 @@ add_device_vfio (vlib_main_t * vm, linux_pci_device_t * p,
goto error;
}
- pci_log_debug (vm, p, "%s region_info index:%u size:0x%lx offset:0x%lx "
- "flags: %s%s%s(0x%x)", __func__,
- reg.index, reg.size, reg.offset,
- reg.flags & VFIO_REGION_INFO_FLAG_READ ? "rd " : "",
- reg.flags & VFIO_REGION_INFO_FLAG_WRITE ? "wr " : "",
- reg.flags & VFIO_REGION_INFO_FLAG_MMAP ? "mmap " : "",
- reg.flags);
+ pci_log_debug (vm, p, "%s %U", __func__, format_vfio_region_info, &reg);
p->config_offset = reg.offset;
p->config_fd = p->fd;
@@ -1087,23 +1081,28 @@ vlib_pci_region (vlib_main_t * vm, vlib_pci_dev_handle_t h, u32 bar, int *fd,
}
else if (p->type == LINUX_PCI_DEVICE_TYPE_VFIO)
{
- struct vfio_region_info reg = { 0 };
- reg.argsz = sizeof (struct vfio_region_info);
- reg.index = bar;
- if (ioctl (p->fd, VFIO_DEVICE_GET_REGION_INFO, &reg) < 0)
+ struct vfio_region_info *r;
+ u32 sz = sizeof (struct vfio_region_info);
+ again:
+ r = clib_mem_alloc (sz);
+ clib_memset (r, 0, sz);
+ r->argsz = sz;
+ r->index = bar;
+ if (ioctl (p->fd, VFIO_DEVICE_GET_REGION_INFO, r) < 0)
return clib_error_return_unix (0, "ioctl(VFIO_DEVICE_GET_INFO) "
"'%U'", format_vlib_pci_addr,
&p->addr);
+ if (sz != r->argsz)
+ {
+ sz = r->argsz;
+ clib_mem_free (r);
+ goto again;
+ }
_fd = p->fd;
- _size = reg.size;
- _offset = reg.offset;
- pci_log_debug (vm, p, "%s region_info index:%u size:0x%lx offset:0x%lx "
- "flags: %s%s%s(0x%x)", __func__,
- reg.index, reg.size, reg.offset,
- reg.flags & VFIO_REGION_INFO_FLAG_READ ? "rd " : "",
- reg.flags & VFIO_REGION_INFO_FLAG_WRITE ? "wr " : "",
- reg.flags & VFIO_REGION_INFO_FLAG_MMAP ? "mmap " : "",
- reg.flags);
+ _size = r->size;
+ _offset = r->offset;
+ pci_log_debug (vm, p, "%s %U", __func__, format_vfio_region_info, r);
+ clib_mem_free (r);
}
else
ASSERT (0);