From nobody Fri May 3 18:51:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550537715710627.2377467552523; Mon, 18 Feb 2019 16:55:15 -0800 (PST) Received: from localhost ([127.0.0.1]:39113 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvtgh-00030W-N5 for importer@patchew.org; Mon, 18 Feb 2019 19:55:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvtfe-0002Wn-Gy for qemu-devel@nongnu.org; Mon, 18 Feb 2019 19:54:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvtfd-0000kN-Eg for qemu-devel@nongnu.org; Mon, 18 Feb 2019 19:54:02 -0500 Received: from mga05.intel.com ([192.55.52.43]:45969) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gvtfc-0000gE-O7 for qemu-devel@nongnu.org; Mon, 18 Feb 2019 19:54:01 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Feb 2019 16:53:47 -0800 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga001.fm.intel.com with ESMTP; 18 Feb 2019 16:53:46 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,385,1544515200"; d="scan'208";a="147888400" From: Wei Yang To: qemu-devel@nongnu.org Date: Tue, 19 Feb 2019 08:53:22 +0800 Message-Id: <20190219005322.16679-1-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 Subject: [Qemu-devel] [PATCH v3] i386, acpi: check acpi_memory_hotplug capacity in pre_plug X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: imammedo@redhat.com, Wei Yang , mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Wei Yang CC: Igor Mammedov CC: Eric Blake --- 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: * (imammedo@redhat.com) - 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(-) diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index c5d8646abc..e53dfe1ee3 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -483,13 +483,24 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMReg= s *pm, Error **errp) NULL); } =20 +void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *= dev, + Error **errp) +{ + ICH9LPCState *lpc =3D 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-suppo= rt " + "is not set", object_get_typename(OBJECT(lpc))); +} + void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { ICH9LPCState *lpc =3D ICH9_LPC_DEVICE(hotplug_dev); =20 - 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 { diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index e330f24c71..f7e3c2018d 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -370,13 +370,23 @@ static void piix4_pm_powerdown_req(Notifier *n, void = *opaque) acpi_pm1_evt_power_down(&s->ar); } =20 +static void piix4_device_pre_plug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + PIIX4PMState *s =3D 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-suppo= rt " + "is not set", object_get_typename(OBJECT(s))); +} static void piix4_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { PIIX4PMState *s =3D PIIX4_PM(hotplug_dev); =20 - 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, voi= d *data) */ dc->user_creatable =3D false; dc->hotpluggable =3D false; + hc->pre_plug =3D piix4_device_pre_plug_cb; hc->plug =3D piix4_device_plug_cb; hc->unplug_request =3D piix4_device_unplug_request_cb; hc->unplug =3D piix4_device_unplug_cb; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 0f61314b79..0b11ebe2c9 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1674,6 +1674,11 @@ static void pc_memory_pre_plug(HotplugHandler *hotpl= ug_dev, DeviceState *dev, return; } =20 + /* + * 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; diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index e692b9fdc1..ac44aa53be 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -805,6 +805,7 @@ static void ich9_lpc_class_init(ObjectClass *klass, voi= d *data) * pc_q35_init() */ dc->user_creatable =3D false; + hc->pre_plug =3D ich9_pm_device_pre_plug_cb; hc->plug =3D ich9_pm_device_plug_cb; hc->unplug_request =3D ich9_pm_device_unplug_request_cb; hc->unplug =3D ich9_pm_device_unplug_cb; diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h index 59aeb06393..428af0b0be 100644 --- a/include/hw/acpi/ich9.h +++ b/include/hw/acpi/ich9.h @@ -74,6 +74,8 @@ extern const VMStateDescription vmstate_ich9_pm; =20 void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp); =20 +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, --=20 2.19.1