Commit 605d0a94 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Michael S. Tsirkin
Browse files

hostmem: add merge and dump properties 



Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarHu Tao <hutao@cn.fujitsu.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 2925020d

backends/hostmem.c

+83 −1
Original line number Diff line number Diff line
@@ -53,8 +53,73 @@ out: 
    error_propagate(errp, local_err);

}



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 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);



    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(obj, "size", "int",

                        host_memory_backend_get_size,

                        host_memory_backend_set_size, NULL, NULL, NULL);
@@ -80,9 +145,26 @@ 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, errp);

        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);

        }

    }

}

include/qemu/osdep.h

+10 −0
Original line number Diff line number Diff line
@@ -116,6 +116,16 @@ void qemu_anon_ram_free(void *ptr, size_t size); 
#else

#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID

#endif

#ifdef MADV_UNMERGEABLE

#define QEMU_MADV_UNMERGEABLE MADV_UNMERGEABLE

#else

#define QEMU_MADV_UNMERGEABLE QEMU_MADV_INVALID

#endif

#ifdef MADV_DODUMP

#define QEMU_MADV_DODUMP MADV_DODUMP

#else

#define QEMU_MADV_DODUMP QEMU_MADV_INVALID

#endif

#ifdef MADV_DONTDUMP

#define QEMU_MADV_DONTDUMP MADV_DONTDUMP

#else

include/sysemu/hostmem.h

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ struct HostMemoryBackend { 


    /* protected */

    uint64_t size;

    bool merge, dump;



    MemoryRegion mr;

};