Commit 186c0ab9 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* Fix Patchew CI failures (myself)
* i386 fw_cfg refactoring (Philippe)
* pmem bugfix (Stefan)
* Support for accessing cstate MSRs (Wanpeng)
* exec.c cleanups (Wei Yang)
* Improved throttling (Yury)
* elf-ops.h coverity fix (Stefano)

# gpg: Signature made Mon 16 Sep 2019 16:13:12 BST
# gpg:                using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream: (29 commits)
  hw/i386/pc: Extract the x86 generic fw_cfg code
  hw/i386/pc: Rename pc_build_feature_control() as generic fw_cfg_build_*
  hw/i386/pc: Let pc_build_feature_control() take a MachineState argument
  hw/i386/pc: Let pc_build_feature_control() take a FWCfgState argument
  hw/i386/pc: Rename pc_build_smbios() as generic fw_cfg_build_smbios()
  hw/i386/pc: Let pc_build_smbios() take a generic MachineState argument
  hw/i386/pc: Let pc_build_smbios() take a FWCfgState argument
  hw/i386/pc: Replace PCMachineState argument with MachineState in fw_cfg_arch_create
  hw/i386/pc: Pass the CPUArchIdList array by argument
  hw/i386/pc: Pass the apic_id_limit value by argument
  hw/i386/pc: Pass the boot_cpus value by argument
  hw/i386/pc: Rename bochs_bios_init as more generic fw_cfg_arch_create
  hw/i386/pc: Use address_space_memory in place
  hw/i386/pc: Extract e820 memory layout code
  hw/i386/pc: Use e820_get_num_entries() to access e820_entries
  cpus: Fix throttling during vm_stop
  qemu-thread: Add qemu_cond_timedwait
  memory: inline and optimize devend_memop
  memory: fetch pmem size in get_file_size()
  elf-ops.h: fix int overflow in load_elf()
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 521db803 149c50ca

backends/hostmem-file.c

+0 −22
Original line number Diff line number Diff line
@@ -58,28 +58,6 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
        return;

    }



    /*

     * Verify pmem file size since starting a guest with an incorrect size

     * leads to confusing failures inside the guest.

     */

    if (fb->is_pmem) {

        Error *local_err = NULL;

        uint64_t size;



        size = qemu_get_pmem_size(fb->mem_path, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            return;

        }



        if (size && backend->size > size) {

            error_setg(errp, "size property %" PRIu64 " is larger than "

                       "pmem file \"%s\" size %" PRIu64, backend->size,

                       fb->mem_path, size);

            return;

        }

    }



    backend->force_prealloc = mem_prealloc;

    name = host_memory_backend_get_name(backend);

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

cpus.c

+17 −8
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ 


#endif /* CONFIG_LINUX */



static QemuMutex qemu_global_mutex;



int64_t max_delay;

int64_t max_advance;
@@ -782,7 +784,7 @@ static void cpu_throttle_thread(CPUState *cpu, run_on_cpu_data opaque) 
{

    double pct;

    double throttle_ratio;

    long sleeptime_ns;

    int64_t sleeptime_ns, endtime_ns;



    if (!cpu_throttle_get_percentage()) {

        return;
@@ -790,11 +792,20 @@ static void cpu_throttle_thread(CPUState *cpu, run_on_cpu_data opaque) 


    pct = (double)cpu_throttle_get_percentage()/100;

    throttle_ratio = pct / (1 - pct);

    sleeptime_ns = (long)(throttle_ratio * CPU_THROTTLE_TIMESLICE_NS);



    /* Add 1ns to fix double's rounding error (like 0.9999999...) */

    sleeptime_ns = (int64_t)(throttle_ratio * CPU_THROTTLE_TIMESLICE_NS + 1);

    endtime_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + sleeptime_ns;

    while (sleeptime_ns > 0 && !cpu->stop) {

        if (sleeptime_ns > SCALE_MS) {

            qemu_cond_timedwait(cpu->halt_cond, &qemu_global_mutex,

                                sleeptime_ns / SCALE_MS);

        } else {

            qemu_mutex_unlock_iothread();

    g_usleep(sleeptime_ns / 1000); /* Convert ns to us for usleep call */

            g_usleep(sleeptime_ns / SCALE_US);

            qemu_mutex_lock_iothread();

        }

        sleeptime_ns = endtime_ns - qemu_clock_get_ns(QEMU_CLOCK_REALTIME);

    }

    atomic_set(&cpu->throttle_thread_scheduled, 0);

}
@@ -1172,8 +1183,6 @@ static void qemu_init_sigbus(void) 
}

#endif /* !CONFIG_LINUX */



static QemuMutex qemu_global_mutex;



static QemuThread io_thread;



/* cpu creation */

default-configs/i386-softmmu.mak

+0 −1
Original line number Diff line number Diff line
@@ -25,4 +25,3 @@ 
CONFIG_ISAPC=y

CONFIG_I440FX=y

CONFIG_Q35=y
 
CONFIG_ACPI_PCI=y

exec.c

+43 −11
Original line number Diff line number Diff line
@@ -227,8 +227,7 @@ static void phys_map_node_reserve(PhysPageMap *map, unsigned nodes) 
{

    static unsigned alloc_hint = 16;

    if (map->nodes_nb + nodes > map->nodes_nb_alloc) {

        map->nodes_nb_alloc = MAX(map->nodes_nb_alloc, alloc_hint);

        map->nodes_nb_alloc = MAX(map->nodes_nb_alloc, map->nodes_nb + nodes);

        map->nodes_nb_alloc = MAX(alloc_hint, map->nodes_nb + nodes);

        map->nodes = g_renew(Node, map->nodes, map->nodes_nb_alloc);

        alloc_hint = map->nodes_nb_alloc;

    }
@@ -255,7 +254,7 @@ static uint32_t phys_map_node_alloc(PhysPageMap *map, bool leaf) 
}



static void phys_page_set_level(PhysPageMap *map, PhysPageEntry *lp,

                                hwaddr *index, hwaddr *nb, uint16_t leaf,

                                hwaddr *index, uint64_t *nb, uint16_t leaf,

                                int level)

{

    PhysPageEntry *p;
@@ -281,7 +280,7 @@ static void phys_page_set_level(PhysPageMap *map, PhysPageEntry *lp, 
}



static void phys_page_set(AddressSpaceDispatch *d,

                          hwaddr index, hwaddr nb,

                          hwaddr index, uint64_t nb,

                          uint16_t leaf)

{

    /* Wildly overreserve - it doesn't matter much. */
@@ -325,7 +324,8 @@ static void phys_page_compact(PhysPageEntry *lp, Node *nodes) 
    assert(valid_ptr < P_L2_SIZE);



    /* Don't compress if it won't fit in the # of bits we have. */

    if (lp->skip + p[valid_ptr].skip >= (1 << 3)) {

    if (P_L2_LEVELS >= (1 << 6) &&

        lp->skip + p[valid_ptr].skip >= (1 << 6)) {

        return;

    }
@@ -1791,7 +1791,39 @@ long qemu_maxrampagesize(void) 
#ifdef CONFIG_POSIX

static int64_t get_file_size(int fd)

{

    int64_t size = lseek(fd, 0, SEEK_END);

    int64_t size;

#if defined(__linux__)

    struct stat st;



    if (fstat(fd, &st) < 0) {

        return -errno;

    }



    /* Special handling for devdax character devices */

    if (S_ISCHR(st.st_mode)) {

        g_autofree char *subsystem_path = NULL;

        g_autofree char *subsystem = NULL;



        subsystem_path = g_strdup_printf("/sys/dev/char/%d:%d/subsystem",

                                         major(st.st_rdev), minor(st.st_rdev));

        subsystem = g_file_read_link(subsystem_path, NULL);



        if (subsystem && g_str_has_suffix(subsystem, "/dax")) {

            g_autofree char *size_path = NULL;

            g_autofree char *size_str = NULL;



            size_path = g_strdup_printf("/sys/dev/char/%d:%d/size",

                                    major(st.st_rdev), minor(st.st_rdev));



            if (g_file_get_contents(size_path, &size_str, NULL, NULL)) {

                return g_ascii_strtoll(size_str, NULL, 0);

            }

        }

    }

#endif /* defined(__linux__) */



    /* st.st_size may be zero for special files yet lseek(2) works */

    size = lseek(fd, 0, SEEK_END);

    if (size < 0) {

        return -errno;

    }
@@ -2938,6 +2970,7 @@ static subpage_t *subpage_init(FlatView *fv, hwaddr base) 
{

    subpage_t *mmio;



    /* mmio->sub_section is set to PHYS_SECTION_UNASSIGNED with g_malloc0 */

    mmio = g_malloc0(sizeof(subpage_t) + TARGET_PAGE_SIZE * sizeof(uint16_t));

    mmio->fv = fv;

    mmio->base = base;
@@ -2948,7 +2981,6 @@ static subpage_t *subpage_init(FlatView *fv, hwaddr base) 
    printf("%s: %p base " TARGET_FMT_plx " len %08x\n", __func__,

           mmio, base, TARGET_PAGE_SIZE);

#endif

    subpage_register(mmio, 0, TARGET_PAGE_SIZE-1, PHYS_SECTION_UNASSIGNED);



    return mmio;

}

hw/core/loader.c

+2 −0
Original line number Diff line number Diff line
@@ -338,6 +338,8 @@ const char *load_elf_strerror(int error) 
        return "The image is from incompatible architecture";

    case ELF_LOAD_WRONG_ENDIAN:

        return "The image has incorrect endianness";

    case ELF_LOAD_TOO_BIG:

        return "The image segments are too big to load";

    default:

        return "Unknown error";

    }