i386, acpi: check acpi_memory_hotplug capacity in pre_plug
PATCH v6 1/1 i386, acpi: check acpi_memory_hotplug capacity in pre_plug
Currently we do device realization like below:
hotplug_handler_pre_plug()
dc->realize()
hotplug_handler_plug()
Before we do device realization and plug, we should allocate necessary resources and check if memory-hotplug-support property is enabled.
At the piix4 and ich9, the memory-hotplug-support property is checked at plug stage. This means that device has been realized and mapped into guest address space 'pc_dimm_plug()' by the time acpi plug handler is called, where it might fail and crash QEMU due to reaching g_assert_not_reached() (piix4) or error_abort (ich9).
Fix it by checking if memory hotplug is enabled at pre_plug stage where we can gracefully abort hotplug request.
---
v6:
* fix the check in piix4_device_pre_plug_cb
v5:
* rebase on latest upstream
* remove a comment before hotplug_handler_pre_plug
* fix alignment for ich9_pm_device_pre_plug_cb
v4:
* fix code alignment of piix4_device_pre_plug_cb
v3:
* replace acpi_memory_hotplug with memory-hotplug-support in changelog
* fix code alignment of ich9_pm_device_pre_plug_cb
* print which device type memory-hotplug-support is disabled in ich9_pm_device_pre_plug_cb and piix4_device_pre_plug_cb
v2:
* ([email protected])
- Almost the whole third paragraph
* apply this change to ich9
* use hotplug_handler_pre_plug() instead of open-coding check
--- hw/acpi/ich9.c | 15 +++++++++++++-- hw/acpi/piix4.c | 13 ++++++++++--- hw/i386/pc.c | 2 ++ hw/isa/lpc_ich9.c | 1 + include/hw/acpi/ich9.h | 2 ++ 5 files changed, 28 insertions(+), 5 deletions(-)
hw/acpi/ich9.c +13 -2
@@ -483,13 +483,24 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) NULL); } +void ich9_pm_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev, +Error **errp) +{ +ICH9LPCState *lpc =ICH9_LPC_DEVICE (hotplug_dev); + +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM ) && + !lpc->pm.acpi_memory_hotplug.is_enabled) +error_setg (errp, +"memory hotplug is not enabled: %s.memory-hotplug-support " +"is not set" ,object_get_typename (OBJECT (lpc))); +} +void ich9_pm_device_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) {ICH9LPCState *lpc =ICH9_LPC_DEVICE (hotplug_dev); -if (lpc->pm.acpi_memory_hotplug.is_enabled && -object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) { +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {if (object_dynamic_cast (OBJECT (dev),TYPE_NVDIMM )) {nvdimm_acpi_plug_cb (hotplug_dev, dev); }else {
hw/acpi/piix4.c +10 -3
@@ -374,9 +374,17 @@ static void piix4_pm_powerdown_req(Notifier *n, void *opaque)static void piix4_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) { +PIIX4PMState *s =PIIX4_PM (hotplug_dev); +if (object_dynamic_cast (OBJECT (dev),TYPE_PCI_DEVICE )) {acpi_pcihp_device_pre_plug_cb (hotplug_dev, dev, errp); - }else if (!object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM ) && + }else if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) { +if (!s->acpi_memory_hotplug.is_enabled) { +error_setg (errp, +"memory hotplug is not enabled: %s.memory-hotplug-support " +"is not set" ,object_get_typename (OBJECT (s))); + } + }else if ( !object_dynamic_cast (OBJECT (dev),TYPE_CPU )) {error_setg (errp,"acpi: device pre plug request for not supported" " device type: %s" ,object_get_typename (OBJECT (dev)));
@@ -388,8 +396,7 @@ static void piix4_device_plug_cb(HotplugHandler *hotplug_dev, {PIIX4PMState *s =PIIX4_PM (hotplug_dev); -if (s->acpi_memory_hotplug.is_enabled && -object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) { +if (object_dynamic_cast (OBJECT (dev),TYPE_PC_DIMM )) {if (object_dynamic_cast (OBJECT (dev),TYPE_NVDIMM )) {nvdimm_acpi_plug_cb (hotplug_dev, dev); }else {
hw/i386/pc.c +2 -0
@@ -2083,6 +2083,8 @@ static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,return ; } +hotplug_handler_pre_plug (pcms->acpi_dev, dev, errp); +if (is_nvdimm && !pcms->acpi_nvdimm_state.is_enabled) {error_setg (errp,"nvdimm is not enabled: missing 'nvdimm' in '-M'" );return ;
hw/isa/lpc_ich9.c +1 -0
@@ -805,6 +805,7 @@ static void ich9_lpc_class_init(ObjectClass *klass, void *data)* pc_q35_init() */ dc->user_creatable = false; + hc->pre_plug = ich9_pm_device_pre_plug_cb; hc->plug = ich9_pm_device_plug_cb; hc->unplug_request = ich9_pm_device_unplug_request_cb; hc->unplug = ich9_pm_device_unplug_cb;
include/hw/acpi/ich9.h +2 -0
@@ -74,6 +74,8 @@ extern const VMStateDescription vmstate_ich9_pm;void ich9_pm_add_properties (Object *obj,ICH9LPCPMRegs *pm,Error **errp); +void ich9_pm_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev, +Error **errp);void ich9_pm_device_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp); void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev,
Signature · 1 line
2.19.1
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Message-id: [email protected]
Subject: [Qemu-devel] [PATCH v6] i386, acpi: check acpi_memory_hotplug capacity in pre_plug
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
* [new tag] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'a0dcf8b1ea i386, acpi: check acpi_memory_hotplug capacity in pre_plug
=== OUTPUT BEGIN ===
ERROR: space required before the open parenthesis '(' #77: FILE: hw/acpi/piix4.c:382:
+ if(!s->acpi_memory_hotplug.is_enabled) {
ERROR: code indent should never use tabs
#81: FILE: hw/acpi/piix4.c:386:
+^I}$
total: 2 errors, 0 warnings, 76 lines checked
Commit a0dcf8b1eac5 (i386, acpi: check acpi_memory_hotplug capacity in pre_plug) has style problems, please review. If any of these errors are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]