From patchwork Mon Jan 13 14:25:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonios Motakis X-Patchwork-Id: 309878 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BE2632C0090 for ; Tue, 14 Jan 2014 01:26:34 +1100 (EST) Received: from localhost ([::1]:42838 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2iTI-00089e-5t for incoming@patchwork.ozlabs.org; Mon, 13 Jan 2014 09:26:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2iSi-00087k-QC for qemu-devel@nongnu.org; Mon, 13 Jan 2014 09:26:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W2iSc-0001Df-Ob for qemu-devel@nongnu.org; Mon, 13 Jan 2014 09:25:56 -0500 Received: from mail-wg0-f41.google.com ([74.125.82.41]:53137) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2iSc-0001DU-Fg for qemu-devel@nongnu.org; Mon, 13 Jan 2014 09:25:50 -0500 Received: by mail-wg0-f41.google.com with SMTP id n12so2797673wgh.0 for ; Mon, 13 Jan 2014 06:25:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IrEbVusAW+VRziXDIeJqvC5Krv5p5cJP/G+bDkqCpt8=; b=CbXUC+8qNxT+bNsjZq76fUdhTuX/mo0/CoT5ekb6bq8AsqrwUlLPKcnW9iB+Q1dH6z 0Yvf6dB+zaL2hE7/QpOXN9DsGkmKrygesah4jhxDaM8f19q3JEDY30V5EkFftvZ24OuF Bo3+nL6eh+/jIxBUTiTappQKdHaDFieE+IxORutQJ8/YBgBwHk/Qy1LjHutTjsT2scb/ yvqsO7sLq3cK9io7WGUDadMUFfd9Paf+ar2q8EHQ0V9oBVLM0tsvlZBYFmrKMtQoR3SQ 3JdLRey1DjSoK5XM2fS8qP3XFkPOpGyks59QBECg3X2kIyL+4v45vFujGGqPASQ/F7d5 bwow== X-Gm-Message-State: ALoCoQnb7TzO4yIXmeRJT5IKRXi0CBw8fBWgoLmQ/C/IsqaUYt9NzpqQdgPAx755ZOneUDXLXvW2 X-Received: by 10.180.205.130 with SMTP id lg2mr2294143wic.9.1389623149757; Mon, 13 Jan 2014 06:25:49 -0800 (PST) Received: from localhost.localdomain (home.tvelocity.eu. [82.67.68.96]) by mx.google.com with ESMTPSA id k10sm11616662wjf.11.2014.01.13.06.25.47 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 13 Jan 2014 06:25:48 -0800 (PST) From: Antonios Motakis To: qemu-devel@nongnu.org, snabb-devel@googlegroups.com Date: Mon, 13 Jan 2014 15:25:12 +0100 Message-Id: <1389623119-15863-2-git-send-email-a.motakis@virtualopensystems.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1389623119-15863-1-git-send-email-a.motakis@virtualopensystems.com> References: <1389623119-15863-1-git-send-email-a.motakis@virtualopensystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.41 Cc: Peter Maydell , Stefan Hajnoczi , Jan Kiszka , Michael Tokarev , Alexander Graf , n.nikolaev@virtualopensystems.com, Markus Armbruster , Anthony Liguori , Paolo Bonzini , lukego@gmail.com, Antonios Motakis , tech@virtualopensystems.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Richard Henderson Subject: [Qemu-devel] [PATCH v6 1/8] Convert -mem-path to QemuOpts and add prealloc and share properties X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Extend -mem-path with additional properties: - prealloc=on|off - default off, same as -mem-prealloc - share=on|off - default off, memory is mmapped with MAP_SHARED flag Signed-off-by: Antonios Motakis Signed-off-by: Nikolay Nikolaev --- exec.c | 41 +++++++++++++++++++++++++++++++++++------ include/exec/cpu-all.h | 3 --- qemu-options.hx | 9 +++++++-- vl.c | 37 ++++++++++++++++++++++++++++++++----- 4 files changed, 74 insertions(+), 16 deletions(-) diff --git a/exec.c b/exec.c index 7e49e8e..1c40a0d 100644 --- a/exec.c +++ b/exec.c @@ -957,6 +957,7 @@ void qemu_mutex_unlock_ramlist(void) #include #define HUGETLBFS_MAGIC 0x958458f6 +#define MIN_HUGE_PAGE_SIZE (2*1024*1024) static long gethugepagesize(const char *path) { @@ -972,8 +973,9 @@ static long gethugepagesize(const char *path) return 0; } - if (fs.f_type != HUGETLBFS_MAGIC) - fprintf(stderr, "Warning: path not on HugeTLBFS: %s\n", path); + if (fs.f_type != HUGETLBFS_MAGIC) { + return 0; + } return fs.f_bsize; } @@ -994,11 +996,14 @@ static void *file_ram_alloc(RAMBlock *block, char *c; void *area; int fd; + int flags; unsigned long hpagesize; + QemuOpts *opts; + unsigned int mem_prealloc = 0, mem_share = 0; hpagesize = gethugepagesize(path); if (!hpagesize) { - return NULL; + hpagesize = MIN_HUGE_PAGE_SIZE; } if (memory < hpagesize) { @@ -1010,6 +1015,13 @@ static void *file_ram_alloc(RAMBlock *block, return NULL; } + /* Fill config options */ + opts = qemu_opts_find(qemu_find_opts("mem-path"), NULL); + if (opts) { + mem_prealloc = qemu_opt_get_bool(opts, "prealloc", 0); + mem_share = qemu_opt_get_bool(opts, "share", 0); + } + /* Make name safe to use with mkstemp by replacing '/' with '_'. */ sanitized_name = g_strdup(block->mr->name); for (c = sanitized_name; *c != '\0'; c++) { @@ -1023,14 +1035,15 @@ static void *file_ram_alloc(RAMBlock *block, fd = mkstemp(filename); if (fd < 0) { - perror("unable to create backing store for hugepages"); + perror("unable to create guest RAM backing store"); g_free(filename); return NULL; } + unlink(filename); g_free(filename); - memory = (memory+hpagesize-1) & ~(hpagesize-1); + memory = (memory + hpagesize - 1) & ~(hpagesize - 1); /* * ftruncate is not supported by hugetlbfs in older @@ -1041,7 +1054,8 @@ static void *file_ram_alloc(RAMBlock *block, if (ftruncate(fd, memory)) perror("ftruncate"); - area = mmap(0, memory, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); + flags = mem_share ? MAP_SHARED : MAP_PRIVATE; + area = mmap(0, memory, PROT_READ | PROT_WRITE, flags, fd, 0); if (area == MAP_FAILED) { perror("file_ram_alloc: can't mmap RAM pages"); close(fd); @@ -1211,11 +1225,18 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, MemoryRegion *mr) { RAMBlock *block, *new_block; + QemuOpts *opts; + const char *mem_path = 0; size = TARGET_PAGE_ALIGN(size); new_block = g_malloc0(sizeof(*new_block)); new_block->fd = -1; + opts = qemu_opts_find(qemu_find_opts("mem-path"), NULL); + if (opts) { + mem_path = qemu_opt_get(opts, "path"); + } + /* This assumes the iothread lock is taken here too. */ qemu_mutex_lock_ramlist(); new_block->mr = mr; @@ -1348,6 +1369,14 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) ram_addr_t offset; int flags; void *area, *vaddr; + QemuOpts *opts; + unsigned int mem_prealloc = 0; + + /* Fill config options */ + opts = qemu_opts_find(qemu_find_opts("mem-path"), NULL); + if (opts) { + mem_prealloc = qemu_opt_get_bool(opts, "prealloc", 0); + } QTAILQ_FOREACH(block, &ram_list.blocks, next) { offset = addr - block->offset; diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index b6998f0..4f8e989 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -467,9 +467,6 @@ typedef struct RAMList { } RAMList; extern RAMList ram_list; -extern const char *mem_path; -extern int mem_prealloc; - /* Flags stored in the low bits of the TLB virtual address. These are defined so that fast path ram access is all zeros. */ /* Zero if TLB entry is valid. */ diff --git a/qemu-options.hx b/qemu-options.hx index 56e5fdf..60ecc95 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -221,9 +221,14 @@ gigabytes respectively. ETEXI DEF("mem-path", HAS_ARG, QEMU_OPTION_mempath, - "-mem-path FILE provide backing storage for guest RAM\n", QEMU_ARCH_ALL) + "-mem-path [path=]path[,prealloc=on|off][,share=on|off]\n" + " provide backing storage for guest RAM\n" + " path= a directory path for the backing store\n" + " prealloc= preallocate guest memory [default disabled]\n" + " share= enable mmap share flag [default disabled]\n", + QEMU_ARCH_ALL) STEXI -@item -mem-path @var{path} +@item -mem-path [path=]@var{path}[,prealloc=on|off][,share=on|off] @findex -mem-path Allocate guest RAM from a temporarily created file in @var{path}. ETEXI diff --git a/vl.c b/vl.c index e755aea..e98abc8 100644 --- a/vl.c +++ b/vl.c @@ -187,8 +187,6 @@ DisplayType display_type = DT_DEFAULT; static int display_remote; const char* keyboard_layout = NULL; ram_addr_t ram_size; -const char *mem_path = NULL; -int mem_prealloc = 0; /* force preallocation of physical target memory */ int nb_nics; NICInfo nd_table[MAX_NICS]; int autostart; @@ -531,6 +529,27 @@ static QemuOptsList qemu_msg_opts = { }, }; +static QemuOptsList qemu_mem_path_opts = { + .name = "mem-path", + .implied_opt_name = "path", + .head = QTAILQ_HEAD_INITIALIZER(qemu_mem_path_opts.head), + .desc = { + { + .name = "path", + .type = QEMU_OPT_STRING, + }, + { + .name = "prealloc", + .type = QEMU_OPT_BOOL, + }, + { + .name = "share", + .type = QEMU_OPT_BOOL, + }, + { /* end of list */ } + }, +}; + /** * Get machine options * @@ -2892,6 +2911,7 @@ int main(int argc, char **argv, char **envp) qemu_add_opts(&qemu_tpmdev_opts); qemu_add_opts(&qemu_realtime_opts); qemu_add_opts(&qemu_msg_opts); + qemu_add_opts(&qemu_mem_path_opts); runstate_init(); @@ -3209,11 +3229,18 @@ int main(int argc, char **argv, char **envp) break; #endif case QEMU_OPTION_mempath: - mem_path = optarg; + if (!qemu_opts_parse(qemu_find_opts("mem-path"), optarg, 1)) { + exit(1); + } break; - case QEMU_OPTION_mem_prealloc: - mem_prealloc = 1; + case QEMU_OPTION_mem_prealloc: { + QemuOpts *mem_opts = qemu_opts_find(qemu_find_opts("mem-path"), + NULL); + if (mem_opts) { + qemu_opt_set(mem_opts, "prealloc", "on"); + } break; + } case QEMU_OPTION_d: log_mask = optarg; break;