Commit 0a99aae5 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 



pc,pci,virtio,hotplug fixes, enhancements

numa work by Hu Tao and others
memory hotplug by Igor
vhost-user by Nikolay, Antonios and others
guest virtio announcements by Jason
qtest fixes by Sergey
qdev hotplug fixes by Paolo
misc other fixes mostly by myself

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

* remotes/mst/tags/for_upstream: (109 commits)
  numa: use RAM_ADDR_FMT with ram_addr_t
  qapi/string-output-visitor: fix bugs
  tests: simplify code
  qapi: fix input visitor bugs
  acpi: rephrase comment
  qmp: add ACPI_DEVICE_OST event handling
  qmp: add query-acpi-ospm-status command
  acpi: implement ospm_status() method for PIIX4/ICH9_LPC devices
  acpi: introduce TYPE_ACPI_DEVICE_IF interface
  qmp: add query-memory-devices command
  numa: handle mmaped memory allocation failure correctly
  pc: acpi: do not hardcode preprocessor
  qmp: clean out whitespace
  qdev: recursively unrealize devices when unrealizing bus
  qdev: reorganize error reporting in bus_set_realized
  qapi: fix build on glib < 2.28
  qapi: make string output visitor parse int list
  qapi: make string input visitor parse int list
  tests: fix memory leak in test of string input visitor
  hmp: add info memdev
  ...

Conflicts:
	include/hw/i386/pc.h
[PMM: fixed minor conflict in pc.h]
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 53001c14 705456c0

Makefile.target

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ endif #CONFIG_BSD_USER 
#########################################################

# System emulator target

ifdef CONFIG_SOFTMMU

obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o

obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o

obj-y += qtest.o

obj-y += hw/

obj-$(CONFIG_FDT) += device_tree.o

backends/Makefile.objs

+3 −0
Original line number Diff line number Diff line
@@ -6,3 +6,6 @@ common-obj-$(CONFIG_BRLAPI) += baum.o 
baum.o-cflags := $(SDL_CFLAGS)



common-obj-$(CONFIG_TPM) += tpm.o



common-obj-y += hostmem.o hostmem-ram.o

common-obj-$(CONFIG_LINUX) += hostmem-file.o

backends/hostmem-file.c

0 → 100644
+134 −0
Original line number Diff line number Diff line 
/*

 * QEMU Host Memory Backend for hugetlbfs

 *

 * Copyright (C) 2013-2014 Red Hat Inc

 *

 * Authors:

 *   Paolo Bonzini <pbonzini@redhat.com>

 *

 * 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 "qemu-common.h"

#include "sysemu/hostmem.h"

#include "sysemu/sysemu.h"

#include "qom/object_interfaces.h"



/* hostmem-file.c */

/**

 * @TYPE_MEMORY_BACKEND_FILE:

 * name of backend that uses mmap on a file descriptor

 */

#define TYPE_MEMORY_BACKEND_FILE "memory-backend-file"



#define MEMORY_BACKEND_FILE(obj) \

    OBJECT_CHECK(HostMemoryBackendFile, (obj), TYPE_MEMORY_BACKEND_FILE)



typedef struct HostMemoryBackendFile HostMemoryBackendFile;



struct HostMemoryBackendFile {

    HostMemoryBackend parent_obj;



    bool share;

    char *mem_path;

};



static void

file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)

{

    HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(backend);



    if (!backend->size) {

        error_setg(errp, "can't create backend with size 0");

        return;

    }

    if (!fb->mem_path) {

        error_setg(errp, "mem_path property not set");

        return;

    }

#ifndef CONFIG_LINUX

    error_setg(errp, "-mem-path not supported on this host");

#else

    if (!memory_region_size(&backend->mr)) {

        backend->force_prealloc = mem_prealloc;

        memory_region_init_ram_from_file(&backend->mr, OBJECT(backend),

                                 object_get_canonical_path(OBJECT(backend)),

                                 backend->size, fb->share,

                                 fb->mem_path, errp);

    }

#endif

}



static void

file_backend_class_init(ObjectClass *oc, void *data)

{

    HostMemoryBackendClass *bc = MEMORY_BACKEND_CLASS(oc);



    bc->alloc = file_backend_memory_alloc;

}



static char *get_mem_path(Object *o, Error **errp)

{

    HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);



    return g_strdup(fb->mem_path);

}



static void set_mem_path(Object *o, const char *str, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(o);

    HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);



    if (memory_region_size(&backend->mr)) {

        error_setg(errp, "cannot change property value");

        return;

    }

    if (fb->mem_path) {

        g_free(fb->mem_path);

    }

    fb->mem_path = g_strdup(str);

}



