- Devel - libvirt List Archives

[PATCH v2 00/13] resolve hangs/crashes on libvirtd shutdown
by Nikolay Shirokovskiy 07 Sep '20

07 Sep '20

I keep qemu VM event loop exiting synchronously but add code to avoid deadlock that can be caused by this approach. I guess it is worth having synchronous exiting of threads in this case to avoid crashes. Patches that are already positively reviewed has appropriate 'Reviewed-by' lines. Changes from v1: - rename stateShutdown to state stateShutdownPrepare - introduce net daemon shutdown callbacks - make some adjustments in terms of qemu per VM's event loop thread finishing - factor out net server shutdown facilities into distinct patch - increase shutdown timeout from 15s to 30s Nikolay Shirokovskiy (13): libvirt: add stateShutdownPrepare/stateShutdownWait to drivers util: always initialize priority condition util: add stop/drain functions to thread pool rpc: don't unref service ref on socket behalf twice rpc: add virNetDaemonSetShutdownCallbacks rpc: add shutdown facilities to netserver rpc: finish all threads before exiting main loop qemu: don't shutdown event thread in monitor EOF callback vireventthread: exit thread synchronously on finalize qemu: avoid deadlock in qemuDomainObjStopWorker qemu: implement driver's shutdown/shutdown wait methods rpc: cleanup virNetDaemonClose method util: remove unused virThreadPoolNew macro scripts/check-drivername.py | 2 + src/driver-state.h | 8 ++++ src/libvirt.c | 42 ++++++++++++++++ src/libvirt_internal.h | 2 + src/libvirt_private.syms | 4 ++ src/libvirt_remote.syms | 2 +- src/qemu/qemu_domain.c | 18 +++++-- src/qemu/qemu_driver.c | 32 +++++++++++++ src/qemu/qemu_process.c | 3 -- src/remote/remote_daemon.c | 6 +-- src/rpc/virnetdaemon.c | 109 ++++++++++++++++++++++++++++++++++++------ src/rpc/virnetdaemon.h | 8 +++- src/rpc/virnetserver.c | 8 ++++ src/rpc/virnetserver.h | 1 + src/rpc/virnetserverservice.c | 1 - src/util/vireventthread.c | 1 + src/util/virthreadpool.c | 65 +++++++++++++++++-------- src/util/virthreadpool.h | 6 +-- 18 files changed, 267 insertions(+), 51 deletions(-) -- 1.8.3.1

3 29

[libvirt PATCH] qemu: migration: remove unused variable
by Ján Tomko 07 Sep '20

07 Sep '20

