From patchwork Wed Jul 1 14:50:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 6703991 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 66BE4C05AC for ; Wed, 1 Jul 2015 14:55:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7D56620651 for ; Wed, 1 Jul 2015 14:55:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6AD2820648 for ; Wed, 1 Jul 2015 14:55:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754088AbbGAOzn (ORCPT ); Wed, 1 Jul 2015 10:55:43 -0400 Received: from mga03.intel.com ([134.134.136.65]:61257 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754346AbbGAOzi (ORCPT ); Wed, 1 Jul 2015 10:55:38 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 01 Jul 2015 07:55:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,386,1432623600"; d="scan'208";a="517239353" Received: from xiao.sh.intel.com ([10.239.159.86]) by FMSMGA003.fm.intel.com with ESMTP; 01 Jul 2015 07:55:35 -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, kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong Subject: [PATCH 08/16] nvdimm: init backend memory mapping and config data area Date: Wed, 1 Jul 2015 22:50:24 +0800 Message-Id: <1435762232-15543-9-git-send-email-guangrong.xiao@linux.intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1435762232-15543-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1435762232-15543-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=-7.5 required=5.0 tests=BAYES_00, 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 The parameter @file is used as backed memory for NVDIMM which is divided into two parts: - first parts is (0, size - 128K], which is used as PMEM (Persistent Memory) - 128K at the end of the file, which is used as Config Data Area, it's used to store Label namespace data The @file supports both regular file and block device, of course we can assign any these two kinds of files for test and emulation, however, in the real word for performance reason, we usually used these files as NVDIMM backed file: - the regular file in the filesystem with DAX enabled created on NVDIMM device on host - the raw PMEM device on host, e,g /dev/pmem0 Signed-off-by: Xiao Guangrong --- hw/mem/pc-nvdimm.c | 102 ++++++++++++++++++++++++++++++++++++++++++++- include/hw/mem/pc-nvdimm.h | 5 +++ 2 files changed, 106 insertions(+), 1 deletion(-) diff --git a/hw/mem/pc-nvdimm.c b/hw/mem/pc-nvdimm.c index b40d4e7..9531935 100644 --- a/hw/mem/pc-nvdimm.c +++ b/hw/mem/pc-nvdimm.c @@ -22,12 +22,20 @@ * License along with this library; if not, see */ +#include +#include +#include + +#include "exec/address-spaces.h" #include "hw/mem/pc-nvdimm.h" -#define PAGE_SIZE (1UL << 12) +#define PAGE_SIZE (1UL << 12) + +#define MIN_CONFIG_DATA_SIZE (128 << 10) static struct nvdimms_info { ram_addr_t current_addr; + int device_index; } nvdimms_info; /* the address range [offset, ~0ULL) is reserved for NVDIMM. */ @@ -37,6 +45,26 @@ void pc_nvdimm_reserve_range(ram_addr_t offset) nvdimms_info.current_addr = offset; } +static ram_addr_t reserved_range_push(uint64_t size) +{ + uint64_t current; + + current = ROUND_UP(nvdimms_info.current_addr, PAGE_SIZE); + + /* do not have enough space? */ + if (current + size < current) { + return 0; + } + + nvdimms_info.current_addr = current + size; + return current; +} + +static uint32_t new_device_index(void) +{ + return nvdimms_info.device_index++; +} + static char *get_file(Object *obj, Error **errp) { PCNVDIMMDevice *nvdimm = PC_NVDIMM(obj); @@ -48,6 +76,11 @@ static void set_file(Object *obj, const char *str, Error **errp) { PCNVDIMMDevice *nvdimm = PC_NVDIMM(obj); + if (memory_region_size(&nvdimm->mr)) { + error_setg(errp, "cannot change property value"); + return; + } + if (nvdimm->file) { g_free(nvdimm->file); } @@ -60,13 +93,80 @@ static void pc_nvdimm_init(Object *obj) object_property_add_str(obj, "file", get_file, set_file, NULL); } +static uint64_t get_file_size(int fd) +{ + struct stat stat_buf; + uint64_t size; + + if (fstat(fd, &stat_buf) < 0) { + return 0; + } + + if (S_ISREG(stat_buf.st_mode)) { + return stat_buf.st_size; + } + + if (S_ISBLK(stat_buf.st_mode) && !ioctl(fd, BLKGETSIZE64, &size)) { + return size; + } + + return 0; +} + static void pc_nvdimm_realize(DeviceState *dev, Error **errp) { PCNVDIMMDevice *nvdimm = PC_NVDIMM(dev); + char name[512]; + void *buf; + ram_addr_t addr; + uint64_t size; + int fd; if (!nvdimm->file) { error_setg(errp, "file property is not set"); } + + fd = open(nvdimm->file, O_RDWR); + if (fd < 0) { + error_setg(errp, "can not open %s", nvdimm->file); + return; + } + + /* reserve MIN_CONFIGDATA_AREA_SIZE for configue data */ + size = get_file_size(fd) - MIN_CONFIG_DATA_SIZE; + if ((int64_t)size <= 0) { + error_setg(errp, "file size is too small to store NVDIMM" + " configure data"); + goto do_close; + } + + buf = mmap(NULL, size + MIN_CONFIG_DATA_SIZE, PROT_READ | PROT_WRITE, + MAP_SHARED, fd, 0); + if (buf == MAP_FAILED) { + error_setg(errp, "can not do mmap on %s", nvdimm->file); + goto do_close; + } + + addr = reserved_range_push(size); + if (!addr) { + error_setg(errp, "do not have enough space for size %#lx.\n", size); + goto do_unmap; + } + + nvdimm->device_index = new_device_index(); + sprintf(name, "NVDIMM-%d", nvdimm->device_index); + memory_region_init_ram_ptr(&nvdimm->mr, OBJECT(dev), name, size, buf); + vmstate_register_ram(&nvdimm->mr, DEVICE(dev)); + memory_region_add_subregion(get_system_memory(), addr, &nvdimm->mr); + + nvdimm->config_data_addr = buf + size; + nvdimm->config_data_size = MIN_CONFIG_DATA_SIZE; + + return; +do_unmap: + munmap(buf, size); +do_close: + close(fd); } static void pc_nvdimm_class_init(ObjectClass *oc, void *data) diff --git a/include/hw/mem/pc-nvdimm.h b/include/hw/mem/pc-nvdimm.h index 2081e7c..e743ed1 100644 --- a/include/hw/mem/pc-nvdimm.h +++ b/include/hw/mem/pc-nvdimm.h @@ -21,6 +21,11 @@ typedef struct PCNVDIMMDevice { DeviceState parent_obj; char *file; + void *config_data_addr; + uint64_t config_data_size; + + int device_index; + MemoryRegion mr; } PCNVDIMMDevice; #define TYPE_PC_NVDIMM "pc-nvdimm"