static char *sysfs_mod_vfio_noiommu =
"/sys/module/vfio/parameters/enable_unsafe_noiommu_mode";
+#define pci_log_debug(vm, dev, f, ...) \
+ vlib_log(VLIB_LOG_LEVEL_DEBUG, pci_main.log_default, "%U: " f, \
+ format_vlib_pci_addr, vlib_pci_get_addr(vm, dev->handle), ## __VA_ARGS__)
+#define pci_log_err(vm, dev, f, ...) \
+ vlib_log(VLIB_LOG_LEVEL_ERR, pci_main.log_default, "%U: " f, \
+ format_vlib_pci_addr, vlib_pci_get_addr(vm, dev->handle), ## __VA_ARGS__)
+
typedef struct
{
int fd;
linux_pci_device_type_t type;
vlib_pci_dev_handle_t handle;
vlib_pci_addr_t addr;
+ u32 numa_node;
/* Resource file descriptors. */
linux_pci_region_t *regions;
/* Device File descriptor */
int fd;
+ /* read/write file descriptor for io bar */
+ int io_fd;
+ u64 io_offset;
+
/* Minor device for uio device. */
u32 uio_minor;
/* private data */
uword private_data;
+ u8 supports_va_dma;
+
} linux_pci_device_t;
/* Pool of PCI devices. */
}
uword
-vlib_pci_get_private_data (vlib_pci_dev_handle_t h)
+vlib_pci_get_private_data (vlib_main_t * vm, vlib_pci_dev_handle_t h)
{
linux_pci_device_t *d = linux_pci_get_device (h);
return d->private_data;
}
void
-vlib_pci_set_private_data (vlib_pci_dev_handle_t h, uword private_data)
+vlib_pci_set_private_data (vlib_main_t * vm, vlib_pci_dev_handle_t h,
+ uword private_data)
{
linux_pci_device_t *d = linux_pci_get_device (h);
d->private_data = private_data;
}
vlib_pci_addr_t *
-vlib_pci_get_addr (vlib_pci_dev_handle_t h)
+vlib_pci_get_addr (vlib_main_t * vm, vlib_pci_dev_handle_t h)
{
linux_pci_device_t *d = linux_pci_get_device (h);
return &d->addr;
}
+u32
+vlib_pci_get_numa_node (vlib_main_t * vm, vlib_pci_dev_handle_t h)
+{
+ linux_pci_device_t *d = linux_pci_get_device (h);
+ return d->numa_node;
+}
+
+u32
+vlib_pci_get_num_msix_interrupts (vlib_main_t * vm, vlib_pci_dev_handle_t h)
+{
+ linux_pci_device_t *d = linux_pci_get_device (h);
+
+ if (d->type == LINUX_PCI_DEVICE_TYPE_VFIO)
+ {
+ struct vfio_irq_info ii = { 0 };
+
+ ii.argsz = sizeof (struct vfio_irq_info);
+ ii.index = VFIO_PCI_MSIX_IRQ_INDEX;
+ if (ioctl (d->fd, VFIO_DEVICE_GET_IRQ_INFO, &ii) < 0)
+ return 0;
+ return ii.count;
+ }
+ return 0;
+}
+
/* Call to allocate/initialize the pci subsystem.
This is not an init function so that users can explicitly enable
pci only when it's needed. */
linux_pci_main_t linux_pci_main;
vlib_pci_device_info_t *
-vlib_pci_get_device_info (vlib_pci_addr_t * addr, clib_error_t ** error)
+vlib_pci_get_device_info (vlib_main_t * vm, vlib_pci_addr_t * addr,
+ clib_error_t ** error)
{
- linux_vfio_main_t *lvm = &vfio_main;
clib_error_t *err;
vlib_pci_device_info_t *di;
u8 *f = 0;
u32 tmp;
int fd;
+ u8 *tmpstr;
+ clib_bitmap_t *bmp = 0;
di = clib_mem_alloc (sizeof (vlib_pci_device_info_t));
- memset (di, 0, sizeof (vlib_pci_device_info_t));
+ clib_memset (di, 0, sizeof (vlib_pci_device_info_t));
di->addr.as_u32 = addr->as_u32;
u8 *dev_dir_name = format (0, "%s/%U", sysfs_pci_dev_path,
{
static pci_config_header_t all_ones;
if (all_ones.vendor_id == 0)
- memset (&all_ones, ~0, sizeof (all_ones));
+ clib_memset (&all_ones, ~0, sizeof (all_ones));
if (!memcmp (&di->config0.header, &all_ones, sizeof (all_ones)))
{
di->numa_node = -1;
vec_reset_length (f);
f = format (f, "%v/numa_node%c", dev_dir_name, 0);
- err = clib_sysfs_read ((char *) f, "%u", &di->numa_node);
+ err = clib_sysfs_read ((char *) f, "%d", &di->numa_node);
if (err)
{
di->numa_node = -1;
clib_error_free (err);
}
+ if (di->numa_node == -1)
+ {
+ /* if '/sys/bus/pci/devices/<device id>/numa_node' returns -1 and
+ it is a SMP system, set numa_node to 0. */
+ if ((err = clib_sysfs_read ("/sys/devices/system/node/online", "%U",
+ unformat_bitmap_list, &bmp)))
+ clib_error_free (err);
+ if (clib_bitmap_count_set_bits (bmp) == 1)
+ di->numa_node = 0;
+ }
vec_reset_length (f);
f = format (f, "%v/class%c", dev_dir_name, 0);
vec_reset_length (f);
f = format (f, "%v/driver%c", dev_dir_name, 0);
di->driver_name = clib_sysfs_link_to_name ((char *) f);
+ if (!di->driver_name)
+ di->driver_name = format (0, "<NONE>%c", 0);
di->iommu_group = -1;
- if (lvm->container_fd != -1)
+ vec_reset_length (f);
+ f = format (f, "%v/iommu_group%c", dev_dir_name, 0);
+ tmpstr = clib_sysfs_link_to_name ((char *) f);
+ if (tmpstr)
{
- u8 *tmpstr;
- vec_reset_length (f);
- f = format (f, "%v/iommu_group%c", dev_dir_name, 0);
- tmpstr = clib_sysfs_link_to_name ((char *) f);
- if (tmpstr)
- {
- di->iommu_group = atoi ((char *) tmpstr);
- vec_free (tmpstr);
- }
- vec_reset_length (f);
- f = format (f, "%v/iommu_group/name%c", dev_dir_name, 0);
- err = clib_sysfs_read ((char *) f, "%s", &tmpstr);
- if (err == 0)
- {
- if (strncmp ((char *) tmpstr, "vfio-noiommu", 12) == 0)
- di->flags |= VLIB_PCI_DEVICE_INFO_F_NOIOMMU;
- vec_free (tmpstr);
- }
- else
- clib_error_free (err);
+ di->iommu_group = atoi ((char *) tmpstr);
+ vec_free (tmpstr);
+ }
+
+ vec_reset_length (f);
+ f = format (f, "%v/iommu_group/name%c", dev_dir_name, 0);
+ err = clib_sysfs_read ((char *) f, "%s", &tmpstr);
+ if (err == 0)
+ {
+ if (strncmp ((char *) tmpstr, "vfio-noiommu", 12) == 0)
+ di->flags |= VLIB_PCI_DEVICE_INFO_F_NOIOMMU;
+ vec_free (tmpstr);
}
+ else
+ clib_error_free (err);
close (fd);
di = 0;
done:
+ vec_free (bmp);
vec_free (f);
vec_free (dev_dir_name);
if (error)
}
clib_error_t *
-vlib_pci_bind_to_uio (vlib_pci_addr_t * addr, char *uio_drv_name)
+vlib_pci_bind_to_uio (vlib_main_t * vm, vlib_pci_addr_t * addr,
+ char *uio_drv_name)
{
clib_error_t *error = 0;
u8 *s = 0, *driver_name = 0;
u8 *dev_dir_name = format (0, "%s/%U", sysfs_pci_dev_path,
format_vlib_pci_addr, addr);
- di = vlib_pci_get_device_info (addr, &error);
+ di = vlib_pci_get_device_info (vm, addr, &error);
if (error)
return error;
if (e->d_name[0] == '.') /* skip . and .. */
continue;
- memset (&ifr, 0, sizeof ifr);
- memset (&drvinfo, 0, sizeof drvinfo);
+ clib_memset (&ifr, 0, sizeof ifr);
+ clib_memset (&drvinfo, 0, sizeof drvinfo);
ifr.ifr_data = (char *) &drvinfo;
- strncpy (ifr.ifr_name, e->d_name, sizeof (ifr.ifr_name));
- ifr.ifr_name[ARRAY_LEN (ifr.ifr_name) - 1] = '\0';
+ clib_strncpy (ifr.ifr_name, e->d_name, sizeof (ifr.ifr_name) - 1);
+
drvinfo.cmd = ETHTOOL_GDRVINFO;
if (ioctl (fd, SIOCETHTOOL, &ifr) < 0)
{
if (strcmp ((char *) s, drvinfo.bus_info))
continue;
- memset (&ifr, 0, sizeof (ifr));
- strncpy (ifr.ifr_name, e->d_name, sizeof (ifr.ifr_name));
- ifr.ifr_name[ARRAY_LEN (ifr.ifr_name) - 1] = '\0';
+ clib_memset (&ifr, 0, sizeof (ifr));
+ clib_strncpy (ifr.ifr_name, e->d_name, sizeof (ifr.ifr_name) - 1);
+
if (ioctl (fd, SIOCGIFFLAGS, &ifr) < 0)
{
error = clib_error_return_unix (0, "ioctl fetch intf %s flags",
}
static clib_error_t *
-vfio_set_irqs (linux_pci_device_t * p, u32 index, u32 start, u32 count,
- u32 flags, int *efds)
+vfio_set_irqs (vlib_main_t * vm, linux_pci_device_t * p, u32 index, u32 start,
+ u32 count, u32 flags, int *efds)
{
int data_len = efds ? count * sizeof (int) : 0;
u8 buf[sizeof (struct vfio_irq_set) + data_len];
- struct vfio_irq_info irq_info = { 0 };
+ struct vfio_irq_info ii = { 0 };
struct vfio_irq_set *irq_set = (struct vfio_irq_set *) buf;
- irq_info.argsz = sizeof (struct vfio_irq_info);
- irq_info.index = index;
+ ii.argsz = sizeof (struct vfio_irq_info);
+ ii.index = index;
- if (ioctl (p->fd, VFIO_DEVICE_GET_IRQ_INFO, &irq_info) < 0)
+ if (ioctl (p->fd, VFIO_DEVICE_GET_IRQ_INFO, &ii) < 0)
return clib_error_return_unix (0, "ioctl(VFIO_DEVICE_GET_IRQ_INFO) "
"'%U'", format_vlib_pci_addr, &p->addr);
- if (irq_info.count < start + count)
+ pci_log_debug (vm, p, "%s index:%u count:%u flags: %s%s%s%s(0x%x)",
+ __func__, ii.index, ii.count,
+ ii.flags & VFIO_IRQ_INFO_EVENTFD ? "eventfd " : "",
+ ii.flags & VFIO_IRQ_INFO_MASKABLE ? "maskable " : "",
+ ii.flags & VFIO_IRQ_INFO_AUTOMASKED ? "automasked " : "",
+ ii.flags & VFIO_IRQ_INFO_NORESIZE ? "noresize " : "",
+ ii.flags);
+
+ if (ii.count < start + count)
return clib_error_return_unix (0, "vfio_set_irq: unexistng interrupt on "
"'%U'", format_vlib_pci_addr, &p->addr);
if (efds)
{
flags |= VFIO_IRQ_SET_DATA_EVENTFD;
- clib_memcpy (&irq_set->data, efds, data_len);
+ clib_memcpy_fast (&irq_set->data, efds, data_len);
}
else
flags |= VFIO_IRQ_SET_DATA_NONE;
static clib_error_t *
linux_pci_uio_read_ready (clib_file_t * uf)
{
+ vlib_main_t *vm = vlib_get_main ();
int __attribute__ ((unused)) rv;
vlib_pci_dev_handle_t h = uf->private_data;
linux_pci_device_t *p = linux_pci_get_device (h);
rv = read (uf->file_descriptor, &icount, 4);
if (irq->intx_handler)
- irq->intx_handler (h);
+ irq->intx_handler (vm, h);
- vlib_pci_intr_enable (h);
+ vlib_pci_intr_enable (vm, h);
return /* no error */ 0;
}
static clib_error_t *
-linux_pci_vfio_unmask_intx (linux_pci_device_t * d)
+linux_pci_vfio_unmask_intx (vlib_main_t * vm, linux_pci_device_t * d)
{
- return vfio_set_irqs (d, VFIO_PCI_INTX_IRQ_INDEX, 0, 1,
+ return vfio_set_irqs (vm, d, VFIO_PCI_INTX_IRQ_INDEX, 0, 1,
VFIO_IRQ_SET_ACTION_UNMASK, 0);
}
static clib_error_t *
linux_pci_vfio_msix_read_ready (clib_file_t * uf)
{
+ vlib_main_t *vm = vlib_get_main ();
int __attribute__ ((unused)) rv;
vlib_pci_dev_handle_t h = uf->private_data >> 16;
u16 line = uf->private_data & 0xffff;
rv = read (uf->file_descriptor, &icount, sizeof (icount));
if (irq->msix_handler)
- irq->msix_handler (h, line);
+ irq->msix_handler (vm, h, line);
return /* no error */ 0;
}
static clib_error_t *
linux_pci_vfio_intx_read_ready (clib_file_t * uf)
{
+ vlib_main_t *vm = vlib_get_main ();
int __attribute__ ((unused)) rv;
vlib_pci_dev_handle_t h = uf->private_data;
linux_pci_device_t *p = linux_pci_get_device (h);
rv = read (uf->file_descriptor, &icount, sizeof (icount));
if (irq->intx_handler)
- irq->intx_handler (h);
+ irq->intx_handler (vm, h);
- linux_pci_vfio_unmask_intx (p);
+ linux_pci_vfio_unmask_intx (vm, p);
return /* no error */ 0;
}
}
static clib_error_t *
-add_device_uio (linux_pci_device_t * p, vlib_pci_device_info_t * di,
- pci_device_registration_t * r)
+add_device_uio (vlib_main_t * vm, linux_pci_device_t * p,
+ vlib_pci_device_info_t * di, pci_device_registration_t * r)
{
linux_pci_main_t *lpm = &linux_pci_main;
clib_error_t *err = 0;
u8 *s = 0;
- p->addr.as_u32 = di->addr.as_u32;
p->fd = -1;
p->type = LINUX_PCI_DEVICE_TYPE_UIO;
goto error;
}
- s = format (0, "%s/%U/uio", sysfs_pci_dev_path,
- format_vlib_pci_addr, &di->addr);
+ s = format (0, "%s/%U/uio%c", sysfs_pci_dev_path,
+ format_vlib_pci_addr, &di->addr, 0);
foreach_directory_file ((char *) s, scan_uio_dir, p, /* scan_dirs */
1);
vec_reset_length (s);
}
if (r && r->interrupt_handler)
- vlib_pci_register_intx_handler (p->handle, r->interrupt_handler);
+ vlib_pci_register_intx_handler (vm, p->handle, r->interrupt_handler);
if (r && r->init_function)
err = r->init_function (lpm->vlib_main, p->handle);
}
clib_error_t *
-vlib_pci_register_intx_handler (vlib_pci_dev_handle_t h,
+vlib_pci_register_intx_handler (vlib_main_t * vm, vlib_pci_dev_handle_t h,
pci_intx_handler_function_t * intx_handler)
{
linux_pci_device_t *p = linux_pci_get_device (h);
if (p->type == LINUX_PCI_DEVICE_TYPE_VFIO)
{
- struct vfio_irq_info irq_info = { 0 };
- irq_info.argsz = sizeof (struct vfio_irq_info);
- irq_info.index = VFIO_PCI_INTX_IRQ_INDEX;
- if (ioctl (p->fd, VFIO_DEVICE_GET_IRQ_INFO, &irq_info) < 0)
+ struct vfio_irq_info ii = { 0 };
+ ii.argsz = sizeof (struct vfio_irq_info);
+ ii.index = VFIO_PCI_INTX_IRQ_INDEX;
+ if (ioctl (p->fd, VFIO_DEVICE_GET_IRQ_INFO, &ii) < 0)
return clib_error_return_unix (0, "ioctl(VFIO_DEVICE_GET_IRQ_INFO) '"
"%U'", format_vlib_pci_addr, &p->addr);
- if (irq_info.count != 1)
+ pci_log_debug (vm, p, "%s index:%u count:%u flags: %s%s%s%s(0x%x)",
+ __func__, ii.index, ii.count,
+ ii.flags & VFIO_IRQ_INFO_EVENTFD ? "eventfd " : "",
+ ii.flags & VFIO_IRQ_INFO_MASKABLE ? "maskable " : "",
+ ii.flags & VFIO_IRQ_INFO_AUTOMASKED ? "automasked " : "",
+ ii.flags & VFIO_IRQ_INFO_NORESIZE ? "noresize " : "",
+ ii.flags);
+ if (ii.count != 1)
return clib_error_return (0, "INTx interrupt does not exist on device"
"'%U'", format_vlib_pci_addr, &p->addr);
irq->fd = eventfd (0, EFD_NONBLOCK);
if (irq->fd == -1)
return clib_error_return_unix (0, "eventfd");
+
t.file_descriptor = irq->fd;
t.read_function = linux_pci_vfio_intx_read_ready;
}
}
clib_error_t *
-vlib_pci_register_msix_handler (vlib_pci_dev_handle_t h, u32 start, u32 count,
+vlib_pci_register_msix_handler (vlib_main_t * vm, vlib_pci_dev_handle_t h,
+ u32 start, u32 count,
pci_msix_handler_function_t * msix_handler)
{
clib_error_t *err = 0;
}
clib_error_t *
-vlib_pci_enable_msix_irq (vlib_pci_dev_handle_t h, u16 start, u16 count)
+vlib_pci_enable_msix_irq (vlib_main_t * vm, vlib_pci_dev_handle_t h,
+ u16 start, u16 count)
{
linux_pci_device_t *p = linux_pci_get_device (h);
int fds[count];
fds[i] = irq->fd;
}
- return vfio_set_irqs (p, VFIO_PCI_MSIX_IRQ_INDEX, start, count,
+ return vfio_set_irqs (vm, p, VFIO_PCI_MSIX_IRQ_INDEX, start, count,
VFIO_IRQ_SET_ACTION_TRIGGER, fds);
}
clib_error_t *
-vlib_pci_disable_msix_irq (vlib_pci_dev_handle_t h, u16 start, u16 count)
+vlib_pci_disable_msix_irq (vlib_main_t * vm, vlib_pci_dev_handle_t h,
+ u16 start, u16 count)
{
linux_pci_device_t *p = linux_pci_get_device (h);
int i, fds[count];
for (i = start; i < start + count; i++)
fds[i] = -1;
- return vfio_set_irqs (p, VFIO_PCI_MSIX_IRQ_INDEX, start, count,
+ return vfio_set_irqs (vm, p, VFIO_PCI_MSIX_IRQ_INDEX, start, count,
VFIO_IRQ_SET_ACTION_TRIGGER, fds);
}
static clib_error_t *
-add_device_vfio (linux_pci_device_t * p, vlib_pci_device_info_t * di,
- pci_device_registration_t * r)
+add_device_vfio (vlib_main_t * vm, linux_pci_device_t * p,
+ vlib_pci_device_info_t * di, pci_device_registration_t * r)
{
linux_pci_main_t *lpm = &linux_pci_main;
struct vfio_device_info device_info = { 0 };
struct vfio_region_info reg = { 0 };
clib_error_t *err = 0;
u8 *s = 0;
+ int is_noiommu;
- p->addr.as_u32 = di->addr.as_u32;
p->type = LINUX_PCI_DEVICE_TYPE_VFIO;
- if (di->driver_name == 0 ||
- (strcmp ("vfio-pci", (char *) di->driver_name) != 0))
- return clib_error_return (0, "Device '%U' (iommu group %d) not bound to "
- "vfio-pci", format_vlib_pci_addr, &di->addr,
- di->iommu_group);
-
- if ((err = linux_vfio_group_get_device_fd (&p->addr, &p->fd)))
+ if ((err = linux_vfio_group_get_device_fd (&p->addr, &p->fd, &is_noiommu)))
return err;
+ if (is_noiommu == 0)
+ p->supports_va_dma = 1;
+
device_info.argsz = sizeof (device_info);
if (ioctl (p->fd, VFIO_DEVICE_GET_INFO, &device_info) < 0)
{
format_vlib_pci_addr, &di->addr);
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);
+
p->config_offset = reg.offset;
p->config_fd = p->fd;
if (r && r->interrupt_handler)
{
- vlib_pci_register_intx_handler (p->handle, r->interrupt_handler);
- linux_pci_vfio_unmask_intx (p);
+ vlib_pci_register_intx_handler (vm, p->handle, r->interrupt_handler);
+ linux_pci_vfio_unmask_intx (vm, p);
+ }
+
+ if (p->supports_va_dma)
+ {
+ vlib_buffer_pool_t *bp;
+ /* *INDENT-OFF* */
+ vec_foreach (bp, vm->buffer_main->buffer_pools)
+ {
+ u32 i;
+ vlib_physmem_map_t *pm;
+ pm = vlib_physmem_get_map (vm, bp->physmem_map_index);
+ for (i = 0; i < pm->n_pages; i++)
+ vfio_map_physmem_page (vm, pm->base + (i << pm->log2_page_size));
+ }
+ /* *INDENT-ON* */
}
if (r && r->init_function)
/* Configuration space read/write. */
clib_error_t *
-vlib_pci_read_write_config (vlib_pci_dev_handle_t h,
+vlib_pci_read_write_config (vlib_main_t * vm, vlib_pci_dev_handle_t h,
vlib_read_or_write_t read_or_write,
uword address, void *data, u32 n_bytes)
{
}
static clib_error_t *
-vlib_pci_map_region_int (vlib_pci_dev_handle_t h,
- u32 bar, u8 * addr, void **result)
+vlib_pci_region (vlib_main_t * vm, vlib_pci_dev_handle_t h, u32 bar, int *fd,
+ u64 * size, u64 * offset)
{
linux_pci_device_t *p = linux_pci_get_device (h);
- int fd = -1;
- clib_error_t *error;
- int flags = MAP_SHARED;
- u64 size = 0, offset = 0;
+ clib_error_t *error = 0;
+ int _fd = -1;
+ u64 _size = 0, _offset = 0;
ASSERT (bar <= 5);
file_name = format (0, "%s/%U/resource%d%c", sysfs_pci_dev_path,
format_vlib_pci_addr, &p->addr, bar, 0);
- fd = open ((char *) file_name, O_RDWR);
- if (fd < 0)
+ _fd = open ((char *) file_name, O_RDWR);
+ if (_fd < 0)
{
error = clib_error_return_unix (0, "open `%s'", file_name);
vec_free (file_name);
return error;
}
- if (fstat (fd, &stat_buf) < 0)
+ if (fstat (_fd, &stat_buf) < 0)
{
error = clib_error_return_unix (0, "fstat `%s'", file_name);
vec_free (file_name);
- close (fd);
+ close (_fd);
return error;
}
vec_free (file_name);
- if (addr != 0)
- flags |= MAP_FIXED;
- size = stat_buf.st_size;
- offset = 0;
+ _size = stat_buf.st_size;
+ _offset = 0;
}
else if (p->type == LINUX_PCI_DEVICE_TYPE_VFIO)
{
return clib_error_return_unix (0, "ioctl(VFIO_DEVICE_GET_INFO) "
"'%U'", format_vlib_pci_addr,
&p->addr);
- fd = p->fd;
- size = reg.size;
- offset = reg.offset;
+ _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);
}
else
ASSERT (0);
+ *fd = _fd;
+ *size = _size;
+ *offset = _offset;
+
+ return error;
+}
+
+static clib_error_t *
+vlib_pci_map_region_int (vlib_main_t * vm, vlib_pci_dev_handle_t h,
+ u32 bar, u8 * addr, void **result)
+{
+ linux_pci_device_t *p = linux_pci_get_device (h);
+ int fd = -1;
+ clib_error_t *error;
+ int flags = MAP_SHARED;
+ u64 size = 0, offset = 0;
+
+ pci_log_debug (vm, p, "map region %u to va %p", bar, addr);
+
+ if ((error = vlib_pci_region (vm, h, bar, &fd, &size, &offset)))
+ return error;
+
+ if (p->type == LINUX_PCI_DEVICE_TYPE_UIO && addr != 0)
+ flags |= MAP_FIXED;
+
*result = mmap (addr, size, PROT_READ | PROT_WRITE, flags, fd, offset);
if (*result == (void *) -1)
{
}
clib_error_t *
-vlib_pci_map_region (vlib_pci_dev_handle_t h, u32 resource, void **result)
+vlib_pci_map_region (vlib_main_t * vm, vlib_pci_dev_handle_t h, u32 resource,
+ void **result)
+{
+ return (vlib_pci_map_region_int (vm, h, resource, 0 /* addr */ , result));
+}
+
+clib_error_t *
+vlib_pci_map_region_fixed (vlib_main_t * vm, vlib_pci_dev_handle_t h,
+ u32 resource, u8 * addr, void **result)
{
- return (vlib_pci_map_region_int (h, resource, 0 /* addr */ , result));
+ return (vlib_pci_map_region_int (vm, h, resource, addr, result));
}
clib_error_t *
-vlib_pci_map_region_fixed (vlib_pci_dev_handle_t h, u32 resource, u8 * addr,
- void **result)
+vlib_pci_io_region (vlib_main_t * vm, vlib_pci_dev_handle_t h, u32 resource)
{
- return (vlib_pci_map_region_int (h, resource, addr, result));
+ linux_pci_device_t *p = linux_pci_get_device (h);
+ clib_error_t *error = 0;
+ int fd = -1;
+ u64 size = 0, offset = 0;
+
+ if ((error = vlib_pci_region (vm, h, resource, &fd, &size, &offset)))
+ return error;
+
+ p->io_fd = fd;
+ p->io_offset = offset;
+ return error;
}
clib_error_t *
-vlib_pci_device_open (vlib_pci_addr_t * addr,
+vlib_pci_read_write_io (vlib_main_t * vm, vlib_pci_dev_handle_t h,
+ vlib_read_or_write_t read_or_write,
+ uword offset, void *data, u32 length)
+{
+ linux_pci_device_t *p = linux_pci_get_device (h);
+ int n = 0;
+
+ if (read_or_write == VLIB_READ)
+ n = pread (p->io_fd, data, length, p->io_offset + offset);
+ else
+ n = pwrite (p->io_fd, data, length, p->io_offset + offset);
+
+ if (n != length)
+ return clib_error_return_unix (0, "%s",
+ read_or_write == VLIB_READ
+ ? "read" : "write");
+ return 0;
+}
+
+clib_error_t *
+vlib_pci_map_dma (vlib_main_t * vm, vlib_pci_dev_handle_t h, void *ptr)
+{
+ linux_pci_device_t *p = linux_pci_get_device (h);
+
+ if (!p->supports_va_dma)
+ return 0;
+
+ return vfio_map_physmem_page (vm, ptr);
+}
+
+int
+vlib_pci_supports_virtual_addr_dma (vlib_main_t * vm, vlib_pci_dev_handle_t h)
+{
+ linux_pci_device_t *p = linux_pci_get_device (h);
+
+ return p->supports_va_dma != 0;
+}
+
+clib_error_t *
+vlib_pci_device_open (vlib_main_t * vm, vlib_pci_addr_t * addr,
pci_device_id_t ids[], vlib_pci_dev_handle_t * handle)
{
linux_pci_main_t *lpm = &linux_pci_main;
clib_error_t *err = 0;
pci_device_id_t *i;
- di = vlib_pci_get_device_info (addr, &err);
+ di = vlib_pci_get_device_info (vm, addr, &err);
if (err)
return err;
pool_get (lpm->linux_pci_devices, p);
p->handle = p - lpm->linux_pci_devices;
+ p->addr.as_u32 = di->addr.as_u32;
p->intx_irq.fd = -1;
-
- if (di->iommu_group != -1)
- err = add_device_vfio (p, di, 0);
+ p->intx_irq.clib_file_index = -1;
+ p->numa_node = di->numa_node;
+ /*
+ * pci io bar read/write fd
+ */
+ p->io_fd = -1;
+
+ pci_log_debug (vm, p, "open vid:0x%04x did:0x%04x driver:%s iommu_group:%d",
+ di->vendor_id, di->device_id, di->driver_name,
+ di->iommu_group);
+
+ if (clib_strncmp ("vfio-pci", (char *) di->driver_name, 8) == 0)
+ err = add_device_vfio (vm, p, di, 0);
+ else if (clib_strncmp ("uio_pci_generic", (char *) di->driver_name, 8) == 0)
+ err = add_device_uio (vm, p, di, 0);
else
- err = add_device_uio (p, di, 0);
+ err = clib_error_create ("device not bound to 'vfio-pci' or "
+ "'uio_pci_generic' kernel module");
if (err)
goto error;
vlib_pci_free_device_info (di);
if (err)
{
- memset (p, 0, sizeof (linux_pci_device_t));
+ pci_log_err (vm, p, "%U", format_clib_error, err);
+ clib_memset (p, 0, sizeof (linux_pci_device_t));
pool_put (lpm->linux_pci_devices, p);
}
}
void
-vlib_pci_device_close (vlib_pci_dev_handle_t h)
+vlib_pci_device_close (vlib_main_t * vm, vlib_pci_dev_handle_t h)
{
linux_pci_main_t *lpm = &linux_pci_main;
linux_pci_device_t *p = linux_pci_get_device (h);
if (p->type == LINUX_PCI_DEVICE_TYPE_UIO)
{
irq = &p->intx_irq;
- clib_file_del_by_index (&file_main, irq->clib_file_index);
+ if (irq->clib_file_index != -1)
+ clib_file_del_by_index (&file_main, irq->clib_file_index);
close (p->config_fd);
+ if (p->io_fd != -1)
+ close (p->io_fd);
}
else if (p->type == LINUX_PCI_DEVICE_TYPE_VFIO)
{
/* close INTx irqs */
if (irq->fd != -1)
{
- err = vfio_set_irqs (p, VFIO_PCI_INTX_IRQ_INDEX, 0, 0,
+ err = vfio_set_irqs (vm, p, VFIO_PCI_INTX_IRQ_INDEX, 0, 0,
VFIO_IRQ_SET_ACTION_TRIGGER, 0);
clib_error_free (err);
- clib_file_del_by_index (&file_main, irq->clib_file_index);
+ if (irq->clib_file_index != -1)
+ clib_file_del_by_index (&file_main, irq->clib_file_index);
close (irq->fd);
}
/* close MSI-X irqs */
if (vec_len (p->msix_irqs))
{
- err = vfio_set_irqs (p, VFIO_PCI_MSIX_IRQ_INDEX, 0, 0,
+ err = vfio_set_irqs (vm, p, VFIO_PCI_MSIX_IRQ_INDEX, 0, 0,
VFIO_IRQ_SET_ACTION_TRIGGER, 0);
clib_error_free (err);
/* *INDENT-OFF* */
vec_free (p->regions);
close (p->fd);
- memset (p, 0, sizeof (linux_pci_device_t));
+ clib_memset (p, 0, sizeof (linux_pci_device_t));
pool_put (lpm->linux_pci_devices, p);
}
void
-init_device_from_registered (vlib_pci_device_info_t * di)
+init_device_from_registered (vlib_main_t * vm, vlib_pci_device_info_t * di)
{
vlib_pci_main_t *pm = &pci_main;
linux_pci_main_t *lpm = &linux_pci_main;
if (i->vendor_id == di->vendor_id && i->device_id == di->device_id)
{
if (di->iommu_group != -1)
- err = add_device_vfio (p, di, r);
+ err = add_device_vfio (vm, p, di, r);
else
- err = add_device_uio (p, di, r);
+ err = add_device_uio (vm, p, di, r);
if (err)
clib_error_report (err);
}
/* No driver, close the PCI config-space FD */
- memset (p, 0, sizeof (linux_pci_device_t));
+ clib_memset (p, 0, sizeof (linux_pci_device_t));
pool_put (lpm->linux_pci_devices, p);
}
{
vlib_pci_main_t *pm = &pci_main;
vlib_pci_addr_t *addr = 0, *addrs;
- clib_error_t *error;
pm->vlib_main = vm;
- if ((error = vlib_call_init_function (vm, unix_input_init)))
- return error;
-
ASSERT (sizeof (vlib_pci_addr_t) == sizeof (u32));
addrs = vlib_pci_get_all_dev_addrs ();
vec_foreach (addr, addrs)
{
vlib_pci_device_info_t *d;
- if ((d = vlib_pci_get_device_info (addr, 0)))
+ if ((d = vlib_pci_get_device_info (vm, addr, 0)))
{
- init_device_from_registered (d);
+ init_device_from_registered (vm, d);
vlib_pci_free_device_info (d);
}
}
/* *INDENT-ON* */
- return error;
+ return 0;
}
-VLIB_INIT_FUNCTION (linux_pci_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (linux_pci_init) =
+{
+ .runs_after = VLIB_INITS("unix_input_init"),
+};
+/* *INDENT-ON* */
/*
* fd.io coding-style-patch-verification: ON
Code Review / vpp.git / blobdiff