../src/qemu/qemu_migration.c:4091:36: error: unused variable 'cfg' [-Werror,-Wunused-variable] g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Fixes: d92c2bbc6597fcb951b303a9122ec1ca71514d10 --- Pushed. src/qemu/qemu_migration.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 03d6a522e7..a530c17582 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4088,7 +4088,6 @@ qemuMigrationSrcPerformTunnel(virQEMUDriverPtr driver, { int ret = -1; qemuMigrationSpec spec; - g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); int fds[2] = { -1, -1 }; VIR_DEBUG("driver=%p, vm=%p, st=%p, cookiein=%s, cookieinlen=%d, " -- 2.26.2

1 0

[PATCH] qemu: Do not error out when setting affinity failed
by Martin Kletzander 06 Sep '20

06 Sep '20

At least in a particular scenario described in the code. Basically when libvirtd is running without CAP_SYS_NICE (e.g. in a container) and it is trying to set QEMU affinity to all CPUs (because there is no setting requested in the XML) it fails. But if we ignore the failure in this particular case than you can limit the CPUs used by controlling the affinity for libvirtd itself. In any other case (anything requested in the XML, pinning a live domain, etc.) the call is still considered fatal and the action errors out. Resolves: https://bugzilla.redhat.com/1819801 Suggested-by: Daniel P. Berrangé <berrange(a)redhat.com> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_process.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index cfe09d632633..270bb37d3682 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2528,6 +2528,7 @@ qemuProcessGetAllCpuAffinity(virBitmapPtr *cpumapRet) static int qemuProcessInitCpuAffinity(virDomainObjPtr vm) { + bool settingAll = false; g_autoptr(virBitmap) cpumapToSet = NULL; virDomainNumatuneMemMode mem_mode; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -2566,13 +2567,30 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm) if (!(cpumapToSet = virBitmapNewCopy(vm->def->cputune.emulatorpin))) return -1; } else { + settingAll = true; if (qemuProcessGetAllCpuAffinity(&cpumapToSet) < 0) return -1; } if (cpumapToSet && virProcessSetAffinity(vm->pid, cpumapToSet) < 0) { - return -1; + /* + * We only want to error out if we failed to set the affinity to + * user-requested mapping. If we are just trying to reset the affinity + * to all CPUs and this fails it can only be an issue if: + * 1) libvirtd does not have CAP_SYS_NICE + * 2) libvirtd does not run on all CPUs + * + * However since this scenario is very improbable, we rather skip + * reporting the error because it helps running libvirtd in a a scenario + * where pinning is handled by someone else. + * + * See also: https://bugzilla.redhat.com/1819801#c2 + */ + if (settingAll) + virResetLastError(); + else + return -1; } return 0; @@ -2726,8 +2744,25 @@ qemuProcessSetupPid(virDomainObjPtr vm, affinity_cpumask = use_cpumask; /* Setup legacy affinity. */ - if (affinity_cpumask && virProcessSetAffinity(pid, affinity_cpumask) < 0) - goto cleanup; + if (affinity_cpumask && virProcessSetAffinity(pid, affinity_cpumask) < 0) { + /* + * We only want to error out if we failed to set the affinity to + * user-requested mapping. If we are just trying to reset the affinity + * to all CPUs and this fails it can only be an issue if: + * 1) libvirtd does not have CAP_SYS_NICE + * 2) libvirtd does not run on all CPUs + * + * However since this scenario is very improbable, we rather skip + * reporting the error because it helps running libvirtd in a a scenario + * where pinning is handled by someone else. + * + * See also: https://bugzilla.redhat.com/1819801#c2 + */ + if (affinity_cpumask == hostcpumap) + virResetLastError(); + else + goto cleanup; + } /* Set scheduler type and priority, but not for the main thread. */ if (sched && -- 2.28.0

3 4

[PATCH] qemu: Fix comment in qemuProcessSetupPid
by Martin Kletzander 06 Sep '20

06 Sep '20

This was supposed to be done in commit 3791f29b085c, but I missed a spot. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial, also suggested here: https://www.redhat.com/archives/libvir-list/2020-September/msg00275.html src/qemu/qemu_process.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 17d083d192a5..934fab98bc42 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2751,9 +2751,8 @@ qemuProcessSetupPid(virDomainObjPtr vm, * 1) libvirtd does not have CAP_SYS_NICE * 2) libvirtd does not run on all CPUs * - * However since this scenario is very improbable, we rather skip - * reporting the error because it helps running libvirtd in a a scenario - * where pinning is handled by someone else. + * This scenario can easily occurr when libvirtd is run inside a + * container with restrictive permissions and CPU pinning. * * See also: https://bugzilla.redhat.com/1819801#c2 */ -- 2.28.0

1 0

[PATCH v3 0/2] qemu: Allow migration over UNIX sockets
by Martin Kletzander 06 Sep '20

06 Sep '20

v3: - Forbid listen-address with unix: desturi v2: - Allow TLS and parallel migration as well - Use simpler unix socket URIs Resolves: https://bugzilla.redhat.com/1638889 Martin Kletzander (2): qemu: Allow migration over UNIX socket news: qemu: Allow migration over UNIX sockets NEWS.rst | 6 ++ docs/manpages/virsh.rst | 13 ++- docs/migration.html.in | 33 ++++++++ src/qemu/qemu_driver.c | 22 ++++- src/qemu/qemu_migration.c | 138 +++++++++++++++++++++++-------- src/qemu/qemu_migration_params.c | 9 ++ src/qemu/qemu_migration_params.h | 3 + src/qemu/qemu_monitor.c | 15 ++++ src/qemu/qemu_monitor.h | 4 + 9 files changed, 204 insertions(+), 39 deletions(-) -- 2.28.0

3 4

Re: [GSoC]: Libvirt driver for Jailhouse-Problem in sending initial patches(0-2)
by Prakhar Bansal 06 Sep '20

06 Sep '20

Hello Libvirt community, I want to apologize for my attempts to send the same patches multiple times, but for some reason I am not able to send Patch 1-2 along with cover letter with this patch set through git send-email. I even tried sending them separately but it didn’t help. When I’m trying sending Patch set(0-9), only Patches 3-9 are being successfully sent to mailing list and I’m getting the message on my gmail account that your message to libvir-list(a)redhat.com has been blocked. I’m still trying to solve this issue but I would appreciate any suggestion on this matter. Thanks, Prakhar Bansal On Sat, Sep 5, 2020 at 2:31 PM <libvir-list-request(a)redhat.com> wrote: > Send libvir-list mailing list submissions to > > libvir-list(a)redhat.com > > > > To subscribe or unsubscribe via the World Wide Web, visit > > https://www.redhat.com/mailman/listinfo/libvir-list > > or, via email, send a message with subject or body 'help' to > > libvir-list-request(a)redhat.com > > > > You can reach the person managing the list at > > libvir-list-owner(a)redhat.com > > > > When replying, please edit your Subject line so it is more specific > > than "Re: Contents of libvir-list digest..." > > > > > > Today's Topics: > > > > 1. [GSoC PATCH 6/9] Jailhouse driver: Implementation of > > DomainLookup* callbacks (Prakhar Bansal) > > 2. [GSoC PATCH 5/9] Jailhouse driver: Implementation of > > DomainInfo/State/List (Prakhar Bansal) > > 3. [GSoC PATCH 7/9] Jailhouse driver: Implementation of > > DomainShutdown/Destroy callbacks (Prakhar Bansal) > > > > > > ---------------------------------------------------------------------- > > > > Message: 1 > > Date: Sat, 5 Sep 2020 16:30:00 -0500 > > From: Prakhar Bansal <prakharbansal0910(a)gmail.com> > > To: libvir-list(a)redhat.com > > Subject: [GSoC PATCH 6/9] Jailhouse driver: Implementation of > > DomainLookup* callbacks > > Message-ID: <20200905213003.10682-7-prakharbansal0910(a)gmail.com> > > Content-Type: text/plain; charset=US-ASCII > > > > Signed-off-by:Prakhar Bansal<prakharbansal0910(a)gmail.com> > > --- > > src/jailhouse/jailhouse_driver.c | 70 ++++++++++++++++++++++++++++---- > > 1 file changed, 61 insertions(+), 9 deletions(-) > > > > diff --git a/src/jailhouse/jailhouse_driver.c > b/src/jailhouse/jailhouse_driver.c > > index 2bb249f996..8c84a23388 100644 > > --- a/src/jailhouse/jailhouse_driver.c > > +++ b/src/jailhouse/jailhouse_driver.c > > @@ -292,25 +292,77 @@ jailhouseConnectListAllDomains(virConnectPtr conn, > > static virDomainPtr > > jailhouseDomainLookupByID(virConnectPtr conn, int id) > > { > > - UNUSED(conn); > > - UNUSED(id); > > - return NULL; > > +virJailhouseDriverPtr driver = conn->privateData; > > + virDomainObjPtr cell; > > + virDomainPtr dom = NULL; > > + > > + cell = virDomainObjListFindByID(driver->domains, id); > > + > > + if (!cell) { > > + virReportError(VIR_ERR_NO_DOMAIN, > > + _("No domain with matching ID '%d'"), id); > > + goto cleanup; > > + } > > + > > + if (virDomainLookupByIDEnsureACL(conn, cell->def) < 0) > > + goto cleanup; > > + > > + dom = virGetDomain(conn, cell->def->name, cell->def->uuid, > cell->def->id); > > + cleanup: > > + virDomainObjEndAPI(&cell); > > + return dom; > > } > > > > static virDomainPtr > > jailhouseDomainLookupByName(virConnectPtr conn, const char *name) > > { > > - UNUSED(conn); > > - UNUSED(name); > > - return NULL; > > + virJailhouseDriverPtr driver = conn->privateData; > > + virDomainObjPtr cell; > > + virDomainPtr dom = NULL; > > + > > + cell = virDomainObjListFindByName(driver->domains, name); > > + > > + if (!cell) { > > + virReportError(VIR_ERR_NO_DOMAIN, > > + _("No domain with matching name '%s'"), name); > > + goto cleanup; > > + } > > + > > + if (virDomainLookupByNameEnsureACL(conn, cell->def) < 0) > > + goto cleanup; > > + > > + dom = virGetDomain(conn, cell->def->name, cell->def->uuid, > cell->def->id); > > + > > + cleanup: > > + virDomainObjEndAPI(&cell); > > + return dom; > > } > > > > static virDomainPtr > > jailhouseDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) > > { > > - UNUSED(conn); > > - UNUSED(uuid); > > - return NULL; > > + virJailhouseDriverPtr driver = conn->privateData; > > + virDomainObjPtr cell; > > + virDomainPtr dom = NULL; > > + > > + cell = virDomainObjListFindByUUID(driver->domains, uuid); > > + > > + if (!cell) { > > + char uuidstr[VIR_UUID_STRING_BUFLEN]; > > + virUUIDFormat(uuid, uuidstr); > > + virReportError(VIR_ERR_NO_DOMAIN, > > + _("No domain with matching UUID '%s'"), uuidstr); > > + goto cleanup; > > + } > > + > > + if (virDomainLookupByUUIDEnsureACL(conn, cell->def) < 0) > > + goto cleanup; > > + > > + dom = virGetDomain(conn, cell->def->name, cell->def->uuid, > cell->def->id); > > + > > + cleanup: > > + virDomainObjEndAPI(&cell); > > + return dom; > > } > > > > static virDomainObjPtr > > -- > > 2.17.1 > > > > > > > > ------------------------------ > > > > Message: 2 > > Date: Sat, 5 Sep 2020 16:29:59 -0500 > > From: Prakhar Bansal <prakharbansal0910(a)gmail.com> > > To: libvir-list(a)redhat.com > > Subject: [GSoC PATCH 5/9] Jailhouse driver: Implementation of > > DomainInfo/State/List > > Message-ID: <20200905213003.10682-6-prakharbansal0910(a)gmail.com> > > Content-Type: text/plain; charset=US-ASCII > > > > Signed-off-by:Prakhar Bansal<prakharbansal0910(a)gmail.com> > > --- > > src/jailhouse/jailhouse_driver.c | 102 +++++++++++++++++++++++++------ > > 1 file changed, 83 insertions(+), 19 deletions(-) > > > > diff --git a/src/jailhouse/jailhouse_driver.c > b/src/jailhouse/jailhouse_driver.c > > index 5b7bdc92d8..2bb249f996 100644 > > --- a/src/jailhouse/jailhouse_driver.c > > +++ b/src/jailhouse/jailhouse_driver.c > > @@ -267,19 +267,26 @@ static int > > jailhouseNodeGetInfo(virConnectPtr conn, > > virNodeInfoPtr nodeinfo) > > { > > - UNUSED(conn); > > - UNUSED(nodeinfo); > > - return -1; > > + if (virNodeGetInfoEnsureACL(conn) < 0) > > + return -1; > > + > > + return virCapabilitiesGetNodeInfo(nodeinfo); > > } > > > > static int > > jailhouseConnectListAllDomains(virConnectPtr conn, > > - virDomainPtr **domain, unsigned int flags) > > + virDomainPtr **domains, > > + unsigned int flags) > > { > > - UNUSED(conn); > > - UNUSED(domain); > > - UNUSED(flags); > > - return -1; > > + virJailhouseDriverPtr driver = conn->privateData; > > + > > + virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); > > + > > + if (virConnectListAllDomainsEnsureACL(conn) < 0) > > + return -1; > > + > > + return virDomainObjListExport(driver->domains, conn, domains, > > + virConnectListAllDomainsCheckACL, > flags); > > } > > > > static virDomainPtr > > @@ -522,30 +529,87 @@ jailhouseDomainDestroy(virDomainPtr domain) > > } > > > > static int > > -jailhouseDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) > > +virjailhouseGetDomainTotalCpuStats(virDomainObjPtr cell, > > + unsigned long long *cpustats) > > { > > - UNUSED(domain); > > - UNUSED(info); > > + // TODO(Prakhar): Not implemented yet. > > + UNUSED(cell); > > + UNUSED(cpustats); > > return -1; > > } > > > > +static int > > +jailhouseDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) > > +{ > > + virDomainObjPtr cell; > > + int ret = -1; > > + > > + if (!(cell = virJailhouseDomObjFromDomain(domain))) > > + goto cleanup; > > + > > + if (virDomainGetInfoEnsureACL(domain->conn, cell->def) < 0) > > + goto cleanup; > > + > > + if (virDomainObjIsActive(cell)) { > > + if (virjailhouseGetDomainTotalCpuStats(cell, &(info->cpuTime)) < > 0) > > + goto cleanup; > > + } else { > > + info->cpuTime = 0; > > + } > > + > > + info->state = virDomainObjGetState(cell, NULL); > > + info->maxMem = virDomainDefGetMemoryTotal(cell->def); > > + info->nrVirtCpu = virDomainDefGetVcpus(cell->def); > > + ret = 0; > > + > > + cleanup: > > + virDomainObjEndAPI(&cell); > > + return ret; > > +} > > + > > static int > > jailhouseDomainGetState(virDomainPtr domain, > > int *state, int *reason, unsigned int flags) > > { > > - UNUSED(domain); > > - UNUSED(state); > > - UNUSED(reason); > > - UNUSED(flags); > > - return -1; > > + virDomainObjPtr cell; > > + int ret = -1; > > + > > + virCheckFlags(0, -1); > > + > > + if (!(cell = virJailhouseDomObjFromDomain(domain))) > > + goto cleanup; > > + > > + if (virDomainGetStateEnsureACL(domain->conn, cell->def) < 0) > > + goto cleanup; > > + > > + *state = virDomainObjGetState(cell, reason); > > + ret = 0; > > + > > + cleanup: > > + virDomainObjEndAPI(&cell); > > + return ret; > > } > > > > static char * > > jailhouseDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) > > { > > - UNUSED(domain); > > - UNUSED(flags); > > - return NULL; > > + virDomainObjPtr cell; > > + char *ret = NULL; > > + > > + virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS, NULL); > > + > > + if (!(cell = virJailhouseDomObjFromDomain(domain))) > > + goto cleanup; > > + > > + if (virDomainGetXMLDescEnsureACL(domain->conn, cell->def, flags) < 0) > > + goto cleanup; > > + > > + ret = virDomainDefFormat(cell->def, NULL /* xmlopt */, > > + virDomainDefFormatConvertXMLFlags(flags)); > > + > > + cleanup: > > + virDomainObjEndAPI(&cell); > > + return ret; > > } > > > > static virHypervisorDriver jailhouseHypervisorDriver = { > > -- > > 2.17.1 > > > > > > > > ------------------------------ > > > > Message: 3 > > Date: Sat, 5 Sep 2020 16:30:01 -0500 > > From: Prakhar Bansal <prakharbansal0910(a)gmail.com> > > To: libvir-list(a)redhat.com > > Subject: [GSoC PATCH 7/9] Jailhouse driver: Implementation of > > DomainShutdown/Destroy callbacks > > Message-ID: <20200905213003.10682-8-prakharbansal0910(a)gmail.com> > > Content-Type: text/plain; charset=US-ASCII > > > > Signed-off-by:Prakhar Bansal<prakharbansal0910(a)gmail.com> > > --- > > src/jailhouse/jailhouse_api.c | 8 +++ > > src/jailhouse/jailhouse_driver.c | 101 +++++++++++++++++++++++++++++-- > > 2 files changed, 104 insertions(+), 5 deletions(-) > > > > diff --git a/src/jailhouse/jailhouse_api.c b/src/jailhouse/jailhouse_api.c > > index 783903e939..510e2f5f66 100644 > > --- a/src/jailhouse/jailhouse_api.c > > +++ b/src/jailhouse/jailhouse_api.c > > @@ -71,6 +71,14 @@ int cell_match(const struct dirent *dirent); > > > > int createCell(const char *conf_file); > > > > +int loadImagesInCell(virJailhouseCellId cell_id, char *images, int > num_images); > > + > > +int shutdownCell(virJailhouseCellId cell_id); > > + > > +int startCell(virJailhouseCellId cell_id); > > + > > +int destroyCell(virJailhouseCellId cell_id); > > + > > int getCellInfo(const unsigned int id, > > virJailhouseCellInfoPtr * cell_info); > > > > diff --git a/src/jailhouse/jailhouse_driver.c > b/src/jailhouse/jailhouse_driver.c > > index 8c84a23388..46c7759cb8 100644 > > --- a/src/jailhouse/jailhouse_driver.c > > +++ b/src/jailhouse/jailhouse_driver.c > > @@ -406,8 +406,8 @@ jailhouseDomainCreateWithFlags(virDomainPtr domain, > > unsigned int flags) > > { > > virJailhouseDriverPtr driver = domain->conn->privateData; > > - virDomainObjPtr cell; > > virJailhouseCellInfoPtr cell_info; > > + virDomainObjPtr cell; > > int ret = -1; > > > > virCheckFlags(VIR_DOMAIN_NONE, -1); > > @@ -566,18 +566,107 @@ jailhouseDomainCreateXML(virConnectPtr conn, > > return dom; > > } > > > > +static int > > +jailhouseDomainShutdownFlags(virDomainPtr domain, unsigned int flags) > > +{ > > + virJailhouseDriverPtr driver = domain->conn->privateData; > > + virJailhouseCellInfoPtr cell_info; > > + virDomainObjPtr cell; > > + virJailhouseCellId cell_id; > > + int ret = -1; > > + > > + virCheckFlags(0, -1); > > + > > + if (!(cell = virJailhouseDomObjFromDomain(domain))) > > + goto cleanup; > > + > > + if (virDomainShutdownFlagsEnsureACL(domain->conn, cell->def, flags) < > 0) > > + goto cleanup; > > + > > + if (virDomainObjGetState(cell, NULL) != VIR_DOMAIN_RUNNING) > > + goto cleanup; > > + > > + if (!(cell_info = virJailhouseFindCellByName(driver, > cell->def->name))) { > > + virReportError(VIR_ERR_NO_DOMAIN, > > + _("no domain with matching name %s and ID %d)"), > > + cell->def->name, cell->def->id); > > + virDomainObjListRemove(driver->domains, cell); > > + goto cleanup; > > + } > > + > > + // Initialize the cell_id. > > + cell_id.id = cell->def->id; > > + cell_id.padding = 0; > > + if (virStrcpy(cell_id.name, cell->def->name, > JAILHOUSE_CELL_ID_NAMELEN) < 0) { > > + virReportError(VIR_ERR_INTERNAL_ERROR, > > + _("Cell name %s length exceeded the limit"), > > + cell->def->name); > > + goto cleanup; > > + } > > + > > + if (shutdownCell(cell_id) < 0) > > + goto cleanup; > > + > > + virDomainObjSetState(cell, VIR_DOMAIN_SHUTOFF, > VIR_DOMAIN_SHUTOFF_SHUTDOWN); > > + > > + ret = 0; > > + > > + cleanup: > > + virDomainObjEndAPI(&cell); > > + return ret; > > +} > > + > > static int > > jailhouseDomainShutdown(virDomainPtr domain) > > { > > - UNUSED(domain); > > - return -1; > > + return jailhouseDomainShutdownFlags(domain, 0); > > +} > > + > > +static int > > +jailhouseDomainDestroyFlags(virDomainPtr domain, unsigned int flags) > > +{ > > + virJailhouseDriverPtr driver = domain->conn->privateData; > > + virJailhouseCellInfoPtr cell_info; > > + virDomainObjPtr cell; > > + int ret = -1; > > + > > + virCheckFlags(0, -1); > > + > > + if (!(cell = virJailhouseDomObjFromDomain(domain))) > > + goto cleanup; > > + > > + if (virDomainDestroyFlagsEnsureACL(domain->conn, cell->def) < 0) > > + goto cleanup; > > + > > + if (virDomainObjGetState(cell, NULL) != VIR_DOMAIN_SHUTOFF) { > > + virReportError(VIR_ERR_OPERATION_INVALID, > > + _("Domain %s is still running."), > > + cell->def->name); > > + goto cleanup; > > + } > > + > > + if (!(cell_info = virJailhouseFindCellByName(driver, > cell->def->name))) { > > + virReportError(VIR_ERR_NO_DOMAIN, > > + _("no domain with matching name %s and ID %d)"), > > + cell->def->name, cell->def->id); > > + virDomainObjListRemove(driver->domains, cell); > > + goto cleanup; > > + } > > + > > + // Remove the cell from the domain list. > > + virDomainObjListRemove(driver->domains, cell); > > + > > + ret = 0; > > + > > + cleanup: > > + virDomainObjEndAPI(&cell); > > + return ret; > > } > > > > static int > > jailhouseDomainDestroy(virDomainPtr domain) > > { > > - UNUSED(domain); > > - return -1; > > + return jailhouseDomainDestroyFlags(domain, 0); > > } > > > > static int > > @@ -675,7 +764,9 @@ static virHypervisorDriver jailhouseHypervisorDriver = > { > > .domainCreateWithFlags = jailhouseDomainCreateWithFlags, /* 6.3.0 > */ > > .domainCreateXML = jailhouseDomainCreateXML, /* 6.3.0 */ > > .domainShutdown = jailhouseDomainShutdown, /* 6.3.0 */ > > + .domainShutdownFlags = jailhouseDomainShutdownFlags, /* 6.3.0 */ > > .domainDestroy = jailhouseDomainDestroy, /* 6.3.0 */ > > + .domainDestroyFlags = jailhouseDomainDestroyFlags, /* 6.3.0 */ > > .domainGetInfo = jailhouseDomainGetInfo, /* 6.3.0 */ > > .domainGetState = jailhouseDomainGetState, /* 6.3.0 */ > > .domainLookupByID = jailhouseDomainLookupByID, /* 6.3.0 */ > > -- > > 2.17.1 > > > > > > > > End of libvir-list Digest, Vol 178, Issue 70 > > ******************************************** > > > >

1 0

[GSoC PATCH 9/9] Jailhouse driver: Add events to events queue in DomainCreate/Shutdown/Destroy
by Prakhar Bansal 06 Sep '20

06 Sep '20

Signed-off-by:Prakhar Bansal<prakharbansal0910(a)gmail.com> --- src/jailhouse/jailhouse_driver.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/jailhouse/jailhouse_driver.c b/src/jailhouse/jailhouse_driver.c index 45b1f35896..70f0f365cb 100644 --- a/src/jailhouse/jailhouse_driver.c +++ b/src/jailhouse/jailhouse_driver.c @@ -122,6 +122,7 @@ jailhouseCreateAndLoadCells(virJailhouseDriverPtr driver) // Create all cells in the hypervisor. if (createJailhouseCells(driver->config->cell_config_dir) < 0) return -1; + // Get all cells created above. driver->cell_info_list = getJailhouseCellsInfo(); @@ -137,6 +138,7 @@ jailhouseFreeDriver(virJailhouseDriverPtr driver) virMutexDestroy(&driver->lock); virObjectUnref(driver->xmlopt); virObjectUnref(driver->domains); + virObjectUnref(driver->domainEventState); virObjectUnref(driver->config); VIR_FREE(driver); } @@ -222,6 +224,9 @@ jailhouseStateInitialize(bool privileged G_GNUC_UNUSED, if (!(jailhouse_driver->domains = virDomainObjListNew())) goto error; + if (!(jailhouse_driver->domainEventState = virObjectEventStateNew())) + goto error; + if (!(cfg = virJailhouseDriverConfigNew())) goto error; @@ -476,6 +481,7 @@ jailhouseDomainCreateXML(virConnectPtr conn, virDomainDefPtr def = NULL; virDomainObjPtr cell = NULL; virJailhouseCellId cell_id; + virObjectEventPtr event = NULL; char **images = NULL; int num_images = 0, i = 0; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE; @@ -573,12 +579,16 @@ jailhouseDomainCreateXML(virConnectPtr conn, dom = virGetDomain(conn, cell->def->name, cell->def->uuid, cell->def->id); + event = virDomainEventLifecycleNewFromObj(cell, + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED_BOOTED); cleanup: if (!dom && removeInactive && !cell->persistent) virDomainObjListRemove(driver->domains, cell); virDomainDefFree(def); virDomainObjEndAPI(&cell); + virObjectEventStateQueue(driver->domainEventState, event); return dom; } @@ -589,6 +599,7 @@ jailhouseDomainShutdownFlags(virDomainPtr domain, unsigned int flags) virJailhouseCellInfoPtr cell_info; virDomainObjPtr cell; virJailhouseCellId cell_id; + virObjectEventPtr event = NULL; int ret = -1; virCheckFlags(0, -1); @@ -627,8 +638,12 @@ jailhouseDomainShutdownFlags(virDomainPtr domain, unsigned int flags) ret = 0; + event = virDomainEventLifecycleNewFromObj(cell, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); cleanup: virDomainObjEndAPI(&cell); + virObjectEventStateQueue(driver->domainEventState, event); return ret; } @@ -644,6 +659,7 @@ jailhouseDomainDestroyFlags(virDomainPtr domain, unsigned int flags) virJailhouseDriverPtr driver = domain->conn->privateData; virJailhouseCellInfoPtr cell_info; virDomainObjPtr cell; + virObjectEventPtr event = NULL; int ret = -1; virCheckFlags(0, -1); @@ -674,8 +690,12 @@ jailhouseDomainDestroyFlags(virDomainPtr domain, unsigned int flags) ret = 0; + event = virDomainEventLifecycleNewFromObj(cell, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_DESTROYED); cleanup: virDomainObjEndAPI(&cell); + virObjectEventStateQueue(driver->domainEventState, event); return ret; } -- 2.17.1

1 0

[GSoC PATCH 8/9] Jailhouse driver: Fixes for creation of cells, fetching cell info, disabling jailhouse hypervisor
by Prakhar Bansal 06 Sep '20

06 Sep '20

- Added xmlopt to the Jailhouse driver - Added ACL check in ConnectOpen Signed-off-by:Prakhar Bansal<prakharbansal0910(a)gmail.com> --- src/jailhouse/jailhouse_api.c | 48 +++++++++++++------------- src/jailhouse/jailhouse_driver.c | 58 ++++++++++++++++++++------------ 2 files changed, 61 insertions(+), 45 deletions(-) diff --git a/src/jailhouse/jailhouse_api.c b/src/jailhouse/jailhouse_api.c index 510e2f5f66..bb82b5a31e 100644 --- a/src/jailhouse/jailhouse_api.c +++ b/src/jailhouse/jailhouse_api.c @@ -69,15 +69,9 @@ char *readSysfsCellString(const unsigned int id, const char *entry); int cell_match(const struct dirent *dirent); -int createCell(const char *conf_file); - -int loadImagesInCell(virJailhouseCellId cell_id, char *images, int num_images); - -int shutdownCell(virJailhouseCellId cell_id); +int cell_match_info(const struct dirent *dirent); -int startCell(virJailhouseCellId cell_id); - -int destroyCell(virJailhouseCellId cell_id); +int createCell(const char *conf_file); int getCellInfo(const unsigned int id, virJailhouseCellInfoPtr * cell_info); @@ -121,25 +115,31 @@ jailhouseDisable(void) fd = openDev(); err = ioctl(fd, JAILHOUSE_DISABLE); - if (err) + if (err) { virReportSystemError(errno, "%s", _("Failed to disable jailhouse: %s")); + return -1; + } VIR_DEBUG("Jailhouse hypervisor is disabled"); - return err; + return 0; } int cell_match(const struct dirent *dirent) { char *ext = strrchr(dirent->d_name, '.'); - return dirent->d_name[0] != '.' - && (STREQ(ext, JAILHOUSE_CELL_FILE_EXTENSION) == 0); + && STREQ(ext, JAILHOUSE_CELL_FILE_EXTENSION); } +int +cell_match_info(const struct dirent *dirent) +{ + return dirent->d_name[0] != '.'; +} int createJailhouseCells(const char *dir_path) { @@ -150,7 +150,6 @@ createJailhouseCells(const char *dir_path) if (strlen(dir_path) == 0) return ret; - num_entries = scandir(dir_path, &namelist, cell_match, alphasort); if (num_entries == -1) { if (errno == ENOENT) { @@ -170,7 +169,8 @@ createJailhouseCells(const char *dir_path) for (i = 0; i < num_entries; i++) { g_autofree char *file_path = g_strdup_printf("%s/%s", dir_path, namelist[i]->d_name); - if (createCell(file_path) != 0) { + + if (createCell(file_path) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Cell creation failed with conf found in %s."), namelist[i]->d_name); @@ -208,13 +208,13 @@ createCell(const char *conf_file) VIR_AUTOCLOSE fd = -1; if (strlen(conf_file) == 0) - return err; + return -1; len = virFileReadAll(conf_file, MAX_JAILHOUSE_CELL_CONFIG_FILE_SIZE, &buffer); if (len < 0 || !buffer) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Failed to read the system configuration file")); - return err; + return -1; } cell_create.config_address = (unsigned long) buffer; @@ -223,12 +223,14 @@ createCell(const char *conf_file) fd = openDev(); err = ioctl(fd, JAILHOUSE_CELL_CREATE, &cell_create); - if (err) + if (err) { virReportSystemError(errno, "%s", _("Cell creation failed: %s")); + return -1; + } - return err; + return 0; } void @@ -243,11 +245,11 @@ cellInfoFree(virJailhouseCellInfoPtr cell_info) char * readSysfsCellString(const unsigned int id, const char *entry) { - g_autofree char *buffer = NULL; + char *buffer = NULL; g_autofree char *file_path = NULL; int len = -1; - file_path = g_strdup_printf(JAILHOUSE_CELLS "%u/%s", id, entry); + file_path = g_strdup_printf(JAILHOUSE_CELLS "/%u/%s", id, entry); len = virFileReadAll(file_path, 1024, &buffer); if (len < 0 || !buffer) { @@ -277,13 +279,12 @@ getCellInfo(const unsigned int id, virJailhouseCellInfoPtr *cell_info_ptr) /* get cell name */ tmp = readSysfsCellString(id, "name"); - if (virStrncpy(cell_info->id.name, tmp, JAILHOUSE_CELL_ID_NAMELEN, JAILHOUSE_CELL_ID_NAMELEN) < 0) { + if (virStrcpy(cell_info->id.name, tmp, JAILHOUSE_CELL_ID_NAMELEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cell ID %s too long to be copied to the cell info"), tmp); return -1; } - cell_info->id.name[JAILHOUSE_CELL_ID_NAMELEN] = 0; VIR_FREE(tmp); @@ -310,8 +311,7 @@ getJailhouseCellsInfo(void) int num_entries; size_t i; - num_entries = - scandir(JAILHOUSE_CELLS, &namelist, cell_match, alphasort); + num_entries = scandir(JAILHOUSE_CELLS, &namelist, cell_match_info, alphasort); if (num_entries == -1) { if (errno == ENOENT) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/jailhouse/jailhouse_driver.c b/src/jailhouse/jailhouse_driver.c index 46c7759cb8..45b1f35896 100644 --- a/src/jailhouse/jailhouse_driver.c +++ b/src/jailhouse/jailhouse_driver.c @@ -122,7 +122,6 @@ jailhouseCreateAndLoadCells(virJailhouseDriverPtr driver) // Create all cells in the hypervisor. if (createJailhouseCells(driver->config->cell_config_dir) < 0) return -1; - // Get all cells created above. driver->cell_info_list = getJailhouseCellsInfo(); @@ -136,6 +135,7 @@ jailhouseFreeDriver(virJailhouseDriverPtr driver) return; virMutexDestroy(&driver->lock); + virObjectUnref(driver->xmlopt); virObjectUnref(driver->domains); virObjectUnref(driver->config); VIR_FREE(driver); @@ -147,7 +147,6 @@ jailhouseConnectOpen(virConnectPtr conn, virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { uid_t uid = geteuid(); - virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); if (!virConnectValidateURIPath(conn->uri->path, "jailhouse", uid == 0)) @@ -159,8 +158,10 @@ jailhouseConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_ERROR; } - conn->privateData = jailhouse_driver; + if (virConnectOpenEnsureACL(conn) < 0) + return VIR_DRV_OPEN_ERROR; + conn->privateData = jailhouse_driver; return VIR_DRV_OPEN_SUCCESS; } @@ -169,16 +170,19 @@ jailhouseConnectOpen(virConnectPtr conn, static int jailhouseConnectClose(virConnectPtr conn) { - conn->privateData = NULL; + conn->privateData = NULL; - return 0; + return 0; } static int jailhouseStateCleanup(void) { if (!jailhouse_driver) - return -1; + return -1; + + if (jailhouseDisable() < 0) + return -1; if (jailhouse_driver->lockFD != -1) virPidFileRelease(jailhouse_driver->config->stateDir, @@ -187,6 +191,9 @@ jailhouseStateCleanup(void) virMutexDestroy(&jailhouse_driver->lock); jailhouseFreeDriver(jailhouse_driver); + + jailhouse_driver = NULL; + return 0; } @@ -199,6 +206,9 @@ jailhouseStateInitialize(bool privileged G_GNUC_UNUSED, virJailhouseDriverConfigPtr cfg = NULL; int rc; + if (jailhouse_driver) + return VIR_DRV_STATE_INIT_COMPLETE; + jailhouse_driver = g_new0(virJailhouseDriver, 1); jailhouse_driver->lockFD = -1; @@ -220,6 +230,10 @@ jailhouseStateInitialize(bool privileged G_GNUC_UNUSED, if (jailhouseLoadConf(cfg) < 0) goto error; + if (!(jailhouse_driver->xmlopt = virDomainXMLOptionNew(NULL, NULL, + NULL, NULL, NULL))) + goto error; + if (virFileMakePath(cfg->stateDir) < 0) { virReportSystemError(errno, _("Failed to create state dir %s"), cfg->stateDir); @@ -292,7 +306,7 @@ jailhouseConnectListAllDomains(virConnectPtr conn, static virDomainPtr jailhouseDomainLookupByID(virConnectPtr conn, int id) { -virJailhouseDriverPtr driver = conn->privateData; + virJailhouseDriverPtr driver = conn->privateData; virDomainObjPtr cell; virDomainPtr dom = NULL; @@ -409,7 +423,6 @@ jailhouseDomainCreateWithFlags(virDomainPtr domain, virJailhouseCellInfoPtr cell_info; virDomainObjPtr cell; int ret = -1; - virCheckFlags(VIR_DOMAIN_NONE, -1); if (!domain->name) { @@ -462,23 +475,23 @@ jailhouseDomainCreateXML(virConnectPtr conn, virDomainPtr dom = NULL; virDomainDefPtr def = NULL; virDomainObjPtr cell = NULL; - virDomainDiskDefPtr disk = NULL; virJailhouseCellId cell_id; char **images = NULL; int num_images = 0, i = 0; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE; + bool removeInactive = false; if (flags & VIR_DOMAIN_START_VALIDATE) parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; - if ((def = virDomainDefParseString(xml, NULL, - NULL, parse_flags)) == NULL) + if (!(def = virDomainDefParseString(xml, driver->xmlopt, + NULL, parse_flags))) goto cleanup; - if ((cell = virDomainObjListFindByUUID(driver->domains, def->uuid))) + if (virDomainCreateXMLEnsureACL(conn, def) < 0) goto cleanup; - if (virDomainCreateXMLEnsureACL(conn, def) < 0) + if ((cell = virDomainObjListFindByUUID(driver->domains, def->uuid))) goto cleanup; if (!(cell_info = virJailhouseFindCellByName(driver, def->name))) { @@ -492,13 +505,13 @@ jailhouseDomainCreateXML(virConnectPtr conn, def->id = cell_info->id.id; if (!(cell = virDomainObjListAdd(driver->domains, def, - NULL, - VIR_DOMAIN_OBJ_LIST_ADD_LIVE | - VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, NULL))) + driver->xmlopt, 0, NULL))) goto cleanup; def = NULL; + removeInactive = true; + if (cell->def->ndisks < 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Domain XML doesn't contain any disk images")); @@ -513,7 +526,7 @@ jailhouseDomainCreateXML(virConnectPtr conn, if (cell->def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK && virDomainDiskGetType(cell->def->disks[i]) == VIR_STORAGE_TYPE_FILE) { - disk = cell->def->disks[i]; + virDomainDiskDefPtr disk = cell->def->disks[i]; const char *src = virDomainDiskGetSource(disk); if (!src) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -525,7 +538,7 @@ jailhouseDomainCreateXML(virConnectPtr conn, num_images++; } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("A Jailhouse doamin(cell) can ONLY have FILE type disks")); + _("A Jailhouse domain(cell) can ONLY have FILE type disks")); goto cleanup; } } @@ -533,7 +546,7 @@ jailhouseDomainCreateXML(virConnectPtr conn, // Initialize the cell_id. cell_id.id = cell->def->id; cell_id.padding = 0; - if (virStrncpy(cell_id.name, cell->def->name, JAILHOUSE_CELL_ID_NAMELEN, JAILHOUSE_CELL_ID_NAMELEN) < 0) { + if (virStrcpy(cell_id.name, cell->def->name, JAILHOUSE_CELL_ID_NAMELEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cell name %s length exceeded the limit"), cell->def->name); @@ -561,6 +574,9 @@ jailhouseDomainCreateXML(virConnectPtr conn, dom = virGetDomain(conn, cell->def->name, cell->def->uuid, cell->def->id); cleanup: + if (!dom && removeInactive && !cell->persistent) + virDomainObjListRemove(driver->domains, cell); + virDomainDefFree(def); virDomainObjEndAPI(&cell); return dom; @@ -671,7 +687,7 @@ jailhouseDomainDestroy(virDomainPtr domain) static int virjailhouseGetDomainTotalCpuStats(virDomainObjPtr cell, - unsigned long long *cpustats) + unsigned long long *cpustats) { // TODO(Prakhar): Not implemented yet. UNUSED(cell); @@ -721,7 +737,7 @@ jailhouseDomainGetState(virDomainPtr domain, goto cleanup; if (virDomainGetStateEnsureACL(domain->conn, cell->def) < 0) - goto cleanup; + goto cleanup; *state = virDomainObjGetState(cell, reason); ret = 0; -- 2.17.1

1 0

[GSoC PATCH 7/9] Jailhouse driver: Implementation of DomainShutdown/Destroy callbacks
by Prakhar Bansal 06 Sep '20

06 Sep '20

Signed-off-by:Prakhar Bansal<prakharbansal0910(a)gmail.com> --- src/jailhouse/jailhouse_api.c | 8 +++ src/jailhouse/jailhouse_driver.c | 101 +++++++++++++++++++++++++++++-- 2 files changed, 104 insertions(+), 5 deletions(-) diff --git a/src/jailhouse/jailhouse_api.c b/src/jailhouse/jailhouse_api.c index 783903e939..510e2f5f66 100644 --- a/src/jailhouse/jailhouse_api.c +++ b/src/jailhouse/jailhouse_api.c @@ -71,6 +71,14 @@ int cell_match(const struct dirent *dirent); int createCell(const char *conf_file); +int loadImagesInCell(virJailhouseCellId cell_id, char *images, int num_images); + +int shutdownCell(virJailhouseCellId cell_id); + +int startCell(virJailhouseCellId cell_id); + +int destroyCell(virJailhouseCellId cell_id); + int getCellInfo(const unsigned int id, virJailhouseCellInfoPtr * cell_info); diff --git a/src/jailhouse/jailhouse_driver.c b/src/jailhouse/jailhouse_driver.c index 8c84a23388..46c7759cb8 100644 --- a/src/jailhouse/jailhouse_driver.c +++ b/src/jailhouse/jailhouse_driver.c @@ -406,8 +406,8 @@ jailhouseDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) { virJailhouseDriverPtr driver = domain->conn->privateData; - virDomainObjPtr cell; virJailhouseCellInfoPtr cell_info; + virDomainObjPtr cell; int ret = -1; virCheckFlags(VIR_DOMAIN_NONE, -1); @@ -566,18 +566,107 @@ jailhouseDomainCreateXML(virConnectPtr conn, return dom; } +static int +jailhouseDomainShutdownFlags(virDomainPtr domain, unsigned int flags) +{ + virJailhouseDriverPtr driver = domain->conn->privateData; + virJailhouseCellInfoPtr cell_info; + virDomainObjPtr cell; + virJailhouseCellId cell_id; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(cell = virJailhouseDomObjFromDomain(domain))) + goto cleanup; + + if (virDomainShutdownFlagsEnsureACL(domain->conn, cell->def, flags) < 0) + goto cleanup; + + if (virDomainObjGetState(cell, NULL) != VIR_DOMAIN_RUNNING) + goto cleanup; + + if (!(cell_info = virJailhouseFindCellByName(driver, cell->def->name))) { + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching name %s and ID %d)"), + cell->def->name, cell->def->id); + virDomainObjListRemove(driver->domains, cell); + goto cleanup; + } + + // Initialize the cell_id. + cell_id.id = cell->def->id; + cell_id.padding = 0; + if (virStrcpy(cell_id.name, cell->def->name, JAILHOUSE_CELL_ID_NAMELEN) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cell name %s length exceeded the limit"), + cell->def->name); + goto cleanup; + } + + if (shutdownCell(cell_id) < 0) + goto cleanup; + + virDomainObjSetState(cell, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_SHUTDOWN); + + ret = 0; + + cleanup: + virDomainObjEndAPI(&cell); + return ret; +} + static int jailhouseDomainShutdown(virDomainPtr domain) { - UNUSED(domain); - return -1; + return jailhouseDomainShutdownFlags(domain, 0); +} + +static int +jailhouseDomainDestroyFlags(virDomainPtr domain, unsigned int flags) +{ + virJailhouseDriverPtr driver = domain->conn->privateData; + virJailhouseCellInfoPtr cell_info; + virDomainObjPtr cell; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(cell = virJailhouseDomObjFromDomain(domain))) + goto cleanup; + + if (virDomainDestroyFlagsEnsureACL(domain->conn, cell->def) < 0) + goto cleanup; + + if (virDomainObjGetState(cell, NULL) != VIR_DOMAIN_SHUTOFF) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("Domain %s is still running."), + cell->def->name); + goto cleanup; + } + + if (!(cell_info = virJailhouseFindCellByName(driver, cell->def->name))) { + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching name %s and ID %d)"), + cell->def->name, cell->def->id); + virDomainObjListRemove(driver->domains, cell); + goto cleanup; + } + + // Remove the cell from the domain list. + virDomainObjListRemove(driver->domains, cell); + + ret = 0; + + cleanup: + virDomainObjEndAPI(&cell); + return ret; } static int jailhouseDomainDestroy(virDomainPtr domain) { - UNUSED(domain); - return -1; + return jailhouseDomainDestroyFlags(domain, 0); } static int @@ -675,7 +764,9 @@ static virHypervisorDriver jailhouseHypervisorDriver = { .domainCreateWithFlags = jailhouseDomainCreateWithFlags, /* 6.3.0 */ .domainCreateXML = jailhouseDomainCreateXML, /* 6.3.0 */ .domainShutdown = jailhouseDomainShutdown, /* 6.3.0 */ + .domainShutdownFlags = jailhouseDomainShutdownFlags, /* 6.3.0 */ .domainDestroy = jailhouseDomainDestroy, /* 6.3.0 */ + .domainDestroyFlags = jailhouseDomainDestroyFlags, /* 6.3.0 */ .domainGetInfo = jailhouseDomainGetInfo, /* 6.3.0 */ .domainGetState = jailhouseDomainGetState, /* 6.3.0 */ .domainLookupByID = jailhouseDomainLookupByID, /* 6.3.0 */ -- 2.17.1

