From patchwork Fri Dec 9 06:55:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Evans X-Patchwork-Id: 130300 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id F11C01007DA for ; Fri, 9 Dec 2011 17:54:35 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752179Ab1LIGyf (ORCPT ); Fri, 9 Dec 2011 01:54:35 -0500 Received: from ozlabs.org ([203.10.76.45]:58869 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751424Ab1LIGye (ORCPT ); Fri, 9 Dec 2011 01:54:34 -0500 Received: from [10.61.2.183] (ibmaus65.lnk.telstra.net [165.228.126.9]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPSA id 1DA861007D7; Fri, 9 Dec 2011 17:54:33 +1100 (EST) Message-ID: <4EE1B0DD.6030004@ozlabs.org> Date: Fri, 09 Dec 2011 17:55:25 +1100 From: Matt Evans User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.23) Gecko/20110921 Thunderbird/3.1.15 MIME-Version: 1.0 To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org CC: penberg@kernel.org, asias.hejun@gmail.com, levinsasha928@gmail.com, gorcunov@gmail.com Subject: [PATCH V2 17/23] kvm tools: Add ability to map guest RAM from hugetlbfs References: In-Reply-To: Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Add a --hugetlbfs commandline option to give a path to hugetlbfs-map guest memory (down in kvm__arch_init()). For x86, guest memory is a normal ANON mmap() if this option is not provided, otherwise a hugetlbfs mmap. Signed-off-by: Matt Evans --- tools/kvm/builtin-run.c | 4 ++- tools/kvm/include/kvm/kvm.h | 4 +- tools/kvm/include/kvm/util.h | 4 +++ tools/kvm/kvm.c | 4 +- tools/kvm/util.c | 45 ++++++++++++++++++++++++++++++++++++++++++ tools/kvm/x86/kvm.c | 20 +++++++++++++++-- 6 files changed, 73 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index 7969901..0acfe81 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -82,6 +82,7 @@ static const char *guest_mac; static const char *host_mac; static const char *script; static const char *guest_name; +static const char *hugetlbfs_path; static struct virtio_net_params *net_params; static bool single_step; static bool readonly_image[MAX_DISK_IMAGES]; @@ -422,6 +423,7 @@ static const struct option options[] = { OPT_CALLBACK('\0', "tty", NULL, "tty id", "Remap guest TTY into a pty on the host", tty_parser), + OPT_STRING('\0', "hugetlbfs", &hugetlbfs_path, "path", "Hugetlbfs path"), OPT_GROUP("Kernel options:"), OPT_STRING('k', "kernel", &kernel_filename, "kernel", @@ -807,7 +809,7 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) guest_name = default_name; } - kvm = kvm__init(dev, ram_size, guest_name); + kvm = kvm__init(dev, hugetlbfs_path, ram_size, guest_name); kvm->single_step = single_step; diff --git a/tools/kvm/include/kvm/kvm.h b/tools/kvm/include/kvm/kvm.h index 5fe6e75..7159952 100644 --- a/tools/kvm/include/kvm/kvm.h +++ b/tools/kvm/include/kvm/kvm.h @@ -30,7 +30,7 @@ struct kvm_ext { void kvm__set_dir(const char *fmt, ...); const char *kvm__get_dir(void); -struct kvm *kvm__init(const char *kvm_dev, u64 ram_size, const char *name); +struct kvm *kvm__init(const char *kvm_dev, const char *hugetlbfs_path, u64 ram_size, const char *name); int kvm__recommended_cpus(struct kvm *kvm); int kvm__max_cpus(struct kvm *kvm); void kvm__init_ram(struct kvm *kvm); @@ -54,7 +54,7 @@ int kvm__enumerate_instances(int (*callback)(const char *name, int pid)); void kvm__remove_socket(const char *name); void kvm__arch_set_cmdline(char *cmdline, bool video); -void kvm__arch_init(struct kvm *kvm, const char *kvm_dev, u64 ram_size, const char *name); +void kvm__arch_init(struct kvm *kvm, const char *kvm_dev, const char *hugetlbfs_path, u64 ram_size, const char *name); void kvm__arch_setup_firmware(struct kvm *kvm); bool kvm__arch_cpu_supports_vm(void); void kvm__arch_periodic_poll(struct kvm *kvm); diff --git a/tools/kvm/include/kvm/util.h b/tools/kvm/include/kvm/util.h index dc2e0b9..1f6fbbd 100644 --- a/tools/kvm/include/kvm/util.h +++ b/tools/kvm/include/kvm/util.h @@ -20,6 +20,7 @@ #include #include #include +#include #ifdef __GNUC__ #define NORETURN __attribute__((__noreturn__)) @@ -75,4 +76,7 @@ static inline void msleep(unsigned int msecs) { usleep(MSECS_TO_USECS(msecs)); } + +void *mmap_hugetlbfs(const char *htlbfs_path, u64 size); + #endif /* KVM__UTIL_H */ diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c index c54f886..35ca2c5 100644 --- a/tools/kvm/kvm.c +++ b/tools/kvm/kvm.c @@ -306,7 +306,7 @@ int kvm__max_cpus(struct kvm *kvm) return ret; } -struct kvm *kvm__init(const char *kvm_dev, u64 ram_size, const char *name) +struct kvm *kvm__init(const char *kvm_dev, const char *hugetlbfs_path, u64 ram_size, const char *name) { struct kvm *kvm; int ret; @@ -339,7 +339,7 @@ struct kvm *kvm__init(const char *kvm_dev, u64 ram_size, const char *name) if (kvm__check_extensions(kvm)) die("A required KVM extention is not supported by OS"); - kvm__arch_init(kvm, kvm_dev, ram_size, name); + kvm__arch_init(kvm, kvm_dev, hugetlbfs_path, ram_size, name); kvm->name = name; diff --git a/tools/kvm/util.c b/tools/kvm/util.c index 4efbce9..90b6a3b 100644 --- a/tools/kvm/util.c +++ b/tools/kvm/util.c @@ -4,6 +4,11 @@ #include "kvm/util.h" +#include /* For HUGETLBFS_MAGIC */ +#include +#include +#include + static void report(const char *prefix, const char *err, va_list params) { char msg[1024]; @@ -99,3 +104,43 @@ size_t strlcat(char *dest, const char *src, size_t count) return res; } + +void *mmap_hugetlbfs(const char *htlbfs_path, u64 size) +{ + char mpath[PATH_MAX]; + int fd; + int r; + struct statfs sfs; + void *addr; + + do { + /* + * QEMU seems to work around this returning EINTR... Let's do + * that too. + */ + r = statfs(htlbfs_path, &sfs); + } while (r && errno == EINTR); + + if (r) + die("Can't stat %s\n", htlbfs_path); + + if (sfs.f_type != HUGETLBFS_MAGIC) { + die("%s is not hugetlbfs!\n", htlbfs_path); + } + + if (sfs.f_bsize == 0 || (unsigned long)sfs.f_bsize > size) { + die("Can't use hugetlbfs pagesize %ld for mem size %lld\n", + sfs.f_bsize, size); + } + + snprintf(mpath, PATH_MAX, "%s/kvmtoolXXXXXX", htlbfs_path); + fd = mkstemp(mpath); + if (fd < 0) + die("Can't open %s for hugetlbfs map\n", mpath); + unlink(mpath); + ftruncate(fd, size); + addr = mmap(NULL, size, PROT_RW, MAP_PRIVATE, fd, 0); + close(fd); + + return addr; +} diff --git a/tools/kvm/x86/kvm.c b/tools/kvm/x86/kvm.c index a116f4b..31671e7 100644 --- a/tools/kvm/x86/kvm.c +++ b/tools/kvm/x86/kvm.c @@ -130,8 +130,22 @@ void kvm__arch_set_cmdline(char *cmdline, bool video) strcat(cmdline, " console=ttyS0 earlyprintk=serial i8042.noaux=1"); } +/* This function wraps the decision between hugetlbfs map (if requested) or normal mmap */ +static void *mmap_anon_or_hugetlbfs(const char *hugetlbfs_path, u64 size) +{ + if (hugetlbfs_path) { + /* + * We don't /need/ to map guest RAM from hugetlbfs, but we do so + * if the user specifies a hugetlbfs path. + */ + return mmap_hugetlbfs(hugetlbfs_path, size); + } else { + return mmap(NULL, size, PROT_RW, MAP_ANON_NORESERVE, -1, 0); + } +} + /* Architecture-specific KVM init */ -void kvm__arch_init(struct kvm *kvm, const char *kvm_dev, u64 ram_size, const char *name) +void kvm__arch_init(struct kvm *kvm, const char *kvm_dev, const char *hugetlbfs_path, u64 ram_size, const char *name) { struct kvm_pit_config pit_config = { .flags = 0, }; int ret; @@ -147,9 +161,9 @@ void kvm__arch_init(struct kvm *kvm, const char *kvm_dev, u64 ram_size, const ch kvm->ram_size = ram_size; if (kvm->ram_size < KVM_32BIT_GAP_START) { - kvm->ram_start = mmap(NULL, ram_size, PROT_RW, MAP_ANON_NORESERVE, -1, 0); + kvm->ram_start = mmap_anon_or_hugetlbfs(hugetlbfs_path, ram_size); } else { - kvm->ram_start = mmap(NULL, ram_size + KVM_32BIT_GAP_SIZE, PROT_RW, MAP_ANON_NORESERVE, -1, 0); + kvm->ram_start = mmap_anon_or_hugetlbfs(hugetlbfs_path, ram_size + KVM_32BIT_GAP_SIZE); if (kvm->ram_start != MAP_FAILED) { /* * We mprotect the gap (see kvm__init_ram() for details) PROT_NONE so that