@@ -1616,8 +1616,13 @@ hexadecimal format, without the "0x" prefix and all in lower case, like
=item B<transport=STRING>
-Specifies the transport mechanism for the Virtio device, only "mmio" is
-supported for now.
+Specifies the transport mechanism for the Virtio device, both "mmio" and "pci"
+are supported. This option is mandatory.
+
+=item B<bdf=STRING>
+
+The Virtio device with transport "pci" must be identified by its B<BDF>.
+See L<xl-pci-configuration(5)> for more details about the format for B<BDF>.
=item B<grant_usage=BOOLEAN>
@@ -20,6 +20,11 @@
*/
#define VIRTIO_MMIO_DEV_SIZE xen_mk_ullong(0x200)
+#define VIRTIO_PCI_HOST_MEM_SIZE xen_mk_ullong(0x800000)
+#define VIRTIO_PCI_HOST_PREFETCH_MEM_SIZE xen_mk_ullong(0x800000)
+#define VIRTIO_PCI_HOST_NUM_SPIS 4
+#define VIRTIO_PCI_MAX_HOSTS 8
+
static uint64_t alloc_virtio_mmio_base(libxl__gc *gc, uint64_t *virtio_mmio_base)
{
uint64_t base = *virtio_mmio_base;
@@ -80,14 +85,101 @@ static const char *gicv_to_string(libxl_gic_version gic_version)
}
}
+static int alloc_virtio_pci_host(libxl__gc *gc,
+ uint32_t backend_domid,
+ uint32_t *host_id,
+ unsigned int *num_hosts,
+ libxl_virtio_pci_host *hosts)
+{
+ unsigned int i;
+
+ BUILD_BUG_ON(VIRTIO_PCI_MAX_HOSTS !=
+ GUEST_VIRTIO_PCI_TOTAL_ECAM_SIZE / GUEST_VIRTIO_PCI_HOST_ECAM_SIZE);
+ BUILD_BUG_ON(VIRTIO_PCI_MAX_HOSTS !=
+ GUEST_VIRTIO_PCI_MEM_SIZE / VIRTIO_PCI_HOST_MEM_SIZE);
+ BUILD_BUG_ON(VIRTIO_PCI_MAX_HOSTS !=
+ GUEST_VIRTIO_PCI_PREFETCH_MEM_SIZE / VIRTIO_PCI_HOST_PREFETCH_MEM_SIZE);
+ BUILD_BUG_ON(VIRTIO_PCI_MAX_HOSTS !=
+ (GUEST_VIRTIO_PCI_SPI_LAST - GUEST_VIRTIO_PCI_SPI_FIRST) / VIRTIO_PCI_HOST_NUM_SPIS);
+
+ if (*num_hosts > VIRTIO_PCI_MAX_HOSTS)
+ return ERROR_INVAL;
+
+ for (i = 0; i < *num_hosts; i++) {
+ if (hosts[i].backend_domid == backend_domid) {
+ *host_id = hosts[i].id;
+
+ LOG(DEBUG, "Reuse host #%u: "
+ "ECAM: 0x%"PRIx64"-0x%"PRIx64" "
+ "MEM: 0x%"PRIx64"-0x%"PRIx64" "
+ "PREFETCH_MEM: 0x%"PRIx64"-0x%"PRIx64" "
+ "IRQ: %u-%u",
+ hosts[i].id,
+ hosts[i].ecam_base,
+ hosts[i].ecam_base + hosts[i].ecam_size - 1,
+ hosts[i].mem_base,
+ hosts[i].mem_base + hosts[i].mem_size - 1,
+ hosts[i].prefetch_mem_base,
+ hosts[i].prefetch_mem_base + hosts[i].prefetch_mem_size - 1,
+ hosts[i].irq_first,
+ hosts[i].irq_first + hosts[i].num_irqs - 1);
+
+ return 0;
+ }
+ }
+
+ if (i == VIRTIO_PCI_MAX_HOSTS) {
+ LOG(ERROR, "Ran out of reserved resources for virtio-pci host\n");
+ return ERROR_FAIL;
+ }
+
+ hosts[i].backend_domid = backend_domid;
+ hosts[i].id = i;
+ hosts[i].ecam_base = GUEST_VIRTIO_PCI_ECAM_BASE +
+ i * GUEST_VIRTIO_PCI_HOST_ECAM_SIZE;
+ hosts[i].ecam_size = GUEST_VIRTIO_PCI_HOST_ECAM_SIZE;
+ hosts[i].mem_base = GUEST_VIRTIO_PCI_MEM_ADDR +
+ i * VIRTIO_PCI_HOST_MEM_SIZE;
+ hosts[i].mem_size = VIRTIO_PCI_HOST_MEM_SIZE;
+ hosts[i].prefetch_mem_base = GUEST_VIRTIO_PCI_PREFETCH_MEM_ADDR +
+ i * VIRTIO_PCI_HOST_PREFETCH_MEM_SIZE;
+ hosts[i].prefetch_mem_size = VIRTIO_PCI_HOST_PREFETCH_MEM_SIZE;
+ hosts[i].irq_first = GUEST_VIRTIO_PCI_SPI_FIRST +
+ i * VIRTIO_PCI_HOST_NUM_SPIS;
+ hosts[i].num_irqs = VIRTIO_PCI_HOST_NUM_SPIS;
+
+ *host_id = hosts[i].id;
+
+ (*num_hosts)++;
+
+ LOG(DEBUG, "Allocate host #%u: "
+ "ECAM: 0x%"PRIx64"-0x%"PRIx64" "
+ "MEM: 0x%"PRIx64"-0x%"PRIx64" "
+ "PREFETCH_MEM: 0x%"PRIx64"-0x%"PRIx64" "
+ "IRQ: %u-%u",
+ hosts[i].id,
+ hosts[i].ecam_base,
+ hosts[i].ecam_base + hosts[i].ecam_size - 1,
+ hosts[i].mem_base,
+ hosts[i].mem_base + hosts[i].mem_size - 1,
+ hosts[i].prefetch_mem_base,
+ hosts[i].prefetch_mem_base + hosts[i].prefetch_mem_size - 1,
+ hosts[i].irq_first,
+ hosts[i].irq_first + hosts[i].num_irqs - 1);
+
+ return 0;
+}
+
int libxl__arch_domain_prepare_config(libxl__gc *gc,
libxl_domain_config *d_config,
struct xen_domctl_createdomain *config)
{
uint32_t nr_spis = 0;
unsigned int i;
- uint32_t vuart_irq, virtio_irq = 0;
- bool vuart_enabled = false, virtio_enabled = false;
+ uint32_t vuart_irq, virtio_mmio_irq_last, virtio_pci_irq_last = 0;
+ bool vuart_enabled = false, virtio_mmio_enabled = false;
+ unsigned int num_virtio_pci_hosts = 0;
+ libxl_virtio_pci_host virtio_pci_hosts[VIRTIO_PCI_MAX_HOSTS] = {0};
uint64_t virtio_mmio_base = GUEST_VIRTIO_MMIO_BASE;
uint32_t virtio_mmio_irq = GUEST_VIRTIO_MMIO_SPI_FIRST;
int rc;
@@ -118,11 +210,17 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,
for (i = 0; i < d_config->num_virtios; i++) {
libxl_device_virtio *virtio = &d_config->virtios[i];
- if (virtio->transport != LIBXL_VIRTIO_TRANSPORT_MMIO)
- continue;
-
- rc = alloc_virtio_mmio_params(gc, &virtio->base, &virtio->irq,
- &virtio_mmio_base, &virtio_mmio_irq);
+ if (virtio->transport != LIBXL_VIRTIO_TRANSPORT_MMIO) {
+ rc = alloc_virtio_pci_host(gc,
+ virtio->backend_domid,
+ &virtio->u.pci.host_id,
+ &num_virtio_pci_hosts,
+ virtio_pci_hosts);
+ } else {
+ rc = alloc_virtio_mmio_params(gc, &virtio->u.mmio.base,
+ &virtio->u.mmio.irq,
+ &virtio_mmio_base, &virtio_mmio_irq);
+ }
if (rc)
return rc;
@@ -134,14 +232,25 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,
* The resulting "nr_spis" needs to cover the highest possible SPI.
*/
if (virtio_mmio_irq != GUEST_VIRTIO_MMIO_SPI_FIRST) {
- virtio_enabled = true;
+ virtio_mmio_enabled = true;
/*
* Assumes that "virtio_mmio_irq" is the highest allocated irq, which is
* updated from alloc_virtio_mmio_irq() currently.
*/
- virtio_irq = virtio_mmio_irq - 1;
- nr_spis = max(nr_spis, virtio_irq - 32 + 1);
+ virtio_mmio_irq_last = virtio_mmio_irq - 1;
+ nr_spis = max(nr_spis, virtio_mmio_irq_last - 32 + 1);
+ }
+
+ if (num_virtio_pci_hosts) {
+ libxl_virtio_pci_host *host = &virtio_pci_hosts[num_virtio_pci_hosts - 1];
+
+ /*
+ * Assumes that latest allocated host contains the highest allocated
+ * irq range.
+ */
+ virtio_pci_irq_last = host->irq_first + host->num_irqs - 1;
+ nr_spis = max(nr_spis, virtio_pci_irq_last - 32 + 1);
}
for (i = 0; i < d_config->b_info.num_irqs; i++) {
@@ -164,10 +273,14 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,
}
/* The same check as for vpl011 */
- if (virtio_enabled &&
- (irq >= GUEST_VIRTIO_MMIO_SPI_FIRST && irq <= virtio_irq)) {
+ if (virtio_mmio_enabled &&
+ (irq >= GUEST_VIRTIO_MMIO_SPI_FIRST && irq <= virtio_mmio_irq_last)) {
LOG(ERROR, "Physical IRQ %u conflicting with Virtio MMIO IRQ range\n", irq);
return ERROR_FAIL;
+ } else if (num_virtio_pci_hosts &&
+ (irq >= GUEST_VIRTIO_PCI_SPI_FIRST && irq <= virtio_pci_irq_last)) {
+ LOG(ERROR, "Physical IRQ %u conflicting with Virtio PCI IRQ range\n", irq);
+ return ERROR_FAIL;
}
if (irq < 32)
@@ -179,6 +292,14 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,
nr_spis = spi + 1;
}
+ if (num_virtio_pci_hosts) {
+ d_config->b_info.num_virtio_pci_hosts = num_virtio_pci_hosts;
+ d_config->b_info.virtio_pci_hosts = libxl__calloc(NOGC,
+ num_virtio_pci_hosts, sizeof(*d_config->b_info.virtio_pci_hosts));
+ memcpy(d_config->b_info.virtio_pci_hosts, virtio_pci_hosts,
+ sizeof(*d_config->b_info.virtio_pci_hosts) * num_virtio_pci_hosts);
+ }
+
LOG(DEBUG, "Configure the domain");
config->arch.nr_spis = nr_spis;
@@ -908,6 +1029,130 @@ static int make_vpci_node(libxl__gc *gc, void *fdt,
return 0;
}
+#define PCI_IRQ_MAP_MIN_STRIDE 8
+
+static int create_virtio_pci_irq_map(libxl__gc *gc, void *fdt,
+ libxl_virtio_pci_host *host)
+{
+ uint32_t *full_irq_map, *irq_map;
+ size_t len;
+ unsigned int slot, pin;
+ int res, cells;
+
+ res = fdt_property_cell(fdt, "#interrupt-cells", 1);
+ if (res) return res;
+
+ /* assume GIC node to be present, due to
+ * make_gicv2_node()/make_gicv3_node() get called earlier
+ */
+ res = fdt_node_offset_by_phandle(fdt, GUEST_PHANDLE_GIC);
+ if (res < 0)
+ return res;
+
+ res = fdt_address_cells(fdt, res);
+ /* handle case of make_gicv2_node() setting #address-cells to 0 */
+ if (res == -FDT_ERR_BADNCELLS)
+ res = 0;
+ else if (res < 0)
+ return res;
+
+ cells = res;
+ len = sizeof(uint32_t) * host->num_irqs * host->num_irqs *
+ (PCI_IRQ_MAP_MIN_STRIDE + cells);
+ irq_map = full_irq_map = libxl__malloc(gc, len);
+
+ for (slot = 0; slot < host->num_irqs; slot++) {
+ for (pin = 0; pin < host->num_irqs; pin++) {
+ uint32_t irq = host->irq_first + ((pin + slot) % host->num_irqs);
+ unsigned int i = 0;
+
+ /* PCI address (3 cells) */
+ irq_map[i++] = cpu_to_fdt32(PCI_DEVFN(slot, 0) << 8);
+ irq_map[i++] = cpu_to_fdt32(0);
+ irq_map[i++] = cpu_to_fdt32(0);
+
+ /* PCI interrupt (1 cell) */
+ irq_map[i++] = cpu_to_fdt32(pin + 1);
+
+ /* GIC phandle (1 cell) */
+ irq_map[i++] = cpu_to_fdt32(GUEST_PHANDLE_GIC);
+
+ /* GIC unit address, set 0 because vgic itself handles vpci IRQs */
+ for (int c = cells; c--; irq_map[i++] = cpu_to_fdt32(0));
+
+ /* GIC interrupt (3 cells) */
+ irq_map[i++] = cpu_to_fdt32(0); /* SPI */
+ irq_map[i++] = cpu_to_fdt32(irq - 32);
+ irq_map[i++] = cpu_to_fdt32(DT_IRQ_TYPE_LEVEL_HIGH);
+
+ irq_map += PCI_IRQ_MAP_MIN_STRIDE + cells;
+ }
+ }
+
+ res = fdt_property(fdt, "interrupt-map", full_irq_map, len);
+ if (res) return res;
+
+ res = fdt_property_values(gc, fdt, "interrupt-map-mask", 4,
+ PCI_DEVFN(3, 0) << 8, 0, 0, 0x7);
+ if (res) return res;
+
+ return 0;
+}
+
+/* TODO Consider reusing make_vpci_node() */
+static int make_virtio_pci_node(libxl__gc *gc, void *fdt,
+ libxl_virtio_pci_host *host,
+ libxl_domain_config *d_config)
+{
+ int res;
+ const char *name = GCSPRINTF("pcie@%"PRIx64, host->ecam_base);
+
+ res = fdt_begin_node(fdt, name);
+ if (res) return res;
+
+ res = fdt_property_compat(gc, fdt, 1, "pci-host-ecam-generic");
+ if (res) return res;
+
+ res = fdt_property_string(fdt, "device_type", "pci");
+ if (res) return res;
+
+ res = fdt_property_regs(gc, fdt, GUEST_ROOT_ADDRESS_CELLS,
+ GUEST_ROOT_SIZE_CELLS, 1, host->ecam_base, host->ecam_size);
+ if (res) return res;
+
+ res = fdt_property_values(gc, fdt, "bus-range", 2, 0, 1);
+ if (res) return res;
+
+ res = fdt_property_cell(fdt, "#address-cells", 3);
+ if (res) return res;
+
+ res = fdt_property_cell(fdt, "#size-cells", 2);
+ if (res) return res;
+
+ res = fdt_property_string(fdt, "status", "okay");
+ if (res) return res;
+
+ res = fdt_property_vpci_ranges(gc, fdt, GUEST_ROOT_ADDRESS_CELLS,
+ GUEST_ROOT_SIZE_CELLS, 2,
+ GUEST_VIRTIO_PCI_ADDR_TYPE_MEM, host->mem_base, host->mem_size,
+ GUEST_VIRTIO_PCI_ADDR_TYPE_PREFETCH_MEM, host->prefetch_mem_base,
+ host->prefetch_mem_size);
+ if (res) return res;
+
+ /* The same property as for virtio-mmio device */
+ res = fdt_property(fdt, "dma-coherent", NULL, 0);
+ if (res) return res;
+
+ /* Legacy PCI interrupts (#INTA - #INTD) */
+ res = create_virtio_pci_irq_map(gc, fdt, host);
+ if (res) return res;
+
+ res = fdt_end_node(fdt);
+ if (res) return res;
+
+ return 0;
+}
+
static int make_xen_iommu_node(libxl__gc *gc, void *fdt)
{
int res;
@@ -1384,20 +1629,26 @@ next_resize:
for (i = 0; i < d_config->num_virtios; i++) {
libxl_device_virtio *virtio = &d_config->virtios[i];
- if (virtio->transport != LIBXL_VIRTIO_TRANSPORT_MMIO)
- continue;
-
if (libxl_defbool_val(virtio->grant_usage))
iommu_needed = true;
- FDT( make_virtio_mmio_node_device(gc, fdt, virtio->base,
- virtio->irq, virtio->type,
+ if (virtio->transport != LIBXL_VIRTIO_TRANSPORT_MMIO)
+ continue;
+
+ FDT( make_virtio_mmio_node_device(gc, fdt, virtio->u.mmio.base,
+ virtio->u.mmio.irq, virtio->type,
virtio->backend_domid,
libxl_defbool_val(virtio->grant_usage)) );
}
+ for (i = 0; i < d_config->b_info.num_virtio_pci_hosts; i++) {
+ libxl_virtio_pci_host *host = &d_config->b_info.virtio_pci_hosts[i];
+
+ FDT( make_virtio_pci_node(gc, fdt, host, d_config) );
+ }
+
/*
- * The iommu node should be created only once for all virtio-mmio
+ * The iommu node should be created only once for all virtio
* devices.
*/
if (iommu_needed)
@@ -1273,8 +1273,9 @@ int libxl__domain_config_setdefault(libxl__gc *gc,
}
for (i = 0; i < d_config->num_virtios; i++) {
- ret = libxl__virtio_devtype.set_default(gc, domid,
- &d_config->virtios[i], false);
+ libxl_device_virtio *virtio = &d_config->virtios[i];
+
+ ret = libxl__virtio_devtype.set_default(gc, domid, virtio, false);
if (ret) {
LOGD(ERROR, domid, "Unable to set virtio defaults for device %d", i);
goto error_out;
@@ -1770,6 +1771,19 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev,
for (i = 0; i < d_config->num_virtios; i++)
libxl__device_add(gc, domid, &libxl__virtio_devtype,
&d_config->virtios[i]);
+ /*
+ * This should be done before spawning device model, but after
+ * the creation of "device-model" directory in Xenstore.
+ */
+ for (i = 0; i < d_config->b_info.num_virtio_pci_hosts; i++) {
+ libxl_virtio_pci_host *host = &d_config->b_info.virtio_pci_hosts[i];
+
+ ret = libxl__save_dm_virtio_pci_host(gc, domid, host);
+ if (ret) {
+ LOGD(ERROR, domid, "Unable to save virtio_pci_host for device model");
+ goto error_out;
+ }
+ }
switch (d_config->c_info.type) {
case LIBXL_DOMAIN_TYPE_HVM:
@@ -3375,6 +3375,76 @@ static void device_model_postconfig_done(libxl__egc *egc,
dmss->callback(egc, dmss, rc);
}
+int libxl__save_dm_virtio_pci_host(libxl__gc *gc,
+ uint32_t domid,
+ libxl_virtio_pci_host *host)
+{
+ const char *dm_path;
+ char **dir;
+ xs_transaction_t t = XBT_NULL;
+ unsigned int n;
+ int rc;
+
+ dm_path = GCSPRINTF("/local/domain/%d/device-model", host->backend_domid);
+
+ dir = libxl__xs_directory(gc, XBT_NULL, dm_path, &n);
+ if (!dir)
+ return ERROR_INVAL;
+
+ dm_path = DEVICE_MODEL_XS_PATH(gc, host->backend_domid, domid, "/virtio_pci_host");
+
+ for (;;) {
+ rc = libxl__xs_transaction_start(gc, &t);
+ if (rc) goto out;
+
+ rc = libxl__xs_write_checked(gc, t, GCSPRINTF("%s/id", dm_path),
+ GCSPRINTF("%u", host->id));
+ if (rc) goto out;
+
+ rc = libxl__xs_write_checked(gc, t, GCSPRINTF("%s/ecam_base", dm_path),
+ GCSPRINTF("%#"PRIx64, host->ecam_base));
+ if (rc) goto out;
+
+ rc = libxl__xs_write_checked(gc, t, GCSPRINTF("%s/ecam_size", dm_path),
+ GCSPRINTF("%#"PRIx64, host->ecam_size));
+ if (rc) goto out;
+
+ rc = libxl__xs_write_checked(gc, t, GCSPRINTF("%s/mem_base", dm_path),
+ GCSPRINTF("%#"PRIx64, host->mem_base));
+ if (rc) goto out;
+
+ rc = libxl__xs_write_checked(gc, t, GCSPRINTF("%s/mem_size", dm_path),
+ GCSPRINTF("%#"PRIx64, host->mem_size));
+ if (rc) goto out;
+
+ rc = libxl__xs_write_checked(gc, t, GCSPRINTF("%s/prefetch_mem_base", dm_path),
+ GCSPRINTF("%#"PRIx64, host->prefetch_mem_base));
+ if (rc) goto out;
+
+ rc = libxl__xs_write_checked(gc, t, GCSPRINTF("%s/prefetch_mem_size", dm_path),
+ GCSPRINTF("%#"PRIx64, host->prefetch_mem_size));
+ if (rc) goto out;
+
+ rc = libxl__xs_write_checked(gc, t, GCSPRINTF("%s/irq_first", dm_path),
+ GCSPRINTF("%u", host->irq_first));
+ if (rc) goto out;
+
+ rc = libxl__xs_write_checked(gc, t, GCSPRINTF("%s/num_irqs", dm_path),
+ GCSPRINTF("%u", host->num_irqs));
+ if (rc) goto out;
+
+ rc = libxl__xs_transaction_commit(gc, &t);
+ if (!rc) break;
+ if (rc < 0) goto out;
+ }
+
+ return 0;
+
+out:
+ libxl__xs_transaction_abort(gc, &t);
+ return rc;
+}
+
void libxl__spawn_qdisk_backend(libxl__egc *egc, libxl__dm_spawn_state *dmss)
{
STATE_AO_GC(dmss->spawn.ao);
@@ -4199,6 +4199,11 @@ _hidden void libxl__spawn_qdisk_backend(libxl__egc *egc,
libxl__dm_spawn_state *dmss);
_hidden int libxl__destroy_qdisk_backend(libxl__gc *gc, uint32_t domid);
+
+_hidden int libxl__save_dm_virtio_pci_host(libxl__gc *gc,
+ uint32_t domid,
+ libxl_virtio_pci_host *host);
+
/*----- Domain creation -----*/
@@ -281,6 +281,7 @@ libxl_vkb_backend = Enumeration("vkb_backend", [
libxl_virtio_transport = Enumeration("virtio_transport", [
(0, "UNKNOWN"),
(1, "MMIO"),
+ (2, "PCI"),
])
libxl_passthrough = Enumeration("passthrough", [
@@ -558,6 +559,19 @@ libxl_altp2m_mode = Enumeration("altp2m_mode", [
(3, "limited"),
], init_val = "LIBXL_ALTP2M_MODE_DISABLED")
+libxl_virtio_pci_host = Struct("virtio_pci_host", [
+ ("backend_domid", libxl_domid),
+ ("id", uint32),
+ ("ecam_base", uint64),
+ ("ecam_size", uint64),
+ ("mem_base", uint64),
+ ("mem_size", uint64),
+ ("prefetch_mem_base", uint64),
+ ("prefetch_mem_size", uint64),
+ ("irq_first", uint32),
+ ("num_irqs", uint32),
+ ])
+
libxl_domain_build_info = Struct("domain_build_info",[
("max_vcpus", integer),
("avail_vcpus", libxl_bitmap),
@@ -631,6 +645,7 @@ libxl_domain_build_info = Struct("domain_build_info",[
("apic", libxl_defbool),
("dm_restrict", libxl_defbool),
("tee", libxl_tee_type),
+ ("virtio_pci_hosts", Array(libxl_virtio_pci_host, "num_virtio_pci_hosts")),
("u", KeyedUnion(None, libxl_domain_type, "type",
[("hvm", Struct(None, [("firmware", string),
("bios", libxl_bios_type),
@@ -764,13 +779,22 @@ libxl_device_virtio = Struct("device_virtio", [
("backend_domid", libxl_domid),
("backend_domname", string),
("type", string),
- ("transport", libxl_virtio_transport),
+ ("u", KeyedUnion(None, libxl_virtio_transport, "transport",
+ [("unknown", None),
+ # Note that virtio-mmio parameters (irq and base) are for internal
+ # use by libxl and can't be modified.
+ ("mmio", Struct(None, [("irq", uint32),
+ ("base", uint64),
+ ])),
+ ("pci", Struct(None, [("func", uint8),
+ ("dev", uint8),
+ ("bus", uint8),
+ ("domain", uint16),
+ ("host_id", uint32),
+ ])),
+ ])),
("grant_usage", libxl_defbool),
("devid", libxl_devid),
- # Note that virtio-mmio parameters (irq and base) are for internal
- # use by libxl and can't be modified.
- ("irq", uint32),
- ("base", uint64)
])
libxl_device_disk = Struct("device_disk", [
@@ -57,8 +57,21 @@ static int libxl__set_xenstore_virtio(libxl__gc *gc, uint32_t domid,
{
const char *transport = libxl_virtio_transport_to_string(virtio->transport);
- flexarray_append_pair(back, "irq", GCSPRINTF("%u", virtio->irq));
- flexarray_append_pair(back, "base", GCSPRINTF("%#"PRIx64, virtio->base));
+ if (virtio->transport == LIBXL_VIRTIO_TRANSPORT_MMIO) {
+ flexarray_append_pair(back, "irq", GCSPRINTF("%u", virtio->u.mmio.irq));
+ flexarray_append_pair(back, "base", GCSPRINTF("%#"PRIx64, virtio->u.mmio.base));
+ } else {
+ /*
+ * TODO:
+ * Probably we will also need to store PCI Host bridge details (irq and
+ * mem ranges) this particular PCI device belongs to if emulator cannot
+ * or should not rely on what is described at include/public/arch-arm.h
+ */
+ flexarray_append_pair(back, "bdf", GCSPRINTF("%04x:%02x:%02x.%01x",
+ virtio->u.pci.domain, virtio->u.pci.bus,
+ virtio->u.pci.dev, virtio->u.pci.func));
+ flexarray_append_pair(back, "host_id", GCSPRINTF("%u", virtio->u.pci.host_id));
+ }
flexarray_append_pair(back, "type", GCSPRINTF("%s", virtio->type));
flexarray_append_pair(back, "transport", GCSPRINTF("%s", transport));
flexarray_append_pair(back, "grant_usage",
@@ -84,33 +97,72 @@ static int libxl__virtio_from_xenstore(libxl__gc *gc, const char *libxl_path,
rc = libxl__backendpath_parse_domid(gc, be_path, &virtio->backend_domid);
if (rc) goto out;
- rc = libxl__xs_read_checked(gc, XBT_NULL,
- GCSPRINTF("%s/irq", be_path), &tmp);
- if (rc) goto out;
-
- if (tmp) {
- virtio->irq = strtoul(tmp, NULL, 0);
+ tmp = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/transport", be_path));
+ if (!tmp) {
+ LOG(ERROR, "Missing xenstore node %s/transport", be_path);
+ rc = ERROR_INVAL;
+ goto out;
}
- tmp = NULL;
- rc = libxl__xs_read_checked(gc, XBT_NULL,
- GCSPRINTF("%s/base", be_path), &tmp);
- if (rc) goto out;
+ rc = libxl_virtio_transport_from_string(tmp, &virtio->transport);
+ if (rc) {
+ LOG(ERROR, "Unable to parse xenstore node %s/transport", be_path);
+ goto out;
+ }
- if (tmp) {
- virtio->base = strtoul(tmp, NULL, 0);
+ if (virtio->transport != LIBXL_VIRTIO_TRANSPORT_MMIO &&
+ virtio->transport != LIBXL_VIRTIO_TRANSPORT_PCI) {
+ LOG(ERROR, "Unexpected transport for virtio");
+ rc = ERROR_INVAL;
+ goto out;
}
- tmp = NULL;
- rc = libxl__xs_read_checked(gc, XBT_NULL,
- GCSPRINTF("%s/transport", be_path), &tmp);
- if (rc) goto out;
+ if (virtio->transport == LIBXL_VIRTIO_TRANSPORT_MMIO) {
+ tmp = NULL;
+ rc = libxl__xs_read_checked(gc, XBT_NULL,
+ GCSPRINTF("%s/irq", be_path), &tmp);
+ if (rc) goto out;
- if (tmp) {
- if (!strcmp(tmp, "mmio")) {
- virtio->transport = LIBXL_VIRTIO_TRANSPORT_MMIO;
- } else {
- return ERROR_INVAL;
+ if (tmp) {
+ virtio->u.mmio.irq = strtoul(tmp, NULL, 0);
+ }
+
+ tmp = NULL;
+ rc = libxl__xs_read_checked(gc, XBT_NULL,
+ GCSPRINTF("%s/base", be_path), &tmp);
+ if (rc) goto out;
+
+ if (tmp) {
+ virtio->u.mmio.base = strtoul(tmp, NULL, 0);
+ }
+ } else {
+ unsigned int domain, bus, dev, func;
+
+ tmp = NULL;
+ rc = libxl__xs_read_checked(gc, XBT_NULL,
+ GCSPRINTF("%s/bdf", be_path), &tmp);
+ if (rc) goto out;
+
+ if (tmp) {
+ if (sscanf(tmp, "%04x:%02x:%02x.%01x",
+ &domain, &bus, &dev, &func) != 4) {
+ rc = ERROR_INVAL;
+ goto out;
+ }
+
+ virtio->u.pci.domain = domain;
+ virtio->u.pci.bus = bus;
+ virtio->u.pci.dev = dev;
+ virtio->u.pci.func = func;
+ }
+
+ tmp = NULL;
+ rc = libxl__xs_read_checked(gc, XBT_NULL,
+ GCSPRINTF("%s/host_id", be_path), &tmp);
+ if (rc) goto out;
+
+ if (tmp) {
+ virtio->u.pci.host_id = strtoul(tmp, NULL, 0);
}
}
@@ -1217,6 +1217,24 @@ static int parse_virtio_config(libxl_device_virtio *virtio, char *token)
if (rc) return rc;
} else if (MATCH_OPTION("grant_usage", token, oparg)) {
libxl_defbool_set(&virtio->grant_usage, strtoul(oparg, NULL, 0));
+ } else if (MATCH_OPTION("bdf", token, oparg)) {
+ /*
+ * TODO:
+ * We pretend that we are ordinary PCI device to reuse BDF parsing
+ * logic. This needs to be properly reused by adjusting parse_bdf().
+ */
+ libxl_device_pci pci;
+
+ rc = xlu_pci_parse_bdf(NULL, &pci, oparg);
+ if (rc) {
+ fprintf(stderr, "Unable to parse BDF `%s' for virtio-pci\n", oparg);
+ return -1;
+ }
+
+ virtio->u.pci.domain = pci.domain;
+ virtio->u.pci.bus = pci.bus;
+ virtio->u.pci.dev = pci.dev;
+ virtio->u.pci.func = pci.func;
} else {
fprintf(stderr, "Unknown string \"%s\" in virtio spec\n", token);
return -1;
@@ -1238,6 +1256,7 @@ static void parse_virtio_list(const XLU_Config *config,
while ((item = xlu_cfg_get_listitem(virtios, entry)) != NULL) {
libxl_device_virtio *virtio;
char *p;
+ bool bdf_present = false;
virtio = ARRAY_EXTEND_INIT(d_config->virtios, d_config->num_virtios,
libxl_device_virtio_init);
@@ -1260,6 +1279,8 @@ static void parse_virtio_list(const XLU_Config *config,
strcat(str, p2);
p = str;
}
+ } else if (MATCH_OPTION("bdf", p, oparg)) {
+ bdf_present = true;
}
rc = parse_virtio_config(virtio, p);
@@ -1270,6 +1291,21 @@ static void parse_virtio_list(const XLU_Config *config,
p = strtok(NULL, ",");
}
+ if (virtio->transport == LIBXL_VIRTIO_TRANSPORT_UNKNOWN) {
+ fprintf(stderr, "Unspecified transport for virtio\n");
+ rc = ERROR_FAIL; goto out;
+ }
+
+ if (virtio->transport == LIBXL_VIRTIO_TRANSPORT_PCI &&
+ !bdf_present) {
+ fprintf(stderr, "BDF must be specified for virtio-pci\n");
+ rc = ERROR_FAIL; goto out;
+ } else if (virtio->transport == LIBXL_VIRTIO_TRANSPORT_MMIO &&
+ bdf_present) {
+ fprintf(stderr, "BDF must not be specified for virtio-mmio\n");
+ rc = ERROR_FAIL; goto out;
+ }
+
entry++;
free(buf);
}