From patchwork Fri Aug 14 14:52:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 7015621 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 2D688C05AC for ; Fri, 14 Aug 2015 14:58:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3CCB9203B0 for ; Fri, 14 Aug 2015 14:58:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E9B23207F9 for ; Fri, 14 Aug 2015 14:58:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755398AbbHNO62 (ORCPT ); Fri, 14 Aug 2015 10:58:28 -0400 Received: from mga01.intel.com ([192.55.52.88]:40400 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753428AbbHNO60 (ORCPT ); Fri, 14 Aug 2015 10:58:26 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP; 14 Aug 2015 07:58:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,678,1432623600"; d="scan'208";a="748633324" Received: from xiao.sh.intel.com ([10.239.159.86]) by orsmga001.jf.intel.com with ESMTP; 14 Aug 2015 07:58:24 -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 v2 08/18] nvdimm: init backend memory mapping and config data area Date: Fri, 14 Aug 2015 22:52:01 +0800 Message-Id: <1439563931-12352-9-git-send-email-guangrong.xiao@linux.intel.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1439563931-12352-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1439563931-12352-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.9 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 if @dataconfig is true: - 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/nvdimm/pc-nvdimm.c | 109 ++++++++++++++++++++++++++++++++++++++++++++- include/hw/mem/pc-nvdimm.h | 7 +++ 2 files changed, 115 insertions(+), 1 deletion(-) diff --git a/hw/mem/nvdimm/pc-nvdimm.c b/hw/mem/nvdimm/pc-nvdimm.c index 7a270a8..97710d1 100644 --- a/hw/mem/nvdimm/pc-nvdimm.c +++ b/hw/mem/nvdimm/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); } @@ -76,13 +109,87 @@ static void pc_nvdimm_init(Object *obj) set_configdata, 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, nvdimm_size, config_size = MIN_CONFIG_DATA_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; + } + + size = get_file_size(fd); + buf = mmap(NULL, 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; + } + + nvdimm->config_data_size = config_size; + if (nvdimm->configdata) { + /* reserve MIN_CONFIGDATA_AREA_SIZE for configue data. */ + nvdimm_size = size - config_size; + nvdimm->config_data_addr = buf + nvdimm_size; + } else { + nvdimm_size = size; + nvdimm->config_data_addr = NULL; + } + + if ((int64_t)nvdimm_size <= 0) { + error_setg(errp, "file size is too small to store NVDIMM" + " configure data"); + goto do_unmap; + } + + addr = reserved_range_push(nvdimm_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, nvdimm_size, + buf); + vmstate_register_ram(&nvdimm->mr, DEVICE(dev)); + memory_region_add_subregion(get_system_memory(), addr, &nvdimm->mr); + + 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 8601e9b..f617fd2 100644 --- a/include/hw/mem/pc-nvdimm.h +++ b/include/hw/mem/pc-nvdimm.h @@ -21,6 +21,13 @@ typedef struct PCNVDIMMDevice { char *file; bool configdata; + + int device_index; + + uint64_t config_data_size; + void *config_data_addr; + + MemoryRegion mr; } PCNVDIMMDevice; #define TYPE_PC_NVDIMM "pc-nvdimm"