From patchwork Tue Mar 4 14:00:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 326325 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 7FDA32C00C3 for ; Wed, 5 Mar 2014 01:07:44 +1100 (EST) Received: from localhost ([::1]:45039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKq0U-00070H-26 for incoming@patchwork.ozlabs.org; Tue, 04 Mar 2014 09:07:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKpvW-0001sk-Tz for qemu-devel@nongnu.org; Tue, 04 Mar 2014 09:02:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKpvO-0001fl-GT for qemu-devel@nongnu.org; Tue, 04 Mar 2014 09:02:34 -0500 Received: from mail-ea0-x233.google.com ([2a00:1450:4013:c01::233]:46998) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKpvO-0001ek-1P for qemu-devel@nongnu.org; Tue, 04 Mar 2014 09:02:26 -0500 Received: by mail-ea0-f179.google.com with SMTP id q10so374112ead.38 for ; Tue, 04 Mar 2014 06:02:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=9dok1i5FpvsStImPnH84I45H9vgb+N+Jp91sIlDd58w=; b=ftGBrT369aEIoTkKrCZ5QNtpNKvlj8dW5hPQ8djeNN2kEvMv4LI2ANbhOKBs3UMsKK XwqeQD6mLn9anRGAWqBFEgwDNf4NEsiRIJRExCpJhlW+zrcQARKgV09pxzLX7RWvHpE3 xtS9Va9MWIjSL8RoeYTLDU21PCXka5nZ/mosD8uh8JSgCXLH8pSp09WceDuPA9iP8m8q CYkT+nckwqEMmz1Ob2Z3vq6JYmKQW+4XrbLlAGY1hCqWbD5Rd7EYkEBjPmilKqOpsWe5 WYjgMJR+TT7is1dI9TFW7vNKPO+4WkDuK2APqVd/a1rtDlE1nD2OI4ypjJ3nI00hgKkp X7SA== X-Received: by 10.14.88.131 with SMTP id a3mr46740862eef.64.1393941745259; Tue, 04 Mar 2014 06:02:25 -0800 (PST) Received: from yakj.lan (net-37-117-154-249.cust.vodafonedsl.it. [37.117.154.249]) by mx.google.com with ESMTPSA id j42sm63911572eep.21.2014.03.04.06.02.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Mar 2014 06:02:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 4 Mar 2014 15:00:51 +0100 Message-Id: <1393941656-29068-24-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1393941656-29068-1-git-send-email-pbonzini@redhat.com> References: <1393941656-29068-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::233 Cc: ehabkost@redhat.com, hutao@cn.fujitsu.com, mtosatti@redhat.com, imammedo@redhat.com, a.motakis@virtualopensystems.com, gaowanlong@cn.fujitsu.com Subject: [Qemu-devel] [PATCH 2.1 23/28] hostmem: add merge and dump 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 Signed-off-by: Paolo Bonzini --- backends/hostmem.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++- include/qemu/osdep.h | 10 ++++++ include/sysemu/hostmem.h | 1 + 3 files changed, 93 insertions(+), 1 deletion(-) diff --git a/backends/hostmem.c b/backends/hostmem.c index 7d6199f..161c494 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -50,8 +50,72 @@ host_memory_backend_set_size(Object *obj, Visitor *v, void *opaque, backend->size = value; } +static bool host_memory_backend_get_merge(Object *obj, Error **errp) +{ + HostMemoryBackend *backend = MEMORY_BACKEND(obj); + + return backend->merge; +} + +static void host_memory_backend_set_merge(Object *obj, bool value, Error **errp) +{ + HostMemoryBackend *backend = MEMORY_BACKEND(obj); + + if (!memory_region_size(&backend->mr)) { + backend->merge = value; + return; + } + + if (value != backend->merge) { + void *ptr = memory_region_get_ram_ptr(&backend->mr); + uint64_t sz = memory_region_size(&backend->mr); + + qemu_madvise(ptr, sz, + value ? QEMU_MADV_MERGEABLE : QEMU_MADV_UNMERGEABLE); + backend->merge = value; + } +} + +static bool host_memory_backend_get_dump(Object *obj, Error **errp) +{ + HostMemoryBackend *backend = MEMORY_BACKEND(obj); + + return backend->dump; +} + +static void host_memory_backend_set_dump(Object *obj, bool value, Error **errp) +{ + HostMemoryBackend *backend = MEMORY_BACKEND(obj); + + if (!memory_region_size(&backend->mr)) { + backend->dump = value; + return; + } + + if (value != backend->dump) { + void *ptr = memory_region_get_ram_ptr(&backend->mr); + uint64_t sz = memory_region_size(&backend->mr); + + qemu_madvise(ptr, sz, + value ? QEMU_MADV_DODUMP : QEMU_MADV_DONTDUMP); + backend->dump = value; + } +} + + static void host_memory_backend_initfn(Object *obj) { + HostMemoryBackend *backend = MEMORY_BACKEND(obj); + + backend->merge = qemu_opt_get_bool(qemu_get_machine_opts(), "mem-merge", true); + backend->dump = qemu_opt_get_bool(qemu_get_machine_opts(), "dump-guest-core", true); + + object_property_add_bool(obj, "merge", + host_memory_backend_get_merge, + host_memory_backend_set_merge, NULL); + object_property_add_bool(obj, "dump", + host_memory_backend_get_dump, + host_memory_backend_set_dump, NULL); object_property_add(obj, "size", "int", host_memory_backend_get_size, host_memory_backend_set_size, NULL, NULL, NULL); @@ -71,6 +135,9 @@ host_memory_backend_memory_init(UserCreatable *uc, Error **errp) { HostMemoryBackend *backend = MEMORY_BACKEND(uc); HostMemoryBackendClass *bc = MEMORY_BACKEND_GET_CLASS(uc); + Error *local_err = NULL; + void *ptr; + uint64_t sz; if (!bc->alloc) { error_setg(errp, "memory_init is not implemented for type [%s]", @@ -78,7 +145,21 @@ host_memory_backend_memory_init(UserCreatable *uc, Error **errp) return; } - bc->alloc(backend, errp); + bc->alloc(backend, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + + ptr = memory_region_get_ram_ptr(&backend->mr); + sz = memory_region_size(&backend->mr); + + if (backend->merge) { + qemu_madvise(ptr, sz, QEMU_MADV_MERGEABLE); + } + if (!backend->dump) { + qemu_madvise(ptr, sz, QEMU_MADV_DONTDUMP); + } } MemoryRegion * diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 9c1a119..820c5d0 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -116,6 +116,16 @@ void qemu_anon_ram_free(void *ptr, size_t size); #else #define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID #endif +#ifdef MADV_UNMERGEABLE +#define QEMU_MADV_UNMERGEABLE MADV_UNMERGEABLE +#else +#define QEMU_MADV_UNMERGEABLE QEMU_MADV_INVALID +#endif +#ifdef MADV_DODUMP +#define QEMU_MADV_DODUMP MADV_DODUMP +#else +#define QEMU_MADV_DODUMP QEMU_MADV_INVALID +#endif #ifdef MADV_DONTDUMP #define QEMU_MADV_DONTDUMP MADV_DONTDUMP #else diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h index 4738107..f33d433 100644 --- a/include/sysemu/hostmem.h +++ b/include/sysemu/hostmem.h @@ -52,6 +52,7 @@ struct HostMemoryBackend { /* protected */ uint64_t size; + bool merge, dump; MemoryRegion mr; };