| Message ID | 20181001185721.15467-6-julien.grall@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | tools/libxl: Switch Arm guest type to PVH | expand |
On Mon, Oct 01, 2018 at 07:57:21PM +0100, Julien Grall wrote: > Currently, the toolstack is considering Arm guest always PV. However, > they are very similar to PVH because HW virtualization extension are used > and QEMU is not started. So switch Arm guest type to PVH. > > To keep compatibility with toolstack creating Arm guest with PV type > (e.g libvirt), libxl will now convert those guests to PVH. > > Furthermore, the default type for Arm in xl will now be PVH to allow > smooth transition for user. > > Signed-off-by: Julien Grall <julien.grall@arm.com> Reviewed-by: Roger Pau Monné <roger.pau@citrix.com> > > --- > > This was discussed at Xen Summit and also in various thread on > xen-devel. The latest one was when Andrew sent a patch to deny guest creation > on Arm with XEN_DOMCTL_CDF_hap unset. > > I suspect we first implemented Arm guest as PV in libxl because PVH was > non-existent and the type was easier to avoid spawning QEMU. Note that > Linux and Xen are already considering Arm guest as PVH. > > Changes in v3: > - Properly reset u.pvh > - Update documentation and print > - Return ERROR_INVAL rather than ERROR_FAIL > > Changes in v2: > - Rather than denying PV guest, convert them to PVH > --- > docs/man/xl.cfg.pod.5.in | 5 +++-- > tools/libxl/libxl_arch.h | 3 ++- > tools/libxl/libxl_arm.c | 26 ++++++++++++++++++++++++-- > tools/libxl/libxl_create.c | 2 +- > tools/libxl/libxl_x86.c | 3 ++- > tools/xl/xl_parse.c | 4 ++++ > 6 files changed, 36 insertions(+), 7 deletions(-) > > diff --git a/docs/man/xl.cfg.pod.5.in b/docs/man/xl.cfg.pod.5.in > index b72718151b..b1c0be14cd 100644 > --- a/docs/man/xl.cfg.pod.5.in > +++ b/docs/man/xl.cfg.pod.5.in > @@ -80,13 +80,14 @@ single host must be unique. > =item B<type="pv"> > > Specifies that this is to be a PV domain, suitable for hosting Xen-aware > -guest operating systems. This is the default. > +guest operating systems. This is the default on x86. > > =item B<type="pvh"> > > Specifies that this is to be an PVH domain. That is a lightweight HVM-like > guest without a device model and without many of the emulated devices > -available to HVM guests. Note that this mode requires a PVH aware kernel. > +available to HVM guests. Note that this mode requires a PVH aware kernel on > +x86. This is the default on Arm. > > =item B<type="hvm"> > > diff --git a/tools/libxl/libxl_arch.h b/tools/libxl/libxl_arch.h > index 5ab0c95974..930570ef1e 100644 > --- a/tools/libxl/libxl_arch.h > +++ b/tools/libxl/libxl_arch.h > @@ -65,7 +65,8 @@ _hidden > int libxl__arch_domain_map_irq(libxl__gc *gc, uint32_t domid, int irq); > > _hidden > -void libxl__arch_domain_build_info_setdefault(libxl_domain_build_info *b_info); > +void libxl__arch_domain_build_info_setdefault(libxl__gc *gc, > + libxl_domain_build_info *b_info); > > _hidden > int libxl__arch_extra_memory(libxl__gc *gc, > diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c > index 699fd9ddc6..25dc3defc6 100644 > --- a/tools/libxl/libxl_arm.c > +++ b/tools/libxl/libxl_arm.c > @@ -953,7 +953,11 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, > int rc; > uint64_t val; > > - assert(info->type == LIBXL_DOMAIN_TYPE_PV); > + if (info->type != LIBXL_DOMAIN_TYPE_PVH) { > + LOG(ERROR, "Unsupported Arm guest type %s", > + libxl_domain_type_to_string(info->type)); > + return ERROR_INVAL; > + } > > /* Set the value of domain param HVM_PARAM_CALLBACK_IRQ. */ > val = MASK_INSR(HVM_PARAM_CALLBACK_TYPE_PPI, > @@ -1110,10 +1114,28 @@ int libxl__arch_domain_map_irq(libxl__gc *gc, uint32_t domid, int irq) > return xc_domain_bind_pt_spi_irq(CTX->xch, domid, irq, irq); > } > > -void libxl__arch_domain_build_info_setdefault(libxl_domain_build_info *b_info) > +void libxl__arch_domain_build_info_setdefault(libxl__gc *gc, > + libxl_domain_build_info *b_info) > { > /* ACPI is disabled by default */ > libxl_defbool_setdefault(&b_info->acpi, false); > + > + /* > + * Arm guest are now considered as PVH by the toolstack. To allow > + * compatibility with previous toolstack, PV guest are automatically > + * converted to PVH. > + */ > + if (b_info->type != LIBXL_DOMAIN_TYPE_PV) > + return; > + > + LOG(WARN, "Converting PV guest to PVH."); > + LOG(WARN, "Arm guest are now PVH."); > + LOG(WARN, "Please fix your configuration file/toolstack."); > + > + /* Re-initialize type to PVH and all associated fields to defaults. */ > + memset(&b_info->u, '\0', sizeof(b_info->u)); I don't really like the zeroing done here, but I think it's fine as long as it's only done when converting from PV -> PVH and after copying the deprecated fields. Thansk, Roger.
Hi Roger, On 02/10/2018 09:56, Roger Pau Monné wrote: > On Mon, Oct 01, 2018 at 07:57:21PM +0100, Julien Grall wrote: >> Currently, the toolstack is considering Arm guest always PV. However, >> they are very similar to PVH because HW virtualization extension are used >> and QEMU is not started. So switch Arm guest type to PVH. >> >> To keep compatibility with toolstack creating Arm guest with PV type >> (e.g libvirt), libxl will now convert those guests to PVH. >> >> Furthermore, the default type for Arm in xl will now be PVH to allow >> smooth transition for user. >> >> Signed-off-by: Julien Grall <julien.grall@arm.com> > > Reviewed-by: Roger Pau Monné <roger.pau@citrix.com> > >> >> --- >> >> This was discussed at Xen Summit and also in various thread on >> xen-devel. The latest one was when Andrew sent a patch to deny guest creation >> on Arm with XEN_DOMCTL_CDF_hap unset. >> >> I suspect we first implemented Arm guest as PV in libxl because PVH was >> non-existent and the type was easier to avoid spawning QEMU. Note that >> Linux and Xen are already considering Arm guest as PVH. >> >> Changes in v3: >> - Properly reset u.pvh >> - Update documentation and print >> - Return ERROR_INVAL rather than ERROR_FAIL >> >> Changes in v2: >> - Rather than denying PV guest, convert them to PVH >> --- >> docs/man/xl.cfg.pod.5.in | 5 +++-- >> tools/libxl/libxl_arch.h | 3 ++- >> tools/libxl/libxl_arm.c | 26 ++++++++++++++++++++++++-- >> tools/libxl/libxl_create.c | 2 +- >> tools/libxl/libxl_x86.c | 3 ++- >> tools/xl/xl_parse.c | 4 ++++ >> 6 files changed, 36 insertions(+), 7 deletions(-) >> >> diff --git a/docs/man/xl.cfg.pod.5.in b/docs/man/xl.cfg.pod.5.in >> index b72718151b..b1c0be14cd 100644 >> --- a/docs/man/xl.cfg.pod.5.in >> +++ b/docs/man/xl.cfg.pod.5.in >> @@ -80,13 +80,14 @@ single host must be unique. >> =item B<type="pv"> >> >> Specifies that this is to be a PV domain, suitable for hosting Xen-aware >> -guest operating systems. This is the default. >> +guest operating systems. This is the default on x86. >> >> =item B<type="pvh"> >> >> Specifies that this is to be an PVH domain. That is a lightweight HVM-like >> guest without a device model and without many of the emulated devices >> -available to HVM guests. Note that this mode requires a PVH aware kernel. >> +available to HVM guests. Note that this mode requires a PVH aware kernel on >> +x86. This is the default on Arm. >> >> =item B<type="hvm"> >> >> diff --git a/tools/libxl/libxl_arch.h b/tools/libxl/libxl_arch.h >> index 5ab0c95974..930570ef1e 100644 >> --- a/tools/libxl/libxl_arch.h >> +++ b/tools/libxl/libxl_arch.h >> @@ -65,7 +65,8 @@ _hidden >> int libxl__arch_domain_map_irq(libxl__gc *gc, uint32_t domid, int irq); >> >> _hidden >> -void libxl__arch_domain_build_info_setdefault(libxl_domain_build_info *b_info); >> +void libxl__arch_domain_build_info_setdefault(libxl__gc *gc, >> + libxl_domain_build_info *b_info); >> >> _hidden >> int libxl__arch_extra_memory(libxl__gc *gc, >> diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c >> index 699fd9ddc6..25dc3defc6 100644 >> --- a/tools/libxl/libxl_arm.c >> +++ b/tools/libxl/libxl_arm.c >> @@ -953,7 +953,11 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, >> int rc; >> uint64_t val; >> >> - assert(info->type == LIBXL_DOMAIN_TYPE_PV); >> + if (info->type != LIBXL_DOMAIN_TYPE_PVH) { >> + LOG(ERROR, "Unsupported Arm guest type %s", >> + libxl_domain_type_to_string(info->type)); >> + return ERROR_INVAL; >> + } >> >> /* Set the value of domain param HVM_PARAM_CALLBACK_IRQ. */ >> val = MASK_INSR(HVM_PARAM_CALLBACK_TYPE_PPI, >> @@ -1110,10 +1114,28 @@ int libxl__arch_domain_map_irq(libxl__gc *gc, uint32_t domid, int irq) >> return xc_domain_bind_pt_spi_irq(CTX->xch, domid, irq, irq); >> } >> >> -void libxl__arch_domain_build_info_setdefault(libxl_domain_build_info *b_info) >> +void libxl__arch_domain_build_info_setdefault(libxl__gc *gc, >> + libxl_domain_build_info *b_info) >> { >> /* ACPI is disabled by default */ >> libxl_defbool_setdefault(&b_info->acpi, false); >> + >> + /* >> + * Arm guest are now considered as PVH by the toolstack. To allow >> + * compatibility with previous toolstack, PV guest are automatically >> + * converted to PVH. >> + */ >> + if (b_info->type != LIBXL_DOMAIN_TYPE_PV) >> + return; >> + >> + LOG(WARN, "Converting PV guest to PVH."); >> + LOG(WARN, "Arm guest are now PVH."); >> + LOG(WARN, "Please fix your configuration file/toolstack."); >> + >> + /* Re-initialize type to PVH and all associated fields to defaults. */ >> + memset(&b_info->u, '\0', sizeof(b_info->u)); > > I don't really like the zeroing done here, but I think it's fine as > long as it's only done when converting from PV -> PVH and after > copying the deprecated fields. I don't think we can safely avoid to re-initialize b_info->u. Some fields in u.pv are not initialized to 0 (e.g slack_memkb is initialized to ~0ULL). So you will transfer that value over to pvh union and altering the init values for PVH. Furthermore, PVH fields may not be initialized to 0 (so far it is not the case). So the memset here will ensure that all fields are 0, then libxl_domain_build_info_init_type() will setup init value for non-zero fields. libxl__arch_domain_build_info_setdefault is called after deprecated fields are copied and soon enough to not handle specific Guest type default. Cheers,
On Mon, Oct 01, 2018 at 07:57:21PM +0100, Julien Grall wrote: > Currently, the toolstack is considering Arm guest always PV. However, > they are very similar to PVH because HW virtualization extension are used > and QEMU is not started. So switch Arm guest type to PVH. > > To keep compatibility with toolstack creating Arm guest with PV type > (e.g libvirt), libxl will now convert those guests to PVH. > > Furthermore, the default type for Arm in xl will now be PVH to allow > smooth transition for user. > > Signed-off-by: Julien Grall <julien.grall@arm.com> Acked-by: Wei Liu <wei.liu2@citrix.com>
diff --git a/docs/man/xl.cfg.pod.5.in b/docs/man/xl.cfg.pod.5.in index b72718151b..b1c0be14cd 100644 --- a/docs/man/xl.cfg.pod.5.in +++ b/docs/man/xl.cfg.pod.5.in @@ -80,13 +80,14 @@ single host must be unique. =item B<type="pv"> Specifies that this is to be a PV domain, suitable for hosting Xen-aware -guest operating systems. This is the default. +guest operating systems. This is the default on x86. =item B<type="pvh"> Specifies that this is to be an PVH domain. That is a lightweight HVM-like guest without a device model and without many of the emulated devices -available to HVM guests. Note that this mode requires a PVH aware kernel. +available to HVM guests. Note that this mode requires a PVH aware kernel on +x86. This is the default on Arm. =item B<type="hvm"> diff --git a/tools/libxl/libxl_arch.h b/tools/libxl/libxl_arch.h index 5ab0c95974..930570ef1e 100644 --- a/tools/libxl/libxl_arch.h +++ b/tools/libxl/libxl_arch.h @@ -65,7 +65,8 @@ _hidden int libxl__arch_domain_map_irq(libxl__gc *gc, uint32_t domid, int irq); _hidden -void libxl__arch_domain_build_info_setdefault(libxl_domain_build_info *b_info); +void libxl__arch_domain_build_info_setdefault(libxl__gc *gc, + libxl_domain_build_info *b_info); _hidden int libxl__arch_extra_memory(libxl__gc *gc, diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 699fd9ddc6..25dc3defc6 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -953,7 +953,11 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, int rc; uint64_t val; - assert(info->type == LIBXL_DOMAIN_TYPE_PV); + if (info->type != LIBXL_DOMAIN_TYPE_PVH) { + LOG(ERROR, "Unsupported Arm guest type %s", + libxl_domain_type_to_string(info->type)); + return ERROR_INVAL; + } /* Set the value of domain param HVM_PARAM_CALLBACK_IRQ. */ val = MASK_INSR(HVM_PARAM_CALLBACK_TYPE_PPI, @@ -1110,10 +1114,28 @@ int libxl__arch_domain_map_irq(libxl__gc *gc, uint32_t domid, int irq) return xc_domain_bind_pt_spi_irq(CTX->xch, domid, irq, irq); } -void libxl__arch_domain_build_info_setdefault(libxl_domain_build_info *b_info) +void libxl__arch_domain_build_info_setdefault(libxl__gc *gc, + libxl_domain_build_info *b_info) { /* ACPI is disabled by default */ libxl_defbool_setdefault(&b_info->acpi, false); + + /* + * Arm guest are now considered as PVH by the toolstack. To allow + * compatibility with previous toolstack, PV guest are automatically + * converted to PVH. + */ + if (b_info->type != LIBXL_DOMAIN_TYPE_PV) + return; + + LOG(WARN, "Converting PV guest to PVH."); + LOG(WARN, "Arm guest are now PVH."); + LOG(WARN, "Please fix your configuration file/toolstack."); + + /* Re-initialize type to PVH and all associated fields to defaults. */ + memset(&b_info->u, '\0', sizeof(b_info->u)); + b_info->type = LIBXL_DOMAIN_TYPE_INVALID; + libxl_domain_build_info_init_type(b_info, LIBXL_DOMAIN_TYPE_PVH); } /* diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index fe97eebdea..320dbed3c6 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -215,7 +215,7 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, if (!b_info->event_channels) b_info->event_channels = 1023; - libxl__arch_domain_build_info_setdefault(b_info); + libxl__arch_domain_build_info_setdefault(gc, b_info); libxl_defbool_setdefault(&b_info->dm_restrict, false); switch (b_info->type) { diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c index 81523a568f..8b6759c089 100644 --- a/tools/libxl/libxl_x86.c +++ b/tools/libxl/libxl_x86.c @@ -613,7 +613,8 @@ int libxl__arch_domain_finalise_hw_description(libxl__gc *gc, return rc; } -void libxl__arch_domain_build_info_setdefault(libxl_domain_build_info *b_info) +void libxl__arch_domain_build_info_setdefault(libxl__gc *gc, + libxl_domain_build_info *b_info) { libxl_defbool_setdefault(&b_info->acpi, true); } diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 971ec1bc56..0bda28152b 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -1286,7 +1286,11 @@ void parse_config_data(const char *config_source, } if (c_info->type == LIBXL_DOMAIN_TYPE_INVALID) +#if defined(__arm__) || defined(__aarch64__) + c_info->type = LIBXL_DOMAIN_TYPE_PVH; +#else c_info->type = LIBXL_DOMAIN_TYPE_PV; +#endif xlu_cfg_get_defbool(config, "hap", &c_info->hap, 0);
Currently, the toolstack is considering Arm guest always PV. However, they are very similar to PVH because HW virtualization extension are used and QEMU is not started. So switch Arm guest type to PVH. To keep compatibility with toolstack creating Arm guest with PV type (e.g libvirt), libxl will now convert those guests to PVH. Furthermore, the default type for Arm in xl will now be PVH to allow smooth transition for user. Signed-off-by: Julien Grall <julien.grall@arm.com> --- This was discussed at Xen Summit and also in various thread on xen-devel. The latest one was when Andrew sent a patch to deny guest creation on Arm with XEN_DOMCTL_CDF_hap unset. I suspect we first implemented Arm guest as PV in libxl because PVH was non-existent and the type was easier to avoid spawning QEMU. Note that Linux and Xen are already considering Arm guest as PVH. Changes in v3: - Properly reset u.pvh - Update documentation and print - Return ERROR_INVAL rather than ERROR_FAIL Changes in v2: - Rather than denying PV guest, convert them to PVH --- docs/man/xl.cfg.pod.5.in | 5 +++-- tools/libxl/libxl_arch.h | 3 ++- tools/libxl/libxl_arm.c | 26 ++++++++++++++++++++++++-- tools/libxl/libxl_create.c | 2 +- tools/libxl/libxl_x86.c | 3 ++- tools/xl/xl_parse.c | 4 ++++ 6 files changed, 36 insertions(+), 7 deletions(-)