i386, acpi: check acpi_memory_hotplug capacity in pre_plug
PATCH v4 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.
---
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 | 15 +++++++++++++-- hw/i386/pc.c | 5 +++++ hw/isa/lpc_ich9.c | 1 + include/hw/acpi/ich9.h | 2 ++ 5 files changed, 34 insertions(+), 4 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 +13 -2
@@ -370,13 +370,23 @@ static void piix4_pm_powerdown_req(Notifier *n, void *opaque)acpi_pm1_evt_power_down (&s->ar); } +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_PC_DIMM ) && + !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))); +}static void piix4_device_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) {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 {
@@ -702,6 +712,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data)*/ dc->user_creatable = false; dc->hotpluggable = false; + hc->pre_plug = piix4_device_pre_plug_cb; hc->plug = piix4_device_plug_cb; hc->unplug_request = piix4_device_unplug_request_cb; hc->unplug = piix4_device_unplug_cb;
hw/i386/pc.c +5 -0
@@ -1674,6 +1674,11 @@ static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,return ; } +/* +* Check acpi_dev memory-hotplug-support property +*/ +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
Quoted 15 lines · On Tue, 19 Feb 2019 16:08:26 +0800 Wei Yang <[email protected]>…
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 reachingg_assert_not_reached()(piix4) orerror_abort(ich9).
Quoted 6 lines
Fix it by checking if memory hotplug is enabled at
pre_plugstage where we can gracefully abort hotplug request.Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>
patch refuses to be applied to current master
Quoted 96 lines
---
v4:
* fix code alignment ofpiix4_device_pre_plug_cb
v3:
* replaceacpi_memory_hotplugwith memory-hotplug-support in changelog
* fix code alignment ofich9_pm_device_pre_plug_cb
* print which device type memory-hotplug-support is disabled inich9_pm_device_pre_plug_cbandpiix4_device_pre_plug_cb
v2:
* ([email protected])
- Almost the whole third paragraph
* apply this change to ich9
* usehotplug_handler_pre_plug()instead of open-coding check--- hw/acpi/ich9.c | 15 +++++++++++++-- hw/acpi/piix4.c | 15 +++++++++++++-- hw/i386/pc.c | 5 +++++ hw/isa/lpc_ich9.c | 1 + include/hw/acpi/ich9.h | 2 ++ 5 files changed, 34 insertions(+), 4 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 +13
-2@@ -370,13 +370,23 @@ static void piix4_pm_powerdown_req(Notifier *n, void *opaque)acpi_pm1_evt_power_down (&s->ar); } +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_PC_DIMM ) && + !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))); +}static void piix4_device_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) {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 {@@ -702,6 +712,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data)*/ dc->user_creatable = false; dc->hotpluggable = false; + hc->pre_plug = piix4_device_pre_plug_cb; hc->plug = piix4_device_plug_cb; hc->unplug_request = piix4_device_unplug_request_cb; hc->unplug = piix4_device_unplug_cb;hw/i386/pc.c +0
-0
hw/i386/pc.c static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, · line 1679
Quoted 6 lines
hw/i386/pc.c +3
-0@@ -1674,6 +1674,11 @@ static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,return ; } +/* +* Check acpi_dev memory-hotplug-support property +*/
I'd drop this comment, it's internal businesses of acpi_dev
Quoted 22 lines
hw/i386/pc.c +2
-0+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 +0
-0
include/hw/acpi/ich9.h extern const VMStateDescription vmstate_ich9_pm; · line 78
Quoted 5 lines
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);
wrong alignment?
Quoted 3 lines
include/hw/acpi/ich9.h +0
-0void ich9_pm_device_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp); void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev,
Quoted 18 lines · Igor Mammedov
Quoted 15 lines · On Tue, 19 Feb 2019 16:08:26 +0800 Wei Yang <[email protected]>…
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 reachingg_assert_not_reached()(piix4) orerror_abort(ich9).
Quoted 7 lines
Quoted 6 lines
Fix it by checking if memory hotplug is enabled at
pre_plugstage where we can gracefully abort hotplug request.Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>patch refuses to be applied to current master
Let me fetch the latest code.
Quoted 100 lines
Quoted 100 lines
---
v4:
* fix code alignment ofpiix4_device_pre_plug_cb
v3:
* replaceacpi_memory_hotplugwith memory-hotplug-support in changelog
* fix code alignment ofich9_pm_device_pre_plug_cb
* print which device type memory-hotplug-support is disabled inich9_pm_device_pre_plug_cbandpiix4_device_pre_plug_cb
v2:
* ([email protected])
- Almost the whole third paragraph
* apply this change to ich9
* usehotplug_handler_pre_plug()instead of open-coding check--- hw/acpi/ich9.c | 15 +++++++++++++-- hw/acpi/piix4.c | 15 +++++++++++++-- hw/i386/pc.c | 5 +++++ hw/isa/lpc_ich9.c | 1 + include/hw/acpi/ich9.h | 2 ++ 5 files changed, 34 insertions(+), 4 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 +13
-2@@ -370,13 +370,23 @@ static void piix4_pm_powerdown_req(Notifier *n, void *opaque)acpi_pm1_evt_power_down (&s->ar); } +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_PC_DIMM ) && + !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))); +}static void piix4_device_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) {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 {@@ -702,6 +712,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data)*/ dc->user_creatable = false; dc->hotpluggable = false; + hc->pre_plug = piix4_device_pre_plug_cb; hc->plug = piix4_device_plug_cb; hc->unplug_request = piix4_device_unplug_request_cb; hc->unplug = piix4_device_unplug_cb;hw/i386/pc.c +0
-0@@ -1674,6 +1674,11 @@ static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,return ; }
Quoted 5 lines
hw/i386/pc.c static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, · line 1679
Quoted 3 lines
hw/i386/pc.c +3
-0+/* +* Check acpi_dev memory-hotplug-support property +*/ I'd drop this comment, it's internal businesses of
acpi_dev
Will drop this in next version.
Quoted 23 lines
Quoted 23 lines
hw/i386/pc.c +2
-0+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 +0
-0@@ -74,6 +74,8 @@ extern const VMStateDescription vmstate_ich9_pm;
Quoted 6 lines
include/hw/acpi/ich9.h extern const VMStateDescription vmstate_ich9_pm; · line 78
Quoted 4 lines
include/hw/acpi/ich9.h +2
-0void ich9_pm_add_properties (Object *obj,ICH9LPCPMRegs *pm,Error **errp); +void ich9_pm_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev, +Error **errp);wrong alignment?
Hmm... you are right. Will fix it.
Quoted 3 lines
Quoted 3 lines
include/hw/acpi/ich9.h +0
-0void ich9_pm_device_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp); void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev,
Signature · 2 lines
Wei Yang Help you, Help me
Quoted 18 lines · Igor Mammedov
Quoted 15 lines · On Tue, 19 Feb 2019 16:08:26 +0800 Wei Yang <[email protected]>…
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 reachingg_assert_not_reached()(piix4) orerror_abort(ich9).
Quoted 8 lines
Quoted 6 lines
Fix it by checking if memory hotplug is enabled at
pre_plugstage where we can gracefully abort hotplug request.Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>patch refuses to be applied to current master
Could latest upstream compile successfully?
Signature · 2 lines
Wei Yang Help you, Help me
Quoted 22 lines · On Fri, 22 Feb 2019 16:53:55 +0800 Wei Yang <[email protected]>…
Quoted 21 lines · Igor Mammedov
Quoted 18 lines · On Tue, 19 Feb 2019 16:08:26 +0800 Wei Yang <[email protected]>…
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 reachingg_assert_not_reached()(piix4) orerror_abort(ich9).Fix it by checking if memory hotplug is enabled at
pre_plugstage where we can gracefully abort hotplug request.
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>patch refuses to be applied to current master
Could latest upstream compile successfully?
works for me