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, kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong <guangrong.xiao@linux.intel.com> Subject: [PATCH 08/16] nvdimm: init backend memory mapping and config data area Date: Wed, 1 Jul 2015 22:50:24 +0800 [thread overview] Message-ID: <1435762232-15543-9-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1435762232-15543-1-git-send-email-guangrong.xiao@linux.intel.com> 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 <guangrong.xiao@linux.intel.com> --- 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 <http://www.gnu.org/licenses/> */ +#include <sys/mman.h> +#include <sys/ioctl.h> +#include <linux/fs.h> + +#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" -- 2.1.0
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, rth@twiddle.net Subject: [Qemu-devel] [PATCH 08/16] nvdimm: init backend memory mapping and config data area Date: Wed, 1 Jul 2015 22:50:24 +0800 [thread overview] Message-ID: <1435762232-15543-9-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1435762232-15543-1-git-send-email-guangrong.xiao@linux.intel.com> 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 <guangrong.xiao@linux.intel.com> --- 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 <http://www.gnu.org/licenses/> */ +#include <sys/mman.h> +#include <sys/ioctl.h> +#include <linux/fs.h> + +#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" -- 2.1.0
next prev parent reply other threads:[~2015-07-01 14:55 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-07-01 14:50 [PATCH 00/16] implement vNVDIMM Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 01/16] acpi: allow aml_operation_region() working on 64 bit offset Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 02/16] i386/acpi-build: allow SSDT to operate on 64 bit Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 03/16] acpi: add aml_derefof Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 04/16] acpi: add aml_sizeof Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 05/16] acpi: add aml_create_field Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 06/16] pc: implement NVDIMM device abstract Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 07/16] nvdimm: reserve address range for NVDIMM Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` Xiao Guangrong [this message] 2015-07-01 14:50 ` [Qemu-devel] [PATCH 08/16] nvdimm: init backend memory mapping and config data area Xiao Guangrong 2015-07-01 14:50 ` [PATCH 09/16] nvdimm: build ACPI NFIT table Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 10/16] nvdimm: init the address region used by _DSM method Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 11/16] nvdimm: build ACPI nvdimm devices Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 12/16] nvdimm: save arg3 for NVDIMM device _DSM method Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 13/16] nvdimm: support NFIT_CMD_IMPLEMENTED function Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 14/16] nvdimm: support NFIT_CMD_GET_CONFIG_SIZE function Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-02 9:23 ` Stefan Hajnoczi 2015-07-02 9:23 ` [Qemu-devel] " Stefan Hajnoczi 2015-07-02 18:02 ` Xiao Guangrong 2015-07-02 18:02 ` Xiao Guangrong 2015-07-01 14:50 ` [PATCH 15/16] nvdimm: support NFIT_CMD_GET_CONFIG_DATA Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-01 14:50 ` [PATCH 16/16] nvdimm: support NFIT_CMD_SET_CONFIG_DATA Xiao Guangrong 2015-07-01 14:50 ` [Qemu-devel] " Xiao Guangrong 2015-07-02 6:17 ` [PATCH 00/16] implement vNVDIMM Michael S. Tsirkin 2015-07-02 6:17 ` [Qemu-devel] " Michael S. Tsirkin 2015-07-02 6:34 ` Xiao Guangrong 2015-07-02 6:34 ` [Qemu-devel] " Xiao Guangrong 2015-07-02 8:31 ` Stefan Hajnoczi 2015-07-02 8:31 ` Stefan Hajnoczi 2015-07-02 8:35 ` Michael S. Tsirkin 2015-07-02 8:35 ` Michael S. Tsirkin 2015-07-02 9:20 ` Stefan Hajnoczi 2015-07-02 9:20 ` Stefan Hajnoczi 2015-07-02 9:52 ` Paolo Bonzini 2015-07-02 9:52 ` Paolo Bonzini 2015-07-02 18:01 ` Xiao Guangrong 2015-07-02 18:01 ` [Qemu-devel] " Xiao Guangrong 2015-07-02 18:11 ` Paolo Bonzini 2015-07-02 18:11 ` Paolo Bonzini 2015-07-29 8:41 ` 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=1435762232-15543-9-git-send-email-guangrong.xiao@linux.intel.com \ --to=guangrong.xiao@linux.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.