i386, acpi: check acpi_memory_hotplug capacity in pre_plug
PATCH v2 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 acpi_memory_hotplug property is checked in 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).
This patch abstract the check on acpi_memory_hotplug capacity in pre_plug stage.
[changelog rephrase from [email protected]]
---
v2:
* rephrase change log
* apply this change to ich9
* use hotplug_handler_pre_plug() instead of open-coding check
--- hw/acpi/ich9.c | 14 ++++++++++++-- hw/acpi/piix4.c | 14 ++++++++++++-- hw/i386/pc.c | 5 +++++ hw/isa/lpc_ich9.c | 1 + include/hw/acpi/ich9.h | 2 ++ 5 files changed, 32 insertions(+), 4 deletions(-)
hw/acpi/ich9.c +12 -2
@@ -483,13 +483,23 @@ 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: ICH9 memory hotplug disabled" ); +} +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 +12 -2
@@ -370,13 +370,22 @@ 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: PIIX4 memory hotplug disabled" ); +}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 +711,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 10 lines · On Mon, 18 Feb 2019 09:13:33 +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
acpi_memory_hotplugproperty is checked in
^^^^^^^ is field name and not a property so
s/acpi_memory_hotplug/memory-hotplug-support/
s/in/at/
Quoted 8 lines
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).This patch abstract the check on
acpi_memory_hotplugcapacity inpre_plugstage.
maybe better would be:
"Fix it by checking if memory hotplug is enabled at pre_plug stage where we can gracefully abort hotplug request."
Quoted 1 line
[changelog rephrase from [email protected]]
this provides zero information for a commit reader, it should go under --- to chagelog
Quoted 7 lines
Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>---
v2:
* rephrase change log
one usually adds commenter's name here
* like this ([email protected])
or
* ([email protected])
- entry 1
- entry 2
* ([email protected])
- ...
Quoted 15 lines
* apply this change to ich9
* usehotplug_handler_pre_plug()instead of open-coding check--- hw/acpi/ich9.c | 14 ++++++++++++-- hw/acpi/piix4.c | 14 ++++++++++++-- hw/i386/pc.c | 5 +++++ hw/isa/lpc_ich9.c | 1 + include/hw/acpi/ich9.h | 2 ++ 5 files changed, 32 insertions(+), 4 deletions(-)hw/acpi/ich9.c +0
-0
hw/acpi/ich9.c void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) · line 487
Quoted 5 lines
hw/acpi/ich9.c +2
-0@@ -483,13 +483,23 @@ 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)
broken alignment?
run /scripts/checkpatch.pl on patches before submitting them
hw/acpi/ich9.c void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) · line 494
Quoted 7 lines
hw/acpi/ich9.c +7
-0+{ +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: ICH9 memory hotplug disabled" );
I'd give a hint where it's disabled, something like
"memory hotplug is not enabled: %s.memory-hotplug-support is not set", object_get_typename(lpc)
the same for piix4
Quoted 91 lines
hw/acpi/ich9.c +3
-2+} +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 +12
-2@@ -370,13 +370,22 @@ 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: PIIX4 memory hotplug disabled" ); +}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 +711,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,
Quoted 25 lines · Igor Mammedov
Quoted 10 lines · On Mon, 18 Feb 2019 09:13:33 +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
acpi_memory_hotplugproperty is checked in^^^^^^^ is field name and not a property so
s/acpi_memory_hotplug/memory-hotplug-support/
s/in/at/Quoted 8 lines
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).This patch abstract the check on
acpi_memory_hotplugcapacity inpre_plugstage.
Quoted 8 lines
maybe better would be:
"Fix it by checking if memory hotplug is enabled atpre_plugstage where we can gracefully abort hotplug request."Quoted 1 line
[changelog rephrase from [email protected]]
this provides zero information for a commit reader, it should go under --- to chagelog
Ok, maybe different community has different convention.
Linux kernel mm subsystem maintainer suggest me to add above line.
Quoted 7 lines
Quoted 7 lines
Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>---
v2:
* rephrase change log
Quoted 9 lines
one usually adds commenter's name here
* like this ([email protected])
or
* ([email protected])
- entry 1
- entry 2
* ([email protected])
- ...
Well, I would change to this style.
Quoted 18 lines
Quoted 18 lines
* apply this change to ich9
* usehotplug_handler_pre_plug()instead of open-coding check--- hw/acpi/ich9.c | 14 ++++++++++++-- hw/acpi/piix4.c | 14 ++++++++++++-- hw/i386/pc.c | 5 +++++ hw/isa/lpc_ich9.c | 1 + include/hw/acpi/ich9.h | 2 ++ 5 files changed, 32 insertions(+), 4 deletions(-)hw/acpi/ich9.c +0
-0@@ -483,13 +483,23 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) NULL); }
Quoted 5 lines
hw/acpi/ich9.c void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) · line 487
Quoted 2 lines
hw/acpi/ich9.c +2
-0+void ich9_pm_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev, +Error **errp)broken alignment?
run /scripts/checkpatch.pl on patches before submitting them
I copied this from ich9_pm_device_plug_cb(), so thought this is the correct style.
Will adjust this according to checkpatch.pl.
Quoted 106 lines
hw/acpi/ich9.c void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) · line 494
Quoted 8 lines
hw/acpi/ich9.c +7
-0+{ +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: ICH9 memory hotplug disabled" );I'd give a hint where it's disabled, something like
"memory hotplug is not enabled: %s.memory-hotplug-support is not set",
object_get_typename(lpc)the same for piix4
Quoted 91 lines
hw/acpi/ich9.c +3
-2+} +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 +12
-2@@ -370,13 +370,22 @@ 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: PIIX4 memory hotplug disabled" ); +}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 +711,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 · 2 lines
Wei Yang Help you, Help me
Quoted 80 lines · On Mon, 18 Feb 2019 12:13:24 +0000 Wei Yang <[email protected]> wrote:
Quoted 25 lines · Igor Mammedov
Quoted 10 lines · On Mon, 18 Feb 2019 09:13:33 +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
acpi_memory_hotplugproperty is checked in^^^^^^^ is field name and not a property so
s/acpi_memory_hotplug/memory-hotplug-support/
s/in/at/Quoted 8 lines
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).This patch abstract the check on
acpi_memory_hotplugcapacity inpre_plugstage.Quoted 8 lines
maybe better would be:
"Fix it by checking if memory hotplug is enabled atpre_plugstage where we can gracefully abort hotplug request."Quoted 1 line
[changelog rephrase from [email protected]]
this provides zero information for a commit reader, it should go under --- to chagelog
Ok, maybe different community has different convention.
Linux kernel mm subsystem maintainer suggest me to add above line.
Quoted 7 lines
Quoted 7 lines
Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>---
v2:
* rephrase change logQuoted 9 lines
one usually adds commenter's name here
* like this ([email protected])
or
* ([email protected])
- entry 1
- entry 2
* ([email protected])
- ...Well, I would change to this style.
Quoted 22 lines
Quoted 15 lines
* apply this change to ich9
* usehotplug_handler_pre_plug()instead of open-coding check--- hw/acpi/ich9.c | 14 ++++++++++++-- hw/acpi/piix4.c | 14 ++++++++++++-- hw/i386/pc.c | 5 +++++ hw/isa/lpc_ich9.c | 1 + include/hw/acpi/ich9.h | 2 ++ 5 files changed, 32 insertions(+), 4 deletions(-)hw/acpi/ich9.c +0
-0hw/acpi/ich9.c void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) · line 487
Quoted 5 lines
hw/acpi/ich9.c +2
-0@@ -483,13 +483,23 @@ 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)broken alignment?
Quoted 6 lines
Quoted 1 line
run /scripts/checkpatch.pl on patches before submitting them
I copied this from
ich9_pm_device_plug_cb(), so thought this is the correct style.Will adjust this according to checkpatch.pl.
see CODING_STYLE
Quoted 108 lines
Quoted 107 lines
hw/acpi/ich9.c void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) · line 494
Quoted 9 lines
hw/acpi/ich9.c +7
-0+{ +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: ICH9 memory hotplug disabled" );I'd give a hint where it's disabled, something like
"memory hotplug is not enabled: %s.memory-hotplug-support is not set",
object_get_typename(lpc)the same for piix4
Quoted 91 lines
hw/acpi/ich9.c +3
-2+} +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 +12
-2@@ -370,13 +370,22 @@ 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: PIIX4 memory hotplug disabled" ); +}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 +711,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,
Quoted 83 lines · Igor Mammedov
Quoted 80 lines · On Mon, 18 Feb 2019 12:13:24 +0000 Wei Yang <[email protected]> wrote:
Quoted 25 lines · Igor Mammedov
Quoted 10 lines · On Mon, 18 Feb 2019 09:13:33 +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
acpi_memory_hotplugproperty is checked in^^^^^^^ is field name and not a property so
s/acpi_memory_hotplug/memory-hotplug-support/
s/in/at/Quoted 8 lines
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).This patch abstract the check on
acpi_memory_hotplugcapacity inpre_plugstage.Quoted 8 lines
maybe better would be:
"Fix it by checking if memory hotplug is enabled atpre_plugstage where we can gracefully abort hotplug request."Quoted 1 line
[changelog rephrase from [email protected]]
this provides zero information for a commit reader, it should go under --- to chagelog
Ok, maybe different community has different convention.
Linux kernel mm subsystem maintainer suggest me to add above line.
Quoted 7 lines
Quoted 7 lines
Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>---
v2:
* rephrase change logQuoted 9 lines
one usually adds commenter's name here
* like this ([email protected])
or
* ([email protected])
- entry 1
- entry 2
* ([email protected])
- ...Well, I would change to this style.
Quoted 22 lines
Quoted 15 lines
* apply this change to ich9
* usehotplug_handler_pre_plug()instead of open-coding check--- hw/acpi/ich9.c | 14 ++++++++++++-- hw/acpi/piix4.c | 14 ++++++++++++-- hw/i386/pc.c | 5 +++++ hw/isa/lpc_ich9.c | 1 + include/hw/acpi/ich9.h | 2 ++ 5 files changed, 32 insertions(+), 4 deletions(-)hw/acpi/ich9.c +0
-0hw/acpi/ich9.c void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) · line 487
Quoted 5 lines
hw/acpi/ich9.c +2
-0@@ -483,13 +483,23 @@ 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)broken alignment?
Quoted 9 lines
Quoted 6 lines
Quoted 1 line
run /scripts/checkpatch.pl on patches before submitting them
I copied this from
ich9_pm_device_plug_cb(), so thought this is the correct style.Will adjust this according to checkpatch.pl.
see
CODING_STYLE
Went throught this file, but not find the description of function definition's second line.
I guess it should start after '(', right?
Quoted 108 lines
Quoted 108 lines
Quoted 107 lines
hw/acpi/ich9.c void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) · line 494
Quoted 9 lines
hw/acpi/ich9.c +7
-0+{ +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: ICH9 memory hotplug disabled" );I'd give a hint where it's disabled, something like
"memory hotplug is not enabled: %s.memory-hotplug-support is not set",
object_get_typename(lpc)the same for piix4
Quoted 91 lines
hw/acpi/ich9.c +3
-2+} +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 +12
-2@@ -370,13 +370,22 @@ 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: PIIX4 memory hotplug disabled" ); +}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 +711,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 · 2 lines
Wei Yang Help you, Help me
Quoted 89 lines · On Mon, 18 Feb 2019 13:21:29 +0000 Wei Yang <[email protected]> wrote:
Quoted 88 lines · Igor Mammedov
Quoted 85 lines · On Mon, 18 Feb 2019 12:13:24 +0000 Wei Yang <[email protected]> wrote:
Quoted 25 lines · Igor Mammedov
Quoted 10 lines · On Mon, 18 Feb 2019 09:13:33 +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
acpi_memory_hotplugproperty is checked in^^^^^^^ is field name and not a property so
s/acpi_memory_hotplug/memory-hotplug-support/
s/in/at/Quoted 8 lines
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).This patch abstract the check on
acpi_memory_hotplugcapacity inpre_plugstage.Quoted 8 lines
maybe better would be:
"Fix it by checking if memory hotplug is enabled atpre_plugstage where we can gracefully abort hotplug request."Quoted 1 line
[changelog rephrase from [email protected]]
this provides zero information for a commit reader, it should go under --- to chagelog
Ok, maybe different community has different convention.
Linux kernel mm subsystem maintainer suggest me to add above line.
Quoted 7 lines
Quoted 7 lines
Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>---
v2:
* rephrase change logQuoted 9 lines
one usually adds commenter's name here
* like this ([email protected])
or
* ([email protected])
- entry 1
- entry 2
* ([email protected])
- ...Well, I would change to this style.
Quoted 18 lines
Quoted 18 lines
* apply this change to ich9
* usehotplug_handler_pre_plug()instead of open-coding check--- hw/acpi/ich9.c | 14 ++++++++++++-- hw/acpi/piix4.c | 14 ++++++++++++-- hw/i386/pc.c | 5 +++++ hw/isa/lpc_ich9.c | 1 + include/hw/acpi/ich9.h | 2 ++ 5 files changed, 32 insertions(+), 4 deletions(-)hw/acpi/ich9.c +0
-0@@ -483,13 +483,23 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) NULL); }Quoted 5 lines
hw/acpi/ich9.c void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) · line 487
Quoted 2 lines
hw/acpi/ich9.c +2
-0+void ich9_pm_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev, +Error **errp)broken alignment?
run /scripts/checkpatch.pl on patches before submitting them
I copied this from
ich9_pm_device_plug_cb(), so thought this is the correct style.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Will adjust this according to checkpatch.pl.
see
CODING_STYLEWent throught this file, but not find the description of function definition's second line.
A patch fixing CODING_STYLE that is welcome
Quoted 2 lines
I guess it should start after '(', right?
either that or 4 spaces after function name beginning if I'm not mistaken (checkpatch will probably complain if something wrong)
Quoted 110 lines
Quoted 109 lines
Quoted 109 lines
Quoted 108 lines
hw/acpi/ich9.c void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) · line 494
Quoted 10 lines
hw/acpi/ich9.c +7
-0+{ +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: ICH9 memory hotplug disabled" );I'd give a hint where it's disabled, something like
"memory hotplug is not enabled: %s.memory-hotplug-support is not set",
object_get_typename(lpc)the same for piix4
Quoted 91 lines
hw/acpi/ich9.c +3
-2+} +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 +12
-2@@ -370,13 +370,22 @@ 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: PIIX4 memory hotplug disabled" ); +}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 +711,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,
Quoted 92 lines · Igor Mammedov
Quoted 89 lines · On Mon, 18 Feb 2019 13:21:29 +0000 Wei Yang <[email protected]> wrote:
Quoted 88 lines · Igor Mammedov
Quoted 85 lines · On Mon, 18 Feb 2019 12:13:24 +0000 Wei Yang <[email protected]> wrote:
Quoted 25 lines · Igor Mammedov
Quoted 10 lines · On Mon, 18 Feb 2019 09:13:33 +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
acpi_memory_hotplugproperty is checked in^^^^^^^ is field name and not a property so
s/acpi_memory_hotplug/memory-hotplug-support/
s/in/at/Quoted 8 lines
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).This patch abstract the check on
acpi_memory_hotplugcapacity inpre_plugstage.Quoted 8 lines
maybe better would be:
"Fix it by checking if memory hotplug is enabled atpre_plugstage where we can gracefully abort hotplug request."Quoted 1 line
[changelog rephrase from [email protected]]
this provides zero information for a commit reader, it should go under --- to chagelog
Ok, maybe different community has different convention.
Linux kernel mm subsystem maintainer suggest me to add above line.
Quoted 7 lines
Quoted 7 lines
Signed-off-by Wei Yang <[email protected]>CC Igor Mammedov <[email protected]>CC Eric Blake <[email protected]>---
v2:
* rephrase change logQuoted 9 lines
one usually adds commenter's name here
* like this ([email protected])
or
* ([email protected])
- entry 1
- entry 2
* ([email protected])
- ...Well, I would change to this style.
Quoted 18 lines
Quoted 18 lines
* apply this change to ich9
* usehotplug_handler_pre_plug()instead of open-coding check--- hw/acpi/ich9.c | 14 ++++++++++++-- hw/acpi/piix4.c | 14 ++++++++++++-- hw/i386/pc.c | 5 +++++ hw/isa/lpc_ich9.c | 1 + include/hw/acpi/ich9.h | 2 ++ 5 files changed, 32 insertions(+), 4 deletions(-)hw/acpi/ich9.c +0
-0@@ -483,13 +483,23 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) NULL); }Quoted 5 lines
hw/acpi/ich9.c void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) · line 487
Quoted 2 lines
hw/acpi/ich9.c +2
-0+void ich9_pm_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev, +Error **errp)broken alignment?
run /scripts/checkpatch.pl on patches before submitting them
I copied this from
ich9_pm_device_plug_cb(), so thought this is the correct style.
Quoted 9 lines
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Will adjust this according to checkpatch.pl.
see
CODING_STYLEWent throught this file, but not find the description of function definition's second line.
A patch fixing
CODING_STYLEthat is welcome
Hmm... writing document seems more difficult than writing code to me :-)
Let me have a try to see if my English is not that bad.
Signature · 2 lines
Wei Yang Help you, Help me