From patchwork Tue Mar 4 07:28:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 326192 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 C29032C0081 for ; Tue, 4 Mar 2014 20:19:07 +1100 (EST) Received: from localhost ([::1]:43524 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKjot-0008Qx-U3 for incoming@patchwork.ozlabs.org; Tue, 04 Mar 2014 02:31:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKjoF-0008Kq-6I for qemu-devel@nongnu.org; Tue, 04 Mar 2014 02:30:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKjo9-0004cP-5Q for qemu-devel@nongnu.org; Tue, 04 Mar 2014 02:30:38 -0500 Received: from [222.73.24.84] (port=33078 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKjo7-0004WB-Qa for qemu-devel@nongnu.org; Tue, 04 Mar 2014 02:30:33 -0500 X-IronPort-AV: E=Sophos;i="4.97,583,1389715200"; d="scan'208";a="9641988" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 04 Mar 2014 15:26:23 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s247UET1004060; Tue, 4 Mar 2014 15:30:14 +0800 Received: from G08FNSTD100614.fnst.cn.fujitsu.com ([10.167.226.102]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2014030415274010-372185 ; Tue, 4 Mar 2014 15:27:40 +0800 From: Hu Tao To: qemu-devel@nongnu.org Date: Tue, 4 Mar 2014 15:28:16 +0800 Message-Id: <0d4975e23adefbd7e0acd354f8c4f42e62828613.1393917248.git.hutao@cn.fujitsu.com> X-Mailer: git-send-email 1.8.5.2.229.g4448466 In-Reply-To: References: X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/03/04 15:27:40, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/03/04 15:27:44, Serialize complete at 2014/03/04 15:27:44 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: pbonzini@redhat.com, gaowanlong@cn.fujitsu.com, imammedo@redhat.com Subject: [Qemu-devel] [PATCH v19 02/11] add memdev backend infrastructure 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 From: Igor Mammedov Provides framework for splitting host RAM allocation/ policies into a separate backend that could be used by devices. Initially only legacy RAM backend is provided, which uses memory_region_init_ram() allocator and compatible with every CLI option that affects memory_region_init_ram(). Signed-off-by: Igor Mammedov Signed-off-by: Paolo Bonzini Signed-off-by: Hu Tao [override UserCreatableClass::complete in HostMemoryBackendRamClass] --- backends/Makefile.objs | 2 + backends/hostmem-ram.c | 77 +++++++++++++++++++++++++++++++++ backends/hostmem.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++ include/sysemu/hostmem.h | 60 ++++++++++++++++++++++++++ 4 files changed, 249 insertions(+) create mode 100644 backends/hostmem-ram.c create mode 100644 backends/hostmem.c create mode 100644 include/sysemu/hostmem.h diff --git a/backends/Makefile.objs b/backends/Makefile.objs index 42557d5..e6bdc11 100644 --- a/backends/Makefile.objs +++ b/backends/Makefile.objs @@ -6,3 +6,5 @@ common-obj-$(CONFIG_BRLAPI) += baum.o $(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS) common-obj-$(CONFIG_TPM) += tpm.o + +common-obj-y += hostmem.o hostmem-ram.o diff --git a/backends/hostmem-ram.c b/backends/hostmem-ram.c new file mode 100644 index 0000000..a4dc734 --- /dev/null +++ b/backends/hostmem-ram.c @@ -0,0 +1,77 @@ +/* + * QEMU Host Memory Backend + * + * Copyright (C) 2013 Red Hat Inc + * + * Authors: + * Igor Mammedov + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#include "sysemu/hostmem.h" +#include "qom/object_interfaces.h" + +#define TYPE_MEMORY_BACKEND_RAM "memory-ram" +#define MEMORY_BACKEND_RAM(obj) \ + OBJECT_CHECK(HostMemoryBackendRam, (obj), TYPE_MEMORY_BACKEND_RAM) +#define MEMORY_BACKEND_RAM_GET_CLASS(obj) \ + OBJECT_GET_CLASS(HostMemoryBackendRamClass, (obj), \ + TYPE_MEMORY_BACKEND_RAM) +#define MEMORY_BACKEND_RAM_CLASS(klass) \ + OBJECT_CLASS_CHECK(HostMemoryBackendRamClass, (klass), \ + TYPE_MEMORY_BACKEND_RAM) + +/** + * @HostMemoryBackendRamClass: + * @parent_complete: The parent class complete handler. + */ +typedef struct HostMemoryBackendRamClass { + /*< private >*/ + HostMemoryBackendClass parent_class; + /*< public >*/ + + void (*parent_complete)(UserCreatable *uc, Error **errp); +} HostMemoryBackendRamClass; + +static void +ram_backend_memory_init(UserCreatable *uc, Error **errp) +{ + HostMemoryBackend *backend = MEMORY_BACKEND(uc); + HostMemoryBackendRamClass *mbrc = MEMORY_BACKEND_RAM_GET_CLASS(uc); + + if (!backend->size) { + error_setg(errp, "can't create backend with size 0"); + return; + } + + memory_region_init_ram(&backend->mr, OBJECT(backend), + object_get_canonical_path(OBJECT(backend)), + backend->size); + mbrc->parent_complete(uc, errp); +} + +static void +ram_backend_class_init(ObjectClass *oc, void *data) +{ + UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc); + HostMemoryBackendRamClass *mbrc = MEMORY_BACKEND_RAM_CLASS(oc); + + mbrc->parent_complete = ucc->complete; + ucc->complete = ram_backend_memory_init; + +} + +static const TypeInfo ram_backend_info = { + .name = TYPE_MEMORY_BACKEND_RAM, + .parent = TYPE_MEMORY_BACKEND, + .class_size = sizeof(HostMemoryBackendRamClass), + .class_init = ram_backend_class_init, +}; + +static void register_types(void) +{ + type_register_static(&ram_backend_info); +} + +type_init(register_types); diff --git a/backends/hostmem.c b/backends/hostmem.c new file mode 100644 index 0000000..0bd3900 --- /dev/null +++ b/backends/hostmem.c @@ -0,0 +1,110 @@ +/* + * QEMU Host Memory Backend + * + * Copyright (C) 2013 Red Hat Inc + * + * Authors: + * Igor Mammedov + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#include "sysemu/hostmem.h" +#include "sysemu/sysemu.h" +#include "qapi/visitor.h" +#include "qapi/qmp/qerror.h" +#include "qemu/config-file.h" +#include "qom/object_interfaces.h" + +static void +hostmemory_backend_get_size(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + HostMemoryBackend *backend = MEMORY_BACKEND(obj); + uint64_t value = backend->size; + + visit_type_size(v, &value, name, errp); +} + +static void +hostmemory_backend_set_size(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + HostMemoryBackend *backend = MEMORY_BACKEND(obj); + uint64_t value; + + if (memory_region_size(&backend->mr)) { + error_setg(errp, "cannot change property value\n"); + return; + } + + visit_type_size(v, &value, name, errp); + if (error_is_set(errp)) { + return; + } + if (!value) { + error_setg(errp, "Property '%s.%s' doesn't take value '%" PRIu64 "'", + object_get_typename(obj), name , value); + return; + } + backend->size = value; +} + +static void hostmemory_backend_initfn(Object *obj) +{ + object_property_add(obj, "size", "int", + hostmemory_backend_get_size, + hostmemory_backend_set_size, NULL, NULL, NULL); +} + +static void hostmemory_backend_finalize(Object *obj) +{ + HostMemoryBackend *backend = MEMORY_BACKEND(obj); + + if (memory_region_size(&backend->mr)) { + memory_region_destroy(&backend->mr); + } +} + +static void +hostmemory_backend_memory_init(UserCreatable *uc, Error **errp) +{ + error_setg(errp, "memory_init is not implemented for type [%s]", + object_get_typename(OBJECT(uc))); +} + +MemoryRegion * +host_memory_backend_get_memory(HostMemoryBackend *backend, Error **errp) +{ + return memory_region_size(&backend->mr) ? &backend->mr : NULL; +} + +static void +hostmemory_backend_class_init(ObjectClass *oc, void *data) +{ + UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc); + + ucc->complete = hostmemory_backend_memory_init; +} + +static const TypeInfo hostmemory_backend_info = { + .name = TYPE_MEMORY_BACKEND, + .parent = TYPE_OBJECT, + .abstract = true, + .class_size = sizeof(HostMemoryBackendClass), + .class_init = hostmemory_backend_class_init, + .instance_size = sizeof(HostMemoryBackend), + .instance_init = hostmemory_backend_initfn, + .instance_finalize = hostmemory_backend_finalize, + .interfaces = (InterfaceInfo[]) { + { TYPE_USER_CREATABLE }, + { } + } +}; + +static void register_types(void) +{ + type_register_static(&hostmemory_backend_info); +} + +type_init(register_types); diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h new file mode 100644 index 0000000..bc3ffb3 --- /dev/null +++ b/include/sysemu/hostmem.h @@ -0,0 +1,60 @@ +/* + * QEMU Host Memory Backend + * + * Copyright (C) 2013 Red Hat Inc + * + * Authors: + * Igor Mammedov + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#ifndef QEMU_RAM_H +#define QEMU_RAM_H + +#include "qom/object.h" +#include "qapi/error.h" +#include "exec/memory.h" +#include "qemu/option.h" + +#define TYPE_MEMORY_BACKEND "memory" +#define MEMORY_BACKEND(obj) \ + OBJECT_CHECK(HostMemoryBackend, (obj), TYPE_MEMORY_BACKEND) +#define MEMORY_BACKEND_GET_CLASS(obj) \ + OBJECT_GET_CLASS(HostMemoryBackendClass, (obj), TYPE_MEMORY_BACKEND) +#define MEMORY_BACKEND_CLASS(klass) \ + OBJECT_CLASS_CHECK(HostMemoryBackendClass, (klass), TYPE_MEMORY_BACKEND) + +typedef struct HostMemoryBackend HostMemoryBackend; +typedef struct HostMemoryBackendClass HostMemoryBackendClass; + +/** + * HostMemoryBackendClass: + * @parent_class: opaque parent class container + */ +struct HostMemoryBackendClass { + ObjectClass parent_class; +}; + +/** + * @HostMemoryBackend + * + * @parent: opaque parent object container + * @size: amount of memory backend provides + * @id: unique identification string in memdev namespace + * @mr: MemoryRegion representing host memory belonging to backend + */ +struct HostMemoryBackend { + /* private */ + Object parent; + + /* protected */ + uint64_t size; + + MemoryRegion mr; +}; + +MemoryRegion *host_memory_backend_get_memory(HostMemoryBackend *backend, + Error **errp); + +#endif