From: Xiao Guangrong <guangrong.xiao@linux.intel.com> 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 <guangrong.xiao@linux.intel.com> Subject: [PATCH 03/15] pc-dimm: keep the state of the whole backend memory Date: Thu, 17 Mar 2016 16:32:49 +0800 [thread overview] Message-ID: <1458203581-59143-4-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1458203581-59143-1-git-send-email-guangrong.xiao@linux.intel.com> QEMU keeps the state of memory of dimm device during live migration, however, it is not enough for nvdimm device as its memory does not contain its label data, so that we should protect the whole backend memory instead Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- hw/mem/pc-dimm.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 47ae823..1b33e6e 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -104,9 +104,16 @@ void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplugState *hpms, } memory_region_add_subregion(&hpms->mr, addr - hpms->base, mr); - vmstate_register_ram(mr, dev); numa_set_mem_node_id(addr, memory_region_size(mr), dimm->node); + /* + * save the state only for @mr is not enough as it does not contain + * the label data of NVDIMM device, so that we keep the state of + * whole hostmem instead. + */ + vmstate_register_ram(host_memory_backend_get_memory(dimm->hostmem, errp), + dev); + out: error_propagate(errp, local_err); } @@ -115,10 +122,12 @@ void pc_dimm_memory_unplug(DeviceState *dev, MemoryHotplugState *hpms, MemoryRegion *mr) { PCDIMMDevice *dimm = PC_DIMM(dev); + MemoryRegion *hostmem; + hostmem = host_memory_backend_get_memory(dimm->hostmem, &error_abort); numa_unset_mem_node_id(dimm->addr, memory_region_size(mr), dimm->node); memory_region_del_subregion(&hpms->mr, mr); - vmstate_unregister_ram(mr, dev); + vmstate_unregister_ram(hostmem, dev); } static int pc_existing_dimms_capacity_internal(Object *obj, void *opaque) -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Xiao Guangrong <guangrong.xiao@linux.intel.com> To: pbonzini@redhat.com, imammedo@redhat.com Cc: Xiao Guangrong <guangrong.xiao@linux.intel.com>, ehabkost@redhat.com, kvm@vger.kernel.org, mst@redhat.com, gleb@kernel.org, mtosatti@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, dan.j.williams@intel.com, rth@twiddle.net Subject: [Qemu-devel] [PATCH 03/15] pc-dimm: keep the state of the whole backend memory Date: Thu, 17 Mar 2016 16:32:49 +0800 [thread overview] Message-ID: <1458203581-59143-4-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1458203581-59143-1-git-send-email-guangrong.xiao@linux.intel.com> QEMU keeps the state of memory of dimm device during live migration, however, it is not enough for nvdimm device as its memory does not contain its label data, so that we should protect the whole backend memory instead Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- hw/mem/pc-dimm.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 47ae823..1b33e6e 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -104,9 +104,16 @@ void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplugState *hpms, } memory_region_add_subregion(&hpms->mr, addr - hpms->base, mr); - vmstate_register_ram(mr, dev); numa_set_mem_node_id(addr, memory_region_size(mr), dimm->node); + /* + * save the state only for @mr is not enough as it does not contain + * the label data of NVDIMM device, so that we keep the state of + * whole hostmem instead. + */ + vmstate_register_ram(host_memory_backend_get_memory(dimm->hostmem, errp), + dev); + out: error_propagate(errp, local_err); } @@ -115,10 +122,12 @@ void pc_dimm_memory_unplug(DeviceState *dev, MemoryHotplugState *hpms, MemoryRegion *mr) { PCDIMMDevice *dimm = PC_DIMM(dev); + MemoryRegion *hostmem; + hostmem = host_memory_backend_get_memory(dimm->hostmem, &error_abort); numa_unset_mem_node_id(dimm->addr, memory_region_size(mr), dimm->node); memory_region_del_subregion(&hpms->mr, mr); - vmstate_unregister_ram(mr, dev); + vmstate_unregister_ram(hostmem, dev); } static int pc_existing_dimms_capacity_internal(Object *obj, void *opaque) -- 1.8.3.1
next prev parent reply other threads:[~2016-03-17 8:32 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-03-17 8:32 [PATCH 00/15] NVDIMM: introduce nvdimm label support Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 01/15] pc-dimm: get memory region from ->get_memory_region() Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 02/15] pc-dimm: introduce realize callback Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` Xiao Guangrong [this message] 2016-03-17 8:32 ` [Qemu-devel] [PATCH 03/15] pc-dimm: keep the state of the whole backend memory Xiao Guangrong 2016-03-17 8:32 ` [PATCH 04/15] nvdimm: support nvdimm label Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 10:28 ` Stefan Hajnoczi 2016-03-17 10:28 ` [Qemu-devel] " Stefan Hajnoczi 2016-03-23 3:40 ` Xiao Guangrong 2016-03-23 3:40 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 05/15] acpi: add aml_object_type Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 06/15] acpi: add aml_call5 Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 07/15] nvdimm acpi: set HDLE properly Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 08/15] nvdimm acpi: save arg3 of _DSM method Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 09/15] nvdimm acpi: check UUID Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 10/15] nvdimm acpi: abstract the operations for root device and nvdimm devices Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 10:35 ` Stefan Hajnoczi 2016-03-17 10:35 ` [Qemu-devel] " Stefan Hajnoczi 2016-03-23 3:43 ` Xiao Guangrong 2016-03-23 3:43 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 11/15] nvdimm acpi: check revision Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 12/15] nvdimm acpi: support Get Namespace Label Size function Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 10:58 ` Stefan Hajnoczi 2016-03-17 10:58 ` [Qemu-devel] " Stefan Hajnoczi 2016-03-23 3:46 ` Xiao Guangrong 2016-03-23 3:46 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:32 ` [PATCH 13/15] nvdimm acpi: support Get Namespace Label Data function Xiao Guangrong 2016-03-17 8:32 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:33 ` [PATCH 14/15] nvdimm acpi: support Set " Xiao Guangrong 2016-03-17 8:33 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 8:33 ` [PATCH 15/15] docs: add NVDIMM ACPI documentation Xiao Guangrong 2016-03-17 8:33 ` [Qemu-devel] " Xiao Guangrong 2016-03-17 10:04 ` [PATCH 00/15] NVDIMM: introduce nvdimm label support Stefan Hajnoczi 2016-03-17 10:04 ` [Qemu-devel] " Stefan Hajnoczi 2016-03-22 15:37 ` Dan Williams 2016-03-22 15:37 ` [Qemu-devel] " Dan Williams 2016-03-22 20:30 ` Stefan Hajnoczi 2016-03-22 20:30 ` [Qemu-devel] " Stefan Hajnoczi 2016-03-23 2:46 ` Xiao Guangrong 2016-03-23 2:46 ` [Qemu-devel] " Xiao Guangrong 2016-03-23 16:48 ` Stefan Hajnoczi 2016-03-23 16:48 ` [Qemu-devel] " Stefan Hajnoczi 2016-03-22 11:17 ` Michael S. Tsirkin 2016-03-22 11:17 ` [Qemu-devel] " Michael S. Tsirkin 2016-03-23 3:47 ` Xiao Guangrong 2016-03-23 3:47 ` [Qemu-devel] " Xiao Guangrong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1458203581-59143-4-git-send-email-guangrong.xiao@linux.intel.com \ --to=guangrong.xiao@linux.intel.com \ --cc=dan.j.williams@intel.com \ --cc=ehabkost@redhat.com \ --cc=gleb@kernel.org \ --cc=imammedo@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=mst@redhat.com \ --cc=mtosatti@redhat.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=rth@twiddle.net \ --cc=stefanha@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.