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: 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>
290 lines
7.9 KiB
C
290 lines
7.9 KiB
C
/*
|
|
* virtio ccw machine
|
|
*
|
|
* Copyright 2012 IBM Corp.
|
|
* Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or (at
|
|
* your option) any later version. See the COPYING file in the top-level
|
|
* directory.
|
|
*/
|
|
|
|
#include "hw/boards.h"
|
|
#include "exec/address-spaces.h"
|
|
#include "s390-virtio.h"
|
|
#include "hw/s390x/sclp.h"
|
|
#include "hw/s390x/s390_flic.h"
|
|
#include "ioinst.h"
|
|
#include "css.h"
|
|
#include "virtio-ccw.h"
|
|
#include "qemu/config-file.h"
|
|
#include "s390-pci-bus.h"
|
|
#include "hw/s390x/storage-keys.h"
|
|
|
|
#define TYPE_S390_CCW_MACHINE "s390-ccw-machine"
|
|
|
|
#define S390_CCW_MACHINE(obj) \
|
|
OBJECT_CHECK(S390CcwMachineState, (obj), TYPE_S390_CCW_MACHINE)
|
|
|
|
typedef struct S390CcwMachineState {
|
|
/*< private >*/
|
|
MachineState parent_obj;
|
|
|
|
/*< public >*/
|
|
bool aes_key_wrap;
|
|
bool dea_key_wrap;
|
|
} S390CcwMachineState;
|
|
|
|
void io_subsystem_reset(void)
|
|
{
|
|
DeviceState *css, *sclp, *flic, *diag288;
|
|
|
|
css = DEVICE(object_resolve_path_type("", "virtual-css-bridge", NULL));
|
|
if (css) {
|
|
qdev_reset_all(css);
|
|
}
|
|
sclp = DEVICE(object_resolve_path_type("",
|
|
"s390-sclp-event-facility", NULL));
|
|
if (sclp) {
|
|
qdev_reset_all(sclp);
|
|
}
|
|
flic = DEVICE(object_resolve_path_type("", "s390-flic", NULL));
|
|
if (flic) {
|
|
qdev_reset_all(flic);
|
|
}
|
|
diag288 = DEVICE(object_resolve_path_type("", "diag288", NULL));
|
|
if (diag288) {
|
|
qdev_reset_all(diag288);
|
|
}
|
|
}
|
|
|
|
static int virtio_ccw_hcall_notify(const uint64_t *args)
|
|
{
|
|
uint64_t subch_id = args[0];
|
|
uint64_t queue = args[1];
|
|
SubchDev *sch;
|
|
int cssid, ssid, schid, m;
|
|
|
|
if (ioinst_disassemble_sch_ident(subch_id, &m, &cssid, &ssid, &schid)) {
|
|
return -EINVAL;
|
|
}
|
|
sch = css_find_subch(m, cssid, ssid, schid);
|
|
if (!sch || !css_subch_visible(sch)) {
|
|
return -EINVAL;
|
|
}
|
|
if (queue >= VIRTIO_CCW_QUEUE_MAX) {
|
|
return -EINVAL;
|
|
}
|
|
virtio_queue_notify(virtio_ccw_get_vdev(sch), queue);
|
|
return 0;
|
|
|
|
}
|
|
|
|
static int virtio_ccw_hcall_early_printk(const uint64_t *args)
|
|
{
|
|
uint64_t mem = args[0];
|
|
|
|
if (mem < ram_size) {
|
|
/* Early printk */
|
|
return 0;
|
|
}
|
|
return -EINVAL;
|
|
}
|
|
|
|
static void virtio_ccw_register_hcalls(void)
|
|
{
|
|
s390_register_virtio_hypercall(KVM_S390_VIRTIO_CCW_NOTIFY,
|
|
virtio_ccw_hcall_notify);
|
|
/* Tolerate early printk. */
|
|
s390_register_virtio_hypercall(KVM_S390_VIRTIO_NOTIFY,
|
|
virtio_ccw_hcall_early_printk);
|
|
}
|
|
|
|
void s390_memory_init(ram_addr_t mem_size)
|
|
{
|
|
MemoryRegion *sysmem = get_system_memory();
|
|
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
|
|
|
/* allocate RAM for core */
|
|
memory_region_init_ram(ram, NULL, "s390.ram", mem_size, &error_fatal);
|
|
vmstate_register_ram_global(ram);
|
|
memory_region_add_subregion(sysmem, 0, ram);
|
|
|
|
/* Initialize storage key device */
|
|
s390_skeys_init();
|
|
}
|
|
|
|
static void ccw_init(MachineState *machine)
|
|
{
|
|
int ret;
|
|
VirtualCssBus *css_bus;
|
|
DeviceState *dev;
|
|
|
|
s390_sclp_init();
|
|
s390_memory_init(machine->ram_size);
|
|
|
|
/* get a BUS */
|
|
css_bus = virtual_css_bus_init();
|
|
s390_init_ipl_dev(machine->kernel_filename, machine->kernel_cmdline,
|
|
machine->initrd_filename, "s390-ccw.img", true);
|
|
s390_flic_init();
|
|
|
|
dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE);
|
|
object_property_add_child(qdev_get_machine(), TYPE_S390_PCI_HOST_BRIDGE,
|
|
OBJECT(dev), NULL);
|
|
qdev_init_nofail(dev);
|
|
|
|
/* register hypercalls */
|
|
virtio_ccw_register_hcalls();
|
|
|
|
/* init CPUs */
|
|
s390_init_cpus(machine->cpu_model);
|
|
|
|
if (kvm_enabled()) {
|
|
kvm_s390_enable_css_support(s390_cpu_addr2state(0));
|
|
}
|
|
/*
|
|
* Create virtual css and set it as default so that non mcss-e
|
|
* enabled guests only see virtio devices.
|
|
*/
|
|
ret = css_create_css_image(VIRTUAL_CSSID, true);
|
|
assert(ret == 0);
|
|
|
|
/* Create VirtIO network adapters */
|
|
s390_create_virtio_net(BUS(css_bus), "virtio-net-ccw");
|
|
|
|
/* Register savevm handler for guest TOD clock */
|
|
register_savevm(NULL, "todclock", 0, 1,
|
|
gtod_save, gtod_load, kvm_state);
|
|
}
|
|
|
|
static void ccw_machine_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
NMIClass *nc = NMI_CLASS(oc);
|
|
|
|
mc->init = ccw_init;
|
|
mc->block_default_type = IF_VIRTIO;
|
|
mc->no_cdrom = 1;
|
|
mc->no_floppy = 1;
|
|
mc->no_serial = 1;
|
|
mc->no_parallel = 1;
|
|
mc->no_sdcard = 1;
|
|
mc->use_sclp = 1;
|
|
mc->max_cpus = 255;
|
|
nc->nmi_monitor_handler = s390_nmi;
|
|
}
|
|
|
|
static inline bool machine_get_aes_key_wrap(Object *obj, Error **errp)
|
|
{
|
|
S390CcwMachineState *ms = S390_CCW_MACHINE(obj);
|
|
|
|
return ms->aes_key_wrap;
|
|
}
|
|
|
|
static inline void machine_set_aes_key_wrap(Object *obj, bool value,
|
|
Error **errp)
|
|
{
|
|
S390CcwMachineState *ms = S390_CCW_MACHINE(obj);
|
|
|
|
ms->aes_key_wrap = value;
|
|
}
|
|
|
|
static inline bool machine_get_dea_key_wrap(Object *obj, Error **errp)
|
|
{
|
|
S390CcwMachineState *ms = S390_CCW_MACHINE(obj);
|
|
|
|
return ms->dea_key_wrap;
|
|
}
|
|
|
|
static inline void machine_set_dea_key_wrap(Object *obj, bool value,
|
|
Error **errp)
|
|
{
|
|
S390CcwMachineState *ms = S390_CCW_MACHINE(obj);
|
|
|
|
ms->dea_key_wrap = value;
|
|
}
|
|
|
|
static inline void s390_machine_initfn(Object *obj)
|
|
{
|
|
object_property_add_bool(obj, "aes-key-wrap",
|
|
machine_get_aes_key_wrap,
|
|
machine_set_aes_key_wrap, NULL);
|
|
object_property_set_description(obj, "aes-key-wrap",
|
|
"enable/disable AES key wrapping using the CPACF wrapping key",
|
|
NULL);
|
|
object_property_set_bool(obj, true, "aes-key-wrap", NULL);
|
|
|
|
object_property_add_bool(obj, "dea-key-wrap",
|
|
machine_get_dea_key_wrap,
|
|
machine_set_dea_key_wrap, NULL);
|
|
object_property_set_description(obj, "dea-key-wrap",
|
|
"enable/disable DEA key wrapping using the CPACF wrapping key",
|
|
NULL);
|
|
object_property_set_bool(obj, true, "dea-key-wrap", NULL);
|
|
}
|
|
|
|
static const TypeInfo ccw_machine_info = {
|
|
.name = TYPE_S390_CCW_MACHINE,
|
|
.parent = TYPE_MACHINE,
|
|
.abstract = true,
|
|
.instance_size = sizeof(S390CcwMachineState),
|
|
.instance_init = s390_machine_initfn,
|
|
.class_init = ccw_machine_class_init,
|
|
.interfaces = (InterfaceInfo[]) {
|
|
{ TYPE_NMI },
|
|
{ }
|
|
},
|
|
};
|
|
|
|
#define CCW_COMPAT_2_4 \
|
|
{\
|
|
.driver = TYPE_S390_SKEYS,\
|
|
.property = "migration-enabled",\
|
|
.value = "off",\
|
|
},
|
|
|
|
static void ccw_machine_2_4_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
static GlobalProperty compat_props[] = {
|
|
CCW_COMPAT_2_4
|
|
{ /* end of list */ }
|
|
};
|
|
|
|
mc->name = "s390-ccw-virtio-2.4";
|
|
mc->desc = "VirtIO-ccw based S390 machine v2.4";
|
|
mc->compat_props = compat_props;
|
|
}
|
|
|
|
static const TypeInfo ccw_machine_2_4_info = {
|
|
.name = TYPE_S390_CCW_MACHINE "2.4",
|
|
.parent = TYPE_S390_CCW_MACHINE,
|
|
.class_init = ccw_machine_2_4_class_init,
|
|
};
|
|
|
|
static void ccw_machine_2_5_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
mc->name = "s390-ccw-virtio-2.5";
|
|
mc->alias = "s390-ccw-virtio";
|
|
mc->desc = "VirtIO-ccw based S390 machine v2.5";
|
|
mc->is_default = 1;
|
|
}
|
|
|
|
static const TypeInfo ccw_machine_2_5_info = {
|
|
.name = TYPE_S390_CCW_MACHINE "2.5",
|
|
.parent = TYPE_S390_CCW_MACHINE,
|
|
.class_init = ccw_machine_2_5_class_init,
|
|
};
|
|
|
|
static void ccw_machine_register_types(void)
|
|
{
|
|
type_register_static(&ccw_machine_info);
|
|
type_register_static(&ccw_machine_2_4_info);
|
|
type_register_static(&ccw_machine_2_5_info);
|
|
}
|
|
|
|
type_init(ccw_machine_register_types)
|