i386, acpi: check acpi_memory_hotplug capacity in pre_plug
PATCH v5 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.
---
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,16 @@ 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 ) && + !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 +395,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 {
@@ -704,6 +710,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->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 +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
Quoted 84 lines · Wei Yang
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.Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>Signed-off-by Wei Yang <[email protected]>---
v5:
* rebase on latest upstream
* remove a comment beforehotplug_handler_pre_plug
* fix alignment forich9_pm_device_pre_plug_cb
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 | 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 +0
-0
hw/acpi/piix4.c static void piix4_pm_powerdown_req(Notifier *n, void *opaque) · line 375
Quoted 2 lines
hw/acpi/piix4.c +0
-0@@ -374,9 +374,16 @@ static void piix4_pm_powerdown_req(Notifier *n, void *opaque)static void piix4_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp)
Hmm, I found one interesting thing.
This function is introduced in
commit ec266f408882fd38475f72c4e864ed576228643b pci/pcihp: perform check for bus capability in pre_plug handler
This is just implemented in piix4, but don't has the counterpart in ich9.
So I suggest to have a follow up patch to create the counterpart for ich9 and then apply this patch on top of that.
Is my understanding correct?
Quoted 73 lines
hw/acpi/piix4.c +10
-3{ +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 ) && + !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 +395,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 {@@ -704,6 +710,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->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 +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
Signature · 2 lines
Wei Yang Help you, Help me
Quoted 74 lines · Wei Yang
Quoted 73 lines · Wei Yang
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.Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>Signed-off-by Wei Yang <[email protected]>---
v5:
* rebase on latest upstream
* remove a comment beforehotplug_handler_pre_plug
* fix alignment forich9_pm_device_pre_plug_cb
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 | 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 +12
-0@@ -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);
Quoted 14 lines
hw/acpi/piix4.c static void piix4_pm_powerdown_req(Notifier *n, void *opaque) · line 375
Quoted 13 lines
hw/acpi/ich9.c +1
-2-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 +0
-0@@ -374,9 +374,16 @@ static void piix4_pm_powerdown_req(Notifier *n, void *opaque)static void piix4_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp)
Where will we invoke this check for pci devices?
pc_machine_device_pre_plug_cb() seems has no connection with this function. So how this pre_plug handler takes effect?
Do I miss something?
Signature · 2 lines
Wei Yang Help you, Help me
Quoted 90 lines · On Tue, 26 Feb 2019 11:37:32 +0800 Wei Yang <[email protected]>…
Quoted 74 lines · Wei Yang
Quoted 73 lines · Wei Yang
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.Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>Signed-off-by Wei Yang <[email protected]>---
v5:
* rebase on latest upstream
* remove a comment beforehotplug_handler_pre_plug
* fix alignment forich9_pm_device_pre_plug_cb
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 | 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 +12
-0@@ -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);Quoted 14 lines
hw/acpi/piix4.c static void piix4_pm_powerdown_req(Notifier *n, void *opaque) · line 375
Quoted 13 lines
hw/acpi/ich9.c +1
-2-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 +0
-0@@ -374,9 +374,16 @@ static void piix4_pm_powerdown_req(Notifier *n, void *opaque)static void piix4_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp)
Quoted 4 lines
Where will we invoke this check for pci devices?
pc_machine_device_pre_plug_cb()seems has no connection with this function. So how thispre_plughandler takes effect?
hotplug handler doesn't have to be machine, on contrary it's typically a bus owner see hw/core/qdev.c: device_set_realized() and qdev_get_hotplug_handler()
you also might want to check relevant
'PATCH v1 0/3] qdev: Hotplug handler chaining' thread
that's hopefully to be merged soon
Quoted 4 lines
Do I miss something?
Quoted 92 lines · On Mon, 25 Feb 2019 09:15:34 +0800 Wei Yang <[email protected]>…
Quoted 84 lines · Wei Yang
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.Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>Signed-off-by Wei Yang <[email protected]>---
v5:
* rebase on latest upstream
* remove a comment beforehotplug_handler_pre_plug
* fix alignment forich9_pm_device_pre_plug_cb
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 | 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 +0
-0hw/acpi/piix4.c static void piix4_pm_powerdown_req(Notifier *n, void *opaque) · line 375
Quoted 2 lines
hw/acpi/piix4.c +0
-0@@ -374,9 +374,16 @@ static void piix4_pm_powerdown_req(Notifier *n, void *opaque)static void piix4_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp)Hmm, I found one interesting thing.
This function is introduced in
Quoted 7 lines
commit
ec266f408882fd38475f72c4e864ed576228643bpci/pcihp: perform check for bus capability inpre_plughandlerThis is just implemented in piix4, but don't has the counterpart in ich9.
So I suggest to have a follow up patch to create the counterpart for ich9 and then apply this patch on top of that.
not sure what do you mean, could you be more specific?
Quoted 77 lines
Is my understanding correct?
Quoted 73 lines
hw/acpi/piix4.c +10
-3{ +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 ) && + !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 +395,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 {@@ -704,6 +710,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->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 +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
Quoted 95 lines · Igor Mammedov
Quoted 92 lines · On Mon, 25 Feb 2019 09:15:34 +0800 Wei Yang <[email protected]>…
Quoted 84 lines · Wei Yang
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.Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>Signed-off-by Wei Yang <[email protected]>---
v5:
* rebase on latest upstream
* remove a comment beforehotplug_handler_pre_plug
* fix alignment forich9_pm_device_pre_plug_cb
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 | 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 +0
-0hw/acpi/piix4.c static void piix4_pm_powerdown_req(Notifier *n, void *opaque) · line 375
Quoted 2 lines
hw/acpi/piix4.c +0
-0@@ -374,9 +374,16 @@ static void piix4_pm_powerdown_req(Notifier *n, void *opaque)static void piix4_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp)Hmm, I found one interesting thing.
This function is introduced in
Quoted 9 lines
Quoted 7 lines
commit
ec266f408882fd38475f72c4e864ed576228643bpci/pcihp: perform check for bus capability inpre_plughandlerThis is just implemented in piix4, but don't has the counterpart in ich9.
So I suggest to have a follow up patch to create the counterpart for ich9 and then apply this patch on top of that.
not sure what do you mean, could you be more specific?
Let me reply here.
Everything starts from device_set_realized().
device_set_realized()
hotplug_handler_pre_plug()
dc->realize()
hotplug_handler_plug()There is two choice of HotplugHandler :
* dev's bus hotplug_handler
* machine_hotplug_handler
Take PIIX as an example, machine_hotplug_handler and pci_bus hotplug_handler is:
pc_machine_device_[pre_]plug_cb
piix4_device_[pre_]plug_cbif I am correct.
Now back to your question.
Commit ec266f408882 introduced piix4_device_pre_plug_cb() to move the check in pre_plug handler for PIIX. Then I am wondering the counter part of ich9, But I don't see something for PCI_DEVICE in ich9_pm_device_plug_cb(). So on ich9, PCI_DEVICE is not pluggable? Maybe I am lost here.
Or in other words, in case other machine supports PCI_DEVICE hotplug, do we need to move similar check to pre_plug too?
Signature · 2 lines
Wei Yang Help you, Help me
Quoted 130 lines · On Thu, 28 Feb 2019 09:13:25 +0800 Wei Yang <[email protected]>…
Quoted 95 lines · Igor Mammedov
Quoted 92 lines · On Mon, 25 Feb 2019 09:15:34 +0800 Wei Yang <[email protected]>…
Quoted 84 lines · Wei Yang
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.Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>Signed-off-by Wei Yang <[email protected]>---
v5:
* rebase on latest upstream
* remove a comment beforehotplug_handler_pre_plug
* fix alignment forich9_pm_device_pre_plug_cb
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 | 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 +0
-0hw/acpi/piix4.c static void piix4_pm_powerdown_req(Notifier *n, void *opaque) · line 375
Quoted 2 lines
hw/acpi/piix4.c +0
-0@@ -374,9 +374,16 @@ static void piix4_pm_powerdown_req(Notifier *n, void *opaque)static void piix4_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp)Hmm, I found one interesting thing.
This function is introduced in
Quoted 9 lines
Quoted 7 lines
commit
ec266f408882fd38475f72c4e864ed576228643bpci/pcihp: perform check for bus capability inpre_plughandlerThis is just implemented in piix4, but don't has the counterpart in ich9.
So I suggest to have a follow up patch to create the counterpart for ich9 and then apply this patch on top of that.
not sure what do you mean, could you be more specific?
Let me reply here.
Everything starts from
device_set_realized().device_set_realized() hotplug_handler_pre_plug() dc->realize() hotplug_handler_plug()There is two choice of HotplugHandler :
* dev's bus
hotplug_handler
*machine_hotplug_handlerTake PIIX as an example,
machine_hotplug_handlerandpci_bushotplug_handleris:pc_machine_device_[pre_]plug_cb piix4_device_[pre_]plug_cbif I am correct.
Now back to your question.
Quoted 7 lines
Commit
ec266f408882introducedpiix4_device_pre_plug_cb()to move the check inpre_plughandler for PIIX. Then I am wondering the counter part of ich9, But I don't see something forPCI_DEVICEinich9_pm_device_plug_cb(). So on ich9,PCI_DEVICEis not pluggable? Maybe I am lost here.Or in other words, in case other machine supports
PCI_DEVICEhotplug, do we need to move similar check topre_plugtoo?
it depends, in case of ICH9. I think acpi hotplug is not used (thankfully)
it uses native PCI-E hotplug path. Following pops out when looking for it.
hw/pci/pcie.c:void pcie_cap_slot_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
hw/pci/pcie_port.c: hc->pre_plug = pcie_cap_slot_pre_plug_cb;
Quoted 138 lines · Igor Mammedov
Quoted 135 lines · On Thu, 28 Feb 2019 09:13:25 +0800 Wei Yang <[email protected]>…
Quoted 95 lines · Igor Mammedov
Quoted 92 lines · On Mon, 25 Feb 2019 09:15:34 +0800 Wei Yang <[email protected]>…
Quoted 84 lines · Wei Yang
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.Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>Signed-off-by Wei Yang <[email protected]>---
v5:
* rebase on latest upstream
* remove a comment beforehotplug_handler_pre_plug
* fix alignment forich9_pm_device_pre_plug_cb
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 | 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 +0
-0hw/acpi/piix4.c static void piix4_pm_powerdown_req(Notifier *n, void *opaque) · line 375
Quoted 2 lines
hw/acpi/piix4.c +0
-0@@ -374,9 +374,16 @@ static void piix4_pm_powerdown_req(Notifier *n, void *opaque)static void piix4_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp)Hmm, I found one interesting thing.
This function is introduced in
Quoted 9 lines
Quoted 7 lines
commit
ec266f408882fd38475f72c4e864ed576228643bpci/pcihp: perform check for bus capability inpre_plughandlerThis is just implemented in piix4, but don't has the counterpart in ich9.
So I suggest to have a follow up patch to create the counterpart for ich9 and then apply this patch on top of that.
not sure what do you mean, could you be more specific?
Let me reply here.
Everything starts from
device_set_realized().device_set_realized() hotplug_handler_pre_plug() dc->realize() hotplug_handler_plug()There is two choice of HotplugHandler :
* dev's bus
hotplug_handler
*machine_hotplug_handlerTake PIIX as an example,
machine_hotplug_handlerandpci_bushotplug_handleris:pc_machine_device_[pre_]plug_cb piix4_device_[pre_]plug_cbif I am correct.
Now back to your question.
Commit
ec266f408882introducedpiix4_device_pre_plug_cb()to move the check inpre_plughandler for PIIX. Then I am wondering the counter part of ich9, But I don't see something forPCI_DEVICEinich9_pm_device_plug_cb(). So on ich9,PCI_DEVICEis not pluggable? Maybe I am lost here.
Quoted 7 lines
Quoted 2 lines
Or in other words, in case other machine supports
PCI_DEVICEhotplug, do we need to move similar check topre_plugtoo?it depends, in case of ICH9. I think acpi hotplug is not used (thankfully) it uses native PCI-E hotplug path. Following pops out when looking for it. hw/pci/pcie.c:void pcie_cap_slot_pre_plug_cb(HotplugHandler
*hotplug_dev, DeviceState *dev,hw/pci/pcie_port.c:hc->pre_plug=pcie_cap_slot_pre_plug_cb;
So in case of ICH9, acpi hotplug is not involved for PCI_DEVICE.
Thanks for your time. I need to resend this patch, because of my misunderstanding.
Signature · 2 lines
Wei Yang Help you, Help me