| Message ID | f1dc91669df27705c25a1f3018427c2db77b32a6.1667906228.git.viresh.kumar@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Virtio toolstack support for I2C and GPIO on Arm | expand |
On 08.11.22 13:23, Viresh Kumar wrote: Hello Viresh [sorry for the possible format issues if any] > This patch adds basic support for configuring and assisting generic > Virtio backend which could run in any domain. > > An example of domain configuration for mmio based Virtio I2C device is: > virtio = ["type=virtio,device22,transport=mmio"] > > Also to make this work on Arm, allocate Virtio MMIO params (IRQ and > memory region) and pass them to the backend. Update guest device-tree as > well to create a DT node for the Virtio devices. Some NITs regarding the commit description: 1. Besides making generic things current patch also adds i2c/gpio device nodes, I would mention that in the description. 2. I assume current patch is not enough to make this work on Arm, at least the subsequent patch is needed, I would mention that as well. 3. I understand where "virtio,device22"/"virtio,device29" came from, but I think that links to the corresponding device-tree bindings should be mentioned here (and/or maybe in the code). > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > --- > tools/libs/light/Makefile | 1 + > tools/libs/light/libxl_arm.c | 89 +++++++++++++++ > tools/libs/light/libxl_create.c | 5 + > tools/libs/light/libxl_internal.h | 1 + > tools/libs/light/libxl_types.idl | 29 +++++ > tools/libs/light/libxl_types_internal.idl | 1 + > tools/libs/light/libxl_virtio.c | 127 ++++++++++++++++++++++ > 7 files changed, 253 insertions(+) > create mode 100644 tools/libs/light/libxl_virtio.c > > diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile > index 374be1cfab25..4fddcc6f51d7 100644 > --- a/tools/libs/light/Makefile > +++ b/tools/libs/light/Makefile > @@ -106,6 +106,7 @@ OBJS-y += libxl_vdispl.o > OBJS-y += libxl_pvcalls.o > OBJS-y += libxl_vsnd.o > OBJS-y += libxl_vkb.o > +OBJS-y += libxl_virtio.o > OBJS-y += libxl_genid.o > OBJS-y += _libxl_types.o > OBJS-y += libxl_flask.o > diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c > index b4928dbf673c..f33c9b273a4f 100644 > --- a/tools/libs/light/libxl_arm.c > +++ b/tools/libs/light/libxl_arm.c > @@ -113,6 +113,19 @@ 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 (rc) > + return rc; > + } > + > /* > * Every virtio-mmio device uses one emulated SPI. If Virtio devices are > * present, make sure that we allocate enough SPIs for them. > @@ -968,6 +981,68 @@ static int make_virtio_mmio_node(libxl__gc *gc, void *fdt, uint64_t base, > return fdt_end_node(fdt); > } > > +static int make_virtio_mmio_node_i2c(libxl__gc *gc, void *fdt) > +{ > + int res; > + > + res = fdt_begin_node(fdt, "i2c"); > + if (res) return res; > + > + res = fdt_property_compat(gc, fdt, 1, "virtio,device22"); > + if (res) return res; > + > + return fdt_end_node(fdt); > +} > + > +static int make_virtio_mmio_node_gpio(libxl__gc *gc, void *fdt) > +{ > + int res; > + > + res = fdt_begin_node(fdt, "gpio"); > + if (res) return res; > + > + res = fdt_property_compat(gc, fdt, 1, "virtio,device29"); > + if (res) return res; > + > + res = fdt_property(fdt, "gpio-controller", NULL, 0); > + if (res) return res; > + > + res = fdt_property_cell(fdt, "#gpio-cells", 2); > + if (res) return res; > + > + res = fdt_property(fdt, "interrupt-controller", NULL, 0); > + if (res) return res; > + > + res = fdt_property_cell(fdt, "#interrupt-cells", 2); > + if (res) return res; > + > + return fdt_end_node(fdt); > +} > + > +static int make_virtio_mmio_node_device(libxl__gc *gc, void *fdt, uint64_t base, > + uint32_t irq, const char *type, > + uint32_t backend_domid) > +{ > + int res, len = strlen(type); > + > + res = make_virtio_mmio_node_common(gc, fdt, base, irq, backend_domid); > + if (res) return res; > + > + /* Add device specific nodes */ > + if (!strncmp(type, "virtio,device22", len)) { > + res = make_virtio_mmio_node_i2c(gc, fdt); > + if (res) return res; > + } else if (!strncmp(type, "virtio,device29", len)) { > + res = make_virtio_mmio_node_gpio(gc, fdt); > + if (res) return res; > + } else { > + LOG(ERROR, "Invalid type for virtio device: %s", type); > + return -EINVAL; > + } I am not sure whether it is the best place to ask, but I will try anyway. So I assume that with the whole series applied it would be possible to configure only two specific device types ("22" and "29"). But what to do if user, for example, is interested in usual virtio device (which doesn't require specific device-tree sub node with specific compatible in it). For these usual virtio devices just calling make_virtio_mmio_node_common() would be enough. Maybe we should introduce something like type "common" which would mean we don't need any additional device-tree sub nodes? virtio = ["type=common,transport=mmio"] > + > + return fdt_end_node(fdt); > +} > + > static const struct arch_info *get_arch_info(libxl__gc *gc, > const struct xc_dom_image *dom) > { > @@ -1290,6 +1365,20 @@ static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_config *d_config, > } > } > > + 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 (virtio->backend_domid != LIBXL_TOOLSTACK_DOMID) > + iommu_needed = true; > + > + FDT( make_virtio_mmio_node_device(gc, fdt, virtio->base, > + virtio->irq, virtio->type, > + virtio->backend_domid) ); > + } > + > /* > * Note, this should be only called after creating all virtio-mmio > * device nodes > diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c > index 612eacfc7fac..15a32c75c045 100644 > --- a/tools/libs/light/libxl_create.c > +++ b/tools/libs/light/libxl_create.c > @@ -1802,6 +1802,11 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, > &d_config->vkbs[i]); > } > > + for (i = 0; i < d_config->num_virtios; i++) { > + libxl__device_add(gc, domid, &libxl__virtio_devtype, > + &d_config->virtios[i]); > + } I am wondering whether this is the best place to put this call. This gets called for LIBXL_DOMAIN_TYPE_PV and LIBXL_DOMAIN_TYPE_PVH (our Arm case), and not for LIBXL_DOMAIN_TYPE_HVM. Is it what we want? > + > if (d_config->b_info.arch_arm.vuart == LIBXL_VUART_TYPE_SBSA_UART) { > init_console_info(gc, &vuart, 0); > vuart.backend_domid = state->console_domid; > diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h > index cb9e8b3b8b5a..e5716f9bef80 100644 > --- a/tools/libs/light/libxl_internal.h > +++ b/tools/libs/light/libxl_internal.h > @@ -4003,6 +4003,7 @@ static inline int *libxl__device_type_get_num( > > extern const libxl__device_type libxl__vfb_devtype; > extern const libxl__device_type libxl__vkb_devtype; > +extern const libxl__device_type libxl__virtio_devtype; > extern const libxl__device_type libxl__disk_devtype; > extern const libxl__device_type libxl__nic_devtype; > extern const libxl__device_type libxl__vtpm_devtype; > diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl > index d634f304cda2..d97a0795d312 100644 > --- a/tools/libs/light/libxl_types.idl > +++ b/tools/libs/light/libxl_types.idl > @@ -278,6 +278,14 @@ libxl_vkb_backend = Enumeration("vkb_backend", [ > (2, "LINUX") > ]) > > +libxl_virtio_backend = Enumeration("virtio_backend", [ I would add (0, "UNKNOWN") here ... > + (1, "STANDALONE") > + ]) > + > +libxl_virtio_transport = Enumeration("virtio_transport", [ ... and here (these might be needed by parsing code) > + (1, "MMIO"), > + ]) > + > libxl_passthrough = Enumeration("passthrough", [ > (0, "default"), > (1, "disabled"), > @@ -705,6 +713,17 @@ libxl_device_vkb = Struct("device_vkb", [ > ("multi_touch_num_contacts", uint32) > ]) > > +libxl_device_virtio = Struct("device_virtio", [ > + ("backend_domid", libxl_domid), > + ("backend_domname", string), > + ("backend", libxl_virtio_backend), > + ("type", string), > + ("transport", libxl_virtio_transport), > + ("devid", libxl_devid), > + ("irq", uint32), > + ("base", uint64) > + ]) > + > libxl_device_disk = Struct("device_disk", [ > ("backend_domid", libxl_domid), > ("backend_domname", string), > @@ -982,6 +1001,7 @@ libxl_domain_config = Struct("domain_config", [ > ("dtdevs", Array(libxl_device_dtdev, "num_dtdevs")), > ("vfbs", Array(libxl_device_vfb, "num_vfbs")), > ("vkbs", Array(libxl_device_vkb, "num_vkbs")), > + ("virtios", Array(libxl_device_virtio, "num_virtios")), > ("vtpms", Array(libxl_device_vtpm, "num_vtpms")), > ("p9s", Array(libxl_device_p9, "num_p9s")), > ("pvcallsifs", Array(libxl_device_pvcallsif, "num_pvcallsifs")), > @@ -1145,6 +1165,15 @@ libxl_vkbinfo = Struct("vkbinfo", [ > ("rref", integer) > ], dir=DIR_OUT) > > +libxl_virtioinfo = Struct("virtioinfo", [ > + ("backend", string), > + ("backend_id", uint32), > + ("frontend", string), > + ("frontend_id", uint32), > + ("devid", libxl_devid), > + ("state", integer), > + ], dir=DIR_OUT) I failed to find where libxl_virtioinfo is used within the series. Why do we need it? > + > # NUMA node characteristics: size and free are how much memory it has, and how > # much of it is free, respectively. dists is an array of distances from this > # node to each other node. > diff --git a/tools/libs/light/libxl_types_internal.idl b/tools/libs/light/libxl_types_internal.idl > index fb0f4f23d7c2..e24288f1a59e 100644 > --- a/tools/libs/light/libxl_types_internal.idl > +++ b/tools/libs/light/libxl_types_internal.idl > @@ -33,6 +33,7 @@ libxl__device_kind = Enumeration("device_kind", [ > (15, "VSND"), > (16, "VINPUT"), > (17, "VIRTIO_DISK"), > + (18, "VIRTIO"), > ]) > > libxl__console_backend = Enumeration("console_backend", [ > diff --git a/tools/libs/light/libxl_virtio.c b/tools/libs/light/libxl_virtio.c > new file mode 100644 > index 000000000000..14b0c016a0a2 > --- /dev/null > +++ b/tools/libs/light/libxl_virtio.c > @@ -0,0 +1,127 @@ > +/* > + * Copyright (C) 2022 Linaro Ltd. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU Lesser General Public License as published > + * by the Free Software Foundation; version 2.1 only. with the special > + * exception on linking described in file LICENSE. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU Lesser General Public License for more details. > + */ > + > +#include "libxl_internal.h" > + > +static int libxl__device_virtio_setdefault(libxl__gc *gc, uint32_t domid, > + libxl_device_virtio *virtio, > + bool hotplug) > +{ > + return libxl__resolve_domid(gc, virtio->backend_domname, > + &virtio->backend_domid); > +} > + > +static int libxl__device_from_virtio(libxl__gc *gc, uint32_t domid, > + libxl_device_virtio *virtio, > + libxl__device *device) > +{ > + device->backend_devid = virtio->devid; > + device->backend_domid = virtio->backend_domid; > + device->devid = virtio->devid; > + device->domid = domid; > + > + device->backend_kind = LIBXL__DEVICE_KIND_VIRTIO; > + device->kind = LIBXL__DEVICE_KIND_VIRTIO; > + > + return 0; > +} > + > +static int libxl__set_xenstore_virtio(libxl__gc *gc, uint32_t domid, > + libxl_device_virtio *virtio, > + flexarray_t *back, flexarray_t *front, > + flexarray_t *ro_front) > +{ > + 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("%lu", virtio->base)); > + flexarray_append_pair(back, "type", GCSPRINTF("%s", virtio->type)); > + flexarray_append_pair(back, "transport", GCSPRINTF("%s", transport)); > + > + flexarray_append_pair(front, "irq", GCSPRINTF("%u", virtio->irq)); > + flexarray_append_pair(front, "base", GCSPRINTF("%lu", virtio->base)); > + flexarray_append_pair(front, "type", GCSPRINTF("%s", virtio->type)); > + flexarray_append_pair(front, "transport", GCSPRINTF("%s", transport)); > + > + return 0; > +} > + > +static int libxl__virtio_from_xenstore(libxl__gc *gc, const char *libxl_path, > + libxl_devid devid, > + libxl_device_virtio *virtio) > +{ > + const char *be_path, *fe_path, *tmp; > + libxl__device dev; > + int rc; > + > + virtio->devid = devid; > + > + rc = libxl__xs_read_mandatory(gc, XBT_NULL, > + GCSPRINTF("%s/backend", libxl_path), > + &be_path); > + if (rc) goto out; > + > + rc = libxl__xs_read_mandatory(gc, XBT_NULL, > + GCSPRINTF("%s/frontend", libxl_path), > + &fe_path); > + if (rc) goto out; fe_path is not used anywhere down the code even within the series, why do we need it? Or we just read it to make sure that corresponding entry is present in Xenstore (some kind of sanity check)? > + > + rc = libxl__backendpath_parse_domid(gc, be_path, &virtio->backend_domid); > + if (rc) goto out; > + > + rc = libxl__parse_backend_path(gc, be_path, &dev); > + if (rc) goto out; The same question for dev variable. > + > + 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); > + } > + > + rc = libxl__xs_read_checked(gc, XBT_NULL, > + GCSPRINTF("%s/base", be_path), &tmp); > + if (rc) goto out; > + > + if (tmp) { > + virtio->base = strtoul(tmp, NULL, 0); > + } > + > + rc = 0; It feels to me, that we also need to read "type" and "transport" from the Xenstore (and probably check them for the valid values). > + > +out: > + > + return rc; > +} > + > +static LIBXL_DEFINE_UPDATE_DEVID(virtio) > + > +#define libxl__add_virtios NULL > +#define libxl_device_virtio_compare NULL > + > +DEFINE_DEVICE_TYPE_STRUCT(virtio, VIRTIO, virtios, > + .set_xenstore_config = (device_set_xenstore_config_fn_t) > + libxl__set_xenstore_virtio, > + .from_xenstore = (device_from_xenstore_fn_t)libxl__virtio_from_xenstore, > + .skip_attach = 1 > +); > + > +/* > + * Local variables: > + * mode: C > + * c-basic-offset: 4 > + * indent-tabs-mode: nil > + * End: > + */
Hi Oleksandr, On 02-12-22, 16:52, Oleksandr Tyshchenko wrote: > > This patch adds basic support for configuring and assisting generic > > Virtio backend which could run in any domain. > > > > An example of domain configuration for mmio based Virtio I2C device is: > > virtio = ["type=virtio,device22,transport=mmio"] > > > > Also to make this work on Arm, allocate Virtio MMIO params (IRQ and > > memory region) and pass them to the backend. Update guest device-tree as > > well to create a DT node for the Virtio devices. > > > Some NITs regarding the commit description: > 1. Besides making generic things current patch also adds i2c/gpio device > nodes, I would mention that in the description. > 2. I assume current patch is not enough to make this work on Arm, at least > the subsequent patch is needed, I would mention that as well. > 3. I understand where "virtio,device22"/"virtio,device29" came from, but I > think that links to the corresponding device-tree bindings should be > mentioned here (and/or maybe in the code). Agree to all. > > +static int make_virtio_mmio_node_device(libxl__gc *gc, void *fdt, uint64_t base, > > + uint32_t irq, const char *type, > > + uint32_t backend_domid) > > +{ > > + int res, len = strlen(type); > > + > > + res = make_virtio_mmio_node_common(gc, fdt, base, irq, backend_domid); > > + if (res) return res; > > + > > + /* Add device specific nodes */ > > + if (!strncmp(type, "virtio,device22", len)) { > > + res = make_virtio_mmio_node_i2c(gc, fdt); > > + if (res) return res; > > + } else if (!strncmp(type, "virtio,device29", len)) { > > + res = make_virtio_mmio_node_gpio(gc, fdt); > > + if (res) return res; > > + } else { > > + LOG(ERROR, "Invalid type for virtio device: %s", type); > > + return -EINVAL; > > + } > > I am not sure whether it is the best place to ask, but I will try anyway. So > I assume that with the whole series applied it would be possible to > configure only two specific device types ("22" and "29"). Right. > But what to do if user, for example, is interested in usual virtio device > (which doesn't require specific device-tree sub node with specific > compatible in it). For these usual virtio devices just calling > make_virtio_mmio_node_common() would be enough. > > > Maybe we should introduce something like type "common" which would mean we > don't need any additional device-tree sub nodes? > > virtio = ["type=common,transport=mmio"] I am fine with this. Maybe, to keep it aligned with compatibles, we can write it as virtio = ["type=virtio,device,transport=mmio"] and document that "virtio,device" type is special and we won't add compatible property to the DT node. > > diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c > > index 612eacfc7fac..15a32c75c045 100644 > > --- a/tools/libs/light/libxl_create.c > > +++ b/tools/libs/light/libxl_create.c > > @@ -1802,6 +1802,11 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, > > &d_config->vkbs[i]); > > } > > + for (i = 0; i < d_config->num_virtios; i++) { > > + libxl__device_add(gc, domid, &libxl__virtio_devtype, > > + &d_config->virtios[i]); > > + } > > > I am wondering whether this is the best place to put this call. This gets > called for LIBXL_DOMAIN_TYPE_PV and LIBXL_DOMAIN_TYPE_PVH (our Arm case), > and not for LIBXL_DOMAIN_TYPE_HVM. Is it what we want? Can you suggest where should I move this ? > > +libxl_virtioinfo = Struct("virtioinfo", [ > > + ("backend", string), > > + ("backend_id", uint32), > > + ("frontend", string), > > + ("frontend_id", uint32), > > + ("devid", libxl_devid), > > + ("state", integer), > > + ], dir=DIR_OUT) > > I failed to find where libxl_virtioinfo is used within the series. Why do we > need it? Looks like leftover that I missed. Will remove it. > > +static int libxl__virtio_from_xenstore(libxl__gc *gc, const char *libxl_path, > > + libxl_devid devid, > > + libxl_device_virtio *virtio) > > +{ > > + const char *be_path, *fe_path, *tmp; > > + libxl__device dev; > > + int rc; > > + > > + virtio->devid = devid; > > + > > + rc = libxl__xs_read_mandatory(gc, XBT_NULL, > > + GCSPRINTF("%s/backend", libxl_path), > > + &be_path); > > + if (rc) goto out; > > + > > + rc = libxl__xs_read_mandatory(gc, XBT_NULL, > > + GCSPRINTF("%s/frontend", libxl_path), > > + &fe_path); > > + if (rc) goto out; > > fe_path is not used anywhere down the code even within the series, why do we > need it? Or we just read it to make sure that corresponding entry is present > in Xenstore (some kind of sanity check)? I copied it from libxl_vkb.c and it isn't using it either. So I assume it is a sanity check, though can be removed if that's what makes sense. > > + > > + rc = libxl__backendpath_parse_domid(gc, be_path, &virtio->backend_domid); > > + if (rc) goto out; > > + > > + rc = libxl__parse_backend_path(gc, be_path, &dev); > > + if (rc) goto out; > > The same question for dev variable. Hmm, this we aren't using at all, which KBD does use it. Maybe we should even call libxl__parse_backend_path() ?
On 05-12-22, 11:45, Viresh Kumar wrote: > > > + rc = libxl__backendpath_parse_domid(gc, be_path, &virtio->backend_domid); > > > + if (rc) goto out; > > > + > > > + rc = libxl__parse_backend_path(gc, be_path, &dev); > > > + if (rc) goto out; > > > > The same question for dev variable. > > Hmm, this we aren't using at all, which KBD does use it. Maybe we > should even call libxl__parse_backend_path() ? Removing it works just fine for me.
On 05.12.22 08:15, Viresh Kumar wrote: > Hi Oleksandr, Hello Viresh > > On 02-12-22, 16:52, Oleksandr Tyshchenko wrote: >>> This patch adds basic support for configuring and assisting generic >>> Virtio backend which could run in any domain. >>> >>> An example of domain configuration for mmio based Virtio I2C device is: >>> virtio = ["type=virtio,device22,transport=mmio"] >>> >>> Also to make this work on Arm, allocate Virtio MMIO params (IRQ and >>> memory region) and pass them to the backend. Update guest device-tree as >>> well to create a DT node for the Virtio devices. >> >> >> Some NITs regarding the commit description: >> 1. Besides making generic things current patch also adds i2c/gpio device >> nodes, I would mention that in the description. >> 2. I assume current patch is not enough to make this work on Arm, at least >> the subsequent patch is needed, I would mention that as well. >> 3. I understand where "virtio,device22"/"virtio,device29" came from, but I >> think that links to the corresponding device-tree bindings should be >> mentioned here (and/or maybe in the code). > > Agree to all. > >>> +static int make_virtio_mmio_node_device(libxl__gc *gc, void *fdt, uint64_t base, >>> + uint32_t irq, const char *type, >>> + uint32_t backend_domid) >>> +{ >>> + int res, len = strlen(type); >>> + >>> + res = make_virtio_mmio_node_common(gc, fdt, base, irq, backend_domid); >>> + if (res) return res; >>> + >>> + /* Add device specific nodes */ >>> + if (!strncmp(type, "virtio,device22", len)) { >>> + res = make_virtio_mmio_node_i2c(gc, fdt); >>> + if (res) return res; >>> + } else if (!strncmp(type, "virtio,device29", len)) { >>> + res = make_virtio_mmio_node_gpio(gc, fdt); >>> + if (res) return res; >>> + } else { >>> + LOG(ERROR, "Invalid type for virtio device: %s", type); >>> + return -EINVAL; >>> + } >> >> I am not sure whether it is the best place to ask, but I will try anyway. So >> I assume that with the whole series applied it would be possible to >> configure only two specific device types ("22" and "29"). > > Right. > >> But what to do if user, for example, is interested in usual virtio device >> (which doesn't require specific device-tree sub node with specific >> compatible in it). For these usual virtio devices just calling >> make_virtio_mmio_node_common() would be enough. >> >> >> Maybe we should introduce something like type "common" which would mean we >> don't need any additional device-tree sub nodes? >> >> virtio = ["type=common,transport=mmio"] > > I am fine with this. Maybe, to keep it aligned with compatibles, we > can write it as > > virtio = ["type=virtio,device,transport=mmio"] > > and document that "virtio,device" type is special and we won't add > compatible property to the DT node. Personally I am fine with this. > >>> diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c >>> index 612eacfc7fac..15a32c75c045 100644 >>> --- a/tools/libs/light/libxl_create.c >>> +++ b/tools/libs/light/libxl_create.c >>> @@ -1802,6 +1802,11 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, >>> &d_config->vkbs[i]); >>> } >>> + for (i = 0; i < d_config->num_virtios; i++) { >>> + libxl__device_add(gc, domid, &libxl__virtio_devtype, >>> + &d_config->virtios[i]); >>> + } >> >> >> I am wondering whether this is the best place to put this call. This gets >> called for LIBXL_DOMAIN_TYPE_PV and LIBXL_DOMAIN_TYPE_PVH (our Arm case), >> and not for LIBXL_DOMAIN_TYPE_HVM. Is it what we want? > > Can you suggest where should I move this ? I am not 100% sure, but I think if this whole enabling work is supposed to be indeed generic, I would move this out of "switch (d_config->c_info.type)" at least. > >>> +libxl_virtioinfo = Struct("virtioinfo", [ >>> + ("backend", string), >>> + ("backend_id", uint32), >>> + ("frontend", string), >>> + ("frontend_id", uint32), >>> + ("devid", libxl_devid), >>> + ("state", integer), >>> + ], dir=DIR_OUT) >> >> I failed to find where libxl_virtioinfo is used within the series. Why do we >> need it? > > Looks like leftover that I missed. Will remove it. > >>> +static int libxl__virtio_from_xenstore(libxl__gc *gc, const char *libxl_path, >>> + libxl_devid devid, >>> + libxl_device_virtio *virtio) >>> +{ >>> + const char *be_path, *fe_path, *tmp; >>> + libxl__device dev; >>> + int rc; >>> + >>> + virtio->devid = devid; >>> + >>> + rc = libxl__xs_read_mandatory(gc, XBT_NULL, >>> + GCSPRINTF("%s/backend", libxl_path), >>> + &be_path); >>> + if (rc) goto out; >>> + >>> + rc = libxl__xs_read_mandatory(gc, XBT_NULL, >>> + GCSPRINTF("%s/frontend", libxl_path), >>> + &fe_path); >>> + if (rc) goto out; >> >> fe_path is not used anywhere down the code even within the series, why do we >> need it? Or we just read it to make sure that corresponding entry is present >> in Xenstore (some kind of sanity check)? > > I copied it from libxl_vkb.c and it isn't using it either. So I assume > it is a sanity check, though can be removed if that's what makes > sense. > >>> + >>> + rc = libxl__backendpath_parse_domid(gc, be_path, &virtio->backend_domid); >>> + if (rc) goto out; >>> + >>> + rc = libxl__parse_backend_path(gc, be_path, &dev); >>> + if (rc) goto out; >> >> The same question for dev variable. > > Hmm, this we aren't using at all, which KBD does use it. Maybe we > should even call libxl__parse_backend_path() ? From the code I see that KBD uses "dev.backend_kind" afterwards, so for that purpose it calls libxl__parse_backend_path() to fill in dev's fields, but here we do not need it. I would drop this call together with dev variable.
On 05.12.22 13:29, Viresh Kumar wrote: Hello Viresh > On 05-12-22, 11:45, Viresh Kumar wrote: >>>> + rc = libxl__backendpath_parse_domid(gc, be_path, &virtio->backend_domid); >>>> + if (rc) goto out; >>>> + >>>> + rc = libxl__parse_backend_path(gc, be_path, &dev); >>>> + if (rc) goto out; >>> >>> The same question for dev variable. >> >> Hmm, this we aren't using at all, which KBD does use it. Maybe we >> should even call libxl__parse_backend_path() ? > > Removing it works just fine for me. Perfect. We will be able to add it when it is *really* needed. >
diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 374be1cfab25..4fddcc6f51d7 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -106,6 +106,7 @@ OBJS-y += libxl_vdispl.o OBJS-y += libxl_pvcalls.o OBJS-y += libxl_vsnd.o OBJS-y += libxl_vkb.o +OBJS-y += libxl_virtio.o OBJS-y += libxl_genid.o OBJS-y += _libxl_types.o OBJS-y += libxl_flask.o diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index b4928dbf673c..f33c9b273a4f 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -113,6 +113,19 @@ 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 (rc) + return rc; + } + /* * Every virtio-mmio device uses one emulated SPI. If Virtio devices are * present, make sure that we allocate enough SPIs for them. @@ -968,6 +981,68 @@ static int make_virtio_mmio_node(libxl__gc *gc, void *fdt, uint64_t base, return fdt_end_node(fdt); } +static int make_virtio_mmio_node_i2c(libxl__gc *gc, void *fdt) +{ + int res; + + res = fdt_begin_node(fdt, "i2c"); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 1, "virtio,device22"); + if (res) return res; + + return fdt_end_node(fdt); +} + +static int make_virtio_mmio_node_gpio(libxl__gc *gc, void *fdt) +{ + int res; + + res = fdt_begin_node(fdt, "gpio"); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 1, "virtio,device29"); + if (res) return res; + + res = fdt_property(fdt, "gpio-controller", NULL, 0); + if (res) return res; + + res = fdt_property_cell(fdt, "#gpio-cells", 2); + if (res) return res; + + res = fdt_property(fdt, "interrupt-controller", NULL, 0); + if (res) return res; + + res = fdt_property_cell(fdt, "#interrupt-cells", 2); + if (res) return res; + + return fdt_end_node(fdt); +} + +static int make_virtio_mmio_node_device(libxl__gc *gc, void *fdt, uint64_t base, + uint32_t irq, const char *type, + uint32_t backend_domid) +{ + int res, len = strlen(type); + + res = make_virtio_mmio_node_common(gc, fdt, base, irq, backend_domid); + if (res) return res; + + /* Add device specific nodes */ + if (!strncmp(type, "virtio,device22", len)) { + res = make_virtio_mmio_node_i2c(gc, fdt); + if (res) return res; + } else if (!strncmp(type, "virtio,device29", len)) { + res = make_virtio_mmio_node_gpio(gc, fdt); + if (res) return res; + } else { + LOG(ERROR, "Invalid type for virtio device: %s", type); + return -EINVAL; + } + + return fdt_end_node(fdt); +} + static const struct arch_info *get_arch_info(libxl__gc *gc, const struct xc_dom_image *dom) { @@ -1290,6 +1365,20 @@ static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_config *d_config, } } + 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 (virtio->backend_domid != LIBXL_TOOLSTACK_DOMID) + iommu_needed = true; + + FDT( make_virtio_mmio_node_device(gc, fdt, virtio->base, + virtio->irq, virtio->type, + virtio->backend_domid) ); + } + /* * Note, this should be only called after creating all virtio-mmio * device nodes diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index 612eacfc7fac..15a32c75c045 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -1802,6 +1802,11 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, &d_config->vkbs[i]); } + for (i = 0; i < d_config->num_virtios; i++) { + libxl__device_add(gc, domid, &libxl__virtio_devtype, + &d_config->virtios[i]); + } + if (d_config->b_info.arch_arm.vuart == LIBXL_VUART_TYPE_SBSA_UART) { init_console_info(gc, &vuart, 0); vuart.backend_domid = state->console_domid; diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h index cb9e8b3b8b5a..e5716f9bef80 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -4003,6 +4003,7 @@ static inline int *libxl__device_type_get_num( extern const libxl__device_type libxl__vfb_devtype; extern const libxl__device_type libxl__vkb_devtype; +extern const libxl__device_type libxl__virtio_devtype; extern const libxl__device_type libxl__disk_devtype; extern const libxl__device_type libxl__nic_devtype; extern const libxl__device_type libxl__vtpm_devtype; diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index d634f304cda2..d97a0795d312 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -278,6 +278,14 @@ libxl_vkb_backend = Enumeration("vkb_backend", [ (2, "LINUX") ]) +libxl_virtio_backend = Enumeration("virtio_backend", [ + (1, "STANDALONE") + ]) + +libxl_virtio_transport = Enumeration("virtio_transport", [ + (1, "MMIO"), + ]) + libxl_passthrough = Enumeration("passthrough", [ (0, "default"), (1, "disabled"), @@ -705,6 +713,17 @@ libxl_device_vkb = Struct("device_vkb", [ ("multi_touch_num_contacts", uint32) ]) +libxl_device_virtio = Struct("device_virtio", [ + ("backend_domid", libxl_domid), + ("backend_domname", string), + ("backend", libxl_virtio_backend), + ("type", string), + ("transport", libxl_virtio_transport), + ("devid", libxl_devid), + ("irq", uint32), + ("base", uint64) + ]) + libxl_device_disk = Struct("device_disk", [ ("backend_domid", libxl_domid), ("backend_domname", string), @@ -982,6 +1001,7 @@ libxl_domain_config = Struct("domain_config", [ ("dtdevs", Array(libxl_device_dtdev, "num_dtdevs")), ("vfbs", Array(libxl_device_vfb, "num_vfbs")), ("vkbs", Array(libxl_device_vkb, "num_vkbs")), + ("virtios", Array(libxl_device_virtio, "num_virtios")), ("vtpms", Array(libxl_device_vtpm, "num_vtpms")), ("p9s", Array(libxl_device_p9, "num_p9s")), ("pvcallsifs", Array(libxl_device_pvcallsif, "num_pvcallsifs")), @@ -1145,6 +1165,15 @@ libxl_vkbinfo = Struct("vkbinfo", [ ("rref", integer) ], dir=DIR_OUT) +libxl_virtioinfo = Struct("virtioinfo", [ + ("backend", string), + ("backend_id", uint32), + ("frontend", string), + ("frontend_id", uint32), + ("devid", libxl_devid), + ("state", integer), + ], dir=DIR_OUT) + # NUMA node characteristics: size and free are how much memory it has, and how # much of it is free, respectively. dists is an array of distances from this # node to each other node. diff --git a/tools/libs/light/libxl_types_internal.idl b/tools/libs/light/libxl_types_internal.idl index fb0f4f23d7c2..e24288f1a59e 100644 --- a/tools/libs/light/libxl_types_internal.idl +++ b/tools/libs/light/libxl_types_internal.idl @@ -33,6 +33,7 @@ libxl__device_kind = Enumeration("device_kind", [ (15, "VSND"), (16, "VINPUT"), (17, "VIRTIO_DISK"), + (18, "VIRTIO"), ]) libxl__console_backend = Enumeration("console_backend", [ diff --git a/tools/libs/light/libxl_virtio.c b/tools/libs/light/libxl_virtio.c new file mode 100644 index 000000000000..14b0c016a0a2 --- /dev/null +++ b/tools/libs/light/libxl_virtio.c @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2022 Linaro Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include "libxl_internal.h" + +static int libxl__device_virtio_setdefault(libxl__gc *gc, uint32_t domid, + libxl_device_virtio *virtio, + bool hotplug) +{ + return libxl__resolve_domid(gc, virtio->backend_domname, + &virtio->backend_domid); +} + +static int libxl__device_from_virtio(libxl__gc *gc, uint32_t domid, + libxl_device_virtio *virtio, + libxl__device *device) +{ + device->backend_devid = virtio->devid; + device->backend_domid = virtio->backend_domid; + device->devid = virtio->devid; + device->domid = domid; + + device->backend_kind = LIBXL__DEVICE_KIND_VIRTIO; + device->kind = LIBXL__DEVICE_KIND_VIRTIO; + + return 0; +} + +static int libxl__set_xenstore_virtio(libxl__gc *gc, uint32_t domid, + libxl_device_virtio *virtio, + flexarray_t *back, flexarray_t *front, + flexarray_t *ro_front) +{ + 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("%lu", virtio->base)); + flexarray_append_pair(back, "type", GCSPRINTF("%s", virtio->type)); + flexarray_append_pair(back, "transport", GCSPRINTF("%s", transport)); + + flexarray_append_pair(front, "irq", GCSPRINTF("%u", virtio->irq)); + flexarray_append_pair(front, "base", GCSPRINTF("%lu", virtio->base)); + flexarray_append_pair(front, "type", GCSPRINTF("%s", virtio->type)); + flexarray_append_pair(front, "transport", GCSPRINTF("%s", transport)); + + return 0; +} + +static int libxl__virtio_from_xenstore(libxl__gc *gc, const char *libxl_path, + libxl_devid devid, + libxl_device_virtio *virtio) +{ + const char *be_path, *fe_path, *tmp; + libxl__device dev; + int rc; + + virtio->devid = devid; + + rc = libxl__xs_read_mandatory(gc, XBT_NULL, + GCSPRINTF("%s/backend", libxl_path), + &be_path); + if (rc) goto out; + + rc = libxl__xs_read_mandatory(gc, XBT_NULL, + GCSPRINTF("%s/frontend", libxl_path), + &fe_path); + if (rc) goto out; + + rc = libxl__backendpath_parse_domid(gc, be_path, &virtio->backend_domid); + if (rc) goto out; + + rc = libxl__parse_backend_path(gc, be_path, &dev); + 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); + } + + rc = libxl__xs_read_checked(gc, XBT_NULL, + GCSPRINTF("%s/base", be_path), &tmp); + if (rc) goto out; + + if (tmp) { + virtio->base = strtoul(tmp, NULL, 0); + } + + rc = 0; + +out: + + return rc; +} + +static LIBXL_DEFINE_UPDATE_DEVID(virtio) + +#define libxl__add_virtios NULL +#define libxl_device_virtio_compare NULL + +DEFINE_DEVICE_TYPE_STRUCT(virtio, VIRTIO, virtios, + .set_xenstore_config = (device_set_xenstore_config_fn_t) + libxl__set_xenstore_virtio, + .from_xenstore = (device_from_xenstore_fn_t)libxl__virtio_from_xenstore, + .skip_attach = 1 +); + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */
This patch adds basic support for configuring and assisting generic Virtio backend which could run in any domain. An example of domain configuration for mmio based Virtio I2C device is: virtio = ["type=virtio,device22,transport=mmio"] Also to make this work on Arm, allocate Virtio MMIO params (IRQ and memory region) and pass them to the backend. Update guest device-tree as well to create a DT node for the Virtio devices. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- tools/libs/light/Makefile | 1 + tools/libs/light/libxl_arm.c | 89 +++++++++++++++ tools/libs/light/libxl_create.c | 5 + tools/libs/light/libxl_internal.h | 1 + tools/libs/light/libxl_types.idl | 29 +++++ tools/libs/light/libxl_types_internal.idl | 1 + tools/libs/light/libxl_virtio.c | 127 ++++++++++++++++++++++ 7 files changed, 253 insertions(+) create mode 100644 tools/libs/light/libxl_virtio.c