* [Xen-devel] [XEN PATCH for-4.13 v3 05/10] libxl: Move shadow_memkb and iommu_memkb defaulting into libxl
2019-10-11 16:55 [Xen-devel] [XEN PATCH for-4.13 v3 00/10] libxl memkb & pt defaulting Ian Jackson
@ 2019-10-11 16:55 ` Ian Jackson
2019-10-14 12:45 ` Anthony PERARD
2019-10-14 16:50 ` Anthony PERARD
2019-10-11 16:55 ` [Xen-devel] [XEN PATCH for-4.13 v3 06/10] libxl: Remove/deprecate libxl_get_required_*_memory from the API Ian Jackson
` (4 subsequent siblings)
5 siblings, 2 replies; 15+ messages in thread
From: Ian Jackson @ 2019-10-11 16:55 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Jan Beulich, Andrew Cooper
Defaulting is supposed to be done by libxl. So these calculations
should be here in libxl. libxl__domain_config_setdefault has all the
necessary information including the values of max_memkb and max_vcpus.
The overall functional effect depends on the caller:
For xl, no change. The code moves from xl to libxl.
For callers who set one or both shadow_memkb and iommu_memkb (whether
from libxl_get_required_shadow_memory or otherwise) before calling
libxl_domain_need_memory (any version): the new code will leave their
setting(s) unchanged.
For callers who do not call libxl_domain_need_memory at all, and who
fail to set one of these memory values: now they are both are properly
set. The shadow and iommu memory to be properly accounted for as
intended.
For callers which call libxl_domain_need_memory and request the
current API (4.13) or which track libxl, the default values are also
now right and everything works as intended.
For callers which call libxl_domain_need_memory, and request an old
pre-4.13 libxl API, and which leave one of these memkb settings unset,
we take special measures to preserve the old behaviour.
This means that they don't get the additional iommu memory and are at
risk of the domain running out of memory as a result of f89f555827a6
"remove late (on-demand) construction of IOMMU page tables". But this
is no worse than the state just after f89f555827a6, which already
broke such callers in that way. This is perhaps justifiable because
of the API stability warning next to libxl_domain_need_memory.
An alternative would be to drop the special-casing of these callers.
That would cause a discrepancy between libxl_domain_need_memory and
libxl_domain_create: the former would not include the iommu memory and
the latter would. That seems worse, but it's debateable.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v2: Replace _Bool with bool
Fix logic sense in ok_to_default_memkb_in_create
---
tools/libxl/libxl_create.c | 40 ++++++++++++++++++++++++++++++++++++++++
tools/libxl/libxl_internal.h | 3 +++
tools/libxl/libxl_mem.c | 4 ++++
tools/xl/xl_parse.c | 15 ++-------------
4 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index fd8bb22be9..a1b00a8aef 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -250,6 +250,7 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
switch (b_info->type) {
case LIBXL_DOMAIN_TYPE_HVM:
if (b_info->shadow_memkb == LIBXL_MEMKB_DEFAULT)
+ /* Normally defaulted in libxl__domain_create_info_setdefault */
b_info->shadow_memkb = 0;
if (b_info->u.hvm.mmio_hole_memkb == LIBXL_MEMKB_DEFAULT)
b_info->u.hvm.mmio_hole_memkb = 0;
@@ -395,6 +396,7 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT)
b_info->video_memkb = 0;
if (b_info->shadow_memkb == LIBXL_MEMKB_DEFAULT)
+ /* Normally defaulted in libxl__domain_create_info_setdefault */
b_info->shadow_memkb = 0;
if (b_info->u.pv.slack_memkb == LIBXL_MEMKB_DEFAULT)
b_info->u.pv.slack_memkb = 0;
@@ -862,6 +864,30 @@ static void domcreate_destruction_cb(libxl__egc *egc,
libxl__domain_destroy_state *dds,
int rc);
+static bool ok_to_default_memkb_in_create(libxl__gc *gc)
+{
+ /*
+ * This is a fudge. We are trying to find whether the caller
+ * calls the old version of libxl_domain_need_memory. If they do
+ * then, because it only gets the b_info, and because it can't
+ * update the b_info (because it's const), it will base its
+ * calculations on defaulting shadow_memkb and iommu_memkb to 0
+ * In that case we probably shouldn't default them differently
+ * during libxl_domain_create.
+ *
+ * The result is that the behaviour with old callers is the same
+ * as in 4.13: no additional memory is allocated for shadow and
+ * iommu (unless the caller set shadow_memkb, eg from a call to
+ * libxl_get_required_shadow_memory).
+ */
+ return !CTX->libxl_domain_need_memory_0x041200_called ||
+ CTX->libxl_domain_need_memory_called;
+ /*
+ * Treat mixed callers as new callers. Presumably they know what
+ * they are doing.
+ */
+}
+
int libxl__domain_config_setdefault(libxl__gc *gc,
libxl_domain_config *d_config,
uint32_t domid)
@@ -974,6 +1000,20 @@ int libxl__domain_config_setdefault(libxl__gc *gc,
goto error_out;
}
+ if (d_config->b_info.shadow_memkb == LIBXL_MEMKB_DEFAULT
+ && ok_to_default_memkb_in_create(gc))
+ d_config->b_info.shadow_memkb =
+ libxl_get_required_shadow_memory(d_config->b_info.max_memkb,
+ d_config->b_info.max_vcpus);
+
+ /* No IOMMU reservation is needed if passthrough mode is not 'sync_pt' */
+ if (d_config->b_info.iommu_memkb == LIBXL_MEMKB_DEFAULT
+ && ok_to_default_memkb_in_create(gc))
+ d_config->b_info.iommu_memkb =
+ (d_config->c_info.passthrough == LIBXL_PASSTHROUGH_SYNC_PT)
+ ? libxl_get_required_iommu_memory(d_config->b_info.max_memkb)
+ : 0;
+
ret = libxl__domain_build_info_setdefault(gc, &d_config->b_info);
if (ret) {
LOGD(ERROR, domid, "Unable to set domain build info defaults");
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 01de5576d9..0185b8ff01 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -637,6 +637,9 @@ struct libxl__ctx {
LIBXL_LIST_ENTRY(libxl_ctx) sigchld_users_entry;
libxl_version_info version_info;
+
+ bool libxl_domain_need_memory_0x041200_called,
+ libxl_domain_need_memory_called;
};
/*
diff --git a/tools/libxl/libxl_mem.c b/tools/libxl/libxl_mem.c
index 6042299393..7c01fac7e5 100644
--- a/tools/libxl/libxl_mem.c
+++ b/tools/libxl/libxl_mem.c
@@ -484,6 +484,8 @@ int libxl_domain_need_memory(libxl_ctx *ctx,
GC_INIT(ctx);
int rc;
+ ctx->libxl_domain_need_memory_called = 1;
+
rc = libxl__domain_config_setdefault(gc,
d_config,
domid_for_logging);
@@ -507,6 +509,8 @@ int libxl_domain_need_memory_0x041200(libxl_ctx *ctx,
GC_INIT(ctx);
int rc;
+ ctx->libxl_domain_need_memory_0x041200_called = 1;
+
libxl_domain_build_info b_info[1];
libxl_domain_build_info_init(b_info);
libxl_domain_build_info_copy(ctx, b_info, b_info_in);
diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c
index 03a2c54dd2..79871c22d0 100644
--- a/tools/xl/xl_parse.c
+++ b/tools/xl/xl_parse.c
@@ -1572,19 +1572,8 @@ void parse_config_data(const char *config_source,
exit(-ERROR_FAIL);
}
- /* libxl_get_required_shadow_memory() and
- * libxl_get_required_iommu_memory() must be called after final values
- * (default or specified) for vcpus and memory are set, because the
- * calculations depend on those values. */
- b_info->shadow_memkb = !xlu_cfg_get_long(config, "shadow_memory", &l, 0)
- ? l * 1024
- : libxl_get_required_shadow_memory(b_info->max_memkb,
- b_info->max_vcpus);
-
- /* No IOMMU reservation is needed if passthrough mode is not 'sync_pt' */
- b_info->iommu_memkb = (c_info->passthrough == LIBXL_PASSTHROUGH_SYNC_PT)
- ? libxl_get_required_iommu_memory(b_info->max_memkb)
- : 0;
+ if (!xlu_cfg_get_long(config, "shadow_memory", &l, 0))
+ b_info->shadow_memkb = l * 1024;
xlu_cfg_get_defbool(config, "nomigrate", &b_info->disable_migrate, 0);
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [Xen-devel] [XEN PATCH for-4.13 v3 05/10] libxl: Move shadow_memkb and iommu_memkb defaulting into libxl
2019-10-11 16:55 ` [Xen-devel] [XEN PATCH for-4.13 v3 05/10] libxl: Move shadow_memkb and iommu_memkb defaulting into libxl Ian Jackson
@ 2019-10-14 12:45 ` Anthony PERARD
2019-10-14 16:50 ` Anthony PERARD
1 sibling, 0 replies; 15+ messages in thread
From: Anthony PERARD @ 2019-10-14 12:45 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel, Andrew Cooper, Jan Beulich, Paul Durrant
On Fri, Oct 11, 2019 at 05:55:44PM +0100, Ian Jackson wrote:
> Defaulting is supposed to be done by libxl. So these calculations
> should be here in libxl. libxl__domain_config_setdefault has all the
> necessary information including the values of max_memkb and max_vcpus.
>
> The overall functional effect depends on the caller:
>
> For xl, no change. The code moves from xl to libxl.
>
> For callers who set one or both shadow_memkb and iommu_memkb (whether
> from libxl_get_required_shadow_memory or otherwise) before calling
> libxl_domain_need_memory (any version): the new code will leave their
> setting(s) unchanged.
>
> For callers who do not call libxl_domain_need_memory at all, and who
> fail to set one of these memory values: now they are both are properly
> set. The shadow and iommu memory to be properly accounted for as
> intended.
>
> For callers which call libxl_domain_need_memory and request the
> current API (4.13) or which track libxl, the default values are also
> now right and everything works as intended.
>
> For callers which call libxl_domain_need_memory, and request an old
> pre-4.13 libxl API, and which leave one of these memkb settings unset,
> we take special measures to preserve the old behaviour.
>
> This means that they don't get the additional iommu memory and are at
> risk of the domain running out of memory as a result of f89f555827a6
> "remove late (on-demand) construction of IOMMU page tables". But this
> is no worse than the state just after f89f555827a6, which already
> broke such callers in that way. This is perhaps justifiable because
> of the API stability warning next to libxl_domain_need_memory.
>
> An alternative would be to drop the special-casing of these callers.
> That would cause a discrepancy between libxl_domain_need_memory and
> libxl_domain_create: the former would not include the iommu memory and
> the latter would. That seems worse, but it's debateable.
>
> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
> ---
> v2: Replace _Bool with bool
> Fix logic sense in ok_to_default_memkb_in_create
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Xen-devel] [XEN PATCH for-4.13 v3 05/10] libxl: Move shadow_memkb and iommu_memkb defaulting into libxl
2019-10-11 16:55 ` [Xen-devel] [XEN PATCH for-4.13 v3 05/10] libxl: Move shadow_memkb and iommu_memkb defaulting into libxl Ian Jackson
2019-10-14 12:45 ` Anthony PERARD
@ 2019-10-14 16:50 ` Anthony PERARD
2019-10-14 16:53 ` Ian Jackson
2019-10-14 17:00 ` Ian Jackson
1 sibling, 2 replies; 15+ messages in thread
From: Anthony PERARD @ 2019-10-14 16:50 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel, Andrew Cooper, Jan Beulich, Paul Durrant
On Fri, Oct 11, 2019 at 05:55:44PM +0100, Ian Jackson wrote:
> For callers which call libxl_domain_need_memory, and request an old
> pre-4.13 libxl API, and which leave one of these memkb settings unset,
> we take special measures to preserve the old behaviour.
>
> This means that they don't get the additional iommu memory and are at
> risk of the domain running out of memory as a result of f89f555827a6
> "remove late (on-demand) construction of IOMMU page tables". But this
> is no worse than the state just after f89f555827a6, which already
> broke such callers in that way. This is perhaps justifiable because
> of the API stability warning next to libxl_domain_need_memory.
There's probably something else that is needed to be done for user of
the pre-4.13 API. If they call libxl_domain_need_memory_0x041200, there
is nothing that set iommu_memkb, so the default value stays at -1 and
libxl_domain_need_memory_0x041200 returns a value that is lower that
"target_memkb + shadow_memkb". Then, when libxl create the domain, it
still keep iommu_memkb==-1, because the old API as been used.
I tried to have xl call the 4.12 API and create a guest without
passthrough, and QEMU crashed (assert() failure).
So maybe libxl__domain_build_info_setdefault() should also set a value
to iommu_memkb as it does for shadow_memkb? At least, set iommu_memkb=0
if still the default.
iommu_memkb is new in 4.13, user of the pre-4.13 API will not set it.
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Xen-devel] [XEN PATCH for-4.13 v3 05/10] libxl: Move shadow_memkb and iommu_memkb defaulting into libxl
2019-10-14 16:50 ` Anthony PERARD
@ 2019-10-14 16:53 ` Ian Jackson
2019-10-14 17:00 ` Ian Jackson
1 sibling, 0 replies; 15+ messages in thread
From: Ian Jackson @ 2019-10-14 16:53 UTC (permalink / raw)
To: Anthony PERARD; +Cc: xen-devel, Andrew Cooper, Jan Beulich, Paul Durrant
Anthony PERARD writes ("Re: [Xen-devel] [XEN PATCH for-4.13 v3 05/10] libxl: Move shadow_memkb and iommu_memkb defaulting into libxl"):
> There's probably something else that is needed to be done for user of
> the pre-4.13 API. If they call libxl_domain_need_memory_0x041200, there
> is nothing that set iommu_memkb, so the default value stays at -1 and
> libxl_domain_need_memory_0x041200 returns a value that is lower that
> "target_memkb + shadow_memkb". Then, when libxl create the domain, it
> still keep iommu_memkb==-1, because the old API as been used.
>
> I tried to have xl call the 4.12 API and create a guest without
> passthrough, and QEMU crashed (assert() failure).
>
> So maybe libxl__domain_build_info_setdefault() should also set a value
> to iommu_memkb as it does for shadow_memkb? At least, set iommu_memkb=0
> if still the default.
I think you are right. Not sure how I missed that.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [Xen-devel] [XEN PATCH for-4.13 v3 05/10] libxl: Move shadow_memkb and iommu_memkb defaulting into libxl
2019-10-14 16:50 ` Anthony PERARD
2019-10-14 16:53 ` Ian Jackson
@ 2019-10-14 17:00 ` Ian Jackson
2019-10-15 10:37 ` Anthony PERARD
1 sibling, 1 reply; 15+ messages in thread
From: Ian Jackson @ 2019-10-14 17:00 UTC (permalink / raw)
To: Anthony PERARD; +Cc: xen-devel, Andrew Cooper, Jan Beulich, Paul Durrant
Anthony PERARD writes ("Re: [Xen-devel] [XEN PATCH for-4.13 v3 05/10] libxl: Move shadow_memkb and iommu_memkb defaulting into libxl"):
> So maybe libxl__domain_build_info_setdefault() should also set a value
> to iommu_memkb as it does for shadow_memkb? At least, set iommu_memkb=0
> if still the default.
I think, this.
Ian.
From 379d8eb69f713cccf7eacb4c2a63f4f5fe944255 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Mon, 14 Oct 2019 17:59:00 +0100
Subject: [PATCH] squash! libxl: Move shadow_memkb and iommu_memkb defaulting
into libxl
---
v4: Provide a fallback default for iommu_memkb too, for old callers.
---
tools/libxl/libxl_create.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 7423bedf7d..b3951a2423 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -229,6 +229,10 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
libxl__arch_domain_build_info_setdefault(gc, b_info);
libxl_defbool_setdefault(&b_info->dm_restrict, false);
+ if (b_info->iommu_memkb == LIBXL_MEMKB_DEFAULT)
+ /* Normally defaulted in libxl__domain_create_info_setdefault */
+ b_info->iommu_memkb = 0;
+
switch (b_info->type) {
case LIBXL_DOMAIN_TYPE_HVM:
if (b_info->shadow_memkb == LIBXL_MEMKB_DEFAULT)
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [Xen-devel] [XEN PATCH for-4.13 v3 05/10] libxl: Move shadow_memkb and iommu_memkb defaulting into libxl
2019-10-14 17:00 ` Ian Jackson
@ 2019-10-15 10:37 ` Anthony PERARD
0 siblings, 0 replies; 15+ messages in thread
From: Anthony PERARD @ 2019-10-15 10:37 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel, Andrew Cooper, Jan Beulich, Paul Durrant
On Mon, Oct 14, 2019 at 06:00:23PM +0100, Ian Jackson wrote:
> Anthony PERARD writes ("Re: [Xen-devel] [XEN PATCH for-4.13 v3 05/10] libxl: Move shadow_memkb and iommu_memkb defaulting into libxl"):
> > So maybe libxl__domain_build_info_setdefault() should also set a value
> > to iommu_memkb as it does for shadow_memkb? At least, set iommu_memkb=0
> > if still the default.
>
> I think, this.
>
> Ian.
>
> From 379d8eb69f713cccf7eacb4c2a63f4f5fe944255 Mon Sep 17 00:00:00 2001
> From: Ian Jackson <ian.jackson@eu.citrix.com>
> Date: Mon, 14 Oct 2019 17:59:00 +0100
> Subject: [PATCH] squash! libxl: Move shadow_memkb and iommu_memkb defaulting
> into libxl
>
> ---
> v4: Provide a fallback default for iommu_memkb too, for old callers.
> ---
> tools/libxl/libxl_create.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
> index 7423bedf7d..b3951a2423 100644
> --- a/tools/libxl/libxl_create.c
> +++ b/tools/libxl/libxl_create.c
> @@ -229,6 +229,10 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
> libxl__arch_domain_build_info_setdefault(gc, b_info);
> libxl_defbool_setdefault(&b_info->dm_restrict, false);
>
> + if (b_info->iommu_memkb == LIBXL_MEMKB_DEFAULT)
> + /* Normally defaulted in libxl__domain_create_info_setdefault */
> + b_info->iommu_memkb = 0;
> +
> switch (b_info->type) {
> case LIBXL_DOMAIN_TYPE_HVM:
> if (b_info->shadow_memkb == LIBXL_MEMKB_DEFAULT)
Acked-by: Anthony PERARD <anthony.perard@citrix.com>
Thanks,
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Xen-devel] [XEN PATCH for-4.13 v3 06/10] libxl: Remove/deprecate libxl_get_required_*_memory from the API
2019-10-11 16:55 [Xen-devel] [XEN PATCH for-4.13 v3 00/10] libxl memkb & pt defaulting Ian Jackson
2019-10-11 16:55 ` [Xen-devel] [XEN PATCH for-4.13 v3 05/10] libxl: Move shadow_memkb and iommu_memkb defaulting into libxl Ian Jackson
@ 2019-10-11 16:55 ` Ian Jackson
2019-10-11 16:55 ` [Xen-devel] [XEN PATCH for-4.13 v3 07/10] libxl: create: setdefault: Make libxl_physinfo info[1] Ian Jackson
` (3 subsequent siblings)
5 siblings, 0 replies; 15+ messages in thread
From: Ian Jackson @ 2019-10-11 16:55 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Jan Beulich, Andrew Cooper
These are now redundant because shadow_memkb and iommu_memkb are now
defaulted automatically by libxl_domain_need_memory and
libxl_domain_create etc. Callers should not now call these; instead,
they should just let libxl take care of it.
libxl_get_required_shadow_memory was introduced in f89f555827a6
"remove late (on-demand) construction of IOMMU page tables"
We can freely remove it because it was never in any release.
libxl_get_required_shadow_memory has been in libxl approximately
forever. It should probably not have survived the creation of
libxl_domain_create, but it seems the API awkwardnesses we see in
recent commits prevented this. So we have to keep it. It remains
functional but we can deprecate it. Hopefully we can get rid of it
completely before we find the need to change the calculation to use
additional information which its arguments do not currently supply.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Anthony PERARD <anthony.perard@citrix.com>
---
tools/libxl/libxl_create.c | 17 ++++++++++++++++-
tools/libxl/libxl_utils.c | 15 ---------------
tools/libxl/libxl_utils.h | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index a1b00a8aef..b394312d98 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -888,6 +888,21 @@ static bool ok_to_default_memkb_in_create(libxl__gc *gc)
*/
}
+static unsigned long libxl__get_required_iommu_memory(unsigned long maxmem_kb)
+{
+ unsigned long iommu_pages = 0, mem_pages = maxmem_kb / 4;
+ unsigned int level;
+
+ /* Assume a 4 level page table with 512 entries per level */
+ for (level = 0; level < 4; level++)
+ {
+ mem_pages = DIV_ROUNDUP(mem_pages, 512);
+ iommu_pages += mem_pages;
+ }
+
+ return iommu_pages * 4;
+}
+
int libxl__domain_config_setdefault(libxl__gc *gc,
libxl_domain_config *d_config,
uint32_t domid)
@@ -1011,7 +1026,7 @@ int libxl__domain_config_setdefault(libxl__gc *gc,
&& ok_to_default_memkb_in_create(gc))
d_config->b_info.iommu_memkb =
(d_config->c_info.passthrough == LIBXL_PASSTHROUGH_SYNC_PT)
- ? libxl_get_required_iommu_memory(d_config->b_info.max_memkb)
+ ? libxl__get_required_iommu_memory(d_config->b_info.max_memkb)
: 0;
ret = libxl__domain_build_info_setdefault(gc, &d_config->b_info);
diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c
index 405733b7e1..f360f5e228 100644
--- a/tools/libxl/libxl_utils.c
+++ b/tools/libxl/libxl_utils.c
@@ -48,21 +48,6 @@ unsigned long libxl_get_required_shadow_memory(unsigned long maxmem_kb, unsigned
return 4 * (256 * smp_cpus + 2 * (maxmem_kb / 1024));
}
-unsigned long libxl_get_required_iommu_memory(unsigned long maxmem_kb)
-{
- unsigned long iommu_pages = 0, mem_pages = maxmem_kb / 4;
- unsigned int level;
-
- /* Assume a 4 level page table with 512 entries per level */
- for (level = 0; level < 4; level++)
- {
- mem_pages = DIV_ROUNDUP(mem_pages, 512);
- iommu_pages += mem_pages;
- }
-
- return iommu_pages * 4;
-}
-
char *libxl_domid_to_name(libxl_ctx *ctx, uint32_t domid)
{
unsigned int len;
diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h
index 630ccbe28a..46918aea84 100644
--- a/tools/libxl/libxl_utils.h
+++ b/tools/libxl/libxl_utils.h
@@ -24,7 +24,7 @@ const
char *libxl_basename(const char *name); /* returns string from strdup */
unsigned long libxl_get_required_shadow_memory(unsigned long maxmem_kb, unsigned int smp_cpus);
-unsigned long libxl_get_required_iommu_memory(unsigned long maxmem_kb);
+ /* deprecated; see LIBXL_HAVE_DOMAIN_NEED_MEMORY_CONFIG in libxl.h */
int libxl_name_to_domid(libxl_ctx *ctx, const char *name, uint32_t *domid);
int libxl_domain_qualifier_to_domid(libxl_ctx *ctx, const char *name, uint32_t *domid);
char *libxl_domid_to_name(libxl_ctx *ctx, uint32_t domid);
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Xen-devel] [XEN PATCH for-4.13 v3 07/10] libxl: create: setdefault: Make libxl_physinfo info[1]
2019-10-11 16:55 [Xen-devel] [XEN PATCH for-4.13 v3 00/10] libxl memkb & pt defaulting Ian Jackson
2019-10-11 16:55 ` [Xen-devel] [XEN PATCH for-4.13 v3 05/10] libxl: Move shadow_memkb and iommu_memkb defaulting into libxl Ian Jackson
2019-10-11 16:55 ` [Xen-devel] [XEN PATCH for-4.13 v3 06/10] libxl: Remove/deprecate libxl_get_required_*_memory from the API Ian Jackson
@ 2019-10-11 16:55 ` Ian Jackson
2019-10-11 16:55 ` [Xen-devel] [XEN PATCH for-4.13 v3 08/10] libxl: create: setdefault: Move physinfo into config_setdefault Ian Jackson
` (2 subsequent siblings)
5 siblings, 0 replies; 15+ messages in thread
From: Ian Jackson @ 2019-10-11 16:55 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Jan Beulich, Andrew Cooper
No functional change. This will let us make it into a pointer without
textual change other than to the definition.
While we are here, fix some style errors (missing { }).
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Wei Liu <wl@xen.org>
---
v2: New patch in this version of the series.
---
tools/libxl/libxl_create.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index b394312d98..9c56a914ca 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -30,10 +30,10 @@
int libxl__domain_create_info_setdefault(libxl__gc *gc,
libxl_domain_create_info *c_info)
{
- libxl_physinfo info;
+ libxl_physinfo info[1];
int rc;
- rc = libxl_get_physinfo(CTX, &info);
+ rc = libxl_get_physinfo(CTX, info);
if (rc)
return rc;
@@ -45,11 +45,11 @@ int libxl__domain_create_info_setdefault(libxl__gc *gc,
libxl__arch_domain_create_info_setdefault(gc, c_info);
if (c_info->type != LIBXL_DOMAIN_TYPE_PV) {
- if (info.cap_hap)
+ if (info->cap_hap) {
libxl_defbool_setdefault(&c_info->hap, true);
- else if (info.cap_shadow)
+ } else if (info->cap_shadow) {
libxl_defbool_setdefault(&c_info->hap, false);
- else {
+ } else {
LOG(ERROR, "neither hap nor shadow paging available");
return ERROR_INVAL;
}
@@ -63,12 +63,12 @@ int libxl__domain_create_info_setdefault(libxl__gc *gc,
if (!c_info->ssidref)
c_info->ssidref = SECINITSID_DOMU;
- if (info.cap_hvm_directio &&
+ if (info->cap_hvm_directio &&
(c_info->passthrough == LIBXL_PASSTHROUGH_UNKNOWN)) {
c_info->passthrough = ((c_info->type == LIBXL_DOMAIN_TYPE_PV) ||
- !info.cap_iommu_hap_pt_share) ?
+ !info->cap_iommu_hap_pt_share) ?
LIBXL_PASSTHROUGH_SYNC_PT : LIBXL_PASSTHROUGH_SHARE_PT;
- } else if (!info.cap_hvm_directio) {
+ } else if (!info->cap_hvm_directio) {
c_info->passthrough = LIBXL_PASSTHROUGH_DISABLED;
}
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Xen-devel] [XEN PATCH for-4.13 v3 08/10] libxl: create: setdefault: Move physinfo into config_setdefault
2019-10-11 16:55 [Xen-devel] [XEN PATCH for-4.13 v3 00/10] libxl memkb & pt defaulting Ian Jackson
` (2 preceding siblings ...)
2019-10-11 16:55 ` [Xen-devel] [XEN PATCH for-4.13 v3 07/10] libxl: create: setdefault: Make libxl_physinfo info[1] Ian Jackson
@ 2019-10-11 16:55 ` Ian Jackson
2019-10-11 16:55 ` [Xen-devel] [XEN PATCH for-4.13 v3 09/10] libxl: Move domain_create_info_setdefault earlier Ian Jackson
2019-10-11 16:55 ` [Xen-devel] [XEN PATCH for-4.13 v3 10/10] libxl/xl: Overhaul passthrough setting logic Ian Jackson
5 siblings, 0 replies; 15+ messages in thread
From: Ian Jackson @ 2019-10-11 16:55 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Jan Beulich, Andrew Cooper
No functional change. This will let us refer to it in code we are
about to add to this function.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Wei Liu <wl@xen.org>
---
v2: New patch in this version of the series.
---
tools/libxl/libxl_create.c | 17 ++++++++---------
tools/libxl/libxl_dm.c | 7 ++++++-
tools/libxl/libxl_internal.h | 3 ++-
3 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 9c56a914ca..69971c97b6 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -28,15 +28,9 @@
#include <xen-xsm/flask/flask.h>
int libxl__domain_create_info_setdefault(libxl__gc *gc,
- libxl_domain_create_info *c_info)
+ libxl_domain_create_info *c_info,
+ const libxl_physinfo *info)
{
- libxl_physinfo info[1];
- int rc;
-
- rc = libxl_get_physinfo(CTX, info);
- if (rc)
- return rc;
-
if (!c_info->type) {
LOG(ERROR, "domain type unspecified");
return ERROR_INVAL;
@@ -911,6 +905,10 @@ int libxl__domain_config_setdefault(libxl__gc *gc,
int ret;
bool pod_enabled = false;
+ libxl_physinfo physinfo;
+ ret = libxl_get_physinfo(CTX, &physinfo);
+ if (ret) goto error_out;
+
if (d_config->c_info.ssid_label) {
char *s = d_config->c_info.ssid_label;
ret = libxl_flask_context_to_sid(ctx, s, strlen(s),
@@ -1009,7 +1007,8 @@ int libxl__domain_config_setdefault(libxl__gc *gc,
goto error_out;
}
- ret = libxl__domain_create_info_setdefault(gc, &d_config->c_info);
+ ret = libxl__domain_create_info_setdefault(gc, &d_config->c_info,
+ &physinfo);
if (ret) {
LOGD(ERROR, domid, "Unable to set domain create info defaults");
goto error_out;
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index c00356a2f1..e6a48974f8 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -2167,7 +2167,12 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss)
dm_config->c_info.run_hotplug_scripts =
guest_config->c_info.run_hotplug_scripts;
- ret = libxl__domain_create_info_setdefault(gc, &dm_config->c_info);
+ libxl_physinfo physinfo;
+ ret = libxl_get_physinfo(CTX, &physinfo);
+ if (ret) goto out;
+
+ ret = libxl__domain_create_info_setdefault(gc, &dm_config->c_info,
+ &physinfo);
if (ret) goto out;
ret = libxl__domain_build_info_setdefault(gc, &dm_config->b_info);
if (ret) goto out;
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 0185b8ff01..6a614658c2 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1447,7 +1447,8 @@ _hidden int libxl__domain_config_setdefault(libxl__gc *gc,
libxl_domain_config *d_config,
uint32_t domid /* logging only */);
_hidden int libxl__domain_create_info_setdefault(libxl__gc *gc,
- libxl_domain_create_info *c_info);
+ libxl_domain_create_info *c_info,
+ const libxl_physinfo *info);
_hidden int libxl__domain_build_info_setdefault(libxl__gc *gc,
libxl_domain_build_info *b_info);
_hidden void libxl__rdm_setdefault(libxl__gc *gc,
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Xen-devel] [XEN PATCH for-4.13 v3 09/10] libxl: Move domain_create_info_setdefault earlier
2019-10-11 16:55 [Xen-devel] [XEN PATCH for-4.13 v3 00/10] libxl memkb & pt defaulting Ian Jackson
` (3 preceding siblings ...)
2019-10-11 16:55 ` [Xen-devel] [XEN PATCH for-4.13 v3 08/10] libxl: create: setdefault: Move physinfo into config_setdefault Ian Jackson
@ 2019-10-11 16:55 ` Ian Jackson
2019-10-14 12:53 ` Anthony PERARD
2019-10-11 16:55 ` [Xen-devel] [XEN PATCH for-4.13 v3 10/10] libxl/xl: Overhaul passthrough setting logic Ian Jackson
5 siblings, 1 reply; 15+ messages in thread
From: Ian Jackson @ 2019-10-11 16:55 UTC (permalink / raw)
To: xen-devel; +Cc: Paul Durrant, Ian Jackson, Jan Beulich, Andrew Cooper
We need this before we start to figure out the passthrough mode.
I have checked that nothing in libxl__domain_create_info_setdefault
nor the two implementations of ..._arch_... accesses anything else,
other than (i) the domain type (which this function is responsible for
setting and nothing before it looks at) (ii) c_info->ssidref (which is
defaulted by flask code near the top of
libxl__domain_config_setdefault and not accessed afterwards).
So no functional change.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v3: New patch in this version of the series.
---
tools/libxl/libxl_create.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 69971c97b6..3d2cb52bf7 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -968,6 +968,13 @@ int libxl__domain_config_setdefault(libxl__gc *gc,
goto error_out;
}
+ ret = libxl__domain_create_info_setdefault(gc, &d_config->c_info,
+ &physinfo);
+ if (ret) {
+ LOGD(ERROR, domid, "Unable to set domain create info defaults");
+ goto error_out;
+ }
+
/* If target_memkb is smaller than max_memkb, the subsequent call
* to libxc when building HVM domain will enable PoD mode.
*/
@@ -1007,13 +1014,6 @@ int libxl__domain_config_setdefault(libxl__gc *gc,
goto error_out;
}
- ret = libxl__domain_create_info_setdefault(gc, &d_config->c_info,
- &physinfo);
- if (ret) {
- LOGD(ERROR, domid, "Unable to set domain create info defaults");
- goto error_out;
- }
-
if (d_config->b_info.shadow_memkb == LIBXL_MEMKB_DEFAULT
&& ok_to_default_memkb_in_create(gc))
d_config->b_info.shadow_memkb =
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [Xen-devel] [XEN PATCH for-4.13 v3 09/10] libxl: Move domain_create_info_setdefault earlier
2019-10-11 16:55 ` [Xen-devel] [XEN PATCH for-4.13 v3 09/10] libxl: Move domain_create_info_setdefault earlier Ian Jackson
@ 2019-10-14 12:53 ` Anthony PERARD
0 siblings, 0 replies; 15+ messages in thread
From: Anthony PERARD @ 2019-10-14 12:53 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel, Andrew Cooper, Jan Beulich, Paul Durrant
On Fri, Oct 11, 2019 at 05:55:48PM +0100, Ian Jackson wrote:
> We need this before we start to figure out the passthrough mode.
>
> I have checked that nothing in libxl__domain_create_info_setdefault
> nor the two implementations of ..._arch_... accesses anything else,
> other than (i) the domain type (which this function is responsible for
> setting and nothing before it looks at) (ii) c_info->ssidref (which is
> defaulted by flask code near the top of
> libxl__domain_config_setdefault and not accessed afterwards).
>
> So no functional change.
>
> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Anthony PERARD <anthony.perard@citrix.com>
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Xen-devel] [XEN PATCH for-4.13 v3 10/10] libxl/xl: Overhaul passthrough setting logic
2019-10-11 16:55 [Xen-devel] [XEN PATCH for-4.13 v3 00/10] libxl memkb & pt defaulting Ian Jackson
` (4 preceding siblings ...)
2019-10-11 16:55 ` [Xen-devel] [XEN PATCH for-4.13 v3 09/10] libxl: Move domain_create_info_setdefault earlier Ian Jackson
@ 2019-10-11 16:55 ` Ian Jackson
2019-10-14 16:05 ` Anthony PERARD
5 siblings, 1 reply; 15+ messages in thread
From: Ian Jackson @ 2019-10-11 16:55 UTC (permalink / raw)
To: xen-devel
Cc: Stefano Stabellini, Julien Grall, Andrew Cooper, Ian Jackson,
Paul Durrant, Jan Beulich, Volodymyr Babchuk
LIBXL_PASSTHROUGH_UNKNOWN (aka "ENABLED" in an earlier uncommitted
version of this code) is doing double duty. We actually need all of
the following to be specificable:
* default ("unspecified"): enable PT iff we have devices to
pass through specified in the initial config file.
* "enabled" (and fail if the platform doesn't support it).
* "disabled" (and reject future PT hotplug).
* "share_pt"/"sync_pt": enable PT and set a specific PT mode.
Defaulting and error checking should be done in libxl. So, we make
several changes here.
We introduce "enabled". (And we document "unspecified".)
We move all of the error checking and defaulting code from xl into
libxl. Now, libxl__domain_config_setdefault has all of the necessary
information to get this right. So we can do it all there. Choosing
the specific mode is arch-specific.
We can also arrange to have only one place each which calculates
(i) whether passthrough needs to be enabled because pt devices were
specified (ii) whether pt_share can be used (for each arch).
xl now only has to parse the enum in the same way as it parses all
other enums.
This change fixes a regression from earlier 4.13-pre: until recent
changes, passthrough was only enabled by default if passthrough
devices were specified. We restore this behaviour.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Julien Grall <julien@xen.org>
CC: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
CC: Andrew Cooper <Andrew.Cooper3@citrix.com>
CC: Paul Durrant <pdurrant@gmail.com>
CC: Jan Beulich <jbeulich@suse.com>
---
v3: Drop paragraph about masking another osstest regression,
as that's now fixed.
Drop redundant "ERROR:" in two log messages.
Add a comment about the way "enabled" gets changed to a specific value.
Split passthrough mode defaulting into arch specific functions.
On ARM, always choose (and insist on) share_pt.
Reject share_pt for non-HAP guests.
Reject passthrough for PVH guests.
Actually document "unspecified" option in xl.cfg(5)
Rename "unknown" to "unspecified"
v2: New patch in this version of the series.
---
docs/man/xl.cfg.5.pod.in | 6 ++++
tools/libxl/libxl_arch.h | 6 ++++
tools/libxl/libxl_arm.c | 24 ++++++++++++++++
tools/libxl/libxl_create.c | 43 ++++++++++++++++++++---------
tools/libxl/libxl_types.idl | 7 +++--
tools/libxl/libxl_x86.c | 41 +++++++++++++++++++++++++++
tools/xl/xl_parse.c | 67 ++++-----------------------------------------
7 files changed, 116 insertions(+), 78 deletions(-)
diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in
index 64bed30bce..7e220d0c20 100644
--- a/docs/man/xl.cfg.5.pod.in
+++ b/docs/man/xl.cfg.5.pod.in
@@ -660,6 +660,12 @@ in preference. However, the availability of this option is hardware
specific. If B<xl info> reports B<virt_caps> containing
B<iommu_hap_pt_share> then this option may be used.
+=item B<unspecified>
+
+The default, which chooses between B<disabled> and B<enabled>
+according to whether passthrough devices are enabled in the config
+file.
+
=back
=back
diff --git a/tools/libxl/libxl_arch.h b/tools/libxl/libxl_arch.h
index d624159e53..ee6641b3e6 100644
--- a/tools/libxl/libxl_arch.h
+++ b/tools/libxl/libxl_arch.h
@@ -73,6 +73,12 @@ void libxl__arch_domain_build_info_setdefault(libxl__gc *gc,
libxl_domain_build_info *b_info);
_hidden
+int libxl__arch_passthrough_mode_setdefault(libxl__gc *gc,
+ uint32_t domid,
+ libxl_domain_config *d_config,
+ const libxl_physinfo *physinfo);
+
+_hidden
int libxl__arch_extra_memory(libxl__gc *gc,
const libxl_domain_build_info *info,
uint64_t *out);
diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c
index bf31b9b3ca..2f1ca69431 100644
--- a/tools/libxl/libxl_arm.c
+++ b/tools/libxl/libxl_arm.c
@@ -1191,6 +1191,30 @@ void libxl__arch_domain_build_info_setdefault(libxl__gc *gc,
libxl_domain_build_info_init_type(b_info, LIBXL_DOMAIN_TYPE_PVH);
}
+int libxl__arch_passthrough_mode_setdefault(libxl__gc *gc,
+ uint32_t domid,
+ libxl_domain_config *d_config,
+ const libxl_physinfo *physinfo)
+{
+ int rc;
+ libxl_domain_create_info *const c_info = &d_config->c_info;
+
+ if (c_info->passthrough == LIBXL_PASSTHROUGH_ENABLED) {
+ c_info->passthrough = LIBXL_PASSTHROUGH_SHARE_PT;
+ }
+
+ if (c_info->passthrough == LIBXL_PASSTHROUGH_SYNC_PT) {
+ LOGD(ERROR, domid,
+ "passthrough=\"sync_pt\" not supported on ARM\n");
+ rc = ERROR_INVAL;
+ goto out;
+ }
+
+ rc = 0;
+ out:
+ return rc;
+}
+
/*
* Local variables:
* mode: C
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 3d2cb52bf7..bcf4896df6 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -57,18 +57,6 @@ int libxl__domain_create_info_setdefault(libxl__gc *gc,
if (!c_info->ssidref)
c_info->ssidref = SECINITSID_DOMU;
- if (info->cap_hvm_directio &&
- (c_info->passthrough == LIBXL_PASSTHROUGH_UNKNOWN)) {
- c_info->passthrough = ((c_info->type == LIBXL_DOMAIN_TYPE_PV) ||
- !info->cap_iommu_hap_pt_share) ?
- LIBXL_PASSTHROUGH_SYNC_PT : LIBXL_PASSTHROUGH_SHARE_PT;
- } else if (!info->cap_hvm_directio) {
- c_info->passthrough = LIBXL_PASSTHROUGH_DISABLED;
- }
-
- /* An explicit setting should now have been chosen */
- assert(c_info->passthrough != LIBXL_PASSTHROUGH_UNKNOWN);
-
return 0;
}
@@ -587,7 +575,7 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config,
libxl_defbool_val(info->oos) ? 0 : XEN_DOMCTL_CDF_oos_off;
}
- assert(info->passthrough != LIBXL_PASSTHROUGH_UNKNOWN);
+ assert(info->passthrough != LIBXL_PASSTHROUGH_UNSPECIFIED);
LOG(DETAIL, "passthrough: %s",
libxl_passthrough_to_string(info->passthrough));
@@ -904,6 +892,7 @@ int libxl__domain_config_setdefault(libxl__gc *gc,
libxl_ctx *ctx = libxl__gc_owner(gc);
int ret;
bool pod_enabled = false;
+ libxl_domain_create_info *c_info = &d_config->c_info;
libxl_physinfo physinfo;
ret = libxl_get_physinfo(CTX, &physinfo);
@@ -975,6 +964,34 @@ int libxl__domain_config_setdefault(libxl__gc *gc,
goto error_out;
}
+ bool need_pt = d_config->num_pcidevs || d_config->num_dtdevs;
+ if (c_info->passthrough == LIBXL_PASSTHROUGH_UNSPECIFIED) {
+ c_info->passthrough = need_pt
+ ? LIBXL_PASSTHROUGH_ENABLED : LIBXL_PASSTHROUGH_DISABLED;
+ }
+
+ bool iommu_enabled = physinfo.cap_hvm_directio;
+ if (c_info->passthrough != LIBXL_PASSTHROUGH_DISABLED && !iommu_enabled) {
+ LOGD(ERROR, domid,
+ "passthrough not supported on this platform\n");
+ ret = ERROR_INVAL;
+ goto error_out;
+ }
+
+ if (c_info->passthrough == LIBXL_PASSTHROUGH_DISABLED && need_pt) {
+ LOGD(ERROR, domid,
+ "passthrough disabled but devices are specified");
+ ret = ERROR_INVAL;
+ goto error_out;
+ }
+
+ ret = libxl__arch_passthrough_mode_setdefault(gc,domid,d_config,&physinfo);
+ if (ret) goto error_out;
+
+ /* An explicit setting should now have been chosen */
+ assert(c_info->passthrough != LIBXL_PASSTHROUGH_UNSPECIFIED);
+ assert(c_info->passthrough != LIBXL_PASSTHROUGH_ENABLED);
+
/* If target_memkb is smaller than max_memkb, the subsequent call
* to libxc when building HVM domain will enable PoD mode.
*/
diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
index 3ac9494b80..2cb5a86b60 100644
--- a/tools/libxl/libxl_types.idl
+++ b/tools/libxl/libxl_types.idl
@@ -264,10 +264,11 @@ libxl_vkb_backend = Enumeration("vkb_backend", [
])
libxl_passthrough = Enumeration("passthrough", [
- (0, "unknown"),
+ (0, "unspecified"),
(1, "disabled"),
- (2, "sync_pt"),
- (3, "share_pt"),
+ (2, "enabled"), # becomes {sync,share}_pt once defaults are evaluated
+ (3, "sync_pt"),
+ (4, "share_pt"),
])
#
diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c
index c0f88a7eaa..226b712cbd 100644
--- a/tools/libxl/libxl_x86.c
+++ b/tools/libxl/libxl_x86.c
@@ -631,6 +631,47 @@ void libxl__arch_domain_build_info_setdefault(libxl__gc *gc,
libxl_defbool_setdefault(&b_info->acpi, true);
}
+int libxl__arch_passthrough_mode_setdefault(libxl__gc *gc,
+ uint32_t domid,
+ libxl_domain_config *d_config,
+ const libxl_physinfo *physinfo)
+{
+ int rc;
+ libxl_domain_create_info *const c_info = &d_config->c_info;
+
+ if (c_info->passthrough != LIBXL_PASSTHROUGH_DISABLED &&
+ c_info->type == LIBXL_DOMAIN_TYPE_PVH) {
+ LOGD(ERROR, domid,
+ "passthrough not yet supported for x86 PVH guests\n");
+ rc = ERROR_INVAL;
+ goto out;
+ }
+
+ const char *whynot_pt_share =
+ c_info->type == LIBXL_DOMAIN_TYPE_PV ? "not valid for PV domain" :
+ !physinfo->cap_iommu_hap_pt_share ? "not supported on this platform" :
+ !libxl_defbool_val(d_config->c_info.hap) ?"only valid for HAP guests":
+ NULL;
+
+ if (c_info->passthrough == LIBXL_PASSTHROUGH_ENABLED) {
+ c_info->passthrough = whynot_pt_share
+ ? LIBXL_PASSTHROUGH_SYNC_PT : LIBXL_PASSTHROUGH_SHARE_PT;
+ }
+
+ if (c_info->passthrough == LIBXL_PASSTHROUGH_SHARE_PT && whynot_pt_share) {
+ LOGD(ERROR, domid,
+ "passthrough=\"share_pt\" %s\n",
+ whynot_pt_share);
+ rc = ERROR_INVAL;
+ goto out;
+ }
+
+ rc = 0;
+ out:
+ return rc;
+}
+
+
/*
* Local variables:
* mode: C
diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c
index 79871c22d0..112f8ee026 100644
--- a/tools/xl/xl_parse.c
+++ b/tools/xl/xl_parse.c
@@ -1222,7 +1222,6 @@ void parse_config_data(const char *config_source,
int pci_seize = 0;
int i, e;
char *kernel_basename;
- bool iommu_enabled, iommu_hap_pt_share;
libxl_domain_create_info *c_info = &d_config->c_info;
libxl_domain_build_info *b_info = &d_config->b_info;
@@ -1234,8 +1233,6 @@ void parse_config_data(const char *config_source,
exit(EXIT_FAILURE);
}
- iommu_enabled = physinfo.cap_hvm_directio;
- iommu_hap_pt_share = physinfo.cap_iommu_hap_pt_share;
libxl_physinfo_dispose(&physinfo);
config= xlu_cfg_init(stderr, config_source);
@@ -1509,67 +1506,13 @@ void parse_config_data(const char *config_source,
}
}
- if (xlu_cfg_get_string(config, "passthrough", &buf, 0)) {
- c_info->passthrough =
- (d_config->num_pcidevs || d_config->num_dtdevs)
- ? LIBXL_PASSTHROUGH_UNKNOWN : LIBXL_PASSTHROUGH_DISABLED;
- } else {
- if (!strcasecmp("enabled", buf))
- c_info->passthrough = LIBXL_PASSTHROUGH_UNKNOWN;
- else {
- libxl_passthrough o;
-
- e = libxl_passthrough_from_string(buf, &o);
- if (e || !strcasecmp("unknown", buf)) {
- fprintf(stderr,
- "ERROR: unknown passthrough option '%s'\n",
- buf);
- exit(-ERROR_FAIL);
- }
-
- c_info->passthrough = o;
- }
- }
-
- switch (c_info->passthrough) {
- case LIBXL_PASSTHROUGH_UNKNOWN:
- /*
- * Choose a suitable default. libxl would also do this but
- * choosing here allows the code calculating 'iommu_memkb'
- * below make an informed decision.
- */
- c_info->passthrough =
- (c_info->type == LIBXL_DOMAIN_TYPE_PV) || !iommu_hap_pt_share
- ? LIBXL_PASSTHROUGH_SYNC_PT : LIBXL_PASSTHROUGH_SHARE_PT;
- break;
-
- case LIBXL_PASSTHROUGH_DISABLED:
- if (d_config->num_pcidevs || d_config->num_dtdevs) {
+ if (!xlu_cfg_get_string(config, "passthrough", &buf, 0)) {
+ if (libxl_passthrough_from_string(buf, &c_info->passthrough)) {
fprintf(stderr,
- "ERROR: passthrough disabled but devices are specified\n");
- exit(-ERROR_FAIL);
- }
- break;
- case LIBXL_PASSTHROUGH_SHARE_PT:
- if (c_info->type == LIBXL_DOMAIN_TYPE_PV) {
- fprintf(stderr,
- "ERROR: passthrough=\"share_pt\" not valid for PV domain\n");
- exit(-ERROR_FAIL);
- } else if (!iommu_hap_pt_share) {
- fprintf(stderr,
- "ERROR: passthrough=\"share_pt\" not supported on this platform\n");
- exit(-ERROR_FAIL);
+ "ERROR: unknown passthrough option '%s'\n",
+ buf);
+ exit(1);
}
- break;
- case LIBXL_PASSTHROUGH_SYNC_PT:
- break;
- }
-
- if ((c_info->passthrough != LIBXL_PASSTHROUGH_DISABLED) &&
- !iommu_enabled) {
- fprintf(stderr,
- "ERROR: passthrough not supported on this platform\n");
- exit(-ERROR_FAIL);
}
if (!xlu_cfg_get_long(config, "shadow_memory", &l, 0))
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [Xen-devel] [XEN PATCH for-4.13 v3 10/10] libxl/xl: Overhaul passthrough setting logic
2019-10-11 16:55 ` [Xen-devel] [XEN PATCH for-4.13 v3 10/10] libxl/xl: Overhaul passthrough setting logic Ian Jackson
@ 2019-10-14 16:05 ` Anthony PERARD
2019-10-14 16:10 ` Ian Jackson
0 siblings, 1 reply; 15+ messages in thread
From: Anthony PERARD @ 2019-10-14 16:05 UTC (permalink / raw)
To: Ian Jackson
Cc: Stefano Stabellini, Julien Grall, Andrew Cooper, Paul Durrant,
Jan Beulich, xen-devel, Volodymyr Babchuk
On Fri, Oct 11, 2019 at 05:55:49PM +0100, Ian Jackson wrote:
> LIBXL_PASSTHROUGH_UNKNOWN (aka "ENABLED" in an earlier uncommitted
I guess that's now LIBXL_PASSTHROUGH_UNSPECIFIED.
> version of this code) is doing double duty. We actually need all of
> the following to be specificable:
> * default ("unspecified"): enable PT iff we have devices to
^if
> pass through specified in the initial config file.
> * "enabled" (and fail if the platform doesn't support it).
> * "disabled" (and reject future PT hotplug).
> * "share_pt"/"sync_pt": enable PT and set a specific PT mode.
>
> Defaulting and error checking should be done in libxl. So, we make
> several changes here.
>
> We introduce "enabled". (And we document "unspecified".)
>
> We move all of the error checking and defaulting code from xl into
> libxl. Now, libxl__domain_config_setdefault has all of the necessary
> information to get this right. So we can do it all there. Choosing
> the specific mode is arch-specific.
>
> We can also arrange to have only one place each which calculates
> (i) whether passthrough needs to be enabled because pt devices were
> specified (ii) whether pt_share can be used (for each arch).
>
> xl now only has to parse the enum in the same way as it parses all
> other enums.
>
> This change fixes a regression from earlier 4.13-pre: until recent
> changes, passthrough was only enabled by default if passthrough
> devices were specified. We restore this behaviour.
>
> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
>
> ---
> diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c
> index c0f88a7eaa..226b712cbd 100644
> --- a/tools/libxl/libxl_x86.c
> +++ b/tools/libxl/libxl_x86.c
> @@ -631,6 +631,47 @@ void libxl__arch_domain_build_info_setdefault(libxl__gc *gc,
> libxl_defbool_setdefault(&b_info->acpi, true);
> }
>
> +int libxl__arch_passthrough_mode_setdefault(libxl__gc *gc,
> + uint32_t domid,
> + libxl_domain_config *d_config,
> + const libxl_physinfo *physinfo)
> +{
[...]
> +}
> +
There are 40 trailing white space here, any reason? :-).
Beside a few typos, the patch looks fine to me:
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [Xen-devel] [XEN PATCH for-4.13 v3 10/10] libxl/xl: Overhaul passthrough setting logic
2019-10-14 16:05 ` Anthony PERARD
@ 2019-10-14 16:10 ` Ian Jackson
0 siblings, 0 replies; 15+ messages in thread
From: Ian Jackson @ 2019-10-14 16:10 UTC (permalink / raw)
To: Anthony PERARD
Cc: Stefano Stabellini, Julien Grall, Andrew Cooper, Paul Durrant,
Jan Beulich, xen-devel, Volodymyr Babchuk
Anthony PERARD writes ("Re: [Xen-devel] [XEN PATCH for-4.13 v3 10/10] libxl/xl: Overhaul passthrough setting logic"):
> On Fri, Oct 11, 2019 at 05:55:49PM +0100, Ian Jackson wrote:
> > LIBXL_PASSTHROUGH_UNKNOWN (aka "ENABLED" in an earlier uncommitted
>
> I guess that's now LIBXL_PASSTHROUGH_UNSPECIFIED.
Heh, see my other mail, just crossed with yours.
> > +int libxl__arch_passthrough_mode_setdefault(libxl__gc *gc,
> > + uint32_t domid,
> > + libxl_domain_config *d_config,
> > + const libxl_physinfo *physinfo)
> > +{
>
> [...]
>
> > +}
> > +
>
> There are 40 trailing white space here, any reason? :-).
No. I will get rid of them. My editor doesn't complain about them
and my personal view is that this is pointless bureaucracy but it's
not just up to me, so I'll fix it.
> Beside a few typos, the patch looks fine to me:
> Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
Thanks.
If I change "unspecified" back to "unknown", and fix the spaces (and
I'll have a look for typos), should I retain your ack ?
Thanks,
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 15+ messages in thread