static bool file_memory_backend_get_share(Object *o, Error **errp)

{

    HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);



    return fb->share;

}



static void file_memory_backend_set_share(Object *o, bool value, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(o);

    HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);



    if (memory_region_size(&backend->mr)) {

        error_setg(errp, "cannot change property value");

        return;

    }

    fb->share = value;

}



static void

file_backend_instance_init(Object *o)

{

    object_property_add_bool(o, "share",

                        file_memory_backend_get_share,

                        file_memory_backend_set_share, NULL);

    object_property_add_str(o, "mem-path", get_mem_path,

                            set_mem_path, NULL);

}



static const TypeInfo file_backend_info = {

    .name = TYPE_MEMORY_BACKEND_FILE,

    .parent = TYPE_MEMORY_BACKEND,

    .class_init = file_backend_class_init,

    .instance_init = file_backend_instance_init,

    .instance_size = sizeof(HostMemoryBackendFile),

};



static void register_types(void)

{

    type_register_static(&file_backend_info);

}



type_init(register_types);

backends/hostmem-ram.c

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/*

 * QEMU Host Memory Backend

 *

 * Copyright (C) 2013-2014 Red Hat Inc

 *

 * Authors:

 *   Igor Mammedov <imammedo@redhat.com>

 *

 * 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 "sysemu/hostmem.h"

#include "qom/object_interfaces.h"



#define TYPE_MEMORY_BACKEND_RAM "memory-backend-ram"





static void

ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)

{

    char *path;



    if (!backend->size) {

        error_setg(errp, "can't create backend with size 0");

        return;

    }



    path = object_get_canonical_path_component(OBJECT(backend));

    memory_region_init_ram(&backend->mr, OBJECT(backend), path,

                           backend->size);

    g_free(path);

}



static void

ram_backend_class_init(ObjectClass *oc, void *data)

{

    HostMemoryBackendClass *bc = MEMORY_BACKEND_CLASS(oc);



    bc->alloc = ram_backend_memory_alloc;

}



static const TypeInfo ram_backend_info = {

    .name = TYPE_MEMORY_BACKEND_RAM,

    .parent = TYPE_MEMORY_BACKEND,

    .class_init = ram_backend_class_init,

};



static void register_types(void)

{

    type_register_static(&ram_backend_info);

}



type_init(register_types);

backends/hostmem.c

0 → 100644
+375 −0
Original line number Diff line number Diff line 
/*

 * QEMU Host Memory Backend

 *

 * Copyright (C) 2013-2014 Red Hat Inc

 *

 * Authors:

 *   Igor Mammedov <imammedo@redhat.com>

 *

 * 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 "sysemu/hostmem.h"

#include "qapi/visitor.h"

#include "qapi-types.h"

#include "qapi-visit.h"

#include "qapi/qmp/qerror.h"

#include "qemu/config-file.h"

#include "qom/object_interfaces.h"



#ifdef CONFIG_NUMA

#include <numaif.h>

QEMU_BUILD_BUG_ON(HOST_MEM_POLICY_DEFAULT != MPOL_DEFAULT);

QEMU_BUILD_BUG_ON(HOST_MEM_POLICY_PREFERRED != MPOL_PREFERRED);

QEMU_BUILD_BUG_ON(HOST_MEM_POLICY_BIND != MPOL_BIND);

QEMU_BUILD_BUG_ON(HOST_MEM_POLICY_INTERLEAVE != MPOL_INTERLEAVE);

#endif



static void

host_memory_backend_get_size(Object *obj, Visitor *v, void *opaque,

                             const char *name, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    uint64_t value = backend->size;



    visit_type_size(v, &value, name, errp);

}



static void

host_memory_backend_set_size(Object *obj, Visitor *v, void *opaque,

                             const char *name, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    Error *local_err = NULL;

    uint64_t value;



    if (memory_region_size(&backend->mr)) {

        error_setg(&local_err, "cannot change property value");

        goto out;

    }



    visit_type_size(v, &value, name, &local_err);

    if (local_err) {

        goto out;

    }

    if (!value) {

        error_setg(&local_err, "Property '%s.%s' doesn't take value '%"

                   PRIu64 "'", object_get_typename(obj), name, value);

        goto out;

    }

    backend->size = value;

out:

    error_propagate(errp, local_err);

}



static void

host_memory_backend_get_host_nodes(Object *obj, Visitor *v, void *opaque,

                                   const char *name, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    uint16List *host_nodes = NULL;

    uint16List **node = &host_nodes;

    unsigned long value;



    value = find_first_bit(backend->host_nodes, MAX_NODES);

    if (value == MAX_NODES) {

        return;

    }



    *node = g_malloc0(sizeof(**node));

    (*node)->value = value;

    node = &(*node)->next;



    do {

        value = find_next_bit(backend->host_nodes, MAX_NODES, value + 1);

        if (value == MAX_NODES) {

            break;

        }



        *node = g_malloc0(sizeof(**node));

        (*node)->value = value;

        node = &(*node)->next;

    } while (true);



    visit_type_uint16List(v, &host_nodes, name, errp);

}



static void

host_memory_backend_set_host_nodes(Object *obj, Visitor *v, void *opaque,

                                   const char *name, Error **errp)

{

#ifdef CONFIG_NUMA

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    uint16List *l = NULL;



    visit_type_uint16List(v, &l, name, errp);



    while (l) {

        bitmap_set(backend->host_nodes, l->value, 1);

        l = l->next;

    }

#else

    error_setg(errp, "NUMA node binding are not supported by this QEMU");

#endif

}



static void

host_memory_backend_get_policy(Object *obj, Visitor *v, void *opaque,

                               const char *name, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    int policy = backend->policy;



    visit_type_enum(v, &policy, HostMemPolicy_lookup, NULL, name, errp);

}



static void

host_memory_backend_set_policy(Object *obj, Visitor *v, void *opaque,

                               const char *name, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    int policy;



    visit_type_enum(v, &policy, HostMemPolicy_lookup, NULL, name, errp);

    backend->policy = policy;



#ifndef CONFIG_NUMA

    if (policy != HOST_MEM_POLICY_DEFAULT) {

        error_setg(errp, "NUMA policies are not supported by this QEMU");

    }

#endif

}



static bool host_memory_backend_get_merge(Object *obj, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);



    return backend->merge;

}



static void host_memory_backend_set_merge(Object *obj, bool value, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);



    if (!memory_region_size(&backend->mr)) {

        backend->merge = value;

        return;

    }



    if (value != backend->merge) {

        void *ptr = memory_region_get_ram_ptr(&backend->mr);

        uint64_t sz = memory_region_size(&backend->mr);



        qemu_madvise(ptr, sz,

                     value ? QEMU_MADV_MERGEABLE : QEMU_MADV_UNMERGEABLE);

        backend->merge = value;

    }

}



static bool host_memory_backend_get_dump(Object *obj, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);



    return backend->dump;

}



static void host_memory_backend_set_dump(Object *obj, bool value, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);



    if (!memory_region_size(&backend->mr)) {

        backend->dump = value;

        return;

    }



    if (value != backend->dump) {

        void *ptr = memory_region_get_ram_ptr(&backend->mr);

        uint64_t sz = memory_region_size(&backend->mr);



        qemu_madvise(ptr, sz,

                     value ? QEMU_MADV_DODUMP : QEMU_MADV_DONTDUMP);

        backend->dump = value;

    }

}



static bool host_memory_backend_get_prealloc(Object *obj, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);



    return backend->prealloc || backend->force_prealloc;

}



static void host_memory_backend_set_prealloc(Object *obj, bool value,

                                             Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);



    if (backend->force_prealloc) {

        if (value) {

            error_setg(errp,

                       "remove -mem-prealloc to use the prealloc property");

            return;

        }

    }



    if (!memory_region_size(&backend->mr)) {

        backend->prealloc = value;

        return;

    }



    if (value && !backend->prealloc) {

        int fd = memory_region_get_fd(&backend->mr);

        void *ptr = memory_region_get_ram_ptr(&backend->mr);

        uint64_t sz = memory_region_size(&backend->mr);



        os_mem_prealloc(fd, ptr, sz);

        backend->prealloc = true;

    }

}



static void host_memory_backend_init(Object *obj)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);



    backend->merge = qemu_opt_get_bool(qemu_get_machine_opts(),

                                       "mem-merge", true);

    backend->dump = qemu_opt_get_bool(qemu_get_machine_opts(),

                                      "dump-guest-core", true);

    backend->prealloc = mem_prealloc;



    object_property_add_bool(obj, "merge",

                        host_memory_backend_get_merge,

                        host_memory_backend_set_merge, NULL);

    object_property_add_bool(obj, "dump",

                        host_memory_backend_get_dump,

                        host_memory_backend_set_dump, NULL);

    object_property_add_bool(obj, "prealloc",

                        host_memory_backend_get_prealloc,

                        host_memory_backend_set_prealloc, NULL);

    object_property_add(obj, "size", "int",

                        host_memory_backend_get_size,

                        host_memory_backend_set_size, NULL, NULL, NULL);

    object_property_add(obj, "host-nodes", "int",

                        host_memory_backend_get_host_nodes,

                        host_memory_backend_set_host_nodes, NULL, NULL, NULL);

    object_property_add(obj, "policy", "str",

                        host_memory_backend_get_policy,

                        host_memory_backend_set_policy, NULL, NULL, NULL);

}



static void host_memory_backend_finalize(Object *obj)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);



    if (memory_region_size(&backend->mr)) {

        memory_region_destroy(&backend->mr);

    }

}



MemoryRegion *

host_memory_backend_get_memory(HostMemoryBackend *backend, Error **errp)

{

    return memory_region_size(&backend->mr) ? &backend->mr : NULL;

}



static void

host_memory_backend_memory_complete(UserCreatable *uc, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(uc);

    HostMemoryBackendClass *bc = MEMORY_BACKEND_GET_CLASS(uc);

    Error *local_err = NULL;

    void *ptr;

    uint64_t sz;



    if (bc->alloc) {

        bc->alloc(backend, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            return;

        }



        ptr = memory_region_get_ram_ptr(&backend->mr);

        sz = memory_region_size(&backend->mr);



        if (backend->merge) {

            qemu_madvise(ptr, sz, QEMU_MADV_MERGEABLE);

        }

        if (!backend->dump) {

            qemu_madvise(ptr, sz, QEMU_MADV_DONTDUMP);

        }

#ifdef CONFIG_NUMA

        unsigned long lastbit = find_last_bit(backend->host_nodes, MAX_NODES);

        /* lastbit == MAX_NODES means maxnode = 0 */

        unsigned long maxnode = (lastbit + 1) % (MAX_NODES + 1);

        /* ensure policy won't be ignored in case memory is preallocated

         * before mbind(). note: MPOL_MF_STRICT is ignored on hugepages so

         * this doesn't catch hugepage case. */

        unsigned flags = MPOL_MF_STRICT;



        /* check for invalid host-nodes and policies and give more verbose

         * error messages than mbind(). */

        if (maxnode && backend->policy == MPOL_DEFAULT) {

            error_setg(errp, "host-nodes must be empty for policy default,"

                       " or you should explicitly specify a policy other"

                       " than default");

            return;

        } else if (maxnode == 0 && backend->policy != MPOL_DEFAULT) {

            error_setg(errp, "host-nodes must be set for policy %s",

                       HostMemPolicy_lookup[backend->policy]);

            return;

        }



        /* We can have up to MAX_NODES nodes, but we need to pass maxnode+1

         * as argument to mbind() due to an old Linux bug (feature?) which

         * cuts off the last specified node. This means backend->host_nodes

         * must have MAX_NODES+1 bits available.

         */

        assert(sizeof(backend->host_nodes) >=

               BITS_TO_LONGS(MAX_NODES + 1) * sizeof(unsigned long));

        assert(maxnode <= MAX_NODES);

        if (mbind(ptr, sz, backend->policy,

                  maxnode ? backend->host_nodes : NULL, maxnode + 1, flags)) {

            error_setg_errno(errp, errno,

                             "cannot bind memory to host NUMA nodes");

            return;

        }

#endif

        /* Preallocate memory after the NUMA policy has been instantiated.

         * This is necessary to guarantee memory is allocated with

         * specified NUMA policy in place.

         */

        if (backend->prealloc) {

            os_mem_prealloc(memory_region_get_fd(&backend->mr), ptr, sz);

        }

    }

}



static void

host_memory_backend_class_init(ObjectClass *oc, void *data)

{

    UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);



    ucc->complete = host_memory_backend_memory_complete;

}



static const TypeInfo host_memory_backend_info = {

    .name = TYPE_MEMORY_BACKEND,

    .parent = TYPE_OBJECT,

    .abstract = true,

    .class_size = sizeof(HostMemoryBackendClass),

    .class_init = host_memory_backend_class_init,

    .instance_size = sizeof(HostMemoryBackend),

    .instance_init = host_memory_backend_init,

    .instance_finalize = host_memory_backend_finalize,

    .interfaces = (InterfaceInfo[]) {

        { TYPE_USER_CREATABLE },

        { }

    }

};



static void register_types(void)

{

    type_register_static(&host_memory_backend_info);

}



type_init(register_types);