 f8ed85ac99
			
		
	
	
		f8ed85ac99
		
	
	
	
	
		
			
			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: commit ef701d7 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 commit 3922825 "exec: Don't
abort when we can't allocate guest memory".
The three places are:
* memory_region_init_ram()
  Commit 4994653 (right after commit ef701d7) 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 commit 33e0eb5 (soon after commit
  ef701d7) 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>
		
	
			
		
			
				
	
	
		
			290 lines
		
	
	
		
			9.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			290 lines
		
	
	
		
			9.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Xilinx Zynq MPSoC emulation
 | |
|  *
 | |
|  * Copyright (C) 2015 Xilinx Inc
 | |
|  * Written by Peter Crosthwaite <peter.crosthwaite@xilinx.com>
 | |
|  *
 | |
|  * This program is free software; you can redistribute it and/or modify it
 | |
|  * under the terms of the GNU General Public License as published by the
 | |
|  * Free Software Foundation; either version 2 of the License, or
 | |
|  * (at your option) any later version.
 | |
|  *
 | |
|  * This program is distributed in the hope that it will be useful, but WITHOUT
 | |
|  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 | |
|  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
 | |
|  * for more details.
 | |
|  */
 | |
| 
 | |
| #include "hw/arm/xlnx-zynqmp.h"
 | |
| #include "hw/intc/arm_gic_common.h"
 | |
| #include "exec/address-spaces.h"
 | |
| 
 | |
| #define GIC_NUM_SPI_INTR 160
 | |
| 
 | |
| #define ARM_PHYS_TIMER_PPI  30
 | |
| #define ARM_VIRT_TIMER_PPI  27
 | |
| 
 | |
| #define GIC_BASE_ADDR       0xf9000000
 | |
| #define GIC_DIST_ADDR       0xf9010000
 | |
| #define GIC_CPU_ADDR        0xf9020000
 | |
| 
 | |
| #define SATA_INTR           133
 | |
| #define SATA_ADDR           0xFD0C0000
 | |
| #define SATA_NUM_PORTS      2
 | |
| 
 | |
| static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] = {
 | |
|     0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000,
 | |
| };
 | |
| 
 | |
| static const int gem_intr[XLNX_ZYNQMP_NUM_GEMS] = {
 | |
|     57, 59, 61, 63,
 | |
| };
 | |
| 
 | |
| static const uint64_t uart_addr[XLNX_ZYNQMP_NUM_UARTS] = {
 | |
|     0xFF000000, 0xFF010000,
 | |
| };
 | |
| 
 | |
| static const int uart_intr[XLNX_ZYNQMP_NUM_UARTS] = {
 | |
|     21, 22,
 | |
| };
 | |
| 
 | |
| typedef struct XlnxZynqMPGICRegion {
 | |
|     int region_index;
 | |
|     uint32_t address;
 | |
| } XlnxZynqMPGICRegion;
 | |
| 
 | |
| static const XlnxZynqMPGICRegion xlnx_zynqmp_gic_regions[] = {
 | |
|     { .region_index = 0, .address = GIC_DIST_ADDR, },
 | |
|     { .region_index = 1, .address = GIC_CPU_ADDR,  },
 | |
| };
 | |
| 
 | |
| static inline int arm_gic_ppi_index(int cpu_nr, int ppi_index)
 | |
| {
 | |
|     return GIC_NUM_SPI_INTR + cpu_nr * GIC_INTERNAL + ppi_index;
 | |
| }
 | |
| 
 | |
| static void xlnx_zynqmp_init(Object *obj)
 | |