1 0

[GSoC PATCH 6/9] Jailhouse driver: Implementation of DomainLookup* callbacks
by Prakhar Bansal 06 Sep '20

06 Sep '20

Signed-off-by:Prakhar Bansal<prakharbansal0910(a)gmail.com> --- src/jailhouse/jailhouse_driver.c | 70 ++++++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 9 deletions(-) diff --git a/src/jailhouse/jailhouse_driver.c b/src/jailhouse/jailhouse_driver.c index 2bb249f996..8c84a23388 100644 --- a/src/jailhouse/jailhouse_driver.c +++ b/src/jailhouse/jailhouse_driver.c @@ -292,25 +292,77 @@ jailhouseConnectListAllDomains(virConnectPtr conn, static virDomainPtr jailhouseDomainLookupByID(virConnectPtr conn, int id) { - UNUSED(conn); - UNUSED(id); - return NULL; +virJailhouseDriverPtr driver = conn->privateData; + virDomainObjPtr cell; + virDomainPtr dom = NULL; + + cell = virDomainObjListFindByID(driver->domains, id); + + if (!cell) { + virReportError(VIR_ERR_NO_DOMAIN, + _("No domain with matching ID '%d'"), id); + goto cleanup; + } + + if (virDomainLookupByIDEnsureACL(conn, cell->def) < 0) + goto cleanup; + + dom = virGetDomain(conn, cell->def->name, cell->def->uuid, cell->def->id); + cleanup: + virDomainObjEndAPI(&cell); + return dom; } static virDomainPtr jailhouseDomainLookupByName(virConnectPtr conn, const char *name) { - UNUSED(conn); - UNUSED(name); - return NULL; + virJailhouseDriverPtr driver = conn->privateData; + virDomainObjPtr cell; + virDomainPtr dom = NULL; + + cell = virDomainObjListFindByName(driver->domains, name); + + if (!cell) { + virReportError(VIR_ERR_NO_DOMAIN, + _("No domain with matching name '%s'"), name); + goto cleanup; + } + + if (virDomainLookupByNameEnsureACL(conn, cell->def) < 0) + goto cleanup; + + dom = virGetDomain(conn, cell->def->name, cell->def->uuid, cell->def->id); + + cleanup: + virDomainObjEndAPI(&cell); + return dom; } static virDomainPtr jailhouseDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { - UNUSED(conn); - UNUSED(uuid); - return NULL; + virJailhouseDriverPtr driver = conn->privateData; + virDomainObjPtr cell; + virDomainPtr dom = NULL; + + cell = virDomainObjListFindByUUID(driver->domains, uuid); + + if (!cell) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("No domain with matching UUID '%s'"), uuidstr); + goto cleanup; + } + + if (virDomainLookupByUUIDEnsureACL(conn, cell->def) < 0) + goto cleanup; + + dom = virGetDomain(conn, cell->def->name, cell->def->uuid, cell->def->id); + + cleanup: + virDomainObjEndAPI(&cell); + return dom; } static virDomainObjPtr -- 2.17.1

