From patchwork Fri Jan 23 16:38:52 2015 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: 432226 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 2B5861402F1 for ; Sat, 24 Jan 2015 03:40:19 +1100 (AEDT) Received: from localhost ([::1]:60271 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEhHN-0004yv-2Y for incoming@patchwork.ozlabs.org; Fri, 23 Jan 2015 11:40:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEhGU-0003Gu-K2 for qemu-devel@nongnu.org; Fri, 23 Jan 2015 11:39:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YEhGT-0002u0-Ic for qemu-devel@nongnu.org; Fri, 23 Jan 2015 11:39:22 -0500 Received: from mail-wi0-x22b.google.com ([2a00:1450:400c:c05::22b]:52053) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEhGT-0002tk-5W for qemu-devel@nongnu.org; Fri, 23 Jan 2015 11:39:21 -0500 Received: by mail-wi0-f171.google.com with SMTP id l15so4082879wiw.4 for ; Fri, 23 Jan 2015 08:39:20 -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=rlKFzrIhHvdVu2zQWF1IuJoSxe6fOxiB4CHOypDC+PxtLBN5D06WYFE6Km49wRYMTT gqWnHJ5RVQbKxbSpB5lOTizTiUW84AqHYrbXTIxTbyW6r+82qxnr8srjuUCsP17Hyd3s 0jQBd76dFdaqmfBANkzWdUcpFbJgZWdtFJJlsQ+gPjBRsEX43IMxUUuBReKT0wjgPDb2 /XNtvgE9CrpND5fkcOdu0YB8J8Dlptf9En/17HbTFXGSdGt3bEK7L5zFzwhoPImoxDyi gioXEbl3qSDHB7cT3/tQ2xSJ6pcJoQH5rHNwZgfWsduLnZ9vivL7NJP8SQUONTIHmJB4 25hQ== X-Received: by 10.194.203.234 with SMTP id kt10mr16244533wjc.88.1422031160555; Fri, 23 Jan 2015 08:39:20 -0800 (PST) Received: from localhost.localdomain (204.Red-79-145-9.dynamicIP.rima-tde.net. [79.145.9.204]) by mx.google.com with ESMTPSA id ez1sm2839242wjd.31.2015.01.23.08.39.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jan 2015 08:39:19 -0800 (PST) From: =?UTF-8?q?Marc=20Mar=C3=AD?= To: qemu-devel@nongnu.org Date: Fri, 23 Jan 2015 17:38:52 +0100 Message-Id: <1422031133-19755-5-git-send-email-marc.mari.barcelo@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1422031133-19755-1-git-send-email-marc.mari.barcelo@gmail.com> References: <1422031133-19755-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::22b Cc: =?UTF-8?q?Marc=20Mar=C3=AD?= , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v4 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