| {
 | |
|     XlnxZynqMPState *s = XLNX_ZYNQMP(obj);
 | |
|     int i;
 | |
| 
 | |
|     for (i = 0; i < XLNX_ZYNQMP_NUM_APU_CPUS; i++) {
 | |
|         object_initialize(&s->apu_cpu[i], sizeof(s->apu_cpu[i]),
 | |
|                           "cortex-a53-" TYPE_ARM_CPU);
 | |
|         object_property_add_child(obj, "apu-cpu[*]", OBJECT(&s->apu_cpu[i]),
 | |
|                                   &error_abort);
 | |
|     }
 | |
| 
 | |
|     for (i = 0; i < XLNX_ZYNQMP_NUM_RPU_CPUS; i++) {
 | |
|         object_initialize(&s->rpu_cpu[i], sizeof(s->rpu_cpu[i]),
 | |
|                           "cortex-r5-" TYPE_ARM_CPU);
 | |
|         object_property_add_child(obj, "rpu-cpu[*]", OBJECT(&s->rpu_cpu[i]),
 | |
|                                   &error_abort);
 | |
|     }
 | |
| 
 | |
|     object_initialize(&s->gic, sizeof(s->gic), TYPE_ARM_GIC);
 | |
|     qdev_set_parent_bus(DEVICE(&s->gic), sysbus_get_default());
 | |
| 
 | |
|     for (i = 0; i < XLNX_ZYNQMP_NUM_GEMS; i++) {
 | |
|         object_initialize(&s->gem[i], sizeof(s->gem[i]), TYPE_CADENCE_GEM);
 | |
|         qdev_set_parent_bus(DEVICE(&s->gem[i]), sysbus_get_default());
 | |
|     }
 | |
| 
 | |
|     for (i = 0; i < XLNX_ZYNQMP_NUM_UARTS; i++) {
 | |
|         object_initialize(&s->uart[i], sizeof(s->uart[i]), TYPE_CADENCE_UART);
 | |
|         qdev_set_parent_bus(DEVICE(&s->uart[i]), sysbus_get_default());
 | |
|     }
 | |
| 
 | |
|     object_initialize(&s->sata, sizeof(s->sata), TYPE_SYSBUS_AHCI);
 | |
|     qdev_set_parent_bus(DEVICE(&s->sata), sysbus_get_default());
 | |
| }
 | |
| 
 | |
| static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
 | |
