Preparation for global nestedhvm configuration - libxlMakeDomBuildInfo needs access to libxlDriverConfig. No functional change. Adjusting tests require slightly more mockup functions, because of libxlDriverConfigNew() call. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com&gt; --- Changes since v4: - drop now unneeded parameters Changes since v3: - new patch, preparation --- src/libxl/libxl_conf.c | 13 +++++++------ src/libxl/libxl_conf.h | 4 +--- src/libxl/libxl_domain.c | 2 +- tests/libxlxml2domconfigtest.c | 23 ++++++++++++++++------- tests/virmocklibxl.c | 25 +++++++++++++++++++++++++ 5 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 2d2a707..e7727a1 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -271,10 +271,11 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) static int libxlMakeDomBuildInfo(virDomainDefPtr def, - libxl_ctx *ctx, + libxlDriverConfigPtr cfg, virCapsPtr caps, libxl_domain_config *d_config) { + libxl_ctx *ctx = cfg->ctx; libxl_domain_build_info *b_info = &d_config->b_info; int hvm = def->os.type == VIR_DOMAIN_OSTYPE_HVM; size_t i; @@ -2287,17 +2288,17 @@ libxlDriverNodeGetInfo(libxlDriverPrivatePtr driver, virNodeInfoPtr info) int libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, virDomainDefPtr def, - const char *channelDir LIBXL_ATTR_UNUSED, - libxl_ctx *ctx, - virCapsPtr caps, + libxlDriverConfigPtr cfg, libxl_domain_config *d_config) { + virCapsPtr caps = cfg->caps; + libxl_ctx *ctx = cfg->ctx; libxl_domain_config_init(d_config); if (libxlMakeDomCreateInfo(ctx, def, &d_config->c_info) < 0) return -1; - if (libxlMakeDomBuildInfo(def, ctx, caps, d_config) < 0) + if (libxlMakeDomBuildInfo(def, cfg, caps, d_config) < 0) return -1; #ifdef LIBXL_HAVE_VNUMA @@ -2329,7 +2330,7 @@ libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, #endif #ifdef LIBXL_HAVE_DEVICE_CHANNEL - if (libxlMakeChannelList(channelDir, def, d_config) < 0) + if (libxlMakeChannelList(cfg->channelDir, def, d_config) < 0) return -1; #endif diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 264df11..ce9db26 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -215,9 +215,7 @@ libxlCreateXMLConf(void); int libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, virDomainDefPtr def, - const char *channelDir LIBXL_ATTR_UNUSED, - libxl_ctx *ctx, - virCapsPtr caps, + libxlDriverConfigPtr cfg, libxl_domain_config *d_config); static inline void diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 395c8a9..8879481 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1253,7 +1253,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, goto cleanup_dom; if (libxlBuildDomainConfig(driver->reservedGraphicsPorts, vm->def, - cfg->channelDir, cfg->ctx, cfg->caps, &d_config) < 0) + cfg, &d_config) < 0) goto cleanup_dom; if (cfg->autoballoon && libxlDomainFreeMem(cfg->ctx, &d_config) < 0) diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index bd4c3af..cfbc37c 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -56,8 +56,8 @@ testCompareXMLToDomConfig(const char *xmlfile, int ret = -1; libxl_domain_config actualconfig; libxl_domain_config expectconfig; + libxlDriverConfigPtr cfg; xentoollog_logger *log = NULL; - libxl_ctx *ctx = NULL; virPortAllocatorPtr gports = NULL; virDomainXMLOptionPtr xmlopt = NULL; virDomainDefPtr vmdef = NULL; @@ -68,10 +68,18 @@ testCompareXMLToDomConfig(const char *xmlfile, libxl_domain_config_init(&actualconfig); libxl_domain_config_init(&expectconfig); + if (!(cfg = libxlDriverConfigNew())) + goto cleanup; + + cfg->caps = caps; +

if (!(log = (xentoollog_logger *)xtl_createlogger_stdiostream(stderr, XTL_DEBUG, 0))) goto cleanup; - if (libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, log) < 0) + /* replace logger with stderr one */ + libxl_ctx_free(cfg->ctx); + + if (libxl_ctx_alloc(&cfg->ctx, LIBXL_VERSION, 0, log) < 0) goto cleanup; if (!(gports = virPortAllocatorNew("vnc", 5900, 6000, @@ -85,22 +93,22 @@ testCompareXMLToDomConfig(const char *xmlfile, NULL, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; - if (libxlBuildDomainConfig(gports, vmdef, NULL, ctx, caps, &actualconfig) < 0) + if (libxlBuildDomainConfig(gports, vmdef, cfg, &actualconfig) < 0) goto cleanup; - if (!(actualjson = libxl_domain_config_to_json(ctx, &actualconfig))) { + if (!(actualjson = libxl_domain_config_to_json(cfg->ctx, &actualconfig))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Failed to retrieve JSON doc for libxl_domain_config"); goto cleanup; } virTestLoadFile(jsonfile, &tempjson); - if (libxl_domain_config_from_json(ctx, &expectconfig, tempjson) != 0) { + if (libxl_domain_config_from_json(cfg->ctx, &expectconfig, tempjson) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Failed to create libxl_domain_config from JSON doc"); goto cleanup; } - if (!(expectjson = libxl_domain_config_to_json(ctx, &expectconfig))) { + if (!(expectjson = libxl_domain_config_to_json(cfg->ctx, &expectconfig))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Failed to retrieve JSON doc for libxl_domain_config"); goto cleanup; @@ -118,10 +126,11 @@ testCompareXMLToDomConfig(const char *xmlfile, virDomainDefFree(vmdef); virObjectUnref(gports); virObjectUnref(xmlopt); - libxl_ctx_free(ctx); libxl_domain_config_dispose(&actualconfig); libxl_domain_config_dispose(&expectconfig); xtl_logger_destroy(log); + cfg->caps = NULL; + virObjectUnref(cfg); return ret; } diff --git a/tests/virmocklibxl.c b/tests/virmocklibxl.c index 747f9f8..133064b 100644 --- a/tests/virmocklibxl.c +++ b/tests/virmocklibxl.c @@ -27,6 +27,7 @@ # include <sys/stat.h> # include <unistd.h> # include <libxl.h> +# include <util/virfile.h> # include <xenstore.h> # include <xenctrl.h> @@ -48,6 +49,19 @@ VIR_MOCK_IMPL_RET_ARGS(xc_interface_open, } +VIR_MOCK_IMPL_RET_ARGS(libxl_get_version_info, + const libxl_version_info*, + libxl_ctx *, ctx) +{ + static libxl_version_info info; + + memset(&info, 0, sizeof(info)); + + return &info; + /* silence gcc warning */ + return real_libxl_get_version_info(ctx); +} + VIR_MOCK_STUB_RET_ARGS(xc_interface_close, int, 0, xc_interface *, handle) @@ -68,6 +82,17 @@ VIR_MOCK_STUB_RET_ARGS(xc_sharing_used_frames, VIR_MOCK_STUB_VOID_ARGS(xs_daemon_close, struct xs_handle *, handle) +VIR_MOCK_IMPL_RET_ARGS(virFileMakePath, int, + const char *, path) +{ + /* replace log path with a writable directory */ + if (strstr(path, "/log/")) { + snprintf((char*)path, strlen(path), "."); + return 0; + } + return real_virFileMakePath(path); +} + VIR_MOCK_IMPL_RET_ARGS(__xstat, int, int, ver, const char *, path,

On 03/22/2018 04:44 PM, Jim Fehlig wrote: > On 03/21/2018 10:32 AM, Marek Marczykowski-Górecki wrote: > > Preparation for global nestedhvm configuration - libxlMakeDomBuildInfo > > needs access to libxlDriverConfig. > > No functional change. > > > > Adjusting tests require slightly more mockup functions, because of > > libxlDriverConfigNew() call. > > > > Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com&gt; > > --- > > Changes since v4: > >   - drop now unneeded parameters > > Changes since v3: > >   - new patch, preparation > > --- > >   src/libxl/libxl_conf.c         | 13 +++++++------ > >   src/libxl/libxl_conf.h         |  4 +--- > >   src/libxl/libxl_domain.c       |  2 +- > >   tests/libxlxml2domconfigtest.c | 23 ++++++++++++++++------- > >   tests/virmocklibxl.c           | 25 +++++++++++++++++++++++++ > >   5 files changed, 50 insertions(+), 17 deletions(-) > > I had to rebase this patch to account for commits 7ebc4f2a4c, > 4c9c7a5ba2, and c391e07eb0. > > > > > diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c > > index 2d2a707..e7727a1 100644 > > --- a/src/libxl/libxl_conf.c > > +++ b/src/libxl/libxl_conf.c > > @@ -271,10 +271,11 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) > >   static int > >   libxlMakeDomBuildInfo(virDomainDefPtr def, > > -                      libxl_ctx *ctx, > > +                      libxlDriverConfigPtr cfg, > >                         virCapsPtr caps, > >                         libxl_domain_config *d_config) > >   { > > +    libxl_ctx *ctx = cfg->ctx; > >       libxl_domain_build_info *b_info = &d_config->b_info; > >       int hvm = def->os.type == VIR_DOMAIN_OSTYPE_HVM; > >       size_t i; > > @@ -2287,17 +2288,17 @@ libxlDriverNodeGetInfo(libxlDriverPrivatePtr > > driver, virNodeInfoPtr info) > >   int > >   libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, > >                          virDomainDefPtr def, > > -                       const char *channelDir LIBXL_ATTR_UNUSED, > > -                       libxl_ctx *ctx, > > -                       virCapsPtr caps, > > +                       libxlDriverConfigPtr cfg, > >                          libxl_domain_config *d_config) > >   { > > +    virCapsPtr caps = cfg->caps; > > +    libxl_ctx *ctx = cfg->ctx; > >       libxl_domain_config_init(d_config); > >       if (libxlMakeDomCreateInfo(ctx, def, &d_config->c_info) < 0) > >           return -1; > > -    if (libxlMakeDomBuildInfo(def, ctx, caps, d_config) < 0) > > +    if (libxlMakeDomBuildInfo(def, cfg, caps, d_config) < 0) > >           return -1; > >   #ifdef LIBXL_HAVE_VNUMA > > @@ -2329,7 +2330,7 @@ libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, > >   #endif > >   #ifdef LIBXL_HAVE_DEVICE_CHANNEL > > -    if (libxlMakeChannelList(channelDir, def, d_config) < 0) > > +    if (libxlMakeChannelList(cfg->channelDir, def, d_config) < 0) > >           return -1; > >   #endif > > diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h > > index 264df11..ce9db26 100644 > > --- a/src/libxl/libxl_conf.h > > +++ b/src/libxl/libxl_conf.h > > @@ -215,9 +215,7 @@ libxlCreateXMLConf(void); > >   int > >   libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, > >                          virDomainDefPtr def, > > -                       const char *channelDir LIBXL_ATTR_UNUSED, > > -                       libxl_ctx *ctx, > > -                       virCapsPtr caps, > > +                       libxlDriverConfigPtr cfg, > >                          libxl_domain_config *d_config); > >   static inline void > > diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c > > index 395c8a9..8879481 100644 > > --- a/src/libxl/libxl_domain.c > > +++ b/src/libxl/libxl_domain.c > > @@ -1253,7 +1253,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, > >           goto cleanup_dom; > >       if (libxlBuildDomainConfig(driver->reservedGraphicsPorts, vm->def, > > -                               cfg->channelDir, cfg->ctx, > > cfg->caps, &d_config) < 0) > > +                               cfg, &d_config) < 0) > >           goto cleanup_dom; > >       if (cfg->autoballoon && libxlDomainFreeMem(cfg->ctx, &d_config) < 0) > > diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c > > index bd4c3af..cfbc37c 100644 > > --- a/tests/libxlxml2domconfigtest.c > > +++ b/tests/libxlxml2domconfigtest.c > > @@ -56,8 +56,8 @@ testCompareXMLToDomConfig(const char *xmlfile, > >       int ret = -1; > >       libxl_domain_config actualconfig; > >       libxl_domain_config expectconfig; > > +    libxlDriverConfigPtr cfg; > >       xentoollog_logger *log = NULL; > > -    libxl_ctx *ctx = NULL; > >       virPortAllocatorPtr gports = NULL; > >       virDomainXMLOptionPtr xmlopt = NULL; > >       virDomainDefPtr vmdef = NULL; > > @@ -68,10 +68,18 @@ testCompareXMLToDomConfig(const char *xmlfile, > >       libxl_domain_config_init(&actualconfig); > >       libxl_domain_config_init(&expectconfig); > > +    if (!(cfg = libxlDriverConfigNew())) > > +        goto cleanup; > > + > > +    cfg->caps = caps; > > + > > Before pushing this series I decided to build test it on several Xen > releases I had readily available: 4.10, 4.9, 4.7, and 4.5. It works fine > on all of those except 4.5. libxlxml2domconfigtest segfaults here on the > first test > > Program received signal SIGSEGV, Segmentation fault. > 0x00007ffff3d60244 in pthread_mutex_lock () from /lib64/libpthread.so.0 > (gdb) bt > #0  0x00007ffff3d60244 in pthread_mutex_lock () from /lib64/libpthread.so.0 > #1  0x00007ffff75250c6 in xs_talkv (h=h@entry=0x1, t=t@entry=0, >     type=type@entry=XS_READ, iovec=iovec@entry=0x7fffffffce50, >     num_vecs=num_vecs@entry=1, len=len@entry=0x0) at xs.c:491 > #2  0x00007ffff752544a in xs_single (h=0x1, t=t@entry=0, >     type=type@entry=XS_READ, >     string=string@entry=0x7ffff79a4b70 "/local/domain/0/memory/freemem-slack", >     len=len@entry=0x0) at xs.c:551 > #3  0x00007ffff75257e4 in xs_read (h=<optimized out>, t=t@entry=0, >     path=path@entry=0x7ffff79a4b70 "/local/domain/0/memory/freemem-slack", >     len=len@entry=0x0) at xs.c:597 > #4  0x00007ffff7978ca9 in libxl__xs_read (gc=gc@entry=0x7fffffffcf40, >     t=t@entry=0, >     path=path@entry=0x7ffff79a4b70 "/local/domain/0/memory/freemem-slack") >     at libxl_xshelp.c:123 > #5  0x00007ffff79622ab in libxl__get_free_memory_slack ( >     gc=gc@entry=0x7fffffffcf40, >     free_mem_slack=free_mem_slack@entry=0x7fffffffcf3c) at libxl.c:5122 > #6  0x00007ffff796238e in libxl_get_free_memory (ctx=<optimized out>, >     memkb=0x7fffffffd014) at libxl.c:5394 > #7  0x000000000041313b in libxlDriverConfigNew () at libxl/libxl_conf.c:1690 > #8  0x000000000040aff0 in testCompareXMLToDomConfig ( >     xmlfile=0x63bd20 "/home/jfehlig/virt/upstream/libvirt/tests/libxlxml2domconfigdata/basic-pv.xml", >     jsonfile=0x63be10 "/home/jfehlig/virt/upstream/libvirt/tests/libxlxml2domconfigdata/basic-pv.json") > at libxlxml2domconfigtest.c:71 > #9  0x000000000040b4b1 in testCompareXMLToDomConfigHelper ( >     data=0x637c50 <info>) at libxlxml2domconfigtest.c:164 > #10 0x000000000040bcd4 in virTestRun ( >     title=0x42dcc0 "LibXL XML-2-JSON basic-pv", >     body=0x40b3cb <testCompareXMLToDomConfigHelper>, data=0x637c50 <info>) >     at testutils.c:180 > > I wonder how much we care about Xen 4.5? According to the Xen wiki [0] > it is no longer supported upstream. 4.6 gets security support until Oct > 2018, so IMO it should be the minimum version supported by upstream > libvirt. Or maybe 4.7 since that is the earliest version still getting > general upstream support? BTW, I forgot to mention that we currently claim support for Xen >= 4.4. See m4/virt-driver-libxl.m4.

On 03/22/2018 04:59 PM, Marek Marczykowski-Górecki wrote: > On Thu, Mar 22, 2018 at 04:48:48PM -0600, Jim Fehlig wrote: >> On 03/22/2018 04:44 PM, Jim Fehlig wrote: >>> On 03/21/2018 10:32 AM, Marek Marczykowski-Górecki wrote: >>>> Preparation for global nestedhvm configuration - libxlMakeDomBuildInfo >>>> needs access to libxlDriverConfig. >>>> No functional change. >>>> >>>> Adjusting tests require slightly more mockup functions, because of >>>> libxlDriverConfigNew() call. >>>> >>>> Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com&gt; >>>> --- >>>> Changes since v4: >>>>    - drop now unneeded parameters >>>> Changes since v3: >>>>    - new patch, preparation >>>> --- >>>>    src/libxl/libxl_conf.c         | 13 +++++++------ >>>>    src/libxl/libxl_conf.h         |  4 +--- >>>>    src/libxl/libxl_domain.c       |  2 +- >>>>    tests/libxlxml2domconfigtest.c | 23 ++++++++++++++++------- >>>>    tests/virmocklibxl.c           | 25 +++++++++++++++++++++++++ >>>>    5 files changed, 50 insertions(+), 17 deletions(-) >>> >>> I had to rebase this patch to account for commits 7ebc4f2a4c, >>> 4c9c7a5ba2, and c391e07eb0. >>> >>>> >>>> diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c >>>> index 2d2a707..e7727a1 100644 >>>> --- a/src/libxl/libxl_conf.c >>>> +++ b/src/libxl/libxl_conf.c >>>> @@ -271,10 +271,11 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) >>>>    static int >>>>    libxlMakeDomBuildInfo(virDomainDefPtr def, >>>> -                      libxl_ctx *ctx, >>>> +                      libxlDriverConfigPtr cfg, >>>>                          virCapsPtr caps, >>>>                          libxl_domain_config *d_config) >>>>    { >>>> +    libxl_ctx *ctx = cfg->ctx; >>>>        libxl_domain_build_info *b_info = &d_config->b_info; >>>>        int hvm = def->os.type == VIR_DOMAIN_OSTYPE_HVM; >>>>        size_t i; >>>> @@ -2287,17 +2288,17 @@ libxlDriverNodeGetInfo(libxlDriverPrivatePtr >>>> driver, virNodeInfoPtr info) >>>>    int >>>>    libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, >>>>                           virDomainDefPtr def, >>>> -                       const char *channelDir LIBXL_ATTR_UNUSED, >>>> -                       libxl_ctx *ctx, >>>> -                       virCapsPtr caps, >>>> +                       libxlDriverConfigPtr cfg, >>>>                           libxl_domain_config *d_config) >>>>    { >>>> +    virCapsPtr caps = cfg->caps; >>>> +    libxl_ctx *ctx = cfg->ctx; >>>>        libxl_domain_config_init(d_config); >>>>        if (libxlMakeDomCreateInfo(ctx, def, &d_config->c_info) < 0) >>>>            return -1; >>>> -    if (libxlMakeDomBuildInfo(def, ctx, caps, d_config) < 0) >>>> +    if (libxlMakeDomBuildInfo(def, cfg, caps, d_config) < 0) >>>>            return -1; >>>>    #ifdef LIBXL_HAVE_VNUMA >>>> @@ -2329,7 +2330,7 @@ libxlBuildDomainConfig(virPortAllocatorPtr >>>> graphicsports, >>>>    #endif >>>>    #ifdef LIBXL_HAVE_DEVICE_CHANNEL >>>> -    if (libxlMakeChannelList(channelDir, def, d_config) < 0) >>>> +    if (libxlMakeChannelList(cfg->channelDir, def, d_config) < 0) >>>>            return -1; >>>>    #endif >>>> diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h >>>> index 264df11..ce9db26 100644 >>>> --- a/src/libxl/libxl_conf.h >>>> +++ b/src/libxl/libxl_conf.h >>>> @@ -215,9 +215,7 @@ libxlCreateXMLConf(void); >>>>    int >>>>    libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, >>>>                           virDomainDefPtr def, >>>> -                       const char *channelDir LIBXL_ATTR_UNUSED, >>>> -                       libxl_ctx *ctx, >>>> -                       virCapsPtr caps, >>>> +                       libxlDriverConfigPtr cfg, >>>>                           libxl_domain_config *d_config); >>>>    static inline void >>>> diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c >>>> index 395c8a9..8879481 100644 >>>> --- a/src/libxl/libxl_domain.c >>>> +++ b/src/libxl/libxl_domain.c >>>> @@ -1253,7 +1253,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, >>>>            goto cleanup_dom; >>>>        if (libxlBuildDomainConfig(driver->reservedGraphicsPorts, vm->def, >>>> -                               cfg->channelDir, cfg->ctx, >>>> cfg->caps, &d_config) < 0) >>>> +                               cfg, &d_config) < 0) >>>>            goto cleanup_dom; >>>>        if (cfg->autoballoon && libxlDomainFreeMem(cfg->ctx, &d_config) < 0) >>>> diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c >>>> index bd4c3af..cfbc37c 100644 >>>> --- a/tests/libxlxml2domconfigtest.c >>>> +++ b/tests/libxlxml2domconfigtest.c >>>> @@ -56,8 +56,8 @@ testCompareXMLToDomConfig(const char *xmlfile, >>>>        int ret = -1; >>>>        libxl_domain_config actualconfig; >>>>        libxl_domain_config expectconfig; >>>> +    libxlDriverConfigPtr cfg; >>>>        xentoollog_logger *log = NULL; >>>> -    libxl_ctx *ctx = NULL; >>>>        virPortAllocatorPtr gports = NULL; >>>>        virDomainXMLOptionPtr xmlopt = NULL; >>>>        virDomainDefPtr vmdef = NULL; >>>> @@ -68,10 +68,18 @@ testCompareXMLToDomConfig(const char *xmlfile, >>>>        libxl_domain_config_init(&actualconfig); >>>>        libxl_domain_config_init(&expectconfig); >>>> +    if (!(cfg = libxlDriverConfigNew())) >>>> +        goto cleanup; >>>> + >>>> +    cfg->caps = caps; >>>> + >>> >>> Before pushing this series I decided to build test it on several Xen >>> releases I had readily available: 4.10, 4.9, 4.7, and 4.5. It works fine >>> on all of those except 4.5. libxlxml2domconfigtest segfaults here on the >>> first test >>> >>> Program received signal SIGSEGV, Segmentation fault. >>> 0x00007ffff3d60244 in pthread_mutex_lock () from /lib64/libpthread.so.0 >>> (gdb) bt >>> #0  0x00007ffff3d60244 in pthread_mutex_lock () from /lib64/libpthread.so.0 >>> #1  0x00007ffff75250c6 in xs_talkv (h=h@entry=0x1, t=t@entry=0, >>>       type=type@entry=XS_READ, iovec=iovec@entry=0x7fffffffce50, >>>       num_vecs=num_vecs@entry=1, len=len@entry=0x0) at xs.c:491 >>> #2  0x00007ffff752544a in xs_single (h=0x1, t=t@entry=0, >>>       type=type@entry=XS_READ, >>>       string=string@entry=0x7ffff79a4b70 >>> "/local/domain/0/memory/freemem-slack", >>>       len=len@entry=0x0) at xs.c:551 >>> #3  0x00007ffff75257e4 in xs_read (h=<optimized out>, t=t@entry=0, >>>       path=path@entry=0x7ffff79a4b70 "/local/domain/0/memory/freemem-slack", >>>       len=len@entry=0x0) at xs.c:597 >>> #4  0x00007ffff7978ca9 in libxl__xs_read (gc=gc@entry=0x7fffffffcf40, >>>       t=t@entry=0, >>>       path=path@entry=0x7ffff79a4b70 "/local/domain/0/memory/freemem-slack") >>>       at libxl_xshelp.c:123 >>> #5  0x00007ffff79622ab in libxl__get_free_memory_slack ( >>>       gc=gc@entry=0x7fffffffcf40, >>>       free_mem_slack=free_mem_slack@entry=0x7fffffffcf3c) at libxl.c:5122 >>> #6  0x00007ffff796238e in libxl_get_free_memory (ctx=<optimized out>, >>>       memkb=0x7fffffffd014) at libxl.c:5394 >>> #7  0x000000000041313b in libxlDriverConfigNew () at libxl/libxl_conf.c:1690 >>> #8  0x000000000040aff0 in testCompareXMLToDomConfig ( >>>       xmlfile=0x63bd20 >>> "/home/jfehlig/virt/upstream/libvirt/tests/libxlxml2domconfigdata/basic-pv.xml", >>> >>>       jsonfile=0x63be10 >>> "/home/jfehlig/virt/upstream/libvirt/tests/libxlxml2domconfigdata/basic-pv.json") >>> >>> at libxlxml2domconfigtest.c:71 >>> #9  0x000000000040b4b1 in testCompareXMLToDomConfigHelper ( >>>       data=0x637c50 <info>) at libxlxml2domconfigtest.c:164 >>> #10 0x000000000040bcd4 in virTestRun ( >>>       title=0x42dcc0 "LibXL XML-2-JSON basic-pv", >>>       body=0x40b3cb <testCompareXMLToDomConfigHelper>, data=0x637c50 <info>) >>>       at testutils.c:180 >>> >>> I wonder how much we care about Xen 4.5? According to the Xen wiki [0] >>> it is no longer supported upstream. 4.6 gets security support until Oct >>> 2018, so IMO it should be the minimum version supported by upstream >>> libvirt. Or maybe 4.7 since that is the earliest version still getting >>> general upstream support? >> >> BTW, I forgot to mention that we currently claim support for Xen >= 4.4. See >> m4/virt-driver-libxl.m4. > > Does it work before applying this series? Sorry, forgot to mention that too. Yes, it works before applying the series.

Preparation for global nestedhvm configuration - libxlMakeDomBuildInfo needs access to libxlDriverConfig. No functional change. Adjusting tests require slightly more mockup functions, because of libxlDriverConfigNew() call. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com&gt; --- Changes since v6: - tests: add libxl_get_free_memory mock needed on Xen 4.5 Changes since v4: - drop now unneeded parameters Changes since v3: - new patch, preparation --- src/libxl/libxl_conf.c | 13 +++++++------ src/libxl/libxl_conf.h | 4 +--- src/libxl/libxl_domain.c | 2 +- tests/libxlxml2domconfigtest.c | 23 ++++++++++++++++------- tests/virmocklibxl.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 55 insertions(+), 17 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 2d2a707..e7727a1 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -271,10 +271,11 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) static int libxlMakeDomBuildInfo(virDomainDefPtr def, - libxl_ctx *ctx, + libxlDriverConfigPtr cfg, virCapsPtr caps, libxl_domain_config *d_config) { + libxl_ctx *ctx = cfg->ctx; libxl_domain_build_info *b_info = &d_config->b_info; int hvm = def->os.type == VIR_DOMAIN_OSTYPE_HVM; size_t i; @@ -2287,17 +2288,17 @@ libxlDriverNodeGetInfo(libxlDriverPrivatePtr driver, virNodeInfoPtr info) int libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, virDomainDefPtr def, - const char *channelDir LIBXL_ATTR_UNUSED, - libxl_ctx *ctx, - virCapsPtr caps, + libxlDriverConfigPtr cfg, libxl_domain_config *d_config) { + virCapsPtr caps = cfg->caps; + libxl_ctx *ctx = cfg->ctx; libxl_domain_config_init(d_config); if (libxlMakeDomCreateInfo(ctx, def, &d_config->c_info) < 0) return -1; - if (libxlMakeDomBuildInfo(def, ctx, caps, d_config) < 0) + if (libxlMakeDomBuildInfo(def, cfg, caps, d_config) < 0) return -1; #ifdef LIBXL_HAVE_VNUMA @@ -2329,7 +2330,7 @@ libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, #endif #ifdef LIBXL_HAVE_DEVICE_CHANNEL - if (libxlMakeChannelList(channelDir, def, d_config) < 0) + if (libxlMakeChannelList(cfg->channelDir, def, d_config) < 0) return -1; #endif diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 264df11..ce9db26 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -215,9 +215,7 @@ libxlCreateXMLConf(void); int libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, virDomainDefPtr def, - const char *channelDir LIBXL_ATTR_UNUSED, - libxl_ctx *ctx, - virCapsPtr caps, + libxlDriverConfigPtr cfg, libxl_domain_config *d_config); static inline void diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 395c8a9..8879481 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1253,7 +1253,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, goto cleanup_dom; if (libxlBuildDomainConfig(driver->reservedGraphicsPorts, vm->def, - cfg->channelDir, cfg->ctx, cfg->caps, &d_config) < 0) + cfg, &d_config) < 0) goto cleanup_dom; if (cfg->autoballoon && libxlDomainFreeMem(cfg->ctx, &d_config) < 0) diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index bd4c3af..cfbc37c 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -56,8 +56,8 @@ testCompareXMLToDomConfig(const char *xmlfile, int ret = -1; libxl_domain_config actualconfig; libxl_domain_config expectconfig; + libxlDriverConfigPtr cfg; xentoollog_logger *log = NULL; - libxl_ctx *ctx = NULL; virPortAllocatorPtr gports = NULL; virDomainXMLOptionPtr xmlopt = NULL; virDomainDefPtr vmdef = NULL; @@ -68,10 +68,18 @@ testCompareXMLToDomConfig(const char *xmlfile, libxl_domain_config_init(&actualconfig); libxl_domain_config_init(&expectconfig); + if (!(cfg = libxlDriverConfigNew())) + goto cleanup; + + cfg->caps = caps; + if (!(log = (xentoollog_logger *)xtl_createlogger_stdiostream(stderr, XTL_DEBUG, 0))) goto cleanup; - if (libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, log) < 0) + /* replace logger with stderr one */ + libxl_ctx_free(cfg->ctx); + + if (libxl_ctx_alloc(&cfg->ctx, LIBXL_VERSION, 0, log) < 0) goto cleanup; if (!(gports = virPortAllocatorNew("vnc", 5900, 6000, @@ -85,22 +93,22 @@ testCompareXMLToDomConfig(const char *xmlfile, NULL, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; - if (libxlBuildDomainConfig(gports, vmdef, NULL, ctx, caps, &actualconfig) < 0) + if (libxlBuildDomainConfig(gports, vmdef, cfg, &actualconfig) < 0) goto cleanup; - if (!(actualjson = libxl_domain_config_to_json(ctx, &actualconfig))) { + if (!(actualjson = libxl_domain_config_to_json(cfg->ctx, &actualconfig))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Failed to retrieve JSON doc for libxl_domain_config"); goto cleanup; } virTestLoadFile(jsonfile, &tempjson); - if (libxl_domain_config_from_json(ctx, &expectconfig, tempjson) != 0) { + if (libxl_domain_config_from_json(cfg->ctx, &expectconfig, tempjson) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Failed to create libxl_domain_config from JSON doc"); goto cleanup; } - if (!(expectjson = libxl_domain_config_to_json(ctx, &expectconfig))) { + if (!(expectjson = libxl_domain_config_to_json(cfg->ctx, &expectconfig))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Failed to retrieve JSON doc for libxl_domain_config"); goto cleanup; @@ -118,10 +126,11 @@ testCompareXMLToDomConfig(const char *xmlfile, virDomainDefFree(vmdef); virObjectUnref(gports); virObjectUnref(xmlopt); - libxl_ctx_free(ctx); libxl_domain_config_dispose(&actualconfig); libxl_domain_config_dispose(&expectconfig); xtl_logger_destroy(log); + cfg->caps = NULL; + virObjectUnref(cfg); return ret; } diff --git a/tests/virmocklibxl.c b/tests/virmocklibxl.c index 747f9f8..28281b6 100644 --- a/tests/virmocklibxl.c +++ b/tests/virmocklibxl.c @@ -27,6 +27,7 @@ # include <sys/stat.h> # include <unistd.h> # include <libxl.h> +# include <util/virfile.h> # include <xenstore.h> # include <xenctrl.h> @@ -48,6 +49,24 @@ VIR_MOCK_IMPL_RET_ARGS(xc_interface_open, } +VIR_MOCK_IMPL_RET_ARGS(libxl_get_version_info, + const libxl_version_info*, + libxl_ctx *, ctx) +{ + static libxl_version_info info; + + memset(&info, 0, sizeof(info)); + + return &info; + /* silence gcc warning */ + return real_libxl_get_version_info(ctx); +} + +VIR_MOCK_STUB_RET_ARGS(libxl_get_free_memory, + int, 0, + libxl_ctx *, ctx, + uint32_t *, memkb); +

VIR_MOCK_STUB_RET_ARGS(xc_interface_close, int, 0, xc_interface *, handle) @@ -68,6 +87,17 @@ VIR_MOCK_STUB_RET_ARGS(xc_sharing_used_frames, VIR_MOCK_STUB_VOID_ARGS(xs_daemon_close, struct xs_handle *, handle) +VIR_MOCK_IMPL_RET_ARGS(virFileMakePath, int, + const char *, path) +{ + /* replace log path with a writable directory */ + if (strstr(path, "/log/")) { + snprintf((char*)path, strlen(path), "."); + return 0; + } + return real_virFileMakePath(path); +} + VIR_MOCK_IMPL_RET_ARGS(__xstat, int, int, ver, const char *, path,

On Wed, Mar 28, 2018 at 01:42:47PM -0600, Jim Fehlig wrote: > On 03/27/2018 05:55 PM, Marek Marczykowski-Górecki wrote: >> diff --git a/tests/virmocklibxl.c b/tests/virmocklibxl.c >> index 747f9f8..28281b6 100644 >> --- a/tests/virmocklibxl.c >> +++ b/tests/virmocklibxl.c >> @@ -27,6 +27,7 @@ >> # include <sys/stat.h> >> # include <unistd.h> >> # include <libxl.h> >> +# include <util/virfile.h> >> # include <xenstore.h> >> # include <xenctrl.h> >> @@ -48,6 +49,24 @@ VIR_MOCK_IMPL_RET_ARGS(xc_interface_open, >> } >> +VIR_MOCK_IMPL_RET_ARGS(libxl_get_version_info, >> + const libxl_version_info*, >> + libxl_ctx *, ctx) >> +{ >> + static libxl_version_info info; >> + >> + memset(&info, 0, sizeof(info)); >> + >> + return &info; >> + /* silence gcc warning */ >> + return real_libxl_get_version_info(ctx); >> +} >> + >> +VIR_MOCK_STUB_RET_ARGS(libxl_get_free_memory, >> + int, 0, >> + libxl_ctx *, ctx, >> + uint32_t *, memkb); >> + > > This doesn't compile with Xen >= 4.8 > > In file included from virmocklibxl.c:26:0: > virmocklibxl.c:66:24: error: conflicting types for 'libxl_get_free_memory' > VIR_MOCK_STUB_RET_ARGS(libxl_get_free_memory, > ^ > virmock.h:182:13: note: in definition of macro 'VIR_MOCK_STUB_RET_ARGS' > rettype name(VIR_MOCK_ARGTYPENAMES_UNUSED(__VA_ARGS__)) \ > ^~~~ > In file included from virmocklibxl.c:29:0: > /usr/include/libxl.h:1570:5: note: previous declaration of > 'libxl_get_free_memory' was here > int libxl_get_free_memory(libxl_ctx *ctx, uint64_t *memkb); > ^~~~~~~~~~~~~~~~~~~~~ > > Using the uint32_t variant works in the libxl driver since we have > -DLIBXL_API_VERSION=0x040400 in LIBXL_CFLAGS. I worked around the > compilation failure with LIBXL_HAVE_MEMKB_64BITS, I can't reproduce this problem, either with 4.8 or 4.10. Even more, if I add alternative mock with uint64_t, under #if LIBXL_HAVE_MEMKB_64BITS, I get compile failure, because of conflicting types (with libxl_get_free_memory_0x040700)... Can you confirm it's really a problem, not some mismatching header versions on your side?

Introduce global libxl option for enabling nested HVM feature, similar to kvm module parameter. This will prevent enabling experimental feature by mere presence of <cpu mode='host-passthrough'> element in domain config, unless explicitly enabled. <cpu mode='host-passthrough'> element may be used to configure other features, like NUMA, or CPUID. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com&gt; Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- Changes since v4: - add nested_hvm option to test_libvirtd_libxl.aug.in and libvirtd_libxl.aug - make it possible to override nested_hvm=0 with explicit <feature policy='require' name='vmx'/> - split xenconfig changes into separate commits Changes since v3: - use config option nested_hvm, instead of requiring explicit <feature ...> entries - title changed from "libxl: do not enable nested HVM by mere presence of <cpu> element" - xenconfig: don't add <feature policy='force' name='vmx'/> since it is implied by presence of <cpu> element - xenconfig: produce <cpu> element even when converting on host not supporting vmx/svm, to not lose setting value Changes since v2: - new patch --- src/libxl/libvirtd_libxl.aug | 2 ++ src/libxl/libxl.conf | 8 ++++++++ src/libxl/libxl_conf.c | 12 +++++++++++- src/libxl/libxl_conf.h | 2 ++ src/libxl/test_libvirtd_libxl.aug.in | 1 + tests/libxlxml2domconfigtest.c | 3 +++ 6 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/libxl/libvirtd_libxl.aug b/src/libxl/libvirtd_libxl.aug index b31cc07..58b9af3 100644 --- a/src/libxl/libvirtd_libxl.aug +++ b/src/libxl/libvirtd_libxl.aug @@ -28,12 +28,14 @@ module Libvirtd_libxl = let lock_entry = str_entry "lock_manager" let keepalive_interval_entry = int_entry "keepalive_interval" let keepalive_count_entry = int_entry "keepalive_count" + let nested_hvm_entry = bool_entry "nested_hvm" (* Each entry in the config is one of the following ... *) let entry = autoballoon_entry | lock_entry | keepalive_interval_entry | keepalive_count_entry + | nested_hvm_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/libxl/libxl.conf b/src/libxl/libxl.conf index 264af7c..72825a7 100644 --- a/src/libxl/libxl.conf +++ b/src/libxl/libxl.conf @@ -41,3 +41,11 @@ # #keepalive_interval = 5 #keepalive_count = 5 + +# Nested HVM default control. In order to use nested HVM feature, this option +# needs to be enabled, in addition to specifying <cpu mode='host-passthrough'> +# in domain configuration. This can be overridden in domain configuration by +# explicitly setting <feature policy='require' name='vmx'/> inside <cpu/> +# element.

+# By default it is disabled. +#nested_hvm = 0 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index dcfdd67..3b9e828 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -360,7 +360,9 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, bool hasHwVirt = false; bool svm = false, vmx = false; - if (ARCH_IS_X86(def->os.arch)) { + /* enable nested HVM only if global nested_hvm option enable it and + * host support it*/ + if (cfg->nested_hvm && ARCH_IS_X86(def->os.arch)) { vmx = virCPUCheckFeature(caps->host.arch, caps->host.cpu, "vmx"); svm = virCPUCheckFeature(caps->host.arch, caps->host.cpu, "svm"); hasHwVirt = vmx | svm;

@@ -380,6 +382,11 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, case VIR_CPU_FEATURE_FORCE: case VIR_CPU_FEATURE_REQUIRE: + if ((vmx && STREQ(def->cpu->features[i].name, "vmx")) || + (svm && STREQ(def->cpu->features[i].name, "svm"))) + hasHwVirt = true; + break; + case VIR_CPU_FEATURE_OPTIONAL: case VIR_CPU_FEATURE_LAST: break; @@ -1699,6 +1706,9 @@ int libxlDriverConfigLoadFile(libxlDriverConfigPtr cfg, if (virConfGetValueUInt(conf, "keepalive_count", &cfg->keepAliveCount) < 0) goto cleanup; + if (virConfGetValueBool(conf, "nested_hvm", &cfg->nested_hvm) < 0) + goto cleanup; + ret = 0; cleanup: diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index ce9db26..27cfc1a 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -88,6 +88,8 @@ struct _libxlDriverConfig { int keepAliveInterval; unsigned int keepAliveCount; + bool nested_hvm; + /* Once created, caps are immutable */ virCapsPtr caps; diff --git a/src/libxl/test_libvirtd_libxl.aug.in b/src/libxl/test_libvirtd_libxl.aug.in index 63558e5..9106abe 100644 --- a/src/libxl/test_libvirtd_libxl.aug.in +++ b/src/libxl/test_libvirtd_libxl.aug.in @@ -6,3 +6,4 @@ module Test_libvirtd_libxl = { "lock_manager" = "lockd" } { "keepalive_interval" = "5" } { "keepalive_count" = "5" } +{ "nested_hvm" = "1" } diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index cfbc37c..8819032 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -76,6 +76,9 @@ testCompareXMLToDomConfig(const char *xmlfile, if (!(log = (xentoollog_logger *)xtl_createlogger_stdiostream(stderr, XTL_DEBUG, 0))) goto cleanup; + /* for testing nested HVM */ + cfg->nested_hvm = true; + /* replace logger with stderr one */ libxl_ctx_free(cfg->ctx);

On Wed, Mar 21, 2018 at 05:55:28PM -0600, Jim Fehlig wrote: > On 03/21/2018 10:32 AM, Marek Marczykowski-Górecki wrote: >> Introduce global libxl option for enabling nested HVM feature, similar >> to kvm module parameter. This will prevent enabling experimental feature >> by mere presence of <cpu mode='host-passthrough'> element in domain >> config, unless explicitly enabled. <cpu mode='host-passthrough'> element >> may be used to configure other features, like NUMA, or CPUID. >> >> Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com&gt; >> Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; >> --- >> Changes since v4: >> - add nested_hvm option to test_libvirtd_libxl.aug.in and libvirtd_libxl.aug >> - make it possible to override nested_hvm=0 with explicit <feature >> policy='require' name='vmx'/> >> - split xenconfig changes into separate commits >> Changes since v3: >> - use config option nested_hvm, instead of requiring explicit <feature >> ...> entries >> - title changed from "libxl: do not enable nested HVM by mere presence >> of <cpu> element" >> - xenconfig: don't add <feature policy='force' name='vmx'/> since it is >> implied by presence of <cpu> element >> - xenconfig: produce <cpu> element even when converting on host not >> supporting vmx/svm, to not lose setting value >> Changes since v2: >> - new patch >> --- >> src/libxl/libvirtd_libxl.aug | 2 ++ >> src/libxl/libxl.conf | 8 ++++++++ >> src/libxl/libxl_conf.c | 12 +++++++++++- >> src/libxl/libxl_conf.h | 2 ++ >> src/libxl/test_libvirtd_libxl.aug.in | 1 + >> tests/libxlxml2domconfigtest.c | 3 +++ >> 6 files changed, 27 insertions(+), 1 deletion(-) >> >> diff --git a/src/libxl/libvirtd_libxl.aug b/src/libxl/libvirtd_libxl.aug >> index b31cc07..58b9af3 100644 >> --- a/src/libxl/libvirtd_libxl.aug >> +++ b/src/libxl/libvirtd_libxl.aug >> @@ -28,12 +28,14 @@ module Libvirtd_libxl = >> let lock_entry = str_entry "lock_manager" >> let keepalive_interval_entry = int_entry "keepalive_interval" >> let keepalive_count_entry = int_entry "keepalive_count" >> + let nested_hvm_entry = bool_entry "nested_hvm" >> (* Each entry in the config is one of the following ... *) >> let entry = autoballoon_entry >> | lock_entry >> | keepalive_interval_entry >> | keepalive_count_entry >> + | nested_hvm_entry >> let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] >> let empty = [ label "#empty" . eol ] >> diff --git a/src/libxl/libxl.conf b/src/libxl/libxl.conf >> index 264af7c..72825a7 100644 >> --- a/src/libxl/libxl.conf >> +++ b/src/libxl/libxl.conf >> @@ -41,3 +41,11 @@ >> # >> #keepalive_interval = 5 >> #keepalive_count = 5 >> + >> +# Nested HVM default control. In order to use nested HVM feature, this option >> +# needs to be enabled, in addition to specifying <cpu mode='host-passthrough'> >> +# in domain configuration. This can be overridden in domain configuration by >> +# explicitly setting <feature policy='require' name='vmx'/> inside <cpu/> >> +# element. > > Cool, the setting can be overridden by per-domain config. > >> +# By default it is disabled. >> +#nested_hvm = 0 >> diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c >> index dcfdd67..3b9e828 100644 >> --- a/src/libxl/libxl_conf.c >> +++ b/src/libxl/libxl_conf.c >> @@ -360,7 +360,9 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, >> bool hasHwVirt = false; >> bool svm = false, vmx = false; >> - if (ARCH_IS_X86(def->os.arch)) { >> + /* enable nested HVM only if global nested_hvm option enable it and >> + * host support it*/ >> + if (cfg->nested_hvm && ARCH_IS_X86(def->os.arch)) { >> vmx = virCPUCheckFeature(caps->host.arch, caps->host.cpu, "vmx"); >> svm = virCPUCheckFeature(caps->host.arch, caps->host.cpu, "svm"); >> hasHwVirt = vmx | svm; > > But IIUC this change will not allow per-domain config to override the global > setting. If cfg->nested_hvm is false, svm and vmx are both false and > FEATURE_REQUIRE is not honored. Ough, conflict resolution went wrong after changing 3/9 :/ Fixed patch will follow.

Introduce global libxl option for enabling nested HVM feature, similar to kvm module parameter. This will prevent enabling experimental feature by mere presence of <cpu mode='host-passthrough'> element in domain config, unless explicitly enabled. <cpu mode='host-passthrough'> element may be used to configure other features, like NUMA, or CPUID. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com&gt; Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- Changes since v6: - really allow per-domain override Changes since v4: - add nested_hvm option to test_libvirtd_libxl.aug.in and libvirtd_libxl.aug - make it possible to override nested_hvm=0 with explicit <feature policy='require' name='vmx'/> - split xenconfig changes into separate commits Changes since v3: - use config option nested_hvm, instead of requiring explicit <feature ...> entries - title changed from "libxl: do not enable nested HVM by mere presence of <cpu> element" - xenconfig: don't add <feature policy='force' name='vmx'/> since it is implied by presence of <cpu> element - xenconfig: produce <cpu> element even when converting on host not supporting vmx/svm, to not lose setting value Changes since v2: - new patch --- src/libxl/libvirtd_libxl.aug | 2 ++ src/libxl/libxl.conf | 8 ++++++++ src/libxl/libxl_conf.c | 12 +++++++++++- src/libxl/libxl_conf.h | 2 ++ src/libxl/test_libvirtd_libxl.aug.in | 1 + tests/libxlxml2domconfigtest.c | 3 +++ 6 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/libxl/libvirtd_libxl.aug b/src/libxl/libvirtd_libxl.aug index b31cc07..58b9af3 100644 --- a/src/libxl/libvirtd_libxl.aug +++ b/src/libxl/libvirtd_libxl.aug @@ -28,12 +28,14 @@ module Libvirtd_libxl = let lock_entry = str_entry "lock_manager" let keepalive_interval_entry = int_entry "keepalive_interval" let keepalive_count_entry = int_entry "keepalive_count" + let nested_hvm_entry = bool_entry "nested_hvm" (* Each entry in the config is one of the following ... *) let entry = autoballoon_entry | lock_entry | keepalive_interval_entry | keepalive_count_entry + | nested_hvm_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/libxl/libxl.conf b/src/libxl/libxl.conf index 264af7c..72825a7 100644 --- a/src/libxl/libxl.conf +++ b/src/libxl/libxl.conf @@ -41,3 +41,11 @@ # #keepalive_interval = 5 #keepalive_count = 5 + +# Nested HVM default control. In order to use nested HVM feature, this option +# needs to be enabled, in addition to specifying <cpu mode='host-passthrough'> +# in domain configuration. This can be overridden in domain configuration by +# explicitly setting <feature policy='require' name='vmx'/> inside <cpu/> +# element. +# By default it is disabled. +#nested_hvm = 0 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index dcfdd67..ed8506d 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -360,10 +360,12 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, bool hasHwVirt = false; bool svm = false, vmx = false; + /* enable nested HVM only if global nested_hvm option enable it and + * host support it*/ if (ARCH_IS_X86(def->os.arch)) { vmx = virCPUCheckFeature(caps->host.arch, caps->host.cpu, "vmx"); svm = virCPUCheckFeature(caps->host.arch, caps->host.cpu, "svm"); - hasHwVirt = vmx | svm; + hasHwVirt = cfg->nested_hvm && (vmx | svm); } if (def->cpu->nfeatures) { @@ -380,6 +382,11 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, case VIR_CPU_FEATURE_FORCE: case VIR_CPU_FEATURE_REQUIRE: + if ((vmx && STREQ(def->cpu->features[i].name, "vmx")) || + (svm && STREQ(def->cpu->features[i].name, "svm"))) + hasHwVirt = true; + break; + case VIR_CPU_FEATURE_OPTIONAL: case VIR_CPU_FEATURE_LAST: break; @@ -1699,6 +1706,9 @@ int libxlDriverConfigLoadFile(libxlDriverConfigPtr cfg, if (virConfGetValueUInt(conf, "keepalive_count", &cfg->keepAliveCount) < 0) goto cleanup; + if (virConfGetValueBool(conf, "nested_hvm", &cfg->nested_hvm) < 0) + goto cleanup; + ret = 0; cleanup: diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index ce9db26..27cfc1a 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -88,6 +88,8 @@ struct _libxlDriverConfig { int keepAliveInterval; unsigned int keepAliveCount; + bool nested_hvm; + /* Once created, caps are immutable */ virCapsPtr caps; diff --git a/src/libxl/test_libvirtd_libxl.aug.in b/src/libxl/test_libvirtd_libxl.aug.in index 63558e5..9106abe 100644 --- a/src/libxl/test_libvirtd_libxl.aug.in +++ b/src/libxl/test_libvirtd_libxl.aug.in @@ -6,3 +6,4 @@ module Test_libvirtd_libxl = { "lock_manager" = "lockd" } { "keepalive_interval" = "5" } { "keepalive_count" = "5" } +{ "nested_hvm" = "1" }

diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index cfbc37c..8819032 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -76,6 +76,9 @@ testCompareXMLToDomConfig(const char *xmlfile, if (!(log = (xentoollog_logger *)xtl_createlogger_stdiostream(stderr, XTL_DEBUG, 0))) goto cleanup; + /* for testing nested HVM */ + cfg->nested_hvm = true; + /* replace logger with stderr one */ libxl_ctx_free(cfg->ctx);

Test enabling/disabling individual CPU features and also setting nested HVM support, which is also controlled by CPU features node. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com&gt; Reviewed-by: Jim Fehlig <jfehlig(a)suse.com&gt; --- Changes since v3: - adjust for modified nested HVM handling Changes since v1: - rewritten to Jim's test suite for libxl_domain_config generator --- tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 64 +++++++++++++++++- tests/libxlxml2domconfigdata/fullvirt-cpuid.xml | 37 ++++++++++- tests/libxlxml2domconfigtest.c | 1 +- 3 files changed, 102 insertions(+) create mode 100644 tests/libxlxml2domconfigdata/fullvirt-cpuid.json create mode 100644 tests/libxlxml2domconfigdata/fullvirt-cpuid.xml diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json new file mode 100644 index 0000000..28037be --- /dev/null +++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json @@ -0,0 +1,64 @@ +{ + "c_info": { + "type": "hvm", + "name": "XenGuest2", + "uuid": "c7a5fdb2-cdaf-9455-926a-d65c16db1809" + }, + "b_info": { + "max_vcpus": 1, + "avail_vcpus": [ + 0 + ], + "max_memkb": 592896, + "target_memkb": 403456, + "video_memkb": 8192, + "shadow_memkb": 5656, + "cpuid": [ + { + "leaf": 1, + "ecx": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0", + "edx": "xxxxxxxxxxxxxxxxxxxxxxxxxxx1xxxx"

+ <cpu mode='host-passthrough'> + <feature policy='forbid' name='pni'/> + <feature policy='forbid' name='vmx'/>

+ <feature policy='require' name='tsc'/>

On Thu, Mar 22, 2018 at 10:03:50AM +0000, Daniel P. Berrangé wrote: > On Wed, Mar 21, 2018 at 05:32:31PM +0100, Marek Marczykowski-Górecki wrote: > > Test enabling/disabling individual CPU features and also setting > > nested HVM support, which is also controlled by CPU features node. > > > > Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com&gt; > > Reviewed-by: Jim Fehlig <jfehlig(a)suse.com&gt; > > --- > > Changes since v3: > > - adjust for modified nested HVM handling > > Changes since v1: > > - rewritten to Jim's test suite for libxl_domain_config generator > > --- > > tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 64 +++++++++++++++++- > > tests/libxlxml2domconfigdata/fullvirt-cpuid.xml | 37 ++++++++++- > > tests/libxlxml2domconfigtest.c | 1 +- > > 3 files changed, 102 insertions(+) > > create mode 100644 tests/libxlxml2domconfigdata/fullvirt-cpuid.json > > create mode 100644 tests/libxlxml2domconfigdata/fullvirt-cpuid.xml > > > > diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json > > new file mode 100644 > > index 0000000..28037be > > --- /dev/null > > +++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json > > @@ -0,0 +1,64 @@ > > +{ > > + "c_info": { > > + "type": "hvm", > > + "name": "XenGuest2", > > + "uuid": "c7a5fdb2-cdaf-9455-926a-d65c16db1809" > > + }, > > + "b_info": { > > + "max_vcpus": 1, > > + "avail_vcpus": [ > > + 0 > > + ], > > + "max_memkb": 592896, > > + "target_memkb": 403456, > > + "video_memkb": 8192, > > + "shadow_memkb": 5656, > > + "cpuid": [ > > + { > > + "leaf": 1, > > + "ecx": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0", > > + "edx": "xxxxxxxxxxxxxxxxxxxxxxxxxxx1xxxx" > > IIUC, this means we have 1 bit marked as forbidden and 1 bit > marked as required but.... > > > > + <cpu mode='host-passthrough'> > > + <feature policy='forbid' name='pni'/> > > + <feature policy='forbid' name='vmx'/> > > 2 features marked forbidden vmx is translated to nested_hvm setting.