From patchwork Wed Dec 3 09:31:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc_Mar=C3=AD?= X-Patchwork-Id: 417304 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 3088C1400A0 for ; Wed, 3 Dec 2014 20:32:53 +1100 (AEDT) Received: from localhost ([::1]:40508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xw6Il-0002p6-C2 for incoming@patchwork.ozlabs.org; Wed, 03 Dec 2014 04:32:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xw6I0-0001cz-Lf for qemu-devel@nongnu.org; Wed, 03 Dec 2014 04:32:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xw6Hq-00039e-K0 for qemu-devel@nongnu.org; Wed, 03 Dec 2014 04:32:04 -0500 Received: from mail-wi0-x22e.google.com ([2a00:1450:400c:c05::22e]:53304) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xw6Hq-00039Y-EO for qemu-devel@nongnu.org; Wed, 03 Dec 2014 04:31:54 -0500 Received: by mail-wi0-f174.google.com with SMTP id h11so30730418wiw.7 for ; Wed, 03 Dec 2014 01:31:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=avSWtVx6rs+a/8aB2caWXiKR/V84M8Yw65rookh5w+Q=; b=hWvS+pBC0c2kYZEiBxkZ8Bt8yqgd1tG9utDuzPcxx2Y1GD1MMZZV/n/b51y21EeZ1x eCSVNUmBtmjgrjYRuiS1FJc3zxpCE4iWWgycElL+moBrtAJ8Qr9vtRCl28N2pcnGg7Fn 9PXZG3Dj/JSdt1YutamQsBysgbl6Ods6YDVqauQ7c3K87inbtfy5LtcLQdc5ZYYc5An3 lGuHzsmar3Xz/85HILq4KTmLQGqvowCzWv9cRIC3Io5DWXpTl7BCKR+7/NCiokqHVqF4 jFc6WWcMVF18JGsba1WWwMGJc5UNtUpFP4vqy07ItYa+io0Z5jlxhsFxYd5tgrn5j0cr ig1Q== X-Received: by 10.194.156.201 with SMTP id wg9mr5626737wjb.59.1417599113876; Wed, 03 Dec 2014 01:31:53 -0800 (PST) Received: from crunchbang.upc.es (cisne-cn07.upc.es. [147.83.182.7]) by mx.google.com with ESMTPSA id wa5sm9718474wjc.8.2014.12.03.01.31.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Dec 2014 01:31:53 -0800 (PST) From: =?UTF-8?q?Marc=20Mar=C3=AD?= To: qemu-devel@nongnu.org Date: Wed, 3 Dec 2014 10:31:36 +0100 Message-Id: <1417599097-3804-5-git-send-email-marc.mari.barcelo@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1417599097-3804-1-git-send-email-marc.mari.barcelo@gmail.com> References: <1417599097-3804-1-git-send-email-marc.mari.barcelo@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::22e Cc: =?UTF-8?q?Marc=20Mar=C3=AD?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v3 4/5] libqos: Add malloc generic 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 This malloc is a basic interface implementation that works for any platform. It should be replaced in the future for a real malloc implementation for each of the platforms. Signed-off-by: Marc Marí --- tests/libqos/malloc-generic.c | 50 +++++++++++++++++++++++++++++++++++++++++ tests/libqos/malloc-generic.h | 21 +++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 tests/libqos/malloc-generic.c create mode 100644 tests/libqos/malloc-generic.h diff --git a/tests/libqos/malloc-generic.c b/tests/libqos/malloc-generic.c new file mode 100644 index 0000000..a0878c5 --- /dev/null +++ b/tests/libqos/malloc-generic.c @@ -0,0 +1,50 @@ +/* + * Basic libqos generic malloc support + * + * Copyright (c) 2014 Marc Marí + * + * 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 +#include "libqos/malloc-generic.h" +#include "libqos/malloc.h" + +/* + * Mostly for valgrind happiness, but it does offer + * a chokepoint for debugging guest memory leaks, too. + */ +void generic_alloc_uninit(QGuestAllocator *allocator) +{ + alloc_uninit(allocator); +} + +QGuestAllocator *generic_alloc_init_flags(uint64_t base_addr, uint64_t size, + uint32_t page_size, QAllocOpts flags) +{ + QGuestAllocator *s = g_malloc0(sizeof(*s)); + MemBlock *node; + + s->opts = flags; + s->page_size = page_size; + + /* Start at 1MB */ + s->start = base_addr + (1 << 20); + + s->end = s->start + size; + + QTAILQ_INIT(&s->used); + QTAILQ_INIT(&s->free); + + node = mlist_new(s->start, s->end - s->start); + QTAILQ_INSERT_HEAD(&s->free, node, MLIST_ENTNAME); + + return s; +} + +inline QGuestAllocator *generic_alloc_init(uint64_t base_addr, uint64_t size, + uint32_t page_size) +{ + return generic_alloc_init_flags(base_addr, size, page_size, ALLOC_NO_FLAGS); +} diff --git a/tests/libqos/malloc-generic.h b/tests/libqos/malloc-generic.h new file mode 100644 index 0000000..90104ec --- /dev/null +++ b/tests/libqos/malloc-generic.h @@ -0,0 +1,21 @@ +/* + * Basic libqos generic malloc support + * + * Copyright (c) 2014 Marc Marí + * + * 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 LIBQOS_MALLOC_GENERIC_H +#define LIBQOS_MALLOC_GENERIC_H + +#include "libqos/malloc.h" + +QGuestAllocator *generic_alloc_init(uint64_t base_addr, uint64_t size, + uint32_t page_size); +QGuestAllocator *generic_alloc_init_flags(uint64_t base_addr, uint64_t size, + uint32_t page_size, QAllocOpts flags); +void generic_alloc_uninit(QGuestAllocator *allocator); + +#endif