Symptom: $ qemu-system-x86_64 -m 10000000 Unexpected error in ram_block_add() at /work/armbru/qemu/exec.c:1456: upstream-qemu: cannot set up guest memory 'pc.ram': Cannot allocate memory Aborted (core dumped) Root cause: commitef701d7
screwed up handling of out-of-memory conditions. Before the commit, we report the error and exit(1), in one place, ram_block_add(). The commit lifts the error handling up the call chain some, to three places. Fine. Except it uses &error_abort in these places, changing the behavior from exit(1) to abort(), and thus undoing the work of commit3922825
"exec: Don't abort when we can't allocate guest memory". The three places are: * memory_region_init_ram() Commit4994653
(right after commitef701d7
) lifted the error handling further, through memory_region_init_ram(), multiplying the incorrect use of &error_abort. Later on, imitation of existing (bad) code may have created more. * memory_region_init_ram_ptr() The &error_abort is still there. * memory_region_init_rom_device() Doesn't need fixing, because commit33e0eb5
(soon after commitef701d7
) lifted the error handling further, and in the process changed it from &error_abort to passing it up the call chain. Correct, because the callers are realize() methods. Fix the error handling after memory_region_init_ram() with a Coccinelle semantic patch: @r@ expression mr, owner, name, size, err; position p; @@ memory_region_init_ram(mr, owner, name, size, ( - &error_abort + &error_fatal | err@p ) ); @script:python@ p << r.p; @@ print "%s:%s:%s" % (p[0].file, p[0].line, p[0].column) When the last argument is &error_abort, it gets replaced by &error_fatal. This is the fix. If the last argument is anything else, its position is reported. This lets us check the fix is complete. Four positions get reported: * ram_backend_memory_alloc() Error is passed up the call chain, ultimately through user_creatable_complete(). As far as I can tell, it's callers all handle the error sanely. * fsl_imx25_realize(), fsl_imx31_realize(), dp8393x_realize() DeviceClass.realize() methods, errors handled sanely further up the call chain. We're good. Test case again behaves: $ qemu-system-x86_64 -m 10000000 qemu-system-x86_64: cannot set up guest memory 'pc.ram': Cannot allocate memory [Exit 1 ] The next commits will repair the rest of commit ef701d7's damage. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1441983105-26376-3-git-send-email-armbru@redhat.com> Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
267 lines
6.7 KiB
C
267 lines
6.7 KiB
C
/*
|
|
* ARMV7M System emulation.
|
|
*
|
|
* Copyright (c) 2006-2007 CodeSourcery.
|
|
* Written by Paul Brook
|
|
*
|
|
* This code is licensed under the GPL.
|
|
*/
|
|
|
|
#include "hw/sysbus.h"
|
|
#include "hw/arm/arm.h"
|
|
#include "hw/loader.h"
|
|
#include "elf.h"
|
|
#include "sysemu/qtest.h"
|
|
#include "qemu/error-report.h"
|
|
|
|
/* Bitbanded IO. Each word corresponds to a single bit. */
|
|
|
|
/* Get the byte address of the real memory for a bitband access. */
|
|
static inline uint32_t bitband_addr(void * opaque, uint32_t addr)
|
|
{
|
|
uint32_t res;
|
|
|
|
res = *(uint32_t *)opaque;
|
|
res |= (addr & 0x1ffffff) >> 5;
|
|
return res;
|
|
|
|
}
|
|
|
|
static uint32_t bitband_readb(void *opaque, hwaddr offset)
|
|
{
|
|
uint8_t v;
|
|
cpu_physical_memory_read(bitband_addr(opaque, offset), &v, 1);
|
|
return (v & (1 << ((offset >> 2) & 7))) != 0;
|
|
}
|
|
|
|
static void bitband_writeb(void *opaque, hwaddr offset,
|
|
uint32_t value)
|
|
{
|
|
uint32_t addr;
|
|
uint8_t mask;
|
|
uint8_t v;
|
|
addr = bitband_addr(opaque, offset);
|
|
mask = (1 << ((offset >> 2) & 7));
|
|
cpu_physical_memory_read(addr, &v, 1);
|
|
if (value & 1)
|
|
v |= mask;
|
|
else
|
|
v &= ~mask;
|
|
cpu_physical_memory_write(addr, &v, 1);
|
|
}
|
|
|
|
static uint32_t bitband_readw(void *opaque, hwaddr offset)
|
|
{
|
|
uint32_t addr;
|
|
uint16_t mask;
|
|
uint16_t v;
|
|
addr = bitband_addr(opaque, offset) & ~1;
|
|
mask = (1 << ((offset >> 2) & 15));
|
|
mask = tswap16(mask);
|
|
cpu_physical_memory_read(addr, &v, 2);
|
|
return (v & mask) != 0;
|
|
}
|
|
|
|
static void bitband_writew(void *opaque, hwaddr offset,
|
|
uint32_t value)
|
|
{
|
|
uint32_t addr;
|
|
uint16_t mask;
|
|
uint16_t v;
|
|
addr = bitband_addr(opaque, offset) & ~1;
|
|
mask = (1 << ((offset >> 2) & 15));
|
|
mask = tswap16(mask);
|
|
cpu_physical_memory_read(addr, &v, 2);
|
|
if (value & 1)
|
|
v |= mask;
|
|
else
|
|
v &= ~mask;
|
|
cpu_physical_memory_write(addr, &v, 2);
|
|
}
|
|
|
|
static uint32_t bitband_readl(void *opaque, hwaddr offset)
|
|
{
|
|
uint32_t addr;
|
|
uint32_t mask;
|
|
uint32_t v;
|
|
addr = bitband_addr(opaque, offset) & ~3;
|
|
mask = (1 << ((offset >> 2) & 31));
|
|
mask = tswap32(mask);
|
|
cpu_physical_memory_read(addr, &v, 4);
|
|
return (v & mask) != 0;
|
|
}
|
|
|
|
static void bitband_writel(void *opaque, hwaddr offset,
|
|
uint32_t value)
|
|
{
|
|
uint32_t addr;
|
|
uint32_t mask;
|
|
uint32_t v;
|
|
addr = bitband_addr(opaque, offset) & ~3;
|
|
mask = (1 << ((offset >> 2) & 31));
|
|
mask = tswap32(mask);
|
|
cpu_physical_memory_read(addr, &v, 4);
|
|
if (value & 1)
|
|
v |= mask;
|
|
else
|
|
v &= ~mask;
|
|
cpu_physical_memory_write(addr, &v, 4);
|
|
}
|
|
|
|
static const MemoryRegionOps bitband_ops = {
|
|
.old_mmio = {
|
|
.read = { bitband_readb, bitband_readw, bitband_readl, },
|
|
.write = { bitband_writeb, bitband_writew, bitband_writel, },
|
|
},
|
|
.endianness = DEVICE_NATIVE_ENDIAN,
|
|
};
|
|
|
|
#define TYPE_BITBAND "ARM,bitband-memory"
|
|
#define BITBAND(obj) OBJECT_CHECK(BitBandState, (obj), TYPE_BITBAND)
|
|
|
|
typedef struct {
|
|
/*< private >*/
|
|
SysBusDevice parent_obj;
|
|
/*< public >*/
|
|
|
|
MemoryRegion iomem;
|
|
uint32_t base;
|
|
} BitBandState;
|
|
|
|
static int bitband_init(SysBusDevice *dev)
|
|
{
|
|
BitBandState *s = BITBAND(dev);
|
|
|
|
memory_region_init_io(&s->iomem, OBJECT(s), &bitband_ops, &s->base,
|
|
"bitband", 0x02000000);
|
|
sysbus_init_mmio(dev, &s->iomem);
|
|
return 0;
|
|
}
|
|
|
|
static void armv7m_bitband_init(void)
|
|
{
|
|
DeviceState *dev;
|
|
|
|
dev = qdev_create(NULL, TYPE_BITBAND);
|
|
qdev_prop_set_uint32(dev, "base", 0x20000000);
|
|
qdev_init_nofail(dev);
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0x22000000);
|
|
|
|
dev = qdev_create(NULL, TYPE_BITBAND);
|
|
qdev_prop_set_uint32(dev, "base", 0x40000000);
|
|
qdev_init_nofail(dev);
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0x42000000);
|
|
}
|
|
|
|
/* Board init. */
|
|
|
|
static void armv7m_reset(void *opaque)
|
|
{
|
|
ARMCPU *cpu = opaque;
|
|
|
|
cpu_reset(CPU(cpu));
|
|
}
|
|
|
|
/* Init CPU and memory for a v7-M based board.
|
|
mem_size is in bytes.
|
|
Returns the NVIC array. */
|
|
|
|
qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq,
|
|
const char *kernel_filename, const char *cpu_model)
|
|
{
|
|
ARMCPU *cpu;
|
|
CPUARMState *env;
|
|
DeviceState *nvic;
|
|
qemu_irq *pic = g_new(qemu_irq, num_irq);
|
|
int image_size;
|
|
uint64_t entry;
|
|
uint64_t lowaddr;
|
|
int i;
|
|
int big_endian;
|
|
MemoryRegion *hack = g_new(MemoryRegion, 1);
|
|
|
|
if (cpu_model == NULL) {
|
|
cpu_model = "cortex-m3";
|
|
}
|
|
cpu = cpu_arm_init(cpu_model);
|
|
if (cpu == NULL) {
|
|
fprintf(stderr, "Unable to find CPU definition\n");
|
|
exit(1);
|
|
}
|
|
env = &cpu->env;
|
|
|
|
armv7m_bitband_init();
|
|
|
|
nvic = qdev_create(NULL, "armv7m_nvic");
|
|
qdev_prop_set_uint32(nvic, "num-irq", num_irq);
|
|
env->nvic = nvic;
|
|
qdev_init_nofail(nvic);
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(nvic), 0,
|
|
qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ));
|
|
for (i = 0; i < num_irq; i++) {
|
|
pic[i] = qdev_get_gpio_in(nvic, i);
|
|
}
|
|
|
|
#ifdef TARGET_WORDS_BIGENDIAN
|
|
big_endian = 1;
|
|
#else
|
|
big_endian = 0;
|
|
#endif
|
|
|
|
if (!kernel_filename && !qtest_enabled()) {
|
|
fprintf(stderr, "Guest image must be specified (using -kernel)\n");
|
|
exit(1);
|
|
}
|
|
|
|
if (kernel_filename) {
|
|
image_size = load_elf(kernel_filename, NULL, NULL, &entry, &lowaddr,
|
|
NULL, big_endian, ELF_MACHINE, 1);
|
|
if (image_size < 0) {
|
|
image_size = load_image_targphys(kernel_filename, 0, mem_size);
|
|
lowaddr = 0;
|
|
}
|
|
if (image_size < 0) {
|
|
error_report("Could not load kernel '%s'", kernel_filename);
|
|
exit(1);
|
|
}
|
|
}
|
|
|
|
/* Hack to map an additional page of ram at the top of the address
|
|
space. This stops qemu complaining about executing code outside RAM
|
|
when returning from an exception. */
|
|
memory_region_init_ram(hack, NULL, "armv7m.hack", 0x1000, &error_fatal);
|
|
vmstate_register_ram_global(hack);
|
|
memory_region_add_subregion(system_memory, 0xfffff000, hack);
|
|
|
|
qemu_register_reset(armv7m_reset, cpu);
|
|
return pic;
|
|
}
|
|
|
|
static Property bitband_properties[] = {
|
|
DEFINE_PROP_UINT32("base", BitBandState, base, 0),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
static void bitband_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
|
|
|
|
k->init = bitband_init;
|
|
dc->props = bitband_properties;
|
|
}
|
|
|
|
static const TypeInfo bitband_info = {
|
|
.name = TYPE_BITBAND,
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
.instance_size = sizeof(BitBandState),
|
|
.class_init = bitband_class_init,
|
|
};
|
|
|
|
static void armv7m_register_types(void)
|
|
{
|
|
type_register_static(&bitband_info);
|
|
}
|
|
|
|
type_init(armv7m_register_types)
|