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 v5 31/33] nvdimm: allow using whole backend memory as pmem Date: Wed, 28 Oct 2015 22:26:29 +0000 [thread overview] Message-ID: <1446071191-62591-32-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1446071191-62591-1-git-send-email-guangrong.xiao@linux.intel.com> Introduce a parameter, named "reserve-label-data", if it is false which indicates that QEMU does not reserve any region on the backend memory to support label data. It is a 'label-less' NVDIMM device mode that linux will use whole memory on the device as a single namesapce This is useful for the users who want to pass whole nvdimm device and make its data completely be visible to guest The parameter is false on default Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- hw/acpi/nvdimm.c | 20 ++++++++++++++++++++ hw/mem/nvdimm.c | 37 ++++++++++++++++++++++++++++++++----- include/hw/mem/nvdimm.h | 6 ++++++ 3 files changed, 58 insertions(+), 5 deletions(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 5e72ca8..c5a50ea 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -545,6 +545,13 @@ static void nvdimm_dsm_func_get_label_data(NVDIMMDevice *nvdimm, nvdimm_debug("Read Label Data: offset %#x length %#x.\n", get_label_data->offset, get_label_data->length); + if (!nvdimm->reserve_label_data) { + nvdimm_debug("read label request on the device without " + "label data reserved.\n"); + status = NVDIMM_DSM_STATUS_NOT_SUPPORTED; + goto exit; + } + if (nvdimm->label_size < get_label_data->offset + get_label_data->length) { nvdimm_debug("position %#x is beyond label data (len = %#lx).\n", get_label_data->offset + get_label_data->length, @@ -588,6 +595,13 @@ static void nvdimm_dsm_func_set_label_data(NVDIMMDevice *nvdimm, nvdimm_debug("Write Label Data: offset %#x length %#x.\n", set_label_data->offset, set_label_data->length); + if (!nvdimm->reserve_label_data) { + nvdimm_debug("write label request on the device without " + "label data reserved.\n"); + status = NVDIMM_DSM_STATUS_NOT_SUPPORTED; + goto exit; + } + if (nvdimm->label_size < set_label_data->offset + set_label_data->length) { nvdimm_debug("position %#x is beyond label data (len = %#lx).\n", set_label_data->offset + set_label_data->length, @@ -632,6 +646,12 @@ static void nvdimm_dsm_device(nvdimm_dsm_in *in, GArray *out) 1 << 4 /* Get Namespace Label Size */ | 1 << 5 /* Get Namespace Label Data */ | 1 << 6 /* Set Namespace Label Data */); + + /* no function support if the device does not have label data. */ + if (!nvdimm->reserve_label_data) { + cmd_list = cpu_to_le64(0); + } + build_append_int_noprefix(out, cmd_list, sizeof(cmd_list)); goto free; case 0x4 /* Get Namespace Label Size */: diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index 825d664..27dbfbd 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -36,14 +36,15 @@ static void nvdimm_realize(DIMMDevice *dimm, Error **errp) { MemoryRegion *mr; NVDIMMDevice *nvdimm = NVDIMM(dimm); - uint64_t size; + uint64_t reserved_label_size, size; nvdimm->label_size = MIN_NAMESPACE_LABEL_SIZE; + reserved_label_size = nvdimm->reserve_label_data ? nvdimm->label_size : 0; mr = host_memory_backend_get_memory(dimm->hostmem, errp); size = memory_region_size(mr); - if (size <= nvdimm->label_size) { + if (size <= reserved_label_size) { char *path = object_get_canonical_path_component(OBJECT(dimm->hostmem)); error_setg(errp, "the size of memdev %s (0x%" PRIx64 ") is too small" " to contain nvdimm namespace label (0x%" PRIx64 ")", path, @@ -52,9 +53,12 @@ static void nvdimm_realize(DIMMDevice *dimm, Error **errp) } memory_region_init_alias(&nvdimm->nvdimm_mr, OBJECT(dimm), "nvdimm-memory", - mr, 0, size - nvdimm->label_size); - nvdimm->label_data = memory_region_get_ram_ptr(mr) + - memory_region_size(&nvdimm->nvdimm_mr); + mr, 0, size - reserved_label_size); + + if (reserved_label_size) { + nvdimm->label_data = memory_region_get_ram_ptr(mr) + + memory_region_size(&nvdimm->nvdimm_mr); + } } static void nvdimm_read_label_data(NVDIMMDevice *nvdimm, void *buf, @@ -97,10 +101,33 @@ static void nvdimm_class_init(ObjectClass *oc, void *data) nvc->write_label_data = nvdimm_write_label_data; } +static bool nvdimm_get_reserve_label_data(Object *obj, Error **errp) +{ + NVDIMMDevice *nvdimm = NVDIMM(obj); + + return nvdimm->reserve_label_data; +} + +static void +nvdimm_set_reserve_label_data(Object *obj, bool value, Error **errp) +{ + NVDIMMDevice *nvdimm = NVDIMM(obj); + + nvdimm->reserve_label_data = value; +} + +static void nvdimm_init(Object *obj) +{ + object_property_add_bool(obj, "reserve-label-data", + nvdimm_get_reserve_label_data, + nvdimm_set_reserve_label_data, NULL); +} + static TypeInfo nvdimm_info = { .name = TYPE_NVDIMM, .parent = TYPE_DIMM, .instance_size = sizeof(NVDIMMDevice), + .instance_init = nvdimm_init, .class_init = nvdimm_class_init, .class_size = sizeof(NVDIMMClass), }; diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h index 7fdf591..b6ac266 100644 --- a/include/hw/mem/nvdimm.h +++ b/include/hw/mem/nvdimm.h @@ -63,6 +63,12 @@ struct NVDIMMDevice { /* public */ /* + * if we need to reserve memory region for NVDIMM label data at + * the end of backend memory? + */ + bool reserve_label_data; + + /* * the size of label data in NVDIMM device which is presented to * guest via __DSM "Get Namespace Label Size" command. */ -- 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 v5 31/33] nvdimm: allow using whole backend memory as pmem Date: Wed, 28 Oct 2015 22:26:29 +0000 [thread overview] Message-ID: <1446071191-62591-32-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1446071191-62591-1-git-send-email-guangrong.xiao@linux.intel.com> Introduce a parameter, named "reserve-label-data", if it is false which indicates that QEMU does not reserve any region on the backend memory to support label data. It is a 'label-less' NVDIMM device mode that linux will use whole memory on the device as a single namesapce This is useful for the users who want to pass whole nvdimm device and make its data completely be visible to guest The parameter is false on default Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- hw/acpi/nvdimm.c | 20 ++++++++++++++++++++ hw/mem/nvdimm.c | 37 ++++++++++++++++++++++++++++++++----- include/hw/mem/nvdimm.h | 6 ++++++ 3 files changed, 58 insertions(+), 5 deletions(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 5e72ca8..c5a50ea 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -545,6 +545,13 @@ static void nvdimm_dsm_func_get_label_data(NVDIMMDevice *nvdimm, nvdimm_debug("Read Label Data: offset %#x length %#x.\n", get_label_data->offset, get_label_data->length); + if (!nvdimm->reserve_label_data) { + nvdimm_debug("read label request on the device without " + "label data reserved.\n"); + status = NVDIMM_DSM_STATUS_NOT_SUPPORTED; + goto exit; + } + if (nvdimm->label_size < get_label_data->offset + get_label_data->length) { nvdimm_debug("position %#x is beyond label data (len = %#lx).\n", get_label_data->offset + get_label_data->length, @@ -588,6 +595,13 @@ static void nvdimm_dsm_func_set_label_data(NVDIMMDevice *nvdimm, nvdimm_debug("Write Label Data: offset %#x length %#x.\n", set_label_data->offset, set_label_data->length); + if (!nvdimm->reserve_label_data) { + nvdimm_debug("write label request on the device without " + "label data reserved.\n"); + status = NVDIMM_DSM_STATUS_NOT_SUPPORTED; + goto exit; + } + if (nvdimm->label_size < set_label_data->offset + set_label_data->length) { nvdimm_debug("position %#x is beyond label data (len = %#lx).\n", set_label_data->offset + set_label_data->length, @@ -632,6 +646,12 @@ static void nvdimm_dsm_device(nvdimm_dsm_in *in, GArray *out) 1 << 4 /* Get Namespace Label Size */ | 1 << 5 /* Get Namespace Label Data */ | 1 << 6 /* Set Namespace Label Data */); + + /* no function support if the device does not have label data. */ + if (!nvdimm->reserve_label_data) { + cmd_list = cpu_to_le64(0); + } + build_append_int_noprefix(out, cmd_list, sizeof(cmd_list)); goto free; case 0x4 /* Get Namespace Label Size */: diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index 825d664..27dbfbd 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -36,14 +36,15 @@ static void nvdimm_realize(DIMMDevice *dimm, Error **errp) { MemoryRegion *mr; NVDIMMDevice *nvdimm = NVDIMM(dimm); - uint64_t size; + uint64_t reserved_label_size, size; nvdimm->label_size = MIN_NAMESPACE_LABEL_SIZE; + reserved_label_size = nvdimm->reserve_label_data ? nvdimm->label_size : 0; mr = host_memory_backend_get_memory(dimm->hostmem, errp); size = memory_region_size(mr); - if (size <= nvdimm->label_size) { + if (size <= reserved_label_size) { char *path = object_get_canonical_path_component(OBJECT(dimm->hostmem)); error_setg(errp, "the size of memdev %s (0x%" PRIx64 ") is too small" " to contain nvdimm namespace label (0x%" PRIx64 ")", path, @@ -52,9 +53,12 @@ static void nvdimm_realize(DIMMDevice *dimm, Error **errp) } memory_region_init_alias(&nvdimm->nvdimm_mr, OBJECT(dimm), "nvdimm-memory", - mr, 0, size - nvdimm->label_size); - nvdimm->label_data = memory_region_get_ram_ptr(mr) + - memory_region_size(&nvdimm->nvdimm_mr); + mr, 0, size - reserved_label_size); + + if (reserved_label_size) { + nvdimm->label_data = memory_region_get_ram_ptr(mr) + + memory_region_size(&nvdimm->nvdimm_mr); + } } static void nvdimm_read_label_data(NVDIMMDevice *nvdimm, void *buf, @@ -97,10 +101,33 @@ static void nvdimm_class_init(ObjectClass *oc, void *data) nvc->write_label_data = nvdimm_write_label_data; } +static bool nvdimm_get_reserve_label_data(Object *obj, Error **errp) +{ + NVDIMMDevice *nvdimm = NVDIMM(obj); + + return nvdimm->reserve_label_data; +} + +static void +nvdimm_set_reserve_label_data(Object *obj, bool value, Error **errp) +{ + NVDIMMDevice *nvdimm = NVDIMM(obj); + + nvdimm->reserve_label_data = value; +} + +static void nvdimm_init(Object *obj) +{ + object_property_add_bool(obj, "reserve-label-data", + nvdimm_get_reserve_label_data, + nvdimm_set_reserve_label_data, NULL); +} + static TypeInfo nvdimm_info = { .name = TYPE_NVDIMM, .parent = TYPE_DIMM, .instance_size = sizeof(NVDIMMDevice), + .instance_init = nvdimm_init, .class_init = nvdimm_class_init, .class_size = sizeof(NVDIMMClass), }; diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h index 7fdf591..b6ac266 100644 --- a/include/hw/mem/nvdimm.h +++ b/include/hw/mem/nvdimm.h @@ -63,6 +63,12 @@ struct NVDIMMDevice { /* public */ /* + * if we need to reserve memory region for NVDIMM label data at + * the end of backend memory? + */ + bool reserve_label_data; + + /* * the size of label data in NVDIMM device which is presented to * guest via __DSM "Get Namespace Label Size" command. */ -- 1.8.3.1
next prev parent reply other threads:[~2015-10-28 14:32 UTC|newest] Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-10-28 22:25 [PATCH v5 00/33] implement vNVDIMM Xiao Guangrong 2015-10-28 22:25 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:25 ` [PATCH v5 01/33] acpi: add aml_derefof Xiao Guangrong 2015-10-28 22:25 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 02/33] acpi: add aml_sizeof Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 03/33] acpi: add aml_create_field Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 04/33] acpi: add aml_concatenate Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 05/33] acpi: add aml_object_type Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 06/33] acpi: add aml_method_serialized Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 07/33] util: introduce qemu_file_get_page_size() Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 08/33] exec: allow memory to be allocated from any kind of path Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 09/33] exec: allow file_ram_alloc to work on file Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 10/33] hostmem-file: clean up memory allocation Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 11/33] hostmem-file: use whole file size if possible Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 12/33] pc-dimm: remove DEFAULT_PC_DIMMSIZE Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 13/33] pc-dimm: make pc_existing_dimms_capacity static and rename it Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 14/33] pc-dimm: drop the prefix of pc-dimm Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 15/33] stubs: rename qmp_pc_dimm_device_list.c Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 16/33] pc-dimm: rename pc-dimm.c and pc-dimm.h Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 17/33] dimm: abstract dimm device from pc-dimm Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 18/33] dimm: get mapped memory region from DIMMDeviceClass->get_memory_region Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 19/33] dimm: keep the state of the whole backend memory Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 20/33] dimm: introduce realize callback Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 21/33] nvdimm: implement NVDIMM device abstract Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 22/33] docs: add NVDIMM ACPI documentation Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 23/33] nvdimm acpi: init the resource used by NVDIMM ACPI Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 24/33] nvdimm acpi: build ACPI NFIT table Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 25/33] nvdimm acpi: build ACPI nvdimm devices Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 26/33] nvdimm acpi: save arg3 for NVDIMM device _DSM method Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 27/33] nvdimm acpi: support function 0 Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 16:37 ` Stefan Hajnoczi 2015-10-28 16:37 ` [Qemu-devel] " Stefan Hajnoczi 2015-10-28 22:26 ` [PATCH v5 28/33] nvdimm acpi: support Get Namespace Label Size function Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 16:41 ` Stefan Hajnoczi 2015-10-28 16:41 ` [Qemu-devel] " Stefan Hajnoczi 2015-10-29 2:16 ` Xiao Guangrong 2015-10-29 2:16 ` [Qemu-devel] " Xiao Guangrong 2015-10-29 14:14 ` Stefan Hajnoczi 2015-10-29 14:14 ` Stefan Hajnoczi 2015-10-28 22:26 ` [PATCH v5 29/33] nvdimm acpi: support Get Namespace Label Data function Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 16:46 ` Stefan Hajnoczi 2015-10-28 16:46 ` [Qemu-devel] " Stefan Hajnoczi 2015-10-29 2:25 ` Xiao Guangrong 2015-10-29 2:25 ` [Qemu-devel] " Xiao Guangrong 2015-10-29 2:58 ` Xiao Guangrong 2015-10-29 2:58 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 30/33] nvdimm acpi: support Set " Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 16:48 ` Stefan Hajnoczi 2015-10-28 16:48 ` [Qemu-devel] " Stefan Hajnoczi 2015-10-29 2:26 ` Xiao Guangrong 2015-10-29 2:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` Xiao Guangrong [this message] 2015-10-28 22:26 ` [Qemu-devel] [PATCH v5 31/33] nvdimm: allow using whole backend memory as pmem Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 32/33] nvdimm acpi: support _FIT method Xiao Guangrong 2015-10-28 22:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-28 22:26 ` [PATCH v5 33/33] nvdimm: add maintain info Xiao Guangrong 2015-10-28 22:26 ` [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=1446071191-62591-32-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.