From 8a0743cf747c659a3443e722a832c8f21f1cc774 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Tue, 16 Apr 2013 09:45:18 -0500 Subject: libqos: add malloc support This is a very simple allocator for the PC platform. It should be possible to add backends for other platforms. Signed-off-by: Anthony Liguori Message-id: 1366123521-4330-5-git-send-email-aliguori@us.ibm.com --- tests/libqos/malloc-pc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/libqos/malloc-pc.h | 20 ++++++++++++++ tests/libqos/malloc.h | 38 ++++++++++++++++++++++++++ 3 files changed, 129 insertions(+) create mode 100644 tests/libqos/malloc-pc.c create mode 100644 tests/libqos/malloc-pc.h create mode 100644 tests/libqos/malloc.h (limited to 'tests/libqos') diff --git a/tests/libqos/malloc-pc.c b/tests/libqos/malloc-pc.c new file mode 100644 index 0000000000..adc36c4731 --- /dev/null +++ b/tests/libqos/malloc-pc.c @@ -0,0 +1,71 @@ +/* + * libqos malloc support for PC + * + * Copyright IBM, Corp. 2012-2013 + * + * Authors: + * Anthony Liguori + * + * 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 "libqos/malloc-pc.h" +#include "libqos/fw_cfg-pc.h" + +#define NO_QEMU_PROTOS +#include "hw/nvram/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 0000000000..ff964abe53 --- /dev/null +++ b/tests/libqos/malloc-pc.h @@ -0,0 +1,20 @@ +/* + * libqos malloc support for PC + * + * Copyright IBM, Corp. 2012-2013 + * + * Authors: + * Anthony Liguori + * + * 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_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 0000000000..46f6000763 --- /dev/null +++ b/tests/libqos/malloc.h @@ -0,0 +1,38 @@ +/* + * libqos malloc support + * + * Copyright IBM, Corp. 2012-2013 + * + * Authors: + * Anthony Liguori + * + * 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_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 -- cgit v1.2.1