From patchwork Mon Jul 11 13:45:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 9223657 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 600A4604DB for ; Mon, 11 Jul 2016 13:57:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5159F2715B for ; Mon, 11 Jul 2016 13:57:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 461C4272AA; Mon, 11 Jul 2016 13:57:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94C6F27D85 for ; Mon, 11 Jul 2016 13:57:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754290AbcGKN5G (ORCPT ); Mon, 11 Jul 2016 09:57:06 -0400 Received: from mga14.intel.com ([192.55.52.115]:41754 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754246AbcGKN5D (ORCPT ); Mon, 11 Jul 2016 09:57:03 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP; 11 Jul 2016 06:57:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,346,1464678000"; d="scan'208";a="1014572100" Received: from xiaoreal1.sh.intel.com (HELO xiaoreal1.sh.intel.com.sh.intel.com) ([10.239.48.133]) by orsmga002.jf.intel.com with ESMTP; 11 Jul 2016 06:57:02 -0700 From: Xiao Guangrong To: pbonzini@redhat.com, imammedo@redhat.com Cc: gleb@kernel.org, mtosatti@redhat.com, stefanha@redhat.com, mst@redhat.com, rth@twiddle.net, ehabkost@redhat.com, dan.j.williams@intel.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong Subject: [PATCH 5/8] pc-dimm: introduce prepare_unplug() callback Date: Mon, 11 Jul 2016 21:45:15 +0800 Message-Id: <1468244718-3731-6-git-send-email-guangrong.xiao@linux.intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1468244718-3731-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1468244718-3731-1-git-send-email-guangrong.xiao@linux.intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We should let nvdimm acpi know which nvdimm device is being unplugged before QEMU interrupts the guest so that nvdimm acpi can update its FIT properly prepare_unplug() callback is introduced exactly for this purpose then the being removed device is skipped when guest reads FIT Signed-off-by: Xiao Guangrong --- hw/acpi/ich9.c | 3 +++ hw/acpi/nvdimm.c | 9 +++++++++ hw/acpi/piix4.c | 3 +++ hw/mem/nvdimm.c | 8 ++++++++ hw/mem/pc-dimm.c | 5 +++++ include/hw/mem/nvdimm.h | 3 +++ include/hw/mem/pc-dimm.h | 1 + 7 files changed, 32 insertions(+) diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index e5a3c18..af08471 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -511,6 +511,9 @@ void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev, if (lpc->pm.acpi_memory_hotplug.is_enabled && object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { + PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dev); + + ddc->prepare_unplug(dev); acpi_memory_unplug_request_cb(hotplug_dev, &lpc->pm.acpi_memory_hotplug, dev, errp); diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index d099ef1..8f68787 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -355,6 +355,15 @@ static GArray *nvdimm_build_device_structure(GSList *device_list) for (; device_list; device_list = device_list->next) { DeviceState *dev = device_list->data; + NVDIMMDevice *nvdimm = NVDIMM(dev); + + /* + * the nvdimm device which is being removed should not be included + * in nfit/fit. + */ + if (nvdimm->is_removing) { + continue; + } /* build System Physical Address Range Structure. */ nvdimm_build_structure_spa(structures, dev); diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 2adc246..57e19e6 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -400,6 +400,9 @@ static void piix4_device_unplug_request_cb(HotplugHandler *hotplug_dev, if (s->acpi_memory_hotplug.is_enabled && object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { + PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dev); + + ddc->prepare_unplug(dev); acpi_memory_unplug_request_cb(hotplug_dev, &s->acpi_memory_hotplug, dev, errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) { diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index 81896c0..28f5251 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -145,6 +145,13 @@ static MemoryRegion *nvdimm_get_vmstate_memory_region(PCDIMMDevice *dimm) return host_memory_backend_get_memory(dimm->hostmem, &error_abort); } +static void nvdimm_prepare_unplug(DeviceState *dev) +{ + NVDIMMDevice *nvdimm = NVDIMM(dev); + + nvdimm->is_removing = true; +} + static void nvdimm_class_init(ObjectClass *oc, void *data) { DeviceClass *dc = DEVICE_CLASS(oc); @@ -157,6 +164,7 @@ static void nvdimm_class_init(ObjectClass *oc, void *data) ddc->realize = nvdimm_realize; ddc->get_memory_region = nvdimm_get_memory_region; ddc->get_vmstate_memory_region = nvdimm_get_vmstate_memory_region; + ddc->prepare_unplug = nvdimm_prepare_unplug; nvc->read_label_data = nvdimm_read_label_data; nvc->write_label_data = nvdimm_write_label_data; diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 249193a..4f40521 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -433,6 +433,10 @@ static MemoryRegion *pc_dimm_get_vmstate_memory_region(PCDIMMDevice *dimm) return host_memory_backend_get_memory(dimm->hostmem, &error_abort); } +static void pc_dimm_prepare_unplug(DeviceState *dev) +{ +} + static void pc_dimm_class_init(ObjectClass *oc, void *data) { DeviceClass *dc = DEVICE_CLASS(oc); @@ -444,6 +448,7 @@ static void pc_dimm_class_init(ObjectClass *oc, void *data) ddc->get_memory_region = pc_dimm_get_memory_region; ddc->get_vmstate_memory_region = pc_dimm_get_vmstate_memory_region; + ddc->prepare_unplug = pc_dimm_prepare_unplug; } static TypeInfo pc_dimm_info = { diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h index 63a2b20..e626199 100644 --- a/include/hw/mem/nvdimm.h +++ b/include/hw/mem/nvdimm.h @@ -71,6 +71,9 @@ struct NVDIMMDevice { * guest via ACPI NFIT and _FIT method if NVDIMM hotplug is supported. */ MemoryRegion nvdimm_mr; + + /* the device is being unplugged. */ + bool is_removing; }; typedef struct NVDIMMDevice NVDIMMDevice; diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index 1e483f2..34797ba 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -73,6 +73,7 @@ typedef struct PCDIMMDeviceClass { void (*realize)(PCDIMMDevice *dimm, Error **errp); MemoryRegion *(*get_memory_region)(PCDIMMDevice *dimm); MemoryRegion *(*get_vmstate_memory_region)(PCDIMMDevice *dimm); + void (*prepare_unplug)(DeviceState *dev); } PCDIMMDeviceClass; /**