Drop/deprecate libxl_get_required_*_memory
cover Drop/deprecate libxl_get_required_*_memory
libxl_get_required_shadow_memory has always been anomalous. libxl ought to default these things itself. Recently, another analogous setting, iommu_memkb, was introduced, along with another function along the same lines.
This API is not very good. Fixing it was not entirely trivial. (Thanks to Paul for explaining some of the difficulties and Anthony for in-principle review of my proposal.)
Ian Jackson (6):
libxl: Offer API versions 0x040700 and 0x040800
xl: Pass libxl_domain_config to freemem(), instead of b_info
libxl: libxl__domain_config_setdefault: New function
libxl: libxl_domain_need_memory: Make it take a domain_config
libxl: Move shadow_memkb and iommu_memkb defaulting into libxl
libxl: Remove/deprecate libxl_get_required_*_memory from the API
tools/libxl/libxl.h | 24 ++++++++++- tools/libxl/libxl_create.c | 95 ++++++++++++++++++++++++++++++++++++++------ tools/libxl/libxl_dom.c | 7 ++-- tools/libxl/libxl_internal.h | 10 +++++ tools/libxl/libxl_mem.c | 70 ++++++++++++++++++++++++++------ tools/libxl/libxl_utils.c | 15 ------- tools/libxl/libxl_utils.h | 2 +- tools/xl/xl_parse.c | 15 +------ tools/xl/xl_vmcontrol.c | 6 +-- 9 files changed, 183 insertions(+), 61 deletions(-)
Signature · 7 lines
2.11.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 1/6 libxl: Offer API versions 0x040700 and 0x040800
According to git log -G:
0x040700 was introduced in 304400459ef0 (aka 4.7.0-rc1~481)
"tools/libxl: rename remus device to checkpoint device"
0x040800 was introduced in 57f8b13c7240 (aka 4.8.0-rc1~437)
"libxl: memory size in kb requires 64 bit variable"
It is surprising that no-one noticed this. I wonder if anyone is using our LIBXL_API_VERSION facility. If not maybe we should take a different approach.
Anyway, in the meantime, we should fix this. Backporting this is probably a good idea: it won't change the behaviour for existing callers but it will avoid errors for some older correct uses.
--- tools/libxl/libxl.h | 1 + 1 file changed, 1 insertion(+)
tools/libxl/libxl.h +1 -0
@@ -655,6 +655,7 @@ typedef struct libxl__ctx libxl_ctx;#ifdef LIBXL_API_VERSION #if LIBXL_API_VERSION !=0x040200 &&LIBXL_API_VERSION !=0x040300 && \LIBXL_API_VERSION !=0x040400 &&LIBXL_API_VERSION !=0x040500 && \ +LIBXL_API_VERSION !=0x040700 &&LIBXL_API_VERSION !=0x040800 && \LIBXL_API_VERSION !=0x041300 #error Unknown LIBXL_API_VERSION#endif
Signature · 7 lines
2.11.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [XEN PATCH for-4.13 1/6] libxl: Offer API versions 0x040700 and 0x040800
Quoted 11 lines · Ian Jackson
According to git log -G:
0x040700was introduced in304400459ef0(aka 4.7.0-rc1~481)
"tools/libxl: rename remus device to checkpoint device"
0x040800was introduced in57f8b13c7240(aka 4.8.0-rc1~437)
"libxl: memory size in kb requires 64 bit variable"It is surprising that no-one noticed this. I wonder if anyone is using our
LIBXL_API_VERSIONfacility. If not maybe we should take a different approach.
Libvirt does use it. I think it's currently set to 4.5.
Quoted 5 lines
Anyway, in the meantime, we should fix this. Backporting this is probably a good idea: it won't change the behaviour for existing callers but it will avoid errors for some older correct uses.
Signed-off-by Ian Jackson <[email protected]>
Quoted 16 lines
--- tools/libxl/libxl.h | 1 + 1 file changed, 1 insertion(+)tools/libxl/libxl.h +1
-0@@ -655,6 +655,7 @@ typedef struct libxl__ctx libxl_ctx;#ifdef LIBXL_API_VERSION #if LIBXL_API_VERSION !=0x040200 &&LIBXL_API_VERSION !=0x040300 && \LIBXL_API_VERSION !=0x040400 &&LIBXL_API_VERSION !=0x040500 && \ +LIBXL_API_VERSION !=0x040700 &&LIBXL_API_VERSION !=0x040800 && \LIBXL_API_VERSION !=0x041300 #error Unknown LIBXL_API_VERSION#endif
Signature · 6 lines
Anthony PERARD _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [XEN PATCH for-4.13 1/6] libxl: Offer API versions 0x040700 and 0x040800
Anthony PERARD writes ("Re: [XEN PATCH for-4.13 1/6] libxl: Offer API versions 0x040700 and 0x040800"):
Quoted 6 lines · Ian Jackson
Quoted 3 lines
It is surprising that no-one noticed this. I wonder if anyone is using our
LIBXL_API_VERSIONfacility. If not maybe we should take a different approach.Libvirt does use it. I think it's currently set to 4.5.
Ah. I have adjusted the commit message somewhat.
Quoted 7 lines
Quoted 5 lines
Anyway, in the meantime, we should fix this. Backporting this is probably a good idea: it won't change the behaviour for existing callers but it will avoid errors for some older correct uses.
Signed-off-by Ian Jackson <[email protected]>Acked-by Anthony PERARD <[email protected]>
Thanks,
Ian.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 2/6 xl: Pass libxl_domain_config to freemem(), instead of b_info
In reply to Ian JacksonWe are going to change the libxl API in a moment and this change will make it simpler.
--- tools/xl/xl_vmcontrol.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/xl/xl_vmcontrol.c +3 -3
@@ -314,7 +314,7 @@ static int domain_wait_event(uint32_t domid, libxl_event **event_r)* Returns true in case there is already, or we manage to free it, enough * memory, but also if autoballoon is false. */ -static bool freemem (uint32_t domid,libxl_domain_build_info *b_info) +static bool freemem (uint32_t domid,libxl_domain_config *d_config) {int rc, retries =3 ;uint64_t need_memkb, free_memkb;
@@ -322,7 +322,7 @@ static bool freemem(uint32_t domid, libxl_domain_build_info *b_info)if (!autoballoon)return true; - rc =libxl_domain_need_memory (ctx, b_info, &need_memkb); + rc =libxl_domain_need_memory (ctx, &d_config->b_info, &need_memkb);if (rc <0 )return false;
@@ -879,7 +879,7 @@ start: goto error_out;if (domid_soft_reset ==INVALID_DOMID ) { -if (!freemem (domid, &d_config.b_info)) { +if (!freemem (domid, &d_config)) {fprintf (stderr,"failed to free memory for the domain\n" ); ret =ERROR_FAIL ; goto error_out;
Signature · 7 lines
2.11.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [XEN PATCH for-4.13 2/6] xl: Pass libxl_domain_config to freemem(), instead of b_info
Quoted 4 lines · Ian Jackson
We are going to change the libxl API in a moment and this change will make it simpler.
Signed-off-by Ian Jackson <[email protected]>
Signature · 6 lines
Anthony PERARD _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 3/6 libxl: libxl__domain_config_setdefault: New function
In reply to Ian JacksonBreak out this into a new function. We are going to want to call it from a new call site.
Unfortunately not all of the defaults can be moved into the new function without changing the order in which things are done. That does not seem wise at this stage of the release. The effect is that additional calls to libxl__domain_config_setdefault (which are going to be introduced) do not quite set everything. But they will do what is needed. After Xen 4.13 is done, we should move those settings into the right order.
No functional change.
--- tools/libxl/libxl_create.c | 40 ++++++++++++++++++++++++++++------------ tools/libxl/libxl_internal.h | 3 +++ 2 files changed, 31 insertions(+), 12 deletions(-)
tools/libxl/libxl_create.c +28 -12
@@ -862,22 +862,14 @@ static void domcreate_destruction_cb(libxl__egc *egc,libxl__domain_destroy_state *dds, int rc); -static void initiate_domain_create (libxl__egc *egc, -libxl__domain_create_state *dcs) +int libxl__domain_config_setdefault (libxl__gc *gc, +libxl_domain_config *d_config, +uint32_t domid) { -STATE_AO_GC (dcs->ao);libxl_ctx *ctx =libxl__gc_owner (gc); -uint32_t domid; -int i, ret; +int ret;bool pod_enabled = false; -/* convenience aliases */ -libxl_domain_config *const d_config = dcs->guest_config; -const int restore_fd = dcs->restore_fd; - - domid = dcs->domid_soft_reset; -libxl__domain_build_state_init (&dcs->build_state); -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),
@@ -1008,6 +1000,27 @@ static void initiate_domain_create(libxl__egc *egc, goto error_out; } + ret =0 ; + error_out: +return ret; +} + +static void initiate_domain_create (libxl__egc *egc, +libxl__domain_create_state *dcs) +{ +STATE_AO_GC (dcs->ao); +uint32_t domid; +int i, ret; + +/* convenience aliases */ +libxl_domain_config *const d_config = dcs->guest_config; +const int restore_fd = dcs->restore_fd; + + domid = dcs->domid_soft_reset; +libxl__domain_build_state_init (&dcs->build_state); + +libxl__domain_config_setdefault (gc,d_config,domid); + ret =libxl__domain_make (gc, d_config, &dcs->build_state, &domid);if (ret) {LOGD (ERROR , domid,"cannot make domain: %d" , ret);
@@ -1019,6 +1032,9 @@ static void initiate_domain_create(libxl__egc *egc, dcs->guest_domid = domid; dcs->sdss.dm.guest_domid =0 ;/* means we haven't spawned */ +/* post-4.13 todo: move these next bits of defaulting to +* libxl__domain_config_setdefault */ +/* * Set the dm version quite early so that libxl doesn't have to pass the * build info around just to know if the domain has a device model or not.
tools/libxl/libxl_internal.h +3 -0
@@ -1440,6 +1440,9 @@ _hidden int libxl__resolve_domid(libxl__gc *gc, const char *name,* All libxl API functions are expected to have arranged for this * to be called before using any values within these structures. */ +_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); _hidden int libxl__domain_build_info_setdefault(libxl__gc *gc,
Signature · 7 lines
2.11.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [XEN PATCH for-4.13 3/6] libxl: libxl__domain_config_setdefault: New function
Quoted 64 lines · Ian Jackson
Break out this into a new function. We are going to want to call it from a new call site.
Unfortunately not all of the defaults can be moved into the new function without changing the order in which things are done. That does not seem wise at this stage of the release. The effect is that additional calls to
libxl__domain_config_setdefault(which are going to be introduced) do not quite set everything. But they will do what is needed. After Xen 4.13 is done, we should move those settings into the right order.No functional change.
Signed-off-by Ian Jackson <[email protected]>--- tools/libxl/libxl_create.c | 40 ++++++++++++++++++++++++++++------------ tools/libxl/libxl_internal.h | 3 +++ 2 files changed, 31 insertions(+), 12 deletions(-)tools/libxl/libxl_create.c +14
-12@@ -862,22 +862,14 @@ static void domcreate_destruction_cb(libxl__egc *egc,libxl__domain_destroy_state *dds, int rc); -static void initiate_domain_create (libxl__egc *egc, -libxl__domain_create_state *dcs) +int libxl__domain_config_setdefault (libxl__gc *gc, +libxl_domain_config *d_config, +uint32_t domid) { -STATE_AO_GC (dcs->ao);libxl_ctx *ctx =libxl__gc_owner (gc); -uint32_t domid; -int i, ret; +int ret;bool pod_enabled = false; -/* convenience aliases */ -libxl_domain_config *const d_config = dcs->guest_config; -const int restore_fd = dcs->restore_fd; - - domid = dcs->domid_soft_reset; -libxl__domain_build_state_init (&dcs->build_state); -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),@@ -1008,6 +1000,27 @@ static void initiate_domain_create(libxl__egc *egc, goto error_out; } + ret =0 ; + error_out: +return ret; +} + +static void initiate_domain_create (libxl__egc *egc, +libxl__domain_create_state *dcs) +{ +STATE_AO_GC (dcs->ao); +uint32_t domid;
tools/libxl/libxl_create.c static void initiate_domain_create(libxl__egc *egc, · line 1022
Quoted 10 lines
tools/libxl/libxl_create.c +10
-0+int i, ret; + +/* convenience aliases */ +libxl_domain_config *const d_config = dcs->guest_config; +const int restore_fd = dcs->restore_fd; + + domid = dcs->domid_soft_reset; +libxl__domain_build_state_init (&dcs->build_state); + +libxl__domain_config_setdefault (gc,d_config,domid);
Shouldn't you check for error ?
Thanks,
Signature · 6 lines
Anthony PERARD _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [XEN PATCH for-4.13 3/6] libxl: libxl__domain_config_setdefault: New function
Anthony PERARD writes ("Re: [XEN PATCH for-4.13 3/6] libxl: libxl__domain_config_setdefault: New function"):
Quoted 4 lines · Ian Jackson
Quoted 1 line
+
libxl__domain_config_setdefault(gc,d_config,domid);Shouldn't you check for error ?
Blimey, yes! Thanks!
Ian.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Anthony PERARD
Reviewed-byRe: [Xen-devel] [XEN PATCH for-4.13 3/6] libxl: libxl__domain_config_setdefault: New function
Quoted 7 lines · Ian Jackson
Anthony PERARD writes ("Re: [XEN PATCH for-4.13 3/6] libxl:
libxl__domain_config_setdefault: New function"):Quoted 4 lines · Ian Jackson
Quoted 1 line
+
libxl__domain_config_setdefault(gc,d_config,domid);Shouldn't you check for error ?
Blimey, yes! Thanks!
With that fixed:
Signature · 6 lines
Anthony PERARD _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [XEN PATCH for-4.13 3/6] libxl: libxl__domain_config_setdefault: New function
Anthony PERARD writes ("Re: [XEN PATCH for-4.13 3/6] libxl: libxl__domain_config_setdefault: New function"):
Quoted 8 lines · Ian Jackson
Quoted 4 lines
Anthony PERARD writes ("Re: [XEN PATCH for-4.13 3/6] libxl:
libxl__domain_config_setdefault: New function"):Quoted 1 line
Shouldn't you check for error ?
Blimey, yes! Thanks!
With that fixed:
Reviewed-by Anthony PERARD <[email protected]>
Thanks.
I think the things you spotted in this review means I should go through this series again, and try to test it somehow. I will do that and then send a v2.
Ian.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 4/6 libxl: libxl_domain_need_memory: Make it take a domain_config
In reply to Ian JacksonThis should calculate the extra memory needed for shadow and iommu, the defaults for which depend on values in c_info. So we need this to have the complete domain config available.
And the defaults should actually be updated and stored. So make it non-const.
We provide the usual kind of compatibility function for callers expecting 4.12 and earlier. This function becomes responsible for the clone-and-modify of the b_info.
No overall functional change for external libxl callers which use the API version system to request a particular API version.
Other external libxl callers will need to update their calling code, and will then find that the new version of this function fills in most of the defaults in d_config. Because libxl__domain_config_setdefault doesn't quite do all of the defaults, that's only partial. For present purposes that doesn't matter because none of the missing settings are used by the memory calculations. It does mean we need to document in the API spec that the defaulting is only partial.
This lack of functional change is despite the fact that numa_place_domain now no longer calls libxl__domain_build_info_setdefault (via libxl_domain_need_memory). That is OK because it's idempotent and numa_place_domain's one call site is libxl__build_pre which is called from libxl__domain_build which is called from domcreate_bootloader_done, well after the defaults are set by initiate_domain_create.
--- tools/libxl/libxl.h | 23 ++++++++++++++- tools/libxl/libxl_dom.c | 7 +++-- tools/libxl/libxl_internal.h | 4 +++ tools/libxl/libxl_mem.c | 66 +++++++++++++++++++++++++++++++++++--------- tools/xl/xl_vmcontrol.c | 2 +- 5 files changed, 84 insertions(+), 18 deletions(-)
tools/libxl/libxl.h +22 -1
@@ -1245,6 +1245,20 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, const libxl_mac *src);*/ #define LIBXL_HAVE_FN_USING_QMP_ASYNC 1 +/* +* LIBXL_HAVE_DOMAIN_NEED_MEMORY_CONFIG +* +* If this is set, libxl_domain_need_memory takes a +* libxl_domain_config* (non-const) and uint32_t domid_for_logging +* (instead of a const libxl_domain_build_info*). +* +* If this is set, there is no need to call +* libxl_get_required_shadow_memory and instead the caller should +* simply leave shadow_memkb set to LIBXL_MEMKB_DEFAULT and allow +* libxl to fill in a suitable default in the usual way. +*/ +#define LIBXL_HAVE_DOMAIN_NEED_MEMORY_CONFIG +typedef char **libxl_string_list ;void libxl_string_list_dispose (libxl_string_list *sl);int libxl_string_list_length (const libxl_string_list *sl);
@@ -1723,8 +1737,13 @@ int libxl_get_memory_target_0x040700(libxl_ctx *ctx, uint32_t domid,*/ /* how much free memory in the system a domain needs to be built */ int libxl_domain_need_memory (libxl_ctx *ctx, -const libxl_domain_build_info *b_info_in, +libxl_domain_config *config +/* ^ will be partially defaulted */ , +uint32_t domid_for_logging/* INVALID_DOMID ok */ ,uint64_t *need_memkb); +int libxl_domain_need_memory_0x041200 (libxl_ctx *ctx, +const libxl_domain_build_info *b_info_in, +uint64_t *need_memkb);int libxl_domain_need_memory_0x040700 (libxl_ctx *ctx,const libxl_domain_build_info *b_info_in,uint32_t *need_memkb)
@@ -1754,6 +1773,8 @@ int libxl_wait_for_memory_target(libxl_ctx *ctx, uint32_t domid, int wait_secs);#define libxl_get_memory_target libxl_get_memory_target_0x040700#define libxl_domain_need_memory libxl_domain_need_memory_0x040700#define libxl_get_free_memory libxl_get_free_memory_0x040700 +#elif defined(LIBXL_API_VERSION ) &&LIBXL_API_VERSION <0x041300 +#define libxl_domain_need_memory libxl_domain_need_memory_0x041200#endif int libxl_vncviewer_exec (libxl_ctx *ctx,uint32_t domid,int autopass);
tools/libxl/libxl_dom.c +4 -3
@@ -140,8 +140,9 @@ static int numa_cmpf(const libxl__numa_candidate *c1,/* The actual automatic NUMA placement routine */ static int numa_place_domain (libxl__gc *gc,uint32_t domid, -libxl_domain_build_info *info) +libxl_domain_config *d_config) { +libxl_domain_build_info *info = &d_config->b_info;int found;libxl__numa_candidate candidate;libxl_bitmap cpumap, cpupool_nodemap, *map;
@@ -195,7 +196,7 @@ static int numa_place_domain(libxl__gc *gc, uint32_t domid, } } - rc =libxl_domain_need_memory (CTX , info, &memkb); + rc =libxl__domain_need_memory_calculate (gc, info, &memkb);if (rc) goto out;if (libxl_node_bitmap_alloc (CTX , &cpupool_nodemap,0 )) {
@@ -432,7 +433,7 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid,if (rc)return rc; - rc =numa_place_domain (gc, domid, info); + rc =numa_place_domain (gc, domid, d_config);if (rc) {libxl_bitmap_dispose (&cpumap_soft);return rc;
tools/libxl/libxl_internal.h +4 -0
@@ -1450,6 +1450,10 @@ _hidden int libxl__domain_build_info_setdefault(libxl__gc *gc, _hidden void libxl__rdm_setdefault(libxl__gc *gc,libxl_domain_build_info *b_info); +_hidden int libxl__domain_need_memory_calculate(libxl__gc *gc, +libxl_domain_build_info *b_info, +uint64_t *need_memkb); + _hidden const char *libxl__device_nic_devname(libxl__gc *gc, uint32_t domid, uint32_t devid,
tools/libxl/libxl_mem.c +53 -13
89 lines not on this page · raw message
tools/xl/xl_vmcontrol.c +1 -1
@@ -322,7 +322,7 @@ static bool freemem(uint32_t domid, libxl_domain_config *d_config)if (!autoballoon)return true; - rc =libxl_domain_need_memory (ctx, &d_config->b_info, &need_memkb); + rc =libxl_domain_need_memory (ctx, d_config, domid, &need_memkb);if (rc <0 )return false;
Signature · 7 lines
2.11.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [XEN PATCH for-4.13 4/6] libxl: libxl_domain_need_memory: Make it take a domain_config
Quoted 29 lines · Ian Jackson
tools/libxl/libxl_mem.c +3
-11@@ -446,20 +446,12 @@ int libxl_get_memory_target_0x040700(return libxl__memkb_64to32 (ctx, rc, my_out_target, out_target); } -int libxl_domain_need_memory (libxl_ctx *ctx, -const libxl_domain_build_info *b_info_in, -uint64_t *need_memkb) +int libxl__domain_need_memory_calculate (libxl__gc *gc, +libxl_domain_build_info *b_info, +uint64_t *need_memkb) { -GC_INIT (ctx); -libxl_domain_build_info b_info[1 ];int rc; -libxl_domain_build_info_init (b_info); -libxl_domain_build_info_copy (ctx, b_info, b_info_in); - - rc =libxl__domain_build_info_setdefault (gc, b_info); -if (rc) goto out; - *need_memkb = b_info->target_memkb; *need_memkb += b_info->shadow_memkb + b_info->iommu_memkb;
tools/libxl/libxl_mem.c int libxl_domain_need_memory(libxl_ctx *ctx, · line 476
Quoted 3 lines
tools/libxl/libxl_mem.c +0
-0@@ -482,9 +474,57 @@ int libxl_domain_need_memory(libxl_ctx *ctx, rc =0 ; out:GC_FREE ;
This GC_FREE should be removed.
tools/libxl/libxl_mem.c int libxl_domain_need_memory(libxl_ctx *ctx, · line 479
Quoted 4 lines
tools/libxl/libxl_mem.c +1
-1-libxl_domain_build_info_dispose (b_info);return rc; +}
The rest looks fine. So with the extra GC_FREE removed:
Thanks,
Signature · 6 lines
Anthony PERARD _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 5/6 libxl: Move shadow_memkb and iommu_memkb defaulting into libxl
In reply to Ian JacksonDefaulting 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 andlibxl_domain_create: the former would not include the iommu memory and the latter would. That seems worse, but it's debateable.
--- 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(-)
tools/libxl/libxl_create.c +40 -0
@@ -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" );
tools/libxl/libxl_internal.h +3 -0
@@ -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; };/*
tools/libxl/libxl_mem.c +4 -0
@@ -485,6 +485,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);
@@ -508,6 +510,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);
tools/xl/xl_parse.c +2 -13
@@ -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 );
Signature · 7 lines
2.11.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [XEN PATCH for-4.13 5/6] libxl: Move shadow_memkb and iommu_memkb defaulting into libxl
tools/libxl/libxl_create.c static void domcreate_destruction_cb(libxl__egc *egc, · line 867
Quoted 5 lines · Ian Jackson
tools/libxl/libxl_create.c +1
-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)
Is there a reason to use _Bool instead of `bool'? It would be the first _Bool in libxl.
Quoted 7 lines
tools/libxl/libxl_create.c +7
-0+{ +/* +* 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
tools/libxl/libxl_create.c static void domcreate_destruction_cb(libxl__egc *egc, · line 884
Quoted 10 lines
tools/libxl/libxl_create.c +10
-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;
I think the logic here is inverted.
With this patch applied, we have:
xl
calls libxl_domain_need_memory()
libxl__domain_config_setdefault()
because shadow_memkb is default and that function return 0 then shadow_memkb is still default
create_domain()
libxl__domain_config_setdefault()
same thing, shadow_memkb is untouch, so still default libxl__domain_build_info_setdefault()
shadow_memkb is default
-> shadow_memkb = 0
This is different what is expected by the commit message.
Quoted 1 line
For xl, no change. The code moves from xl to libxl.
Instead, if xl calls libxl_domain_need_memory_0x041200():
create_domain()
libxl__domain_config_setdefault()
if shadow_memkb is default; ok_to_default_memkb_in_create is 1
so shadow_memkb is set to a value different that the one calculated by need_memory_0x04100.
Or did I miss something?
Signature · 6 lines
Anthony PERARD _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [XEN PATCH for-4.13 5/6] libxl: Move shadow_memkb and iommu_memkb defaulting into libxl
Anthony PERARD writes ("Re: [XEN PATCH for-4.13 5/6] libxl: Move shadow_memkb and iommu_memkb defaulting into libxl"):
Quoted 9 lines · Ian Jackson
tools/libxl/libxl_create.c static void domcreate_destruction_cb(libxl__egc *egc, · line 867
Quoted 5 lines
tools/libxl/libxl_create.c +1
-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)Is there a reason to use
_Boolinstead of `bool'? It would be the first_Boolin libxl.
I had the wrong head on. (I've been writing code recently where `bool' wasn't available.)
Quoted 4 lines
tools/libxl/libxl_create.c static void domcreate_destruction_cb(libxl__egc *egc, · line 884
Quoted 2 lines
tools/libxl/libxl_create.c +2
-0+return CTX ->libxl_domain_need_memory_0x041200_called && + !CTX ->libxl_domain_need_memory_called;I think the logic here is inverted.
You are right.
Thanks,
Ian.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 6/6 libxl: Remove/deprecate libxl_get_required_*_memory from the API
In reply to Ian JacksonThese 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.
--- 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(-)
tools/libxl/libxl_create.c +16 -1
@@ -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);
tools/libxl/libxl_utils.c +0 -15
@@ -48,21 +48,6 @@ unsigned long libxl_get_required_shadow_memory(unsigned long maxmem_kb, unsignedreturn 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;
tools/libxl/libxl_utils.h +1 -1
@@ -24,7 +24,7 @@ constchar *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);
Signature · 7 lines
2.11.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [XEN PATCH for-4.13 6/6] libxl: Remove/deprecate libxl_get_required_*_memory from the API
Quoted 17 lines · Ian Jackson
These are now redundant because
shadow_memkbandiommu_memkbare now defaulted automatically bylibxl_domain_need_memoryandlibxl_domain_createetc. Callers should not now call these; instead, they should just let libxl take care of it.
libxl_get_required_shadow_memorywas introduced inf89f555827a6
"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_memoryhas been in libxl approximately forever. It should probably not have survived the creation oflibxl_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.
Quoted 1 line
Signed-off-by Ian Jackson <[email protected]>
Signature · 6 lines
Anthony PERARD _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 17 lines · Ian Jackson
libxl_get_required_shadow_memoryhas always been anomalous. libxl ought to default these things itself. Recently, another analogous setting,iommu_memkb, was introduced, along with another function along the same lines.This API is not very good. Fixing it was not entirely trivial. (Thanks to Paul for explaining some of the difficulties and Anthony for in-principle review of my proposal.)
Ian Jackson (6):
libxl: Offer API versions0x040700and0x040800
xl: Passlibxl_domain_configtofreemem(), instead ofb_info
libxl:libxl__domain_config_setdefault: New function
libxl:libxl_domain_need_memory: Make it take adomain_config
libxl: Moveshadow_memkbandiommu_memkbdefaulting into libxl
libxl: Remove/deprecate libxl_get_required_*_memory from the API
Quoted 11 lines
tools/libxl/libxl.h | 24 ++++++++++- tools/libxl/libxl_create.c | 95 ++++++++++++++++++++++++++++++++++++++------ tools/libxl/libxl_dom.c | 7 ++-- tools/libxl/libxl_internal.h | 10 +++++ tools/libxl/libxl_mem.c | 70 ++++++++++++++++++++++++++------ tools/libxl/libxl_utils.c | 15 ------- tools/libxl/libxl_utils.h | 2 +- tools/xl/xl_parse.c | 15 +------ tools/xl/xl_vmcontrol.c | 6 +-- 9 files changed, 183 insertions(+), 61 deletions(-)
For the series:
Juergen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel