Commit 557529dd authored by Hu Tao's avatar Hu Tao Committed by Paolo Bonzini
Browse files

exec: report error when memory < hpagesize 



Report an error when memory < hpagesize in file_ram_alloc() so callers
can handle the error.

If user adds a memory-backend-file object using object_add command,
specifying a size that is less than huge page size, qemu will core dump
with message:

  Bad ram offset fffffffffffff000
  Aborted (core dumped)

This patch fixes the problem. With this patch, qemu reports error
message like:

  qemu-system-x86_64: -object memory-backend-file,mem-path=/hugepages,id=mem-file0,size=1M: memory
  size 0x100000 must be equal to or larger than huge page size 0x200000

Signed-off-by: default avatarHu Tao <hutao@cn.fujitsu.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d42e2de7

exec.c

+6 −3
Original line number Diff line number Diff line
@@ -1059,9 +1059,9 @@ static void *file_ram_alloc(RAMBlock *block, 
    char *filename;

    char *sanitized_name;

    char *c;

    void *area;

    void *area = NULL;

    int fd;

    unsigned long hpagesize;

    uint64_t hpagesize;



    hpagesize = gethugepagesize(path);

    if (!hpagesize) {
@@ -1069,7 +1069,10 @@ static void *file_ram_alloc(RAMBlock *block, 
    }



    if (memory < hpagesize) {

        return NULL;

        error_setg(errp, "memory size 0x" RAM_ADDR_FMT " must be equal to "

                   "or larger than huge page size 0x%" PRIx64,

                   memory, hpagesize);

        goto error;

    }



    if (kvm_enabled() && !kvm_has_sync_mmu()) {