1 0

[GSoC PATCH 5/9] Jailhouse driver: Implementation of DomainInfo/State/List
by Prakhar Bansal 06 Sep '20

06 Sep '20

Signed-off-by:Prakhar Bansal<prakharbansal0910(a)gmail.com> --- src/jailhouse/jailhouse_driver.c | 102 +++++++++++++++++++++++++------ 1 file changed, 83 insertions(+), 19 deletions(-) diff --git a/src/jailhouse/jailhouse_driver.c b/src/jailhouse/jailhouse_driver.c index 5b7bdc92d8..2bb249f996 100644 --- a/src/jailhouse/jailhouse_driver.c +++ b/src/jailhouse/jailhouse_driver.c @@ -267,19 +267,26 @@ static int jailhouseNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) { - UNUSED(conn); - UNUSED(nodeinfo); - return -1; + if (virNodeGetInfoEnsureACL(conn) < 0) + return -1; + + return virCapabilitiesGetNodeInfo(nodeinfo); } static int jailhouseConnectListAllDomains(virConnectPtr conn, - virDomainPtr **domain, unsigned int flags) + virDomainPtr **domains, + unsigned int flags) { - UNUSED(conn); - UNUSED(domain); - UNUSED(flags); - return -1; + virJailhouseDriverPtr driver = conn->privateData; + + virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); + + if (virConnectListAllDomainsEnsureACL(conn) < 0) + return -1; + + return virDomainObjListExport(driver->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } static virDomainPtr @@ -522,30 +529,87 @@ jailhouseDomainDestroy(virDomainPtr domain) } static int -jailhouseDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) +virjailhouseGetDomainTotalCpuStats(virDomainObjPtr cell, + unsigned long long *cpustats) { - UNUSED(domain); - UNUSED(info); + // TODO(Prakhar): Not implemented yet. + UNUSED(cell); + UNUSED(cpustats); return -1; } +static int +jailhouseDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) +{ + virDomainObjPtr cell; + int ret = -1; + + if (!(cell = virJailhouseDomObjFromDomain(domain))) + goto cleanup; + + if (virDomainGetInfoEnsureACL(domain->conn, cell->def) < 0) + goto cleanup; + + if (virDomainObjIsActive(cell)) { + if (virjailhouseGetDomainTotalCpuStats(cell, &(info->cpuTime)) < 0) + goto cleanup; + } else { + info->cpuTime = 0; + } + + info->state = virDomainObjGetState(cell, NULL); + info->maxMem = virDomainDefGetMemoryTotal(cell->def); + info->nrVirtCpu = virDomainDefGetVcpus(cell->def); + ret = 0; + + cleanup: + virDomainObjEndAPI(&cell); + return ret; +} + static int jailhouseDomainGetState(virDomainPtr domain, int *state, int *reason, unsigned int flags) { - UNUSED(domain); - UNUSED(state); - UNUSED(reason); - UNUSED(flags); - return -1; + virDomainObjPtr cell; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(cell = virJailhouseDomObjFromDomain(domain))) + goto cleanup; + + if (virDomainGetStateEnsureACL(domain->conn, cell->def) < 0) + goto cleanup; + + *state = virDomainObjGetState(cell, reason); + ret = 0; + + cleanup: + virDomainObjEndAPI(&cell); + return ret; } static char * jailhouseDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) { - UNUSED(domain); - UNUSED(flags); - return NULL; + virDomainObjPtr cell; + char *ret = NULL; + + virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS, NULL); + + if (!(cell = virJailhouseDomObjFromDomain(domain))) + goto cleanup; + + if (virDomainGetXMLDescEnsureACL(domain->conn, cell->def, flags) < 0) + goto cleanup; + + ret = virDomainDefFormat(cell->def, NULL /* xmlopt */, + virDomainDefFormatConvertXMLFlags(flags)); + + cleanup: + virDomainObjEndAPI(&cell); + return ret; } static virHypervisorDriver jailhouseHypervisorDriver = { -- 2.17.1

1 0

[GSoC PATCH 4/9] Jailhouse driver: Implementation of DomainCreate* callbacks
by Prakhar Bansal 06 Sep '20

06 Sep '20

Implemented Jailhouse hypervisor APIs for cell load/start/shutdown/destroy. Signed-off-by:Prakhar Bansal<prakharbansal0910(a)gmail.com> --- src/jailhouse/jailhouse_api.c | 100 ++++++++++++-- src/jailhouse/jailhouse_api.h | 29 +++++ src/jailhouse/jailhouse_driver.c | 217 +++++++++++++++++++++++++++++-- src/jailhouse/jailhouse_driver.h | 8 ++ 4 files changed, 335 insertions(+), 19 deletions(-) diff --git a/src/jailhouse/jailhouse_api.c b/src/jailhouse/jailhouse_api.c index cda00b50e7..783903e939 100644 --- a/src/jailhouse/jailhouse_api.c +++ b/src/jailhouse/jailhouse_api.c @@ -43,11 +43,14 @@ #define JAILHOUSE_CELLS "/sys/devices/jailhouse/cells" #define MAX_JAILHOUSE_SYS_CONFIG_FILE_SIZE 1024*1024 #define MAX_JAILHOUSE_CELL_CONFIG_FILE_SIZE 1024 +#define MAX_JAILHOUSE_CELL_IMAGE_FILE_SIZE 64*1024*1024 #define JAILHOUSE_ENABLE _IOW(0, 0, void *) #define JAILHOUSE_DISABLE _IO(0, 1) #define JAILHOUSE_CELL_CREATE _IOW(0, 2, virJailhouseCellCreate) +#define JAILHOUSE_CELL_LOAD _IOW(0, 3, virJailhouseCellLoad) +#define JAILHOUSE_CELL_START _IOW(0, 4, virJailhouseCellId) #define JAILHOUSE_CELL_DESTROY _IOW(0, 5, virJailhouseCellId) #define VIR_FROM_THIS VIR_FROM_JAILHOUSE @@ -68,8 +71,6 @@ int cell_match(const struct dirent *dirent); int createCell(const char *conf_file); -int destroyCell(virJailhouseCellId cell_id); - int getCellInfo(const unsigned int id, virJailhouseCellInfoPtr * cell_info); @@ -254,7 +255,7 @@ readSysfsCellString(const unsigned int id, const char *entry) } int -getCellInfo(const unsigned int id, virJailhouseCellInfoPtr * cell_info_ptr) +getCellInfo(const unsigned int id, virJailhouseCellInfoPtr *cell_info_ptr) { char *tmp; @@ -345,28 +346,105 @@ getJailhouseCellsInfo(void) } int -destroyCell(virJailhouseCellId cell_id) +loadImagesInCell(virJailhouseCellId cell_id, char **images, int num_images) +{ + virJailhousePreloadImagePtr image; + virJailhouseCellLoadPtr cell_load; + g_autofree char *buffer = NULL; + unsigned int n; + int len = -1, err = -1; + VIR_AUTOCLOSE fd = -1; + + + if (VIR_ALLOC(cell_load) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", + _("Insufficient memory for cell load")); + return -1; + } + + + if (VIR_ALLOC_N(cell_load->image, num_images) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", + _("Insufficient memory for cell load images")); + return -1; + } + + cell_load->id = cell_id; + cell_load->num_preload_images = num_images; + + for (n = 0, image = cell_load->image; n < num_images; n++, image++) { + len = virFileReadAll(images[n], MAX_JAILHOUSE_CELL_IMAGE_FILE_SIZE, &buffer); + if (len < 0 || !buffer) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Failed to read the image file %s"), + images[n]); + return -1; + } + + image->source_address = (unsigned long)buffer; + image->size = len; + + // TODO(Prakhar): Add support for target address. + image->target_address = 0; + } + + fd = openDev(); + + err = ioctl(fd, JAILHOUSE_CELL_LOAD, cell_load); + if (err) { + virReportSystemError(errno, + _("Loading cell images for %d failed"), + cell_id.id); + return -1; + } + + return 0; +} + +int +shutdownCell(virJailhouseCellId cell_id) +{ + // Loading 0 images in the cell causes cell to shutdown. + return loadImagesInCell(cell_id, NULL, 0); +} + +int +startCell(virJailhouseCellId cell_id) { int err = -1; VIR_AUTOCLOSE fd = -1; fd = openDev(); - err = ioctl(fd, JAILHOUSE_CELL_DESTROY, &cell_id); - if (err) + err = ioctl(fd, JAILHOUSE_CELL_START, &cell_id); + if (err) { virReportSystemError(errno, - _("Destroying cell %d failed"), + _("Start cell %d failed"), cell_id.id); + return -1; + } - return err; + return 0; } int -destroyJailhouseCells(virJailhouseCellInfoPtr *cell_info_list G_GNUC_UNUSED) +destroyCell(virJailhouseCellId cell_id) { + int err = -1; + VIR_AUTOCLOSE fd = -1; + + fd = openDev(); - /* Iterate over all cells in cell_info_list and destroy each cell */ - // TODO: Not implemented yet. + err = ioctl(fd, JAILHOUSE_CELL_DESTROY, &cell_id); + if (err) { + virReportSystemError(errno, + _("Destroying cell %d failed"), + cell_id.id); + + return -1; + } return 0; } diff --git a/src/jailhouse/jailhouse_api.h b/src/jailhouse/jailhouse_api.h index 8362cb3d0f..ba39a4c8b7 100644 --- a/src/jailhouse/jailhouse_api.h +++ b/src/jailhouse/jailhouse_api.h @@ -48,6 +48,27 @@ struct _virJailhouseCellCreate { __u32 padding; }; +typedef struct _virJailhousePreloadImage virJailhousePreloadImage; +typedef virJailhousePreloadImage *virJailhousePreloadImagePtr; + +struct _virJailhousePreloadImage { + __u64 source_address; + __u64 size; + __u64 target_address; + __u64 padding; +}; + +typedef struct _virJailhouseCellLoad virJailhouseCellLoad; +typedef virJailhouseCellLoad *virJailhouseCellLoadPtr; + +struct _virJailhouseCellLoad { + struct _virJailhouseCellId id; + __u32 num_preload_images; + __u32 padding; + struct _virJailhousePreloadImage image[]; +}; + + // Enables the Jailhouse hypervisor by reading the hypervisor system // configuration from the given file and calls the ioctl API to // enable the hypervisor. @@ -62,6 +83,14 @@ int jailhouseDisable(void); // provided in the dir_name. int createJailhouseCells(const char *dir_path); +int loadImagesInCell(virJailhouseCellId cell_id, char **images, int num_images); + +int startCell(virJailhouseCellId cell_id); + +int shutdownCell(virJailhouseCellId cell_id); + +int destroyCell(virJailhouseCellId cell_id); + // Destroys Jailhouse cells using the cell IDs provided in // the cell_info_list. int destroyJailhouseCells(virJailhouseCellInfoPtr *cell_info_list); diff --git a/src/jailhouse/jailhouse_driver.c b/src/jailhouse/jailhouse_driver.c index 75bf41fc11..5b7bdc92d8 100644 --- a/src/jailhouse/jailhouse_driver.c +++ b/src/jailhouse/jailhouse_driver.c @@ -25,7 +25,6 @@ #include "configmake.h" #include "datatypes.h" #include "domain_conf.h" -#include "jailhouse_driver.h" #include "virtypedparam.h" #include "virerror.h" #include "virstring.h" @@ -36,6 +35,9 @@ #include "vircommand.h" #include "virpidfile.h" #include "access/viraccessapicheck.h" +#include "virdomainobjlist.h" + +#include "jailhouse_driver.h" #define VIR_FROM_THIS VIR_FROM_JAILHOUSE @@ -62,7 +64,6 @@ virJailhouseDriverConfigNew(void) { virJailhouseDriverConfigPtr cfg; - // TODO: Check if the following has to be uncommented. if (virJailhouseConfigInitialize() < 0) return NULL; @@ -135,6 +136,7 @@ jailhouseFreeDriver(virJailhouseDriverPtr driver) return; virMutexDestroy(&driver->lock); + virObjectUnref(driver->domains); virObjectUnref(driver->config); VIR_FREE(driver); } @@ -207,6 +209,9 @@ jailhouseStateInitialize(bool privileged G_GNUC_UNUSED, return VIR_DRV_STATE_INIT_ERROR; } + if (!(jailhouse_driver->domains = virDomainObjListNew())) + goto error; + if (!(cfg = virJailhouseDriverConfigNew())) goto error; @@ -259,10 +264,11 @@ jailhouseConnectGetHostname(virConnectPtr conn) } static int -jailhouseNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) +jailhouseNodeGetInfo(virConnectPtr conn, + virNodeInfoPtr nodeinfo) { UNUSED(conn); - UNUSED(info); + UNUSED(nodeinfo); return -1; } @@ -300,11 +306,205 @@ jailhouseDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) return NULL; } +static virDomainObjPtr +virJailhouseDomObjFromDomain(virDomainPtr domain) +{ + virDomainObjPtr cell; + virJailhouseDriverPtr driver = domain->conn->privateData; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + cell = virDomainObjListFindByUUID(driver->domains, domain->uuid); + if (!cell) { + virUUIDFormat(domain->uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s' (%s)"), + uuidstr, domain->name); + return NULL; + } + + return cell; +} + + + +static virJailhouseCellInfoPtr +virJailhouseFindCellByName(virJailhouseDriverPtr driver, + char* name) +{ + virJailhouseCellInfoPtr *cell = driver->cell_info_list; + + while (*cell) { + if (STRCASEEQ((*cell)->id.name, name)) + return *cell; + cell++; + } + + return NULL; +} + +static int +jailhouseDomainCreateWithFlags(virDomainPtr domain, + unsigned int flags) +{ + virJailhouseDriverPtr driver = domain->conn->privateData; + virDomainObjPtr cell; + virJailhouseCellInfoPtr cell_info; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_NONE, -1); + + if (!domain->name) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Error while reading the domain name")); + goto cleanup; + } + + if (!domain->id) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Error while reading the domain ID")); + goto cleanup; + } + + if (!(cell = virJailhouseDomObjFromDomain(domain))) + goto cleanup; + + if (virDomainCreateWithFlagsEnsureACL(domain->conn, cell->def) < 0) + goto cleanup; + + if (!(cell_info = virJailhouseFindCellByName(driver, cell->def->name))) { + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching name %s and ID %d)"), + cell->def->name, cell->def->id); + virDomainObjListRemove(driver->domains, cell); + goto cleanup; + } + + ret = 0; + + cleanup: + virDomainObjEndAPI(&cell); + return ret; + +} + static int jailhouseDomainCreate(virDomainPtr domain) { - UNUSED(domain); - return -1; + return jailhouseDomainCreateWithFlags(domain, 0); +} + +static virDomainPtr +jailhouseDomainCreateXML(virConnectPtr conn, + const char *xml, + unsigned int flags) +{ + virJailhouseDriverPtr driver = conn->privateData; + virJailhouseCellInfoPtr cell_info; + virDomainPtr dom = NULL; + virDomainDefPtr def = NULL; + virDomainObjPtr cell = NULL; + virDomainDiskDefPtr disk = NULL; + virJailhouseCellId cell_id; + char **images = NULL; + int num_images = 0, i = 0; + unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE; + + if (flags & VIR_DOMAIN_START_VALIDATE) + parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; + + if ((def = virDomainDefParseString(xml, NULL, + NULL, parse_flags)) == NULL) + goto cleanup; + + if ((cell = virDomainObjListFindByUUID(driver->domains, def->uuid))) + goto cleanup; + + if (virDomainCreateXMLEnsureACL(conn, def) < 0) + goto cleanup; + + if (!(cell_info = virJailhouseFindCellByName(driver, def->name))) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("cell info for %s not found"), + def->name); + goto cleanup; + } + + // Assign cell Id to the domain. + def->id = cell_info->id.id; + + if (!(cell = virDomainObjListAdd(driver->domains, def, + NULL, + VIR_DOMAIN_OBJ_LIST_ADD_LIVE | + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, NULL))) + goto cleanup; + + def = NULL; + + if (cell->def->ndisks < 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Domain XML doesn't contain any disk images")); + goto cleanup; + } + + if (VIR_ALLOC_N(images, cell->def->ndisks) < 0) + goto cleanup; + + for (i = 0; i < cell->def->ndisks; ++i) { + images[i] = NULL; + + if (cell->def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK && + virDomainDiskGetType(cell->def->disks[i]) == VIR_STORAGE_TYPE_FILE) { + disk = cell->def->disks[i]; + const char *src = virDomainDiskGetSource(disk); + if (!src) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("First file-based harddisk has no source")); + goto cleanup; + } + + images[i] = (char *)src; + num_images++; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("A Jailhouse doamin(cell) can ONLY have FILE type disks")); + goto cleanup; + } + } + + // Initialize the cell_id. + cell_id.id = cell->def->id; + cell_id.padding = 0; + if (virStrncpy(cell_id.name, cell->def->name, JAILHOUSE_CELL_ID_NAMELEN, JAILHOUSE_CELL_ID_NAMELEN) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cell name %s length exceeded the limit"), + cell->def->name); + goto cleanup; + } + + if (loadImagesInCell(cell_id, images, num_images) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to load images in the Cell %s"), + cell->def->name); + goto cleanup; + } + + VIR_DEBUG("Starting the domain..."); + + if (startCell(cell_id) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to start the Cell %s"), + cell->def->name); + goto cleanup; + } + + virDomainObjSetState(cell, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_BOOTED); + + dom = virGetDomain(conn, cell->def->name, cell->def->uuid, cell->def->id); + + cleanup: + virDomainDefFree(def); + virDomainObjEndAPI(&cell); + return dom; } static int @@ -314,7 +514,6 @@ jailhouseDomainShutdown(virDomainPtr domain) return -1; } - static int jailhouseDomainDestroy(virDomainPtr domain) { @@ -356,7 +555,9 @@ static virHypervisorDriver jailhouseHypervisorDriver = { .connectListAllDomains = jailhouseConnectListAllDomains, /* 6.3.0 */ .connectGetType = jailhouseConnectGetType, /* 6.3.0 */ .connectGetHostname = jailhouseConnectGetHostname, /* 6.3.0 */ - .domainCreate = jailhouseDomainCreate, /* 6.3.0 */ + .domainCreate = jailhouseDomainCreate, /*6.3.0 */ + .domainCreateWithFlags = jailhouseDomainCreateWithFlags, /* 6.3.0 */ + .domainCreateXML = jailhouseDomainCreateXML, /* 6.3.0 */ .domainShutdown = jailhouseDomainShutdown, /* 6.3.0 */ .domainDestroy = jailhouseDomainDestroy, /* 6.3.0 */ .domainGetInfo = jailhouseDomainGetInfo, /* 6.3.0 */ diff --git a/src/jailhouse/jailhouse_driver.h b/src/jailhouse/jailhouse_driver.h index 8a0e111676..8fc99fe7d2 100644 --- a/src/jailhouse/jailhouse_driver.h +++ b/src/jailhouse/jailhouse_driver.h @@ -22,7 +22,9 @@ #include <linux/types.h> +#include "domain_event.h" #include "jailhouse_api.h" +#include "virdomainobjlist.h" int jailhouseRegister(void); @@ -64,6 +66,12 @@ struct _virJailhouseDriver { // All the cells created during connect open on the hypervisor. virJailhouseCellInfoPtr *cell_info_list; + + // XML options for domain XMLs. + virDomainXMLOptionPtr xmlopt; + virDomainObjListPtr domains; + + virObjectEventStatePtr domainEventState; }; struct _jailhouseCell { -- 2.17.1

1 0

[PATCH 3/9] Jailhouse driver: Implementation of ConnectGetType
by Prakhar Bansal 06 Sep '20

06 Sep '20

Signed-off-by:Prakhar Bansal<prakharbansal0910(a)gmail.com> --- src/jailhouse/jailhouse_driver.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/jailhouse/jailhouse_driver.c b/src/jailhouse/jailhouse_driver.c index ac9da4c85d..75bf41fc11 100644 --- a/src/jailhouse/jailhouse_driver.c +++ b/src/jailhouse/jailhouse_driver.c @@ -32,8 +32,10 @@ #include "viralloc.h" #include "virfile.h" #include "virlog.h" +#include "virutil.h" #include "vircommand.h" #include "virpidfile.h" +#include "access/viraccessapicheck.h" #define VIR_FROM_THIS VIR_FROM_JAILHOUSE @@ -241,16 +243,19 @@ jailhouseStateInitialize(bool privileged G_GNUC_UNUSED, static const char * jailhouseConnectGetType(virConnectPtr conn) { - UNUSED(conn); - return NULL; + if (virConnectGetTypeEnsureACL(conn) < 0) + return NULL; + return "JAILHOUSE"; } static char * jailhouseConnectGetHostname(virConnectPtr conn) { - UNUSED(conn); - return NULL; + if (virConnectGetHostnameEnsureACL(conn) < 0) + return NULL; + + return virGetHostname(); } static int @@ -263,7 +268,7 @@ jailhouseNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) static int jailhouseConnectListAllDomains(virConnectPtr conn, - virDomainPtr ** domain, unsigned int flags) + virDomainPtr **domain, unsigned int flags) { UNUSED(conn); UNUSED(domain); @@ -300,7 +305,6 @@ jailhouseDomainCreate(virDomainPtr domain) { UNUSED(domain); return -1; - } static int @@ -350,18 +354,18 @@ static virHypervisorDriver jailhouseHypervisorDriver = { .connectOpen = jailhouseConnectOpen, /* 6.3.0 */ .connectClose = jailhouseConnectClose, /* 6.3.0 */ .connectListAllDomains = jailhouseConnectListAllDomains, /* 6.3.0 */ - .domainLookupByID = jailhouseDomainLookupByID, /* 6.3.0 */ - .domainLookupByUUID = jailhouseDomainLookupByUUID, /* 6.3.0 */ - .domainLookupByName = jailhouseDomainLookupByName, /* 6.3.0 */ - .domainGetXMLDesc = jailhouseDomainGetXMLDesc, /* 6.3.0 */ - .domainCreate = jailhouseDomainCreate, /* 6.3.0 */ .connectGetType = jailhouseConnectGetType, /* 6.3.0 */ .connectGetHostname = jailhouseConnectGetHostname, /* 6.3.0 */ - .nodeGetInfo = jailhouseNodeGetInfo, /* 6.3.0 */ + .domainCreate = jailhouseDomainCreate, /* 6.3.0 */ .domainShutdown = jailhouseDomainShutdown, /* 6.3.0 */ .domainDestroy = jailhouseDomainDestroy, /* 6.3.0 */ .domainGetInfo = jailhouseDomainGetInfo, /* 6.3.0 */ .domainGetState = jailhouseDomainGetState, /* 6.3.0 */ + .domainLookupByID = jailhouseDomainLookupByID, /* 6.3.0 */ + .domainLookupByUUID = jailhouseDomainLookupByUUID, /* 6.3.0 */ + .domainLookupByName = jailhouseDomainLookupByName, /* 6.3.0 */ + .domainGetXMLDesc = jailhouseDomainGetXMLDesc, /* 6.3.0 */ + .nodeGetInfo = jailhouseNodeGetInfo, /* 6.3.0 */ }; -- 2.17.1

1 0

[GSoC] Final Project report
by Prathamesh Chavan 05 Sep '20

05 Sep '20

Since GSoC has come to an end, I would like to share with the libvirt-community the work which I was able to do during this time[1]. I would like to thanks the libvirt-community and my mentors for giving me this opportunity, and helping me through this amazing experience. Thanks, Prathamesh Chavan [1]: https://drive.google.com/drive/u/0/folders/19KMJhUUp1WdXGl7slk9hLqXSwK8aG4di

1 0

[PATCH] tools: avoid unused parameter warning when readline is disabled
by Daniel P. Berrangé 05 Sep '20

05 Sep '20

The vshReadlineHistoryAdd stub method does not use its parameter. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed to fix minimal build used by layered repo CI tools/vsh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/vsh.c b/tools/vsh.c index ef2a3f62d7..0e8edcd78c 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2971,7 +2971,7 @@ vshReadline(vshControl *ctl G_GNUC_UNUSED, } void -vshReadlineHistoryAdd(const char *cmd) +vshReadlineHistoryAdd(const char *cmd G_GNUC_UNUSED) { /* empty */ } -- 2.26.2

2 2

[PATCH 0/3] Some random fixes
by Michal Privoznik 05 Sep '20

05 Sep '20

I've tried to run libvirt under valgrind and found two issues. Here are the fixes. Michal Prívozník (3): qemu_interface: Fix @cfg refcounting in qemuInterfacePrepareSlirp() lib: Prefer g_autoptr() declaration of virQEMUDriverConfigPtr qemu_namespace: Don't leak mknod items that are being skipped over src/qemu/qemu_conf.h | 6 +---- src/qemu/qemu_hostdev.c | 4 +-- src/qemu/qemu_interface.c | 11 +++------ src/qemu/qemu_migration.c | 8 ++---- src/qemu/qemu_migration_cookie.c | 4 +-- src/qemu/qemu_namespace.c | 42 +++++++++++++++++++++++--------- tests/domaincapstest.c | 4 +-- tests/qemuxml2xmltest.c | 2 +- 8 files changed, 42 insertions(+), 39 deletions(-) -- 2.26.2

3 7

[libvirt PATCH] cpu_map: Use g_auto* in cpuMapLoad
by Tim Wiederhake 04 Sep '20

04 Sep '20

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/cpu/cpu_map.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index 913e34a067..cbf90d1395 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -169,12 +169,11 @@ int cpuMapLoad(const char *arch, cpuMapLoadCallback modelCB, void *data) { - xmlDocPtr xml = NULL; - xmlXPathContextPtr ctxt = NULL; + g_autoptr(xmlDoc) xml = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - char *xpath = NULL; - int ret = -1; - char *mapfile; + g_autofree char *xpath = NULL; + g_autofree char *mapfile = NULL; if (!(mapfile = virFileFindResource("index.xml", abs_top_srcdir "/src/cpu_map", @@ -186,11 +185,11 @@ int cpuMapLoad(const char *arch, if (arch == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("undefined hardware architecture")); - goto cleanup; + return -1; } if (!(xml = virXMLParseFileCtxt(mapfile, &ctxt))) - goto cleanup; + return -1; virBufferAsprintf(&buf, "./arch[@name='%s']", arch); @@ -201,28 +200,20 @@ int cpuMapLoad(const char *arch, if ((ctxt->node = virXPathNode(xpath, ctxt)) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find CPU map for %s architecture"), arch); - goto cleanup; + return -1; } if (loadData(mapfile, ctxt, "vendor", vendorCB, data) < 0) - goto cleanup; + return -1; if (loadData(mapfile, ctxt, "feature", featureCB, data) < 0) - goto cleanup; + return -1; if (loadData(mapfile, ctxt, "model", modelCB, data) < 0) - goto cleanup; + return -1; if (loadIncludes(ctxt, vendorCB, featureCB, modelCB, data) < 0) - goto cleanup; - - ret = 0; - - cleanup: - xmlXPathFreeContext(ctxt); - xmlFreeDoc(xml); - VIR_FREE(xpath); - VIR_FREE(mapfile); + return -1; - return ret; + return 0; } -- 2.26.2

2 1

[libvirt PATCH] Add FreeBSD 11.4 CI job on Cirrus
by Daniel P. Berrangé 04 Sep '20

04 Sep '20

The previous 11.3 image provided by Cirrus did not boot, but they have now provided a working 11.4 image Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- NB, as expected this CI job fails due to the bug that Roman identified here: https://www.redhat.com/archives/libvir-list/2020-September/msg00151.html .gitlab-ci.yml | 9 +++++++++ ci/cirrus/libvirt-freebsd-11.vars | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 ci/cirrus/libvirt-freebsd-11.vars diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a42eb479f..ee404bf50a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -383,6 +383,15 @@ x64-ubuntu-2004: variables: NAME: ubuntu-2004 +x64-freebsd-11-build: + <<: *cirrus_build_job_definition + variables: + NAME: freebsd-11 + CIRRUS_VM_INSTANCE_TYPE: freebsd_instance + CIRRUS_VM_IMAGE_SELECTOR: image_family + CIRRUS_VM_IMAGE_NAME: freebsd-11-4 + INSTALL_COMMAND: pkg install -y + x64-freebsd-12-build: <<: *cirrus_build_job_definition variables: diff --git a/ci/cirrus/libvirt-freebsd-11.vars b/ci/cirrus/libvirt-freebsd-11.vars new file mode 100644 index 0000000000..7c29c6f899 --- /dev/null +++ b/ci/cirrus/libvirt-freebsd-11.vars @@ -0,0 +1,9 @@ +PACKAGING_COMMAND='pkg' +CC='/usr/bin/clang' +CCACHE='/usr/local/bin/ccache' +MAKE='/usr/local/bin/gmake' +NINJA='/usr/local/bin/ninja' +PYTHON='/usr/local/bin/python3' +PIP='/usr/local/bin/pip-3.7' +PKGS='augeas autoconf automake avahi bash bash-completion ca_root_nss ccache chrony cppi curl cyrus-sasl dbus diskscrub dnsmasq fusefs-libs gdb gettext gettext-tools git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libtool libxml2 libxslt lsof ncurses ninja p5-App-cpanminus patch perl5 pkgconf polkit py37-docutils py37-flake8 py37-pip py37-setuptools py37-wheel python3 qemu-utils radvd readline screen sudo vim yajl' +PYPI_PKGS='meson==0.54.0' -- 2.26.2

2 1

[PATCH] util: re-add conditional for ifi_iqdrops field for macOS
by Daniel P. Berrangé 04 Sep '20

04 Sep '20

The conditional was removed in commit ebbf8ebe4fa6f9d43b40673f0f2dad6bf50e2085 Author: Ján Tomko <jtomko(a)redhat.com> Date: Tue Sep 1 22:56:37 2020 +0200 util: virnetdevtap: stats: fix txdrop on FreeBSD That commit was correct about this no longer being required for FreeBSD, but missed that the code is also built on macOS. Rather than testing for this field in meson though, we can simply use a platform conditional test in the code. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed to fix macOS CI build jobs src/util/virnetdevtap.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index cc6f254aa1..ab5959c646 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -974,12 +974,20 @@ virNetDevTapInterfaceStats(const char *ifname, stats->rx_bytes = ifd->ifi_obytes; stats->rx_packets = ifd->ifi_opackets; stats->rx_errs = ifd->ifi_oerrors; +# ifndef __APPLE__ stats->rx_drop = ifd->ifi_oqdrops; +# else + stats->rx_drop = 0; +# endif } else { stats->tx_bytes = ifd->ifi_obytes; stats->tx_packets = ifd->ifi_opackets; stats->tx_errs = ifd->ifi_oerrors; +# ifndef __APPLE__ stats->tx_drop = ifd->ifi_oqdrops; +# else + stats->tx_drop = 0; +# endif stats->rx_bytes = ifd->ifi_ibytes; stats->rx_packets = ifd->ifi_ipackets; stats->rx_errs = ifd->ifi_ierrors; -- 2.26.2

2 1

[PATCH] tests: add FreeBSD dependencies
by Roman Bogorodskiy 04 Sep '20

04 Sep '20

Add some FreeBSD-specific libraries (-lutil, -lkvm) to tests dependencies. Without that, FreeBSD 11.x, which uses the GNU ld, fails to link tests. Interestingly, newer FreeBSD versions that use LLVM ld tolerate this behaviour and builds successfully as is. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- tests/meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/meson.build b/tests/meson.build index ad13e2de60..ea2458efbc 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -10,11 +10,13 @@ tests_dep = declare_dependency( dlopen_dep, glib_dep, gnutls_dep, + kvm_dep, libnl_dep, libxml_dep, rpc_dep, sasl_dep, selinux_dep, + util_dep, xdr_dep, yajl_dep, ], -- 2.27.0

3 8

[libvirt PATCH] ci: Disable verbose mode for cirrus-run
by Andrea Bolognani 04 Sep '20

04 Sep '20

It was temporarily enabled to help the upstream author validate some changes, but now that 0.3.0 is out we can safely disable it again. This reverts commit 9b5622d31f8c3036425721ab9c6b23067aa87034. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a42eb479f..bd42c95602 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -104,7 +104,7 @@ stages: -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g" <ci/cirrus/build.yml >ci/cirrus/$NAME.yml - cat ci/cirrus/$NAME.yml - - cirrus-run -v --show-build-log always ci/cirrus/$NAME.yml + - cirrus-run --show-build-log always ci/cirrus/$NAME.yml only: variables: - $CIRRUS_GITHUB_REPO -- 2.26.2

2 2

[libvirt PATCH v2 0/3] Add support for vDPA network devices
by Jonathon Jongsma 04 Sep '20

04 Sep '20

vDPA network devices allow high-performance networking in a virtual machine by providing a wire-speed data path. These devices require a vendor-specific host driver but the data path follows the virtio specification. The support for vDPA devices was recently added to qemu. This allows libvirt to support these devices. It requires that the device is configured on the host with the appropriate vendor-specific driver. This will create a chardev on the host at e.g. /dev/vhost-vdpa-0. That chardev path can then be used to define a new interface with type='vdpa'. Changes in v2: - split patches - add qemu capability - disallow migration for vdpa devices Jonathon Jongsma (3): conf: Add support for vDPA network devices qemu: add vhost-vdpa capability qemu: add vdpa support docs/formatdomain.rst | 23 ++++++++++++ docs/schemas/domaincommon.rng | 15 ++++++++ src/conf/domain_conf.c | 32 ++++++++++++++++ src/conf/domain_conf.h | 4 ++ src/conf/netdev_bandwidth_conf.c | 1 + src/libxl/libxl_conf.c | 1 + src/libxl/xen_common.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_driver.c | 3 ++ src/lxc/lxc_process.c | 1 + src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 3 ++ src/qemu/qemu_command.c | 29 ++++++++++++++- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.c | 10 ++++- src/qemu/qemu_hotplug.c | 15 +++++--- src/qemu/qemu_interface.c | 25 +++++++++++++ src/qemu/qemu_interface.h | 2 + src/qemu/qemu_migration.c | 10 ++++- src/qemu/qemu_process.c | 1 + src/qemu/qemu_validate.c | 1 + src/vmx/vmx.c | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../net-vdpa.x86_64-latest.args | 37 +++++++++++++++++++ tests/qemuxml2argvdata/net-vdpa.xml | 28 ++++++++++++++ tests/qemuxml2argvmock.c | 11 +++++- tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/net-vdpa.xml | 33 +++++++++++++++++ tests/qemuxml2xmltest.c | 1 + tools/virsh-domain.c | 1 + 30 files changed, 288 insertions(+), 11 deletions(-) create mode 100644 tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/net-vdpa.xml create mode 100644 tests/qemuxml2xmloutdata/net-vdpa.xml -- 2.26.2

3 7

[PATCH] qemu_namespace: Be tolerant to non-existent files when populating /dev
by Michal Privoznik 04 Sep '20

04 Sep '20

In 6.7.0 release I've changed how domain namespace is built and populated. Previously it used to be done from a pre-exec hook (ran in the forked off child, just before dropping all privileges and exec()-ing QEMU), which not only meant we had to have two different code paths for creating a node in domain's namespace (one for this pre-exec hook, the other for hotplug ran from the daemon), it also proved problematic because it was leaking FDs into QEMU process. To mitigate this problem, we've not only ditched libdevmapper from the NS population process, I've also dropped the pre-exec code and let the NS be populated from the daemon (using the hotplug code). But, I was not careful when doing so, because the pre-exec code was tolerant to files that doesn't exist, while this new code isn't. For instance, the very first thing that is done when the new NS is created is it's populated with @defaultDeviceACL which contain files like /dev/null, /dev/zero, /dev/random and /dev/kvm (and others). While the rest will probably exist every time, /dev/kvm might not and thus the new code I wrote has to be tolerant to that. Of course, users can override the @defaultDeviceACL (by setting cgroup_device_acl in qemu.conf) and remove /dev/kvm (which is acceptable workaround), but we definitely want libvirt to work out of the box even on hosts without KVM. Fixes: 9048dc4e627ddf33996084167bece7b5fb83b0bc Reported-by: Daniel P. Berrangé <berrange(a)redhat.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_namespace.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 454d6a7b4d..87f4fd8d58 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -1094,6 +1094,9 @@ qemuNamespaceMknodItemInit(qemuNamespaceMknodItemPtr item, item->file = file; if (g_lstat(file, &item->sb) < 0) { + if (errno == ENOENT) + return -2; + virReportSystemError(errno, _("Unable to access %s"), file); return -1; @@ -1168,9 +1171,16 @@ qemuNamespacePrepareOneItem(qemuNamespaceMknodDataPtr data, while (1) { qemuNamespaceMknodItem item = { 0 }; + int rc; - if (qemuNamespaceMknodItemInit(&item, cfg, vm, next) < 0) + rc = qemuNamespaceMknodItemInit(&item, cfg, vm, next); + if (rc == -2) { + /* @file doesn't exist. We can break here. */ + break; + } else if (rc < 0) { + /* Some other (critical) error. */ return -1; + } if (STRPREFIX(next, QEMU_DEVPREFIX)) { for (i = 0; i < ndevMountsPath; i++) { -- 2.26.2

3 2

[PATCH] util: add device name in errors from ethtool ioctls
by Daniel P. Berrangé 04 Sep '20

04 Sep '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/virnetdev.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 3040f129d1..e1a4cc2bef 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2849,7 +2849,7 @@ virNetDevRDMAFeature(const char *ifname, * Returns 0 on success, -1 on failure. */ static int -virNetDevSendEthtoolIoctl(int fd, struct ifreq *ifr) +virNetDevSendEthtoolIoctl(const char *ifname, int fd, struct ifreq *ifr) { int ret = -1; @@ -2857,13 +2857,13 @@ virNetDevSendEthtoolIoctl(int fd, struct ifreq *ifr) if (ret != 0) { switch (errno) { case EINVAL: /* kernel doesn't support SIOCETHTOOL */ - VIR_DEBUG("ethtool ioctl: invalid request"); + VIR_DEBUG("ethtool ioctl: invalid request on %s", ifname); break; case EOPNOTSUPP: /* kernel doesn't support specific feature */ - VIR_DEBUG("ethtool ioctl: request not supported"); + VIR_DEBUG("ethtool ioctl: request not supported on %s", ifname); break; default: - virReportSystemError(errno, "%s", _("ethtool ioctl error")); + virReportSystemError(errno, _("ethtool ioctl error on %s"), ifname); break; } } @@ -2888,10 +2888,10 @@ struct virNetDevEthtoolFeatureCmd { * Returns true if the feature is available, false otherwise. */ static bool -virNetDevFeatureAvailable(int fd, struct ifreq *ifr, struct ethtool_value *cmd) +virNetDevFeatureAvailable(const char *ifname, int fd, struct ifreq *ifr, struct ethtool_value *cmd) { ifr->ifr_data = (void*)cmd; - if (virNetDevSendEthtoolIoctl(fd, ifr) == 0 && + if (virNetDevSendEthtoolIoctl(ifname, fd, ifr) == 0 && cmd->data > 0) return true; return false; @@ -2899,7 +2899,8 @@ virNetDevFeatureAvailable(int fd, struct ifreq *ifr, struct ethtool_value *cmd) static void -virNetDevGetEthtoolFeatures(virBitmapPtr bitmap, +virNetDevGetEthtoolFeatures(const char *ifname, + virBitmapPtr bitmap, int fd, struct ifreq *ifr) { @@ -2941,13 +2942,13 @@ virNetDevGetEthtoolFeatures(virBitmapPtr bitmap, for (i = 0; i < G_N_ELEMENTS(ethtool_cmds); i++) { cmd.cmd = ethtool_cmds[i].cmd; - if (virNetDevFeatureAvailable(fd, ifr, &cmd)) + if (virNetDevFeatureAvailable(ifname, fd, ifr, &cmd)) ignore_value(virBitmapSetBit(bitmap, ethtool_cmds[i].feat)); } # if WITH_DECL_ETHTOOL_GFLAGS cmd.cmd = ETHTOOL_GFLAGS; - if (virNetDevFeatureAvailable(fd, ifr, &cmd)) { + if (virNetDevFeatureAvailable(ifname, fd, ifr, &cmd)) { for (i = 0; i < G_N_ELEMENTS(flags); i++) { if (cmd.data & flags[i].cmd) ignore_value(virBitmapSetBit(bitmap, flags[i].feat)); @@ -3133,19 +3134,21 @@ virNetDevSwitchdevFeature(const char *ifname G_GNUC_UNUSED, * Returns true if the feature is available, false otherwise. */ static bool -virNetDevGFeatureAvailable(int fd, +virNetDevGFeatureAvailable(const char *ifname, + int fd, struct ifreq *ifr, struct ethtool_gfeatures *cmd) { ifr->ifr_data = (void*)cmd; - if (virNetDevSendEthtoolIoctl(fd, ifr) == 0) + if (virNetDevSendEthtoolIoctl(ifname, fd, ifr) == 0) return !!FEATURE_BIT_IS_SET(cmd->features, TX_UDP_TNL, active); return false; } static int -virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap, +virNetDevGetEthtoolGFeatures(const char *ifname, + virBitmapPtr bitmap, int fd, struct ifreq *ifr) { @@ -3157,13 +3160,14 @@ virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap, g_cmd->cmd = ETHTOOL_GFEATURES; g_cmd->size = GFEATURES_SIZE; - if (virNetDevGFeatureAvailable(fd, ifr, g_cmd)) + if (virNetDevGFeatureAvailable(ifname, fd, ifr, g_cmd)) ignore_value(virBitmapSetBit(bitmap, VIR_NET_DEV_FEAT_TXUDPTNL)); return 0; } # else static int -virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap G_GNUC_UNUSED, +virNetDevGetEthtoolGFeatures(const char *ifname G_GNUC_UNUSED, + virBitmapPtr bitmap G_GNUC_UNUSED, int fd G_GNUC_UNUSED, struct ifreq *ifr G_GNUC_UNUSED) { @@ -3228,7 +3232,7 @@ int virNetDevSetCoalesce(const char *ifname, ifr.ifr_data = (void *) &coal; - if (virNetDevSendEthtoolIoctl(fd, &ifr) < 0) { + if (virNetDevSendEthtoolIoctl(ifname, fd, &ifr) < 0) { virReportSystemError(errno, _("Cannot set coalesce info on '%s'"), ifname); @@ -3241,7 +3245,7 @@ int virNetDevSetCoalesce(const char *ifname, }; /* Don't fail if the update itself fails */ - if (virNetDevSendEthtoolIoctl(fd, &ifr) == 0) { + if (virNetDevSendEthtoolIoctl(ifname, fd, &ifr) == 0) { coalesce->rx_max_coalesced_frames = coal.rx_max_coalesced_frames; coalesce->rx_coalesce_usecs_irq = coal.rx_coalesce_usecs_irq; coalesce->rx_max_coalesced_frames_irq = coal.rx_max_coalesced_frames_irq; @@ -3307,9 +3311,9 @@ virNetDevGetFeatures(const char *ifname, if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) return -1; - virNetDevGetEthtoolFeatures(*out, fd, &ifr); + virNetDevGetEthtoolFeatures(ifname, *out, fd, &ifr); - if (virNetDevGetEthtoolGFeatures(*out, fd, &ifr) < 0) + if (virNetDevGetEthtoolGFeatures(ifname, *out, fd, &ifr) < 0) return -1; if (virNetDevRDMAFeature(ifname, out) < 0) -- 2.25.4

2 1

[PATCH v1 00/34] Rework building of domain's namespaces
by Michal Privoznik 04 Sep '20

04 Sep '20

There are couple of things happening in this series. The first patch fixes a bug. We are leaking /dev/mapper/control in QEMU. See the patch for detailed info. The second patch then cleans up code a bit. The third patch moves namespace handling code into a separate file. Patches 4 - 15 then prepare the code for switch to different approach in populating the namespace. Patches 16 - 26 then do the switch and finally, the rest of the patches drops and deduplicates some code. You can fetch the patches from here too: https://gitlab.com/MichalPrivoznik/libvirt/-/commits/dm_namespace/ Michal Prívozník (34): virDevMapperGetTargetsImpl: Close /dev/mapper/control in the end virDevMapperGetTargets: Don't ignore EBADF qemu: Separate out namespace handling code qemu_domain_namespace: Rename qemuDomainCreateNamespace() qemu_domain_namespace: Drop unused @cfg argument qemu_domain_namespace: Check for namespace enablement earlier qemuDomainNamespaceSetupHostdev: Create paths in one go qemuDomainAttachDeviceMknodHelper: Don't leak data->target qemu_domain_namespace.c: Rename qemuDomainAttachDeviceMknodData qemuDomainAttachDeviceMknodRecursive: Isolate bind mounted devices condition qemuDomainAttachDeviceMknodHelper: Create more files in a single go qemuDomainNamespaceMknodPaths: Create more files in one go qemuDomainNamespaceMknodPaths: Turn @paths into string list qemuDomainSetupDisk: Accept @src qemu_domain_namespace: Repurpose qemuDomainBuildNamespace() qemuDomainBuildNamespace: Populate basic /dev from daemon's namespace qemuDomainBuildNamespace: Populate disks from daemon's namespace qemuDomainBuildNamespace: Populate hostdevs from daemon's namespace qemuDomainBuildNamespace: Populate memory from daemon's namespace qemuDomainBuildNamespace: Populate chardevs from daemon's namespace qemuDomainBuildNamespace: Populate TPM from daemon's namespace qemuDomainBuildNamespace: Populate graphics from daemon's namespace qemuDomainBuildNamespace: Populate inputs from daemon's namespace qemuDomainBuildNamespace: Populate RNGs from daemon's namespace qemuDomainBuildNamespace: Populate loader from daemon's namespace qemuDomainBuildNamespace: Populate SEV from daemon's namespace qemu_domain_namespace: Drop unused functions qemuDomainDetachDeviceUnlink: Unlink paths in one go qemuDomainNamespaceUnlinkPaths: Turn @paths into string list qemuDomainNamespaceTeardownHostdev: Unlink paths in one go qemuDomainNamespaceTeardownMemory: Deduplicate code qemuDomainNamespaceTeardownChardev: Deduplicate code qemuDomainNamespaceTeardownRNG: Deduplicate code qemuDomainNamespaceTeardownInput: Deduplicate code po/POTFILES.in | 1 + src/qemu/Makefile.inc.am | 2 + src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_conf.c | 1 + src/qemu/qemu_domain.c | 1848 +----------------------------- src/qemu/qemu_domain.h | 57 - src/qemu/qemu_domain_namespace.c | 1610 ++++++++++++++++++++++++++ src/qemu/qemu_domain_namespace.h | 86 ++ src/qemu/qemu_driver.c | 1 + src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_process.c | 23 +- src/qemu/qemu_security.c | 1 + src/util/virdevmapper.c | 4 +- 13 files changed, 1727 insertions(+), 1910 deletions(-) create mode 100644 src/qemu/qemu_domain_namespace.c create mode 100644 src/qemu/qemu_domain_namespace.h -- 2.26.2

4 74