From patchwork Tue Jun 28 09:01:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 9202317 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B594B60757 for ; Tue, 28 Jun 2016 09:07:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3F49285FF for ; Tue, 28 Jun 2016 09:07:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9834A28601; Tue, 28 Jun 2016 09:07:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 70E99285FF for ; Tue, 28 Jun 2016 09:07:12 +0000 (UTC) Received: from localhost ([::1]:35187 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHoz9-0004eK-Fq for patchwork-qemu-devel@patchwork.kernel.org; Tue, 28 Jun 2016 05:07:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHouI-0006nB-AY for qemu-devel@nongnu.org; Tue, 28 Jun 2016 05:02:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHouE-0003My-Bp for qemu-devel@nongnu.org; Tue, 28 Jun 2016 05:02:10 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:57854 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHouE-0003Md-2E for qemu-devel@nongnu.org; Tue, 28 Jun 2016 05:02:06 -0400 Received: (qmail 26829 invoked by uid 89); 28 Jun 2016 09:02:05 -0000 Received: from [195.62.97.28] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.99.2/21804. hbedv: 8.3.40.44/7.12.99.34. avast: 1.2.2/16062800. spamassassin: 3.4.1. Clear:RC:1(195.62.97.28):. Processed in 0.350413 secs); 28 Jun 2016 09:02:05 -0000 Received: from smtp.kamp.de (HELO submission.kamp.de) ([195.62.97.28]) by mx01.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted); 28 Jun 2016 09:02:01 -0000 X-GL_Whitelist: yes Received: (qmail 29669 invoked from network); 28 Jun 2016 09:01:47 -0000 Received: from lieven-pc.kamp-intra.net (HELO lieven-pc) (relay@kamp.de@::ffff:172.21.12.60) by submission.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPA; 28 Jun 2016 09:01:47 -0000 Received: by lieven-pc (Postfix, from userid 1000) id 5CDA420844; Tue, 28 Jun 2016 11:01:46 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Tue, 28 Jun 2016 11:01:35 +0200 Message-Id: <1467104499-27517-12-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467104499-27517-1-git-send-email-pl@kamp.de> References: <1467104499-27517-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a02:248:0:51::16 Subject: [Qemu-devel] [PATCH 11/15] qom: use mmap for bigger Objects X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, mst@redhat.com, Peter Lieven , dgilbert@redhat.com, mreitz@redhat.com, kraxel@redhat.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Peter Lieven --- include/qom/object.h | 1 + qom/object.c | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index 2f8ac47..c612f3a 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -400,6 +400,7 @@ struct Object GHashTable *properties; uint32_t ref; Object *parent; + size_t instance_size; }; /** diff --git a/qom/object.c b/qom/object.c index 9743ea4..203162b 100644 --- a/qom/object.c +++ b/qom/object.c @@ -15,6 +15,7 @@ #include "qom/object.h" #include "qom/object_interfaces.h" #include "qemu/cutils.h" +#include "qemu/mmap-alloc.h" #include "qapi/visitor.h" #include "qapi-visit.h" #include "qapi/string-input-visitor.h" @@ -453,6 +454,12 @@ static void object_deinit(Object *obj, TypeImpl *type) } } +static void object_munmap(void *opaque) +{ + Object *obj = opaque; + qemu_anon_ram_munmap(obj, obj->instance_size); +} + static void object_finalize(void *data) { Object *obj = data; @@ -467,16 +474,23 @@ static void object_finalize(void *data) } } +#define OBJECT_MMAP_THRESH 4096 + Object *object_new_with_type(Type type) { Object *obj; g_assert(type != NULL); type_initialize(type); - - obj = g_malloc(type->instance_size); + if (type->instance_size < OBJECT_MMAP_THRESH) { + obj = g_malloc(type->instance_size); + obj->free = g_free; + } else { + obj = qemu_anon_ram_mmap(type->instance_size); + obj->free = object_munmap; + } + obj->instance_size = type->instance_size; object_initialize_with_type(obj, type->instance_size, type); - obj->free = g_free; return obj; }