From patchwork Wed Oct 28 22:26:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 7512531 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AAF9FBEEA4 for ; Wed, 28 Oct 2015 14:33:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 981AC20820 for ; Wed, 28 Oct 2015 14:33:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8245820822 for ; Wed, 28 Oct 2015 14:33:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966594AbbJ1OdA (ORCPT ); Wed, 28 Oct 2015 10:33:00 -0400 Received: from mga14.intel.com ([192.55.52.115]:7411 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966057AbbJ1Oc6 (ORCPT ); Wed, 28 Oct 2015 10:32:58 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP; 28 Oct 2015 07:32:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,210,1444719600"; d="scan'208";a="589668566" Received: from xiaoreal1.sh.intel.com (HELO xiaoreal1.sh.intel.com.sh.intel.com) ([10.239.48.79]) by FMSMGA003.fm.intel.com with ESMTP; 28 Oct 2015 07:32:56 -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 v5 31/33] nvdimm: allow using whole backend memory as pmem Date: Wed, 28 Oct 2015 22:26:29 +0000 Message-Id: <1446071191-62591-32-git-send-email-guangrong.xiao@linux.intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1446071191-62591-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1446071191-62591-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-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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. */