| {
 | |
|     XlnxZynqMPState *s = XLNX_ZYNQMP(dev);
 | |
|     MemoryRegion *system_memory = get_system_memory();
 | |
|     uint8_t i;
 | |
|     const char *boot_cpu = s->boot_cpu ? s->boot_cpu : "apu-cpu[0]";
 | |
|     qemu_irq gic_spi[GIC_NUM_SPI_INTR];
 | |
|     Error *err = NULL;
 | |
| 
 | |
|     /* Create the four OCM banks */
 | |
|     for (i = 0; i < XLNX_ZYNQMP_NUM_OCM_BANKS; i++) {
 | |
|         char *ocm_name = g_strdup_printf("zynqmp.ocm_ram_bank_%d", i);
 | |
| 
 | |
|         memory_region_init_ram(&s->ocm_ram[i], NULL, ocm_name,
 | |
|                                XLNX_ZYNQMP_OCM_RAM_SIZE, &error_fatal);
 | |
|         vmstate_register_ram_global(&s->ocm_ram[i]);
 | |
|         memory_region_add_subregion(get_system_memory(),
 | |
|                                     XLNX_ZYNQMP_OCM_RAM_0_ADDRESS +
 | |
|                                         i * XLNX_ZYNQMP_OCM_RAM_SIZE,
 | |
|                                     &s->ocm_ram[i]);
 | |
| 
 | |
|         g_free(ocm_name);
 | |
|     }
 | |
| 
 | |
|     qdev_prop_set_uint32(DEVICE(&s->gic), "num-irq", GIC_NUM_SPI_INTR + 32);
 | |
|     qdev_prop_set_uint32(DEVICE(&s->gic), "revision", 2);
 | |
|     qdev_prop_set_uint32(DEVICE(&s->gic), "num-cpu", XLNX_ZYNQMP_NUM_APU_CPUS);
 | |
|     object_property_set_bool(OBJECT(&s->gic), true, "realized", &err);
 | |
|     if (err) {
 | |
|         error_propagate(errp, err);
 | |
|         return;
 | |
|     }
 | |
|     assert(ARRAY_SIZE(xlnx_zynqmp_gic_regions) == XLNX_ZYNQMP_GIC_REGIONS);
 | |
|     for (i = 0; i < XLNX_ZYNQMP_GIC_REGIONS; i++) {
 | |
|         SysBusDevice *gic = SYS_BUS_DEVICE(&s->gic);
 | |
|         const XlnxZynqMPGICRegion *r = &xlnx_zynqmp_gic_regions[i];
 | |
|         MemoryRegion *mr = sysbus_mmio_get_region(gic, r->region_index);
 | |
|         uint32_t addr = r->address;
 | |
|         int j;
 | |
| 
 | |
|         sysbus_mmio_map(gic, r->region_index, addr);
 | |
| 
 | |
|         for (j = 0; j < XLNX_ZYNQMP_GIC_ALIASES; j++) {
 | |
|             MemoryRegion *alias = &s->gic_mr[i][j];
 | |
| 
 | |
|             addr += XLNX_ZYNQMP_GIC_REGION_SIZE;
 | |
|             memory_region_init_alias(alias, OBJECT(s), "zynqmp-gic-alias", mr,
 | |
|                                      0, XLNX_ZYNQMP_GIC_REGION_SIZE);
 | |
|             memory_region_add_subregion(system_memory, addr, alias);
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     for (i = 0; i < XLNX_ZYNQMP_NUM_APU_CPUS; i++) {
 | |
|         qemu_irq irq;
 | |
|         char *name;
 | |
| 
 | |
|         object_property_set_int(OBJECT(&s->apu_cpu[i]), QEMU_PSCI_CONDUIT_SMC,
 | |
|                                 "psci-conduit", &error_abort);
 | |
| 
 | |
|         name = object_get_canonical_path_component(OBJECT(&s->apu_cpu[i]));
 | |
|         if (strcmp(name, boot_cpu)) {
 | |
|             /* Secondary CPUs start in PSCI powered-down state */
 | |
|             object_property_set_bool(OBJECT(&s->apu_cpu[i]), true,
 | |
|                                      "start-powered-off", &error_abort);
 | |
|         } else {
 | |
|             s->boot_cpu_ptr = &s->apu_cpu[i];
 | |
|         }
 | |
|         g_free(name);
 | |
| 
 | |
|         object_property_set_int(OBJECT(&s->apu_cpu[i]), GIC_BASE_ADDR,
 | |
|                                 "reset-cbar", &error_abort);
 | |
|         object_property_set_bool(OBJECT(&s->apu_cpu[i]), true, "realized",
 | |
|                                  &err);
 | |
|         if (err) {
 | |
|             error_propagate(errp, err);
 | |
|             return;
 | |
|         }
 | |
| 
 | |
|         sysbus_connect_irq(SYS_BUS_DEVICE(&s->gic), i,
 | |
|                            qdev_get_gpio_in(DEVICE(&s->apu_cpu[i]),
 | |
|                                             ARM_CPU_IRQ));
 | |
|         irq = qdev_get_gpio_in(DEVICE(&s->gic),
 | |
|                                arm_gic_ppi_index(i, ARM_PHYS_TIMER_PPI));
 | |
|         qdev_connect_gpio_out(DEVICE(&s->apu_cpu[i]), 0, irq);
 | |
|         irq = qdev_get_gpio_in(DEVICE(&s->gic),
 | |
|                                arm_gic_ppi_index(i, ARM_VIRT_TIMER_PPI));
 | |
|         qdev_connect_gpio_out(DEVICE(&s->apu_cpu[i]), 1, irq);
 | |
|     }
 | |
| 
 | |
|     for (i = 0; i < XLNX_ZYNQMP_NUM_RPU_CPUS; i++) {
 | |
|         char *name;
 | |
| 
 | |
|         name = object_get_canonical_path_component(OBJECT(&s->rpu_cpu[i]));
 | |
|         if (strcmp(name, boot_cpu)) {
 | |
|             /* Secondary CPUs start in PSCI powered-down state */
 | |
|             object_property_set_bool(OBJECT(&s->rpu_cpu[i]), true,
 | |
|                                      "start-powered-off", &error_abort);
 | |
|         } else {
 | |
|             s->boot_cpu_ptr = &s->rpu_cpu[i];
 | |
|         }
 | |
|         g_free(name);
 | |
| 
 | |
|         object_property_set_bool(OBJECT(&s->rpu_cpu[i]), true, "reset-hivecs",
 | |
|                                  &error_abort);
 | |
|         object_property_set_bool(OBJECT(&s->rpu_cpu[i]), true, "realized",
 | |
|                                  &err);
 | |
|         if (err) {
 | |
|             error_propagate(errp, err);
 | |
|             return;
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     if (!s->boot_cpu_ptr) {
 | |
|         error_setg(errp, "ZynqMP Boot cpu %s not found\n", boot_cpu);
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     for (i = 0; i < GIC_NUM_SPI_INTR; i++) {
 | |
|         gic_spi[i] = qdev_get_gpio_in(DEVICE(&s->gic), i);
 | |
|     }
 | |
| 
 | |
|     for (i = 0; i < XLNX_ZYNQMP_NUM_GEMS; i++) {
 | |
|         NICInfo *nd = &nd_table[i];
 | |
| 
 | |
|         if (nd->used) {
 | |
|             qemu_check_nic_model(nd, TYPE_CADENCE_GEM);
 | |
|             qdev_set_nic_properties(DEVICE(&s->gem[i]), nd);
 | |
|         }
 | |
|         object_property_set_bool(OBJECT(&s->gem[i]), true, "realized", &err);
 | |
|         if (err) {
 | |
|             error_propagate(errp, err);
 | |
|             return;
 | |
|         }
 | |
|         sysbus_mmio_map(SYS_BUS_DEVICE(&s->gem[i]), 0, gem_addr[i]);
 | |
|         sysbus_connect_irq(SYS_BUS_DEVICE(&s->gem[i]), 0,
 | |
|                            gic_spi[gem_intr[i]]);
 | |
|     }
 | |
| 
 | |
|     for (i = 0; i < XLNX_ZYNQMP_NUM_UARTS; i++) {
 | |
|         object_property_set_bool(OBJECT(&s->uart[i]), true, "realized", &err);
 | |
|         if (err) {
 | |
|             error_propagate(errp, err);
 | |
|             return;
 | |
|         }
 | |
|         sysbus_mmio_map(SYS_BUS_DEVICE(&s->uart[i]), 0, uart_addr[i]);
 | |
|         sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart[i]), 0,
 | |
|                            gic_spi[uart_intr[i]]);
 | |
|     }
 | |
| 
 | |
|     object_property_set_int(OBJECT(&s->sata), SATA_NUM_PORTS, "num-ports",
 | |
|                             &error_abort);
 | |
|     object_property_set_bool(OBJECT(&s->sata), true, "realized", &err);
 | |
|     if (err) {
 | |
|         error_propagate(errp, err);
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     sysbus_mmio_map(SYS_BUS_DEVICE(&s->sata), 0, SATA_ADDR);
 | |
|     sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, gic_spi[SATA_INTR]);
 | |
| }
 | |
| 
 | |
| static Property xlnx_zynqmp_props[] = {
 | |
|     DEFINE_PROP_STRING("boot-cpu", XlnxZynqMPState, boot_cpu),
 | |
|     DEFINE_PROP_END_OF_LIST()
 | |
| };
 | |
| 
 | |
| static void xlnx_zynqmp_class_init(ObjectClass *oc, void *data)
 | |
| {
 | |
|     DeviceClass *dc = DEVICE_CLASS(oc);
 | |
| 
 | |
|     dc->props = xlnx_zynqmp_props;
 | |
|     dc->realize = xlnx_zynqmp_realize;
 | |
| }
 | |
| 
 | |
| static const TypeInfo xlnx_zynqmp_type_info = {
 | |
|     .name = TYPE_XLNX_ZYNQMP,
 | |
|     .parent = TYPE_DEVICE,
 | |
|     .instance_size = sizeof(XlnxZynqMPState),
 | |
|     .instance_init = xlnx_zynqmp_init,
 | |
|     .class_init = xlnx_zynqmp_class_init,
 | |
| };
 | |
| 
 | |
| static void xlnx_zynqmp_register_types(void)
 | |
| {
 | |
|     type_register_static(&xlnx_zynqmp_type_info);
 | |
| }
 | |
| 
 | |
| type_init(xlnx_zynqmp_register_types)
 |