From patchwork Tue Mar 5 13:53:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 225045 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 347282C033C for ; Wed, 6 Mar 2013 01:02:00 +1100 (EST) Received: from localhost ([::1]:46668 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCsRK-0007OB-8f for incoming@patchwork.ozlabs.org; Tue, 05 Mar 2013 09:01:58 -0500 Received: from eggs.gnu.org ([208.118.235.92]:51042) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCsR5-0007Nl-MU for qemu-devel@nongnu.org; Tue, 05 Mar 2013 09:01:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UCsJe-0006lm-H4 for qemu-devel@nongnu.org; Tue, 05 Mar 2013 08:54:14 -0500 Received: from e23smtp03.au.ibm.com ([202.81.31.145]:60131) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCsJd-0006lK-SK for qemu-devel@nongnu.org; Tue, 05 Mar 2013 08:54:02 -0500 Received: from /spool/local by e23smtp03.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 5 Mar 2013 23:47:39 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp03.au.ibm.com (202.81.31.209) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 5 Mar 2013 23:47:37 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 5E73E2BB0023 for ; Wed, 6 Mar 2013 00:53:58 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r25DfEZr1180096 for ; Wed, 6 Mar 2013 00:41:14 +1100 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r25DrwCC017130 for ; Wed, 6 Mar 2013 00:53:58 +1100 Received: from titi.austin.rr.com (sig-9-65-237-165.mts.ibm.com [9.65.237.165]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r25DrYFl016593; Wed, 6 Mar 2013 00:53:56 +1100 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Tue, 5 Mar 2013 07:53:32 -0600 Message-Id: <1362491612-19226-9-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1362491612-19226-1-git-send-email-aliguori@us.ibm.com> References: <1362491612-19226-1-git-send-email-aliguori@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13030513-6102-0000-0000-00000319CEFF X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.145 Cc: Kevin Wolf , Anthony Liguori , Stefan Hajnoczi Subject: [Qemu-devel] [RFC PATCH 8/8] libqos: add malloc 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: Anthony Liguori --- tests/Makefile | 1 + tests/libqos/malloc-pc.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/libqos/malloc-pc.h | 8 +++++++ tests/libqos/malloc.h | 26 +++++++++++++++++++++ 4 files changed, 94 insertions(+) create mode 100644 tests/libqos/malloc-pc.c create mode 100644 tests/libqos/malloc-pc.h create mode 100644 tests/libqos/malloc.h diff --git a/tests/Makefile b/tests/Makefile index bfeee5e..37442bf 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -132,6 +132,7 @@ tests/test-mul64$(EXESUF): tests/test-mul64.o libqemuutil.a libqos-obj-y = tests/libqos/pci.o tests/libqos/fw_cfg.o libqos-pc-obj-y = $(libqos-obj-y) tests/libqos/pci-pc.o tests/libqos/fw_cfg-pc.o +libqos-pc-obj-y += tests/libqos/malloc-pc.o tests/rtc-test$(EXESUF): tests/rtc-test.o tests/m48t59-test$(EXESUF): tests/m48t59-test.o diff --git a/tests/libqos/malloc-pc.c b/tests/libqos/malloc-pc.c new file mode 100644 index 0000000..26868b7 --- /dev/null +++ b/tests/libqos/malloc-pc.c @@ -0,0 +1,59 @@ +#include "libqos/malloc-pc.h" +#include "libqos/fw_cfg-pc.h" + +#define NO_QEMU_PROTOS +#include "hw/fw_cfg.h" + +#include "qemu-common.h" +#include + +#define PAGE_SIZE (4096) + +typedef struct PCAlloc +{ + QGuestAllocator alloc; + + uint64_t start; + uint64_t end; +} PCAlloc; + +static uint64_t pc_alloc(QGuestAllocator *allocator, size_t size) +{ + PCAlloc *s = container_of(allocator, PCAlloc, alloc); + uint64_t addr; + + + size += (PAGE_SIZE - 1); + size &= PAGE_SIZE; + + g_assert_cmpint((s->start + size), <=, s->end); + + addr = s->start; + s->start += size; + + return addr; +} + +static void pc_free(QGuestAllocator *allocator, uint64_t addr) +{ +} + +QGuestAllocator *pc_alloc_init(void) +{ + PCAlloc *s = g_malloc0(sizeof(*s)); + uint64_t ram_size; + QFWCFG *fw_cfg = pc_fw_cfg_init(); + + s->alloc.alloc = pc_alloc; + s->alloc.free = pc_free; + + ram_size = qfw_cfg_get_u64(fw_cfg, FW_CFG_RAM_SIZE); + + /* Start at 1MB */ + s->start = 1 << 20; + + /* Respect PCI hole */ + s->end = MIN(ram_size, 0xE0000000); + + return &s->alloc; +} diff --git a/tests/libqos/malloc-pc.h b/tests/libqos/malloc-pc.h new file mode 100644 index 0000000..31f19eb --- /dev/null +++ b/tests/libqos/malloc-pc.h @@ -0,0 +1,8 @@ +#ifndef LIBQOS_MALLOC_PC_H +#define LIBQOS_MALLOC_PC_H + +#include "libqos/malloc.h" + +QGuestAllocator *pc_alloc_init(void); + +#endif diff --git a/tests/libqos/malloc.h b/tests/libqos/malloc.h new file mode 100644 index 0000000..5c06318 --- /dev/null +++ b/tests/libqos/malloc.h @@ -0,0 +1,26 @@ +#ifndef LIBQOS_MALLOC_H +#define LIBQOS_MALLOC_H + +#include +#include + +typedef struct QGuestAllocator QGuestAllocator; + +struct QGuestAllocator +{ + uint64_t (*alloc)(QGuestAllocator *allocator, size_t size); + void (*free)(QGuestAllocator *allocator, uint64_t addr); +}; + +/* Always returns page aligned values */ +static inline uint64_t guest_alloc(QGuestAllocator *allocator, size_t size) +{ + return allocator->alloc(allocator, size); +} + +static inline void guest_free(QGuestAllocator *allocator, uint64_t addr) +{ + allocator->alloc(allocator, addr); +} + +#endif