Commit 2cb73afa authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging 



Machine queue, 2019-03-11

* memfd fixes (Ilya Maximets)
* Move nvdimms state into struct MachineState (Eric Auger)
* hostmem-file: reject invalid pmem file sizes (Stefan Hajnoczi)

# gpg: Signature made Tue 12 Mar 2019 00:57:41 GMT
# gpg:                using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/machine-next-pull-request:
  memfd: improve error messages
  memfd: set up correct errno if not supported
  memfd: always check for MFD_CLOEXEC
  hostmem-memfd: disable for systems without sealing support
  machine: Move nvdimms state into struct MachineState
  nvdimm: Rename AcpiNVDIMMState into NVDIMMState
  hostmem-file: reject invalid pmem file sizes

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 46316f1d edaed6c7

backends/hostmem-file.c

+23 −0
Original line number Diff line number Diff line
@@ -56,6 +56,29 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
        error_setg(errp, "mem-path property not set");

        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 (!size) {

            error_propagate(errp, local_err);

            return;

        }



        if (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),

backends/hostmem-memfd.c

+8 −10
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ memfd_backend_class_init(ObjectClass *oc, void *data) 
                                              "Huge pages size (ex: 2M, 1G)",

                                              &error_abort);

    }

    if (qemu_memfd_check(MFD_ALLOW_SEALING)) {

    object_class_property_add_bool(oc, "seal",

                                   memfd_backend_get_seal,

                                   memfd_backend_set_seal,
@@ -163,7 +162,6 @@ memfd_backend_class_init(ObjectClass *oc, void *data) 
                                          "Seal growing & shrinking",

                                          &error_abort);

}

}



static const TypeInfo memfd_backend_info = {

    .name = TYPE_MEMORY_BACKEND_MEMFD,
@@ -175,7 +173,7 @@ static const TypeInfo memfd_backend_info = { 


static void register_types(void)

{

    if (qemu_memfd_check(0)) {

    if (qemu_memfd_check(MFD_ALLOW_SEALING)) {

        type_register_static(&memfd_backend_info);

    }

}

hw/acpi/nvdimm.c

+9 −9
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ nvdimm_build_structure_caps(GArray *structures, uint32_t capabilities) 
    nfit_caps->capabilities = cpu_to_le32(capabilities);

}



static GArray *nvdimm_build_device_structure(AcpiNVDIMMState *state)

static GArray *nvdimm_build_device_structure(NVDIMMState *state)

{

    GSList *device_list = nvdimm_get_device_list();

    GArray *structures = g_array_new(false, true /* clear */, 1);
@@ -416,7 +416,7 @@ static void nvdimm_init_fit_buffer(NvdimmFitBuffer *fit_buf) 
    fit_buf->fit = g_array_new(false, true /* clear */, 1);

}



static void nvdimm_build_fit_buffer(AcpiNVDIMMState *state)

static void nvdimm_build_fit_buffer(NVDIMMState *state)

{

    NvdimmFitBuffer *fit_buf = &state->fit_buf;
@@ -425,12 +425,12 @@ static void nvdimm_build_fit_buffer(AcpiNVDIMMState *state) 
    fit_buf->dirty = true;

}



void nvdimm_plug(AcpiNVDIMMState *state)

void nvdimm_plug(NVDIMMState *state)

{

    nvdimm_build_fit_buffer(state);

}



static void nvdimm_build_nfit(AcpiNVDIMMState *state, GArray *table_offsets,

static void nvdimm_build_nfit(NVDIMMState *state, GArray *table_offsets,

                              GArray *table_data, BIOSLinker *linker)

{

    NvdimmFitBuffer *fit_buf = &state->fit_buf;
@@ -570,7 +570,7 @@ nvdimm_dsm_no_payload(uint32_t func_ret_status, hwaddr dsm_mem_addr) 
#define NVDIMM_QEMU_RSVD_HANDLE_ROOT         0x10000



/* Read FIT data, defined in docs/specs/acpi_nvdimm.txt. */

static void nvdimm_dsm_func_read_fit(AcpiNVDIMMState *state, NvdimmDsmIn *in,

static void nvdimm_dsm_func_read_fit(NVDIMMState *state, NvdimmDsmIn *in,

                                     hwaddr dsm_mem_addr)

{

    NvdimmFitBuffer *fit_buf = &state->fit_buf;
@@ -619,7 +619,7 @@ exit: 
}



static void

nvdimm_dsm_handle_reserved_root_method(AcpiNVDIMMState *state,

nvdimm_dsm_handle_reserved_root_method(NVDIMMState *state,

                                       NvdimmDsmIn *in, hwaddr dsm_mem_addr)

{

    switch (in->function) {
@@ -863,7 +863,7 @@ nvdimm_dsm_read(void *opaque, hwaddr addr, unsigned size) 
static void

nvdimm_dsm_write(void *opaque, hwaddr addr, uint64_t val, unsigned size)

{

    AcpiNVDIMMState *state = opaque;

    NVDIMMState *state = opaque;

    NvdimmDsmIn *in;

    hwaddr dsm_mem_addr = val;
@@ -925,7 +925,7 @@ void nvdimm_acpi_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev) 
    }

}



void nvdimm_init_acpi_state(AcpiNVDIMMState *state, MemoryRegion *io,

void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,

                            FWCfgState *fw_cfg, Object *owner)

{

    memory_region_init_io(&state->io_mr, owner, &nvdimm_dsm_ops, state,
@@ -1319,7 +1319,7 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data, 
}



void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,

                       BIOSLinker *linker, AcpiNVDIMMState *state,

                       BIOSLinker *linker, NVDIMMState *state,

                       uint32_t ram_slots)

{

    GSList *device_list;

hw/core/machine.c

+65 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "qemu/error-report.h"

#include "sysemu/qtest.h"

#include "hw/pci/pci.h"

#include "hw/mem/nvdimm.h"



GlobalProperty hw_compat_3_1[] = {

    { "pcie-root-port", "x-speed", "2_5" },
@@ -481,6 +482,47 @@ static void machine_set_memory_encryption(Object *obj, const char *value, 
    ms->memory_encryption = g_strdup(value);

}



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

{

    MachineState *ms = MACHINE(obj);



    return ms->nvdimms_state->is_enabled;

}



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

{

    MachineState *ms = MACHINE(obj);



    ms->nvdimms_state->is_enabled = value;

}



static char *machine_get_nvdimm_persistence(Object *obj, Error **errp)

{

    MachineState *ms = MACHINE(obj);



    return g_strdup(ms->nvdimms_state->persistence_string);

}



static void machine_set_nvdimm_persistence(Object *obj, const char *value,

                                           Error **errp)

{

    MachineState *ms = MACHINE(obj);

    NVDIMMState *nvdimms_state = ms->nvdimms_state;



    if (strcmp(value, "cpu") == 0) {

        nvdimms_state->persistence = 3;

    } else if (strcmp(value, "mem-ctrl") == 0) {

        nvdimms_state->persistence = 2;

    } else {

        error_setg(errp, "-machine nvdimm-persistence=%s: unsupported option",

                   value);

        return;

    }



    g_free(nvdimms_state->persistence_string);

    nvdimms_state->persistence_string = g_strdup(value);

}



void machine_class_allow_dynamic_sysbus_dev(MachineClass *mc, const char *type)

{

    strList *item = g_new0(strList, 1);
@@ -791,6 +833,28 @@ static void machine_initfn(Object *obj) 
    ms->mem_merge = true;

    ms->enable_graphics = true;



    if (mc->nvdimm_supported) {

        Object *obj = OBJECT(ms);



        ms->nvdimms_state = g_new0(NVDIMMState, 1);

        object_property_add_bool(obj, "nvdimm",

                                 machine_get_nvdimm, machine_set_nvdimm,

                                 &error_abort);

        object_property_set_description(obj, "nvdimm",

                                        "Set on/off to enable/disable "

                                        "NVDIMM instantiation", NULL);



        object_property_add_str(obj, "nvdimm-persistence",

                                machine_get_nvdimm_persistence,

                                machine_set_nvdimm_persistence,

                                &error_abort);

        object_property_set_description(obj, "nvdimm-persistence",

                                        "Set NVDIMM persistence"

                                        "Valid values are cpu, mem-ctrl",

                                        NULL);

    }





    /* Register notifier when init is done for sysbus sanity checks */

    ms->sysbus_notifier.notify = machine_init_notify;

    qemu_add_machine_init_done_notifier(&ms->sysbus_notifier);
@@ -809,6 +873,7 @@ static void machine_finalize(Object *obj) 
    g_free(ms->dt_compatible);

    g_free(ms->firmware);

    g_free(ms->device_memory);

    g_free(ms->nvdimms_state);

}



bool machine_usb(MachineState *machine)

hw/i386/acpi-build.c

+3 −3
Original line number Diff line number Diff line
@@ -1867,7 +1867,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, 
            aml_append(scope, method);

        }



        if (pcms->acpi_nvdimm_state.is_enabled) {

        if (machine->nvdimms_state->is_enabled) {

            method = aml_method("_E04", 0, AML_NOTSERIALIZED);

            aml_append(method, aml_notify(aml_name("\\_SB.NVDR"),

                                          aml_int(0x80)));
@@ -2704,9 +2704,9 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) 
            build_dmar_q35(tables_blob, tables->linker);

        }

    }

    if (pcms->acpi_nvdimm_state.is_enabled) {

    if (machine->nvdimms_state->is_enabled) {

        nvdimm_build_acpi(table_offsets, tables_blob, tables->linker,

                          &pcms->acpi_nvdimm_state, machine->ram_slots);

                          machine->nvdimms_state, machine->ram_slots);

    }



    /* Add tables supplied by user (if any) */