November 2022 - Devel - libvirt List Archives

[libvirt] conf: Allow > UINT_MAX of cache for NUMA nodes
by Lin Yang 08 Nov '22

08 Nov '22

The high-bandwidth memory (HBM) in cache mode might be greater than UINT_MAX of cache per NUMA node, so change to unsigned long long. Signed-off-by: Lin Yang <lin.a.yang(a)intel.com> --- src/conf/capabilities.c | 70 +++++++++++++++++++++++++++-------------- src/conf/numa_conf.c | 2 +- src/conf/numa_conf.h | 2 +- 3 files changed, 48 insertions(+), 26 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index e498c77efc..85c06f0d2b 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1549,10 +1549,10 @@ virCapabilitiesGetNUMAPagesInfo(int node, static int -virCapabilitiesGetNodeCacheReadFile(const char *prefix, - const char *dir, - const char *file, - unsigned int *value) +virCapabilitiesGetNodeCacheReadFileUint(const char *prefix, + const char *dir, + const char *file, + unsigned int *value) { g_autofree char *path = g_build_filename(prefix, dir, file, NULL); int rv = virFileReadValueUint(value, "%s", path); @@ -1570,6 +1570,28 @@ virCapabilitiesGetNodeCacheReadFile(const char *prefix, } +static int +virCapabilitiesGetNodeCacheReadFileUllong(const char *prefix, + const char *dir, + const char *file, + unsigned long long *value) +{ + g_autofree char *path = g_build_filename(prefix, dir, file, NULL); + int rv = virFileReadValueUllong(value, "%s", path); + + if (rv < 0) { + if (rv == -2) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("File '%s' does not exist"), + path); + } + return -1; + } + + return 0; +} + + static int virCapsHostNUMACellCacheComparator(const void *a, const void *b) @@ -1612,18 +1634,18 @@ virCapabilitiesGetNodeCache(int node, return -1; } - if (virCapabilitiesGetNodeCacheReadFile(path, entry->d_name, - "size", &cache.size) < 0) + if (virCapabilitiesGetNodeCacheReadFileUllong(path, entry->d_name, + "size", &cache.size) < 0) return -1; cache.size >>= 10; /* read in bytes but stored in kibibytes */ - if (virCapabilitiesGetNodeCacheReadFile(path, entry->d_name, - "line_size", &cache.line) < 0) + if (virCapabilitiesGetNodeCacheReadFileUint(path, entry->d_name, + "line_size", &cache.line) < 0) return -1; - if (virCapabilitiesGetNodeCacheReadFile(path, entry->d_name, - "indexing", &indexing) < 0) + if (virCapabilitiesGetNodeCacheReadFileUint(path, entry->d_name, + "indexing", &indexing) < 0) return -1; /* see enum cache_indexing in kernel */ @@ -1638,8 +1660,8 @@ virCapabilitiesGetNodeCache(int node, return -1; } - if (virCapabilitiesGetNodeCacheReadFile(path, entry->d_name, - "write_policy", &write_policy) < 0) + if (virCapabilitiesGetNodeCacheReadFileUint(path, entry->d_name, + "write_policy", &write_policy) < 0) return -1; /* see enum cache_write_policy in kernel */ @@ -1793,26 +1815,26 @@ virCapabilitiesHostNUMAInitInterconnectsNode(GArray *interconnects, if (!virFileExists(path)) return 0; - if (virCapabilitiesGetNodeCacheReadFile(path, "initiators", - "read_bandwidth", - &read_bandwidth) < 0) + if (virCapabilitiesGetNodeCacheReadFileUint(path, "initiators", + "read_bandwidth", + &read_bandwidth) < 0) return -1; - if (virCapabilitiesGetNodeCacheReadFile(path, "initiators", - "write_bandwidth", - &write_bandwidth) < 0) + if (virCapabilitiesGetNodeCacheReadFileUint(path, "initiators", + "write_bandwidth", + &write_bandwidth) < 0) return -1; /* Bandwidths are read in MiB but stored in KiB */ read_bandwidth <<= 10; write_bandwidth <<= 10; - if (virCapabilitiesGetNodeCacheReadFile(path, "initiators", - "read_latency", - &read_latency) < 0) + if (virCapabilitiesGetNodeCacheReadFileUint(path, "initiators", + "read_latency", + &read_latency) < 0) return -1; - if (virCapabilitiesGetNodeCacheReadFile(path, "initiators", - "write_latency", - &write_latency) < 0) + if (virCapabilitiesGetNodeCacheReadFileUint(path, "initiators", + "write_latency", + &write_latency) < 0) return -1; initPath = g_strdup_printf("%s/initiators", path); diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 688aa7b409..b55bb3ffcb 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -1765,7 +1765,7 @@ virNumaCacheFormat(virBuffer *buf, } virBufferAsprintf(&childBuf, - "<size value='%u' unit='KiB'/>\n", + "<size value='%llu' unit='KiB'/>\n", cache->size); if (cache->line) { diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h index 1d1e816870..bbb928abb2 100644 --- a/src/conf/numa_conf.h +++ b/src/conf/numa_conf.h @@ -263,7 +263,7 @@ void virNumaDistanceFormat(virBuffer *buf, typedef struct _virNumaCache virNumaCache; struct _virNumaCache { unsigned int level; /* cache level */ - unsigned int size; /* cache size */ + unsigned long long size; /* cache size */ unsigned int line; /* line size, !!! in bytes !!! */ virNumaCacheAssociativity associativity; /* cache associativity */ virNumaCachePolicy policy; /* cache policy */ -- 2.25.1

2 1

[PATCH] qemu_agent: Bring back single sync
by Michal Privoznik 08 Nov '22

08 Nov '22

Historically, we had no idea whether the qemu-ga running inside the guest was running or not. Or whether it crashed in the middle of reading of a command. That's why we issued guest-sync prior any intended command, to make the agent flush any partially read JSON and reset its state machine. But with VSERPORT_CHANGE event we know when the guest agent (dis-)connects and thus can issue the sync command just once for each 'connection'. Whether the agent is synced is tracked in agent->inSync member, which used to be set to true upon successful sync. But after rework in v8.0.0-rc1~361 that line is gone, leaving us with using the historic approach basically. Fixes: cad84fd51eaac5e3bfdf441f9986e1f2639a0828 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_agent.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 0d77a2f90d..94782f2bc9 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -869,16 +869,20 @@ qemuAgentGuestSync(qemuAgent *agent) return -1; /* successfully sync'd */ - if (rc == 1) + if (rc == 1) { + agent->inSync = true; return 0; + } /* send another sync */ if ((rc = qemuAgentGuestSyncSend(agent, timeout, false)) < 0) return -1; /* successfully sync'd */ - if (rc == 1) + if (rc == 1) { + agent->inSync = true; return 0; + } if (agent->running) virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 2.37.4

2 1

how hotplug devices onto pcie-to-pci-bridge
by longguang.yue 08 Nov '22

08 Nov '22

Hi, all I have add two pcie-to-pci-bridge controllers, how hotplug devices onto this two controllers? and libvirt knows to plug onto pci-bridge when there are no pcie-ports. defaultly libvirt plugs devices onto pcie-port. thanks

2 5

[PATCH] tests: Drop needless .err files from qemuxml2argvdata/
by Michal Privoznik 07 Nov '22

07 Nov '22

As some qemxml2argvtest cases were removed, we forgot to remove their expected output counterparts. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/qemuxml2argvdata/cpu-numa-memshared.err | 1 - tests/qemuxml2argvdata/numatune-memnode-no-memory.err | 1 - tests/qemuxml2argvdata/pseries-vio-address-clash.err | 1 - 3 files changed, 3 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-numa-memshared.err delete mode 100644 tests/qemuxml2argvdata/numatune-memnode-no-memory.err delete mode 100644 tests/qemuxml2argvdata/pseries-vio-address-clash.err diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.err b/tests/qemuxml2argvdata/cpu-numa-memshared.err deleted file mode 100644 index e0fdffd42c..0000000000 --- a/tests/qemuxml2argvdata/cpu-numa-memshared.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: this qemu doesn't support the memory-backend-file object diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.err b/tests/qemuxml2argvdata/numatune-memnode-no-memory.err deleted file mode 100644 index 1d5e57f996..0000000000 --- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: Per-node memory binding is not supported with this QEMU diff --git a/tests/qemuxml2argvdata/pseries-vio-address-clash.err b/tests/qemuxml2argvdata/pseries-vio-address-clash.err deleted file mode 100644 index e4eed76f23..0000000000 --- a/tests/qemuxml2argvdata/pseries-vio-address-clash.err +++ /dev/null @@ -1 +0,0 @@ -XML error: spapr-vio address 0x4000 already in use -- 2.37.4

2 1

[libvirt PATCH v4 0/4] tools: provide virt-qemu-sev-validate for SEV(-ES) launch attestation
by Daniel P. Berrangé 07 Nov '22

07 Nov '22

The libvirt QEMU driver provides all the functionality required for launching a guest on AMD SEV(-ES) platforms, with a configuration that enables attestation of the launch measurement. The documentation for how to actually perform an attestation is severely lacking and not suitable for mere mortals to understand. IOW, someone trying to implement attestation is in for a world of pain and suffering. This series doesn't fix the documentation problem, but it does provide a reference implementation of a tool for performing attestation of SEV(-ES) guests in the context of libvirt / KVM. There will be other tools and libraries that implement attestation logic too, but this tool is likely somewhat unique in its usage of libvirt. Now for a attestation to be trustworthy you don't want to perform it on the hypervisor host, since the goal is to prove that the hypervisor has not acted maliciously. None the less it is still beneficial to have libvirt integration to some extent. When running this tool on a remote (trusted) host, it can connect to the libvirt hypervisor and fetch the data provided by the virDomainLaunchSecurityInfo API, which is safe to trust as the key pieces are cryptographically measured. Attestation is a complex problem though and it is very easy to screw up and feed the wrong information and then waste hours trying to figure out what piece was wrong, to cause the hash digest to change. For debugging such problems, you can thus tell the tool to operate insecurely, by querying libvirt for almost all of the configuration information required to determine the expected measurement. By comparing these results,to the results obtained in offline mode it helps narrow down where the mistake lies. So I view this tool as being useful in a number of ways: * Quality assurance engineers needing to test libvirt/QEMU/KVM get a simple and reliable tool for automating tests with. * Users running simple libvirt deployments without any large management stack, get a standalone tool for attestation they can rely on. * Developers writing/integrating attestation support into management stacks above libvirt, get a reference against which they can debug their own tools. * Users wanting to demonstrate the core SEV/SEV-ES functionality get a simple and reliable tool to illustrate the core concepts involved. Since I didn't fancy writing such complex logic in C, this tool is a python3 program. As such, we don't want to include it in the main libvirt-client RPM, nor any other existing RPM. THus, this series puts it in a new libvirt-client-qemu RPM which, through no co-inicidence at all, is the same RPM I invented a few days ago to hold the virt-qemu-qmp-proxy command. Note, people will have already seen an earlier version of this tool I hacked up some months ago. This code is very significantly changed since that earlier version, to make it more maintainable, and simpler to use (especially for SEV-ES) but the general theme is still the same. Changed in v4: - Fixed loading of initrd/cmdline from XML - s/loader/firmware/ in some error messages Changed in v3: - Remove LUKS specific --disk-password and have generic --inject-secret - Fix handling of optional initrd/cmdline - Require --kernel if --initrd or --cmdline are present - Ensure VM is in paused state Changed in v2: - All the suggestions from Cole and Kashyap Daniel P. Berrangé (4): build-aux: only forbid gethostname in C files tools: support validating SEV firmware boot measurements tools: load guest config from libvirt tools: support validating SEV direct kernel boot measurements build-aux/syntax-check.mk | 1 + docs/manpages/meson.build | 1 + docs/manpages/virt-qemu-sev-validate.rst | 359 +++++++++++++++ libvirt.spec.in | 2 + tools/meson.build | 5 + tools/virt-qemu-sev-validate | 555 +++++++++++++++++++++++ 6 files changed, 923 insertions(+) create mode 100644 docs/manpages/virt-qemu-sev-validate.rst create mode 100755 tools/virt-qemu-sev-validate -- 2.37.3

1 4

[libvirt PATCH v3 00/12] tools: provide virt-qemu-sev-validate for SEV(-ES) launch attestation
by Daniel P. Berrangé 07 Nov '22

07 Nov '22

The libvirt QEMU driver provides all the functionality required for launching a guest on AMD SEV(-ES) platforms, with a configuration that enables attestation of the launch measurement. The documentation for how to actually perform an attestation is severely lacking and not suitable for mere mortals to understand. IOW, someone trying to implement attestation is in for a world of pain and suffering. This series doesn't fix the documentation problem, but it does provide a reference implementation of a tool for performing attestation of SEV(-ES) guests in the context of libvirt / KVM. There will be other tools and libraries that implement attestation logic too, but this tool is likely somewhat unique in its usage of libvirt. Now for a attestation to be trustworthy you don't want to perform it on the hypervisor host, since the goal is to prove that the hypervisor has not acted maliciously. None the less it is still beneficial to have libvirt integration to some extent. When running this tool on a remote (trusted) host, it can connect to the libvirt hypervisor and fetch the data provided by the virDomainLaunchSecurityInfo API, which is safe to trust as the key pieces are cryptographically measured. Attestation is a complex problem though and it is very easy to screw up and feed the wrong information and then waste hours trying to figure out what piece was wrong, to cause the hash digest to change. For debugging such problems, you can thus tell the tool to operate insecurely, by querying libvirt for almost all of the configuration information required to determine the expected measurement. By comparing these results,to the results obtained in offline mode it helps narrow down where the mistake lies. So I view this tool as being useful in a number of ways: * Quality assurance engineers needing to test libvirt/QEMU/KVM get a simple and reliable tool for automating tests with. * Users running simple libvirt deployments without any large management stack, get a standalone tool for attestation they can rely on. * Developers writing/integrating attestation support into management stacks above libvirt, get a reference against which they can debug their own tools. * Users wanting to demonstrate the core SEV/SEV-ES functionality get a simple and reliable tool to illustrate the core concepts involved. Since I didn't fancy writing such complex logic in C, this tool is a python3 program. As such, we don't want to include it in the main libvirt-client RPM, nor any other existing RPM. THus, this series puts it in a new libvirt-client-qemu RPM which, through no co-inicidence at all, is the same RPM I invented a few days ago to hold the virt-qemu-qmp-proxy command. Note, people will have already seen an earlier version of this tool I hacked up some months ago. This code is very significantly changed since that earlier version, to make it more maintainable, and simpler to use (especially for SEV-ES) but the general theme is still the same. Changed in v3: - Remove LUKS specific --disk-password and have generic --inject-secret - Fix handling of optional initrd/cmdline - Require --kernel if --initrd or --cmdline are present - Ensure VM is in paused state Changed in v2: - All the suggestions from Cole and Kashyap Daniel P. Berrangé (12): build-aux: only forbid gethostname in C files tools: support validating SEV firmware boot measurements tools: load guest config from libvirt tools: support validating SEV direct kernel boot measurements tools: load direct kernel config from libvirt tools: support validating SEV-ES initial vCPU state measurements tools: support automatically constructing SEV-ES vCPU state tools: load CPU count and CPU SKU from libvirt tools: support generating SEV secret injection tables docs/kbase: describe attestation for SEV guests scripts: add systemtap script for capturing SEV-ES VMSA docs/manpages: add checklist of problems for SEV attestation build-aux/syntax-check.mk | 1 + docs/kbase/launch_security_sev.rst | 105 ++ docs/manpages/meson.build | 1 + docs/manpages/virt-qemu-sev-validate.rst | 666 +++++++++++ examples/systemtap/amd-sev-es-vmsa.stp | 48 + libvirt.spec.in | 2 + tools/meson.build | 5 + tools/virt-qemu-sev-validate | 1330 ++++++++++++++++++++++ 8 files changed, 2158 insertions(+) create mode 100644 docs/manpages/virt-qemu-sev-validate.rst create mode 100644 examples/systemtap/amd-sev-es-vmsa.stp create mode 100755 tools/virt-qemu-sev-validate -- 2.37.3

3 27

[PATCH] conf: schemas: Include 'privatedata.rng' in installed schema files
by Peter Krempa 07 Nov '22

07 Nov '22

The privatedata.rng file was accidentally left uninstalled, but it's referenced by other schema files effectively breaking validation of XMLs in new installations. Change to libvirt.spec is not needed as we include all installed schemas via a wildcard. Fixes: d8ceacdc87907a3c8656f7ee815ed32f06fe5c7f Reported-by: "Daniel P. Berrangé" <berrange(a)redhat.com> Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/conf/schemas/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/schemas/meson.build b/src/conf/schemas/meson.build index 9ec4c010d6..b293373085 100644 --- a/src/conf/schemas/meson.build +++ b/src/conf/schemas/meson.build @@ -19,6 +19,7 @@ schema_files = [ 'nwfilterbinding.rng', 'nwfilter_params.rng', 'nwfilter.rng', + 'privatedata.rng', 'secret.rng', 'storagecommon.rng', 'storagepoolcaps.rng', -- 2.37.3

2 1

[PATCH 00/12] tests: Schema testing improvements
by Peter Krempa 07 Nov '22

07 Nov '22

This series: - cleans up the XML validator code a bit - adds testing of nodedevxml2xmlout directory - cleans up some mistakes in un-tested XML files - adds internal schema and improves testing of - cputestdata - simplifies file selection by using a custom schema - device schemas (e.g. qemuhotplugtest) After this series the outstanding list of XML files which are not validated is: ./examples/xml/test/testnodeinline.xml ./examples/xml/test/testnode.xml ./tests/virsh-auth.xml All of the above should be tested, but there's no schema for them yet. ./src/cpu_map/*.xml These are internal input-only data files distributed by libvirt. Creating a schema for them is possible, but not very justified and neither simple. ./tests/qemumigparamsdata/*.xml ./tests/qemumigrationcookiexmldata/*.xml Internal input and output files. Writing a schema could theoretically make sense as they are used for migration but currently doesn't seem to be worth it. ./tests/qemucapabilitiesdata/*.xml Internal input and output, for caching only, thus any incompatibility allows us to simply drop them. Not worth writing schema. ./tests/qemustatusxml2xmldata/*.xml Internal status XML, input/output. Writing schema might make sense to avoid regressions and have a scaffold for future. ./tests/networkxml2xmlupdatein/.xml Snippets of <network> xml, hard to write custom schema for. ./tests/nodedevmdevctldata/*.xml ./tests/virstorageutildata/*.xml Non-libvirt test data. Peter Krempa (12): virschematest: Test 'nodedevxml2xmlout' directory qemustatusxml2xml: Remove obsolete 'json' attribute util: xml: Refactor cleanup path in virXMLValidatorInit util: xml: Refactor cleanup in virXMLValidateAgainstSchema virschematest: Construct path to the schema in the SCHEMAS_PATH virschematest: Improve testing schemas in 'tests/cputestdata' schema: Introduce scaffolding for schema for <privateData> elements qemublocktestdata: Fix 'block-raw-reservations' case tests: qemublocktestdata/imagecreate: Remove bogus 'name="vda"' attribute from <disk> qemublocktest: Mark 'network-ssh-qcow2' input XML as invalid schema: Rename definition of disk 'target' element to 'diskTarget' virschematest: Add infrastructure for testing single devices src/conf/schemas/domainbackup.rng | 4 +- src/conf/schemas/domaincheckpoint.rng | 2 +- src/conf/schemas/domaincommon.rng | 12 ++- src/conf/schemas/domainsnapshot.rng | 2 +- src/conf/schemas/privatedata.rng | 30 +++++++ src/util/virxml.c | 23 ++--- tests/meson.build | 1 + tests/qemublocktest.c | 2 +- .../imagecreate/luks-encopts.xml | 2 +- .../imagecreate/luks-noopts.xml | 2 +- .../imagecreate/network-gluster-qcow2.xml | 2 +- .../imagecreate/network-rbd-qcow2.xml | 2 +- ...w2.json => network-ssh-qcow2-invalid.json} | 0 ...cow2.xml => network-ssh-qcow2-invalid.xml} | 2 +- .../imagecreate/qcow2-luks-encopts.xml | 2 +- .../imagecreate/qcow2-luks-noopts.xml | 2 +- .../imagecreate/qcow2-slice.xml | 2 +- tests/qemublocktestdata/imagecreate/qcow2.xml | 2 +- .../qemublocktestdata/imagecreate/raw-nbd.xml | 2 +- .../imagecreate/raw-slice.xml | 2 +- tests/qemublocktestdata/imagecreate/raw.xml | 2 +- .../xml2json/block-raw-reservations.xml | 2 +- .../migration-out-nbd-in.xml | 2 +- .../migration-out-nbd-tls-in.xml | 2 +- tests/qemustatusxml2xmldata/upgrade-in.xml | 2 +- tests/schemas/cpu-baseline.rng.in | 84 +++++++++++++++++++ tests/schemas/device.rng.in | 51 +++++++++++ tests/schemas/meson.build | 18 ++++ tests/schemas/privatedata.rng.in | 68 +++++++++++++++ tests/virschematest.c | 28 ++++--- 30 files changed, 304 insertions(+), 53 deletions(-) create mode 100644 src/conf/schemas/privatedata.rng rename tests/qemublocktestdata/imagecreate/{network-ssh-qcow2.json => network-ssh-qcow2-invalid.json} (100%) rename tests/qemublocktestdata/imagecreate/{network-ssh-qcow2.xml => network-ssh-qcow2-invalid.xml} (88%) create mode 100644 tests/schemas/cpu-baseline.rng.in create mode 100644 tests/schemas/device.rng.in create mode 100644 tests/schemas/meson.build create mode 100644 tests/schemas/privatedata.rng.in -- 2.38.1

4 27

[PATCH] qemu: fix vcpu clearing when multiple vcpu hotunplugs timeout
by Shaleen Bathla 07 Nov '22

07 Nov '22

Problem: libvirt has a 5 second timeout (generally) for hotplug/unplug operations which can time out due to heavy load in guest. vcpu hotunplug occurs one vcpu at a time. But, if we perform hotplug-unplug repeatedly, there is a situation where qemu has multiple timedout vcpu unplug operations pending. libvirt waits for an async event notification from qemu regarding successful vcpu delete. qemu deletes the vcpu-vcpuinfo and sends this notification to libvirt. libvirt handles vcpu delete notification, and refreshes vcpuinfo by querying vcpuinfo from qemu in qemuDomainRefreshVcpuInfo(). qemu's vcpuinfo will not contain vcpu that was deleted and sent. qemu's vcpuinfo will overwrite libvirt's vcpuinfo of the other pending timedout vcpu(s) which qemu has deleted and notified libvirt. The overwrite resets other timedout vcpu's alias to NULL and tid to 0. The error is then seen when validating tid of vcpus. Example error log: "internal error: qemu didn't report thread id for vcpu 'XX'" Solution: Create a per vcpu hp_timeout_alias which will be set as vcpu alias when a timeout occurs else it is set as NULL. This data does not get reset when vcpuinfo refresh occurs. And we can remove a vcpu if it's alias was NULL by checking this alias. During vcpu validation, we can skip to nextvcpu if this hotplug-timeout-alias is set indicating that this vcpu is actually valid. Co-authored-by: Partha Satapathy <partha.satapathy(a)oracle.com> Signed-off-by: Shaleen Bathla <shaleen.bathla(a)oracle.com> --- src/qemu/qemu_domain.c | 6 ++++++ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_hotplug.c | 41 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c3afc6c9d3ba..0f6e4dc78b93 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9568,6 +9568,8 @@ qemuDomainValidateVcpuInfo(virDomainObj *vm) vcpupriv = QEMU_DOMAIN_VCPU_PRIVATE(vcpu); if (vcpu->online && vcpupriv->tid == 0) { + if (vcpupriv->hp_timeout_alias) + continue; virReportError(VIR_ERR_INTERNAL_ERROR, _("qemu didn't report thread id for vcpu '%zu'"), i); return -1; @@ -9696,6 +9698,10 @@ qemuDomainRefreshVcpuInfo(virDomainObj *vm, if (validTIDs) vcpupriv->tid = info[i].tid; + if (vcpupriv->hp_timeout_alias && !info[i].alias) + VIR_DEBUG("no alias for timed out vcpu%zu domain %s", i, + vm->def->name); + vcpupriv->socket_id = info[i].socket_id; vcpupriv->core_id = info[i].core_id; vcpupriv->thread_id = info[i].thread_id; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 2bbd492d62da..68f6c645ef79 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -324,6 +324,7 @@ struct _qemuDomainVcpuPrivate { int thread_id; int node_id; int vcpus; + char *hp_timeout_alias; /* alias after hotplug timeout */ char *qomPath; }; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index da92ced2f444..5d54e9c67c3f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -6138,9 +6138,21 @@ qemuDomainRemoveVcpuAlias(virDomainObj *vm, if (STREQ_NULLABLE(alias, vcpupriv->alias)) { qemuDomainRemoveVcpu(vm, i); + if (vcpupriv->hp_timeout_alias) + g_free(vcpupriv->hp_timeout_alias); + return; + } + if (STREQ_NULLABLE(alias, vcpupriv->hp_timeout_alias)) { + qemuDomainRemoveVcpu(vm, i); + VIR_DEBUG("%s found in timed out list of domain %s", + alias, vm->def->name); + g_free(vcpupriv->hp_timeout_alias); return; } } + + VIR_DEBUG("%s not found in vcpulist of domain %s ", + alias, vm->def->name); } @@ -6172,11 +6184,19 @@ qemuDomainHotplugDelVcpu(virQEMUDriver *driver, } if ((rc = qemuDomainWaitForDeviceRemoval(vm)) <= 0) { - if (rc == 0) + if (rc == 0) { virReportError(VIR_ERR_OPERATION_TIMEOUT, "%s", _("vcpu unplug request timed out. Unplug result " "must be manually inspected in the domain")); + if (vcpupriv) { + VIR_INFO("unplug timeout set for vcpu '%u' of domain %s", + vcpu, vm->def->name); + + vcpupriv->hp_timeout_alias = g_strdup(vcpupriv->alias); + } + } + goto cleanup; } @@ -6362,6 +6382,8 @@ qemuDomainSetVcpusLive(virQEMUDriver *driver, { qemuDomainObjPrivate *priv = vm->privateData; virCgroupEmulatorAllNodesData *emulatorCgroup = NULL; + qemuDomainVcpuPrivate *vcpupriv = NULL; + virDomainVcpuDef *vcpuinfo = NULL; ssize_t nextvcpu = -1; int ret = -1; @@ -6370,6 +6392,14 @@ qemuDomainSetVcpusLive(virQEMUDriver *driver, if (enable) { while ((nextvcpu = virBitmapNextSetBit(vcpumap, nextvcpu)) != -1) { + vcpuinfo = virDomainDefGetVcpu(vm->def, nextvcpu); + vcpupriv = QEMU_DOMAIN_VCPU_PRIVATE(vcpuinfo); + + if (vcpupriv && vcpupriv->hp_timeout_alias) { + VIR_INFO("reject hotplug of timed out vcpu '%zd' from domain %s", + nextvcpu, vm->def->name); + goto cleanup; + } if (qemuDomainHotplugAddVcpu(driver, cfg, vm, nextvcpu) < 0) goto cleanup; } @@ -6378,6 +6408,15 @@ qemuDomainSetVcpusLive(virQEMUDriver *driver, if (!virBitmapIsBitSet(vcpumap, nextvcpu)) continue; + vcpuinfo = virDomainDefGetVcpu(vm->def, nextvcpu); + vcpupriv = QEMU_DOMAIN_VCPU_PRIVATE(vcpuinfo); + + if (vcpupriv && vcpupriv->hp_timeout_alias) { + VIR_INFO("already serving unplug for vcpu '%zd' in domain %s", + nextvcpu, vm->def->name); + goto cleanup; + } + if (qemuDomainHotplugDelVcpu(driver, cfg, vm, nextvcpu) < 0) goto cleanup; } -- 2.31.1

2 1

FOR GSOC
by ARPAN GUPTA 07 Nov '22

07 Nov '22

Hello Sir, My Self Arpan Gupta percieving B.Tech from RKGIT ghaziabad for Cse(Ai-Ml) , I have been intrested in Developing Apps using Android firebase framework and studying solana block chain with rust and trying to implement with saga. And if i am having knowledge of technology you work for I will learn it for sure because I am good and fast learner. I can hand on practice the technology in a week. Other than coding I have discovered 3 astroide and registered citizen scientist from NASA and I have intrested in astronomy And I am President of my college coding ×Astronomy club NEBULA and I want to contribute in redhat. I am planning to apply for GSOC , Can someone guide me. Regards Arpan Gupta

2 1