SeaBIOS September 2012

seabios@seabios.org

27 participants
112 discussions

[RFC PATCH v3 19/19] Calculate pcimem_start and pcimem64_start from SRAT entries
by Vasilis Liaskovitis 21 Sep '12

21 Sep '12

pcimem_start and pcimem64_start are adjusted from srat entries. For this reason, paravirt info (NUMA SRAT entries and number of cpus) need to be read before pci_setup. Imho, this is an ugly code change since SRAT bios tables and number of cpus have to be read earlier. But the advantage is that no new paravirt interface is introduced. Suggestions to make the code change cleaner are welcome. The alternative patch (will be sent as a reply to this patch) implements a paravirt interface to read the starting values of pcimem_start and pcimem64_start from QEMU. Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> --- src/acpi.c | 82 ++++++++++++++++++++++++++++++++++++++++---------------- src/acpi.h | 3 ++ src/pciinit.c | 6 +++- src/post.c | 3 ++ src/smp.c | 4 +++ 5 files changed, 72 insertions(+), 26 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index 1223b52..9e99aa7 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -428,7 +428,10 @@ encodeLen(u8 *ssdt_ptr, int length, int bytes) #define MEM_OFFSET_END 63 #define MEM_OFFSET_SIZE 79 -u64 nb_hp_memslots = 0; +u64 nb_hp_memslots = 0, nb_numanodes; +u64 *numa_data, *hp_memdata; +u64 below_4g_hp_mem_size = 0; +u64 above_4g_hp_mem_size = 0; struct srat_memory_affinity *mem; #define SSDT_SIGNATURE 0x54445353 // SSDT @@ -763,17 +766,7 @@ acpi_build_srat_memory(struct srat_memory_affinity *numamem, static void * build_srat(void) { - int nb_numa_nodes = qemu_cfg_get_numa_nodes(); - - u64 *numadata = malloc_tmphigh(sizeof(u64) * (MaxCountCPUs + nb_numa_nodes)); - if (!numadata) { - warn_noalloc(); - return NULL; - } - - qemu_cfg_get_numa_data(numadata, MaxCountCPUs + nb_numa_nodes); - - qemu_cfg_get_numa_data(&nb_hp_memslots, 1); + int nb_numa_nodes = nb_numanodes; struct system_resource_affinity_table *srat; int srat_size = sizeof(*srat) + sizeof(struct srat_processor_affinity) * MaxCountCPUs + @@ -782,7 +775,7 @@ build_srat(void) srat = malloc_high(srat_size); if (!srat) { warn_noalloc(); - free(numadata); + free(numa_data); return NULL; } @@ -791,6 +784,7 @@ build_srat(void) struct srat_processor_affinity *core = (void*)(srat + 1); int i; u64 curnode; + u64 *numadata = numa_data; for (i = 0; i < MaxCountCPUs; ++i) { core->type = SRAT_PROCESSOR; @@ -847,15 +841,7 @@ build_srat(void) mem = (void*)numamem; if (nb_hp_memslots) { - u64 *hpmemdata = malloc_tmphigh(sizeof(u64) * (3 * nb_hp_memslots)); - if (!hpmemdata) { - warn_noalloc(); - free(hpmemdata); - free(numadata); - return NULL; - } - - qemu_cfg_get_numa_data(hpmemdata, 3 * nb_hp_memslots); + u64 *hpmemdata = hp_memdata; for (i = 1; i < nb_hp_memslots + 1; ++i) { mem_base = *hpmemdata++; @@ -865,7 +851,7 @@ build_srat(void) numamem++; slots++; } - free(hpmemdata); + free(hp_memdata); } for (; slots < nb_numa_nodes + nb_hp_memslots + 2; slots++) { @@ -875,10 +861,58 @@ build_srat(void) build_header((void*)srat, SRAT_SIGNATURE, srat_size, 1); - free(numadata); + free(numa_data); return srat; } +/* QEMU paravirt SRAT entries need to be read in before pci initilization */ +void read_srat_early(void) +{ + int i; + + nb_numanodes = qemu_cfg_get_numa_nodes(); + u64 *hpmemdata; + u64 mem_len, mem_base; + + numa_data = malloc_tmphigh(sizeof(u64) * (MaxCountCPUs + nb_numanodes)); + if (!numa_data) { + warn_noalloc(); + } + + qemu_cfg_get_numa_data(numa_data, MaxCountCPUs + nb_numanodes); + qemu_cfg_get_numa_data(&nb_hp_memslots, 1); + + if (nb_hp_memslots) { + hp_memdata = malloc_tmphigh(sizeof(u64) * (3 * nb_hp_memslots)); + if (!hp_memdata) { + warn_noalloc(); + free(hp_memdata); + free(numa_data); + } + + qemu_cfg_get_numa_data(hp_memdata, 3 * nb_hp_memslots); + hpmemdata = hp_memdata; + + for (i = 1; i < nb_hp_memslots + 1; ++i) { + mem_base = *hpmemdata++; + mem_len = *hpmemdata++; + hpmemdata++; + if (mem_base >= 0x100000000LL) { + above_4g_hp_mem_size += mem_len; + } + /* if dimm fits before pci hole, append it normally */ + else if (mem_base + mem_len <= BUILD_PCIMEM_START) { + below_4g_hp_mem_size += mem_len; + } + /* otherwise place it above 4GB */ + else { + above_4g_hp_mem_size += mem_len; + } + } + + } +} + static const struct pci_device_id acpi_find_tbl[] = { /* PIIX4 Power Management device. */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3, NULL), diff --git a/src/acpi.h b/src/acpi.h index cb21561..d29837f 100644 --- a/src/acpi.h +++ b/src/acpi.h @@ -5,6 +5,9 @@ void acpi_bios_init(void); u32 find_resume_vector(void); +void read_srat_early(void); +extern u64 below_4g_hp_mem_size; +extern u64 above_4g_hp_mem_size; #define RSDP_SIGNATURE 0x2052545020445352LL // "RSD PTR " diff --git a/src/pciinit.c b/src/pciinit.c index 31115ee..c5a4b24 100644 --- a/src/pciinit.c +++ b/src/pciinit.c @@ -12,6 +12,7 @@ #include "ioport.h" // PORT_ATA1_CMD_BASE #include "config.h" // CONFIG_* #include "xen.h" // usingXen +#include "acpi.h" #define PCI_DEVICE_MEM_MIN 0x1000 #define PCI_BRIDGE_IO_MIN 0x1000 @@ -597,7 +598,7 @@ static void pci_region_map_entries(struct pci_bus *busses, struct pci_region *r) static void pci_bios_map_devices(struct pci_bus *busses) { - pcimem_start = RamSize; + pcimem_start = RamSize + below_4g_hp_mem_size; if (pci_bios_init_root_regions(busses)) { struct pci_region r64_mem, r64_pref; @@ -616,7 +617,8 @@ static void pci_bios_map_devices(struct pci_bus *busses) u64 align_mem = pci_region_align(&r64_mem); u64 align_pref = pci_region_align(&r64_pref); - r64_mem.base = ALIGN(0x100000000LL + RamSizeOver4G, align_mem); + r64_mem.base = ALIGN(0x100000000LL + RamSizeOver4G + + above_4g_hp_mem_size, align_mem); r64_pref.base = ALIGN(r64_mem.base + sum_mem, align_pref); pcimem64_start = r64_mem.base; pcimem64_end = r64_pref.base + sum_pref; diff --git a/src/post.c b/src/post.c index 924b311..c37730b 100644 --- a/src/post.c +++ b/src/post.c @@ -234,6 +234,9 @@ maininit(void) // Initialize mtrr mtrr_setup(); + smp_get_ncpus(); + read_srat_early(); + // Initialize pci pci_setup(); smm_init(); diff --git a/src/smp.c b/src/smp.c index 4975412..3922776 100644 --- a/src/smp.c +++ b/src/smp.c @@ -138,7 +138,11 @@ smp_probe(void) // Restore memory. *(u64*)BUILD_AP_BOOT_ADDR = old; +} +void +smp_get_ncpus(void) +{ MaxCountCPUs = qemu_cfg_get_max_cpus(); if (!MaxCountCPUs || MaxCountCPUs < CountCPUs) MaxCountCPUs = CountCPUs; -- 1.7.9

1 0

[RFC PATCH v3 18/19] Implement _PS3 for dimm
by Vasilis Liaskovitis 21 Sep '12

21 Sep '12

This will allow us to update dimm state on OSPM-initiated eject operations e.g. with "echo 1 > /sys/bus/acpi/devices/PNP0C80\:00/eject" Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> --- docs/specs/acpi_hotplug.txt | 7 +++++++ hw/acpi_piix4.c | 5 +++++ hw/dimm.c | 3 +++ hw/dimm.h | 3 ++- 4 files changed, 17 insertions(+), 1 deletions(-) diff --git a/docs/specs/acpi_hotplug.txt b/docs/specs/acpi_hotplug.txt index 536da16..69868fe 100644 --- a/docs/specs/acpi_hotplug.txt +++ b/docs/specs/acpi_hotplug.txt @@ -45,3 +45,10 @@ insertion failed. Written by ACPI memory device _OST method to notify qemu of failed hot-add. Write-only. +Memory Dimm _PS3 power-off initiated by OSPM (IO port 0xafa4, 1-byte access): +--------------------------------------------------------------- +Dimm hot-add _PS3 initiated by OSPM. Byte value indicates Dimm slot which +entered D3 state. + +Written by ACPI memory device _PS3 method to notify qemu of power-off state for +the dimm. Write-only. diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 8bf58a6..aad78ca 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -52,6 +52,7 @@ #define MEM_OST_REMOVE_FAIL 0xafa1 #define MEM_OST_ADD_SUCCESS 0xafa2 #define MEM_OST_ADD_FAIL 0xafa3 +#define MEM_PS3 0xafa4 #define PIIX4_MEM_HOTPLUG_STATUS 8 #define PIIX4_PCI_HOTPLUG_STATUS 2 @@ -545,6 +546,9 @@ static void gpe_writeb(void *opaque, uint32_t addr, uint32_t val) case MEM_OST_ADD_FAIL: dimm_notify(val, DIMM_ADD_FAIL); break; + case MEM_PS3: + dimm_notify(val, DIMM_OSPM_POWEROFF); + break; default: acpi_gpe_ioport_writeb(&s->ar, addr, val); } @@ -621,6 +625,7 @@ static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s) register_ioport_write(MEM_OST_REMOVE_FAIL, 1, 1, gpe_writeb, s); register_ioport_write(MEM_OST_ADD_SUCCESS, 1, 1, gpe_writeb, s); register_ioport_write(MEM_OST_ADD_FAIL, 1, 1, gpe_writeb, s); + register_ioport_write(MEM_PS3, 1, 1, gpe_writeb, s); for(i = 0; i < DIMM_BITMAP_BYTES; i++) { s->gperegs.mems_sts[i] = 0; diff --git a/hw/dimm.c b/hw/dimm.c index b993668..08f66d5 100644 --- a/hw/dimm.c +++ b/hw/dimm.c @@ -319,6 +319,9 @@ void dimm_notify(uint32_t idx, uint32_t event) qdev_simple_unplug_cb((DeviceState*)s); QTAILQ_INSERT_TAIL(&bus->dimm_hp_result_queue, result, next); break; + case DIMM_OSPM_POWEROFF: + if (bus->dimm_revert) + bus->dimm_revert(bus->dimm_hotplug_qdev, s, 1); default: g_free(result); break; diff --git a/hw/dimm.h b/hw/dimm.h index ce091fe..8d73b8f 100644 --- a/hw/dimm.h +++ b/hw/dimm.h @@ -15,7 +15,8 @@ typedef enum { DIMM_REMOVE_SUCCESS = 0, DIMM_REMOVE_FAIL = 1, DIMM_ADD_SUCCESS = 2, - DIMM_ADD_FAIL = 3 + DIMM_ADD_FAIL = 3, + DIMM_OSPM_POWEROFF = 4 } dimm_hp_result_code; typedef enum { -- 1.7.9

1 0

[RFC PATCH v3 17/19] Implement _PS3 method for memory device
by Vasilis Liaskovitis 21 Sep '12

21 Sep '12

Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> --- src/acpi-dsdt.dsl | 15 +++++++++++++++ src/ssdt-mem.dsl | 4 ++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl index 0d37bbc..8a18770 100644 --- a/src/acpi-dsdt.dsl +++ b/src/acpi-dsdt.dsl @@ -784,6 +784,13 @@ DefinitionBlock ( MIF, 8 } + /* Memory _PS3 byte */ + OperationRegion(MPSB, SystemIO, 0xafa4, 1) + Field (MPSB, ByteAcc, NoLock, Preserve) + { + MPS, 8 + } + Method(MESC, 0) { // Local5 = active memdevice bitmap Store (MES, Local5) @@ -824,6 +831,14 @@ DefinitionBlock ( Store(Arg0, MPE) Sleep(200) } + + Method (MPS3, 1, NotSerialized) { + // _PS3 method - power-off method + Store(Arg0, MPS) + Store(Zero, Index(MEON, Arg0)) + Sleep(200) + } + Method (MOST, 3, Serialized) { // _OST method - OS status indication Switch (And(Arg0, 0xFF)) { diff --git a/src/ssdt-mem.dsl b/src/ssdt-mem.dsl index 041d301..7423fc6 100644 --- a/src/ssdt-mem.dsl +++ b/src/ssdt-mem.dsl @@ -39,6 +39,7 @@ DefinitionBlock ("ssdt-mem.aml", "SSDT", 0x02, "BXPC", "CSSDT", 0x1) External(CMST, MethodObj) External(MPEJ, MethodObj) External(MOST, MethodObj) + External(MPS3, MethodObj) Name(_CRS, ResourceTemplate() { QwordMemory( @@ -64,6 +65,9 @@ DefinitionBlock ("ssdt-mem.aml", "SSDT", 0x02, "BXPC", "CSSDT", 0x1) Method (_OST, 3) { MOST(Arg0, Arg1, ID) } + Method (_PS3, 0) { + MPS3(ID) + } } } -- 1.7.9

1 0

[RFC PATCH v3 16/19] Update dimm state on reset
by Vasilis Liaskovitis 21 Sep '12

21 Sep '12

in case of hot-remove failure on a guest that does not implement _OST, the dimm bitmaps in qemu and Seabios show the dimm as unplugged, but the dimm is still present on the qdev/memory bus. To avoid this inconsistency, we set the dimm state to active/hot-plugged on a reset of the associated acpi_pm device. This way the dimm is still active after a VM reboot and dimm visibility has always the same behaviour, regardless of _OST support in the guest. Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> --- hw/acpi_piix4.c | 1 + hw/dimm.c | 20 ++++++++++++++++++++ hw/dimm.h | 1 + 3 files changed, 22 insertions(+), 0 deletions(-) diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index f7220d4..8bf58a6 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -373,6 +373,7 @@ static void piix4_reset(void *opaque) pci_conf[0x5B] = 0x02; } piix4_update_hotplug(s); + dimm_state_sync(); } static void piix4_powerdown(void *opaque, int irq, int power_failing) diff --git a/hw/dimm.c b/hw/dimm.c index 1521462..b993668 100644 --- a/hw/dimm.c +++ b/hw/dimm.c @@ -182,6 +182,26 @@ static DimmDevice *dimm_find_from_idx(uint32_t idx) return NULL; } +void dimm_state_sync(void) +{ + DimmBus *bus = main_memory_bus; + DimmDevice *slot; + + /* if a hot-remove operation is pending on reset, it means the hot-remove + * operation has failed, but the guest hasn't notified us e.g. because the + * guest does not provide _OST notifications. The device is still present on + * the dimmbus, but the qemu and Seabios dimm bitmaps show this device as + * unplugged. To avoid this inconsistency, we set the dimm bits to active + * i.e. hot-plugged for each dimm present on the dimmbus. + */ + QTAILQ_FOREACH(slot, &bus->dimmlist, nextdimm) { + if (slot->pending == DIMM_REMOVE_PENDING) { + if (bus->dimm_revert) + bus->dimm_revert(bus->dimm_hotplug_qdev, slot, 0); + } + } +} + /* used to create a dimm device, only on incoming migration of a hotplugged * RAMBlock */ diff --git a/hw/dimm.h b/hw/dimm.h index a6c6e6f..ce091fe 100644 --- a/hw/dimm.h +++ b/hw/dimm.h @@ -95,5 +95,6 @@ void main_memory_bus_create(Object *parent); void dimm_config_create(char *id, uint64_t size, uint64_t node, uint32_t dimm_idx, uint32_t populated); uint64_t get_hp_memory_total(void); +void dimm_state_sync(void); #endif -- 1.7.9

1 0

[RFC PATCH v3 15/19] Add _OST dimm support
by Vasilis Liaskovitis 21 Sep '12

21 Sep '12

This allows qemu to receive notifications from the guest OS on success or failure of a memory hotplug request. The guest OS needs to implement the _OST functionality for this to work (linux-next: http://lkml.org/lkml/2012/6/25/321) This patch also updates dimm bitmap state and hot-remove pending flag on hot-remove fail. This allows failed hot operations to be retried at anytime. This only works for guests that use _OST notification. Also adds new _OST registers in docs/specs/acpi_hotplug.txt Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> --- docs/specs/acpi_hotplug.txt | 25 +++++++++++++++++++++++++ hw/acpi_piix4.c | 35 ++++++++++++++++++++++++++++++++++- hw/dimm.c | 28 +++++++++++++++++++++++++++- hw/dimm.h | 10 +++++++++- 4 files changed, 95 insertions(+), 3 deletions(-) diff --git a/docs/specs/acpi_hotplug.txt b/docs/specs/acpi_hotplug.txt index cf86242..536da16 100644 --- a/docs/specs/acpi_hotplug.txt +++ b/docs/specs/acpi_hotplug.txt @@ -20,3 +20,28 @@ ejected. Written by ACPI memory device _EJ0 method to notify qemu of successfull hot-removal. Write-only. + +Memory Dimm ejection failure notification (IO port 0xafa1, 1-byte access): +--------------------------------------------------------------- +Dimm hot-remove _OST notification. Byte value indicates Dimm slot for which +ejection failed. + +Written by ACPI memory device _OST method to notify qemu of failed +hot-removal. Write-only. + +Memory Dimm insertion success notification (IO port 0xafa2, 1-byte access): +--------------------------------------------------------------- +Dimm hot-remove _OST notification. Byte value indicates Dimm slot for which +insertion succeeded. + +Written by ACPI memory device _OST method to notify qemu of failed +hot-add. Write-only. + +Memory Dimm insertion failure notification (IO port 0xafa3, 1-byte access): +--------------------------------------------------------------- +Dimm hot-remove _OST notification. Byte value indicates Dimm slot for which +insertion failed. + +Written by ACPI memory device _OST method to notify qemu of failed +hot-add. Write-only. + diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 8776669..f7220d4 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -49,6 +49,9 @@ #define PCI_RMV_BASE 0xae0c #define MEM_BASE 0xaf80 #define MEM_EJ_BASE 0xafa0 +#define MEM_OST_REMOVE_FAIL 0xafa1 +#define MEM_OST_ADD_SUCCESS 0xafa2 +#define MEM_OST_ADD_FAIL 0xafa3 #define PIIX4_MEM_HOTPLUG_STATUS 8 #define PIIX4_PCI_HOTPLUG_STATUS 2 @@ -87,6 +90,7 @@ typedef struct PIIX4PMState { uint8_t s4_val; } PIIX4PMState; +static int piix4_dimm_revert(DeviceState *qdev, DimmDevice *dev, int add); static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s); #define ACPI_ENABLE 0xf1 @@ -531,6 +535,15 @@ static void gpe_writeb(void *opaque, uint32_t addr, uint32_t val) case MEM_EJ_BASE: dimm_notify(val, DIMM_REMOVE_SUCCESS); break; + case MEM_OST_REMOVE_FAIL: + dimm_notify(val, DIMM_REMOVE_FAIL); + break; + case MEM_OST_ADD_SUCCESS: + dimm_notify(val, DIMM_ADD_SUCCESS); + break; + case MEM_OST_ADD_FAIL: + dimm_notify(val, DIMM_ADD_FAIL); + break; default: acpi_gpe_ioport_writeb(&s->ar, addr, val); } @@ -604,13 +617,16 @@ static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s) register_ioport_read(MEM_BASE, DIMM_BITMAP_BYTES, 1, gpe_readb, s); register_ioport_write(MEM_EJ_BASE, 1, 1, gpe_writeb, s); + register_ioport_write(MEM_OST_REMOVE_FAIL, 1, 1, gpe_writeb, s); + register_ioport_write(MEM_OST_ADD_SUCCESS, 1, 1, gpe_writeb, s); + register_ioport_write(MEM_OST_ADD_FAIL, 1, 1, gpe_writeb, s); for(i = 0; i < DIMM_BITMAP_BYTES; i++) { s->gperegs.mems_sts[i] = 0; } pci_bus_hotplug(bus, piix4_device_hotplug, &s->dev.qdev); - dimm_bus_hotplug(piix4_dimm_hotplug, &s->dev.qdev); + dimm_bus_hotplug(piix4_dimm_hotplug, piix4_dimm_revert, &s->dev.qdev); } static void enable_device(PIIX4PMState *s, int slot) @@ -656,6 +672,23 @@ static int piix4_dimm_hotplug(DeviceState *qdev, DimmDevice *dev, int return 0; } +static int piix4_dimm_revert(DeviceState *qdev, DimmDevice *dev, int add) +{ + PCIDevice *pci_dev = DO_UPCAST(PCIDevice, qdev, qdev); + PIIX4PMState *s = DO_UPCAST(PIIX4PMState, dev, pci_dev); + struct gpe_regs *g = &s->gperegs; + DimmDevice *slot = DIMM(dev); + int idx = slot->idx; + + if (add) { + g->mems_sts[idx/8] &= ~(1 << (idx%8)); + } + else { + g->mems_sts[idx/8] |= (1 << (idx%8)); + } + return 0; +} + static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev, PCIHotplugState state) { diff --git a/hw/dimm.c b/hw/dimm.c index 21626f6..1521462 100644 --- a/hw/dimm.c +++ b/hw/dimm.c @@ -126,12 +126,14 @@ void dimm_config_create(char *id, uint64_t size, uint64_t node, uint32_t QTAILQ_INSERT_TAIL(&dimmconfig_list, dimm_cfg, nextdimmcfg); } -void dimm_bus_hotplug(dimm_hotplug_fn hotplug, DeviceState *qdev) +void dimm_bus_hotplug(dimm_hotplug_fn hotplug, dimm_hotplug_fn revert, + DeviceState *qdev) { DimmBus *bus = main_memory_bus; bus->qbus.allow_hotplug = 1; bus->dimm_hotplug_qdev = qdev; bus->dimm_hotplug = hotplug; + bus->dimm_revert = revert; } static void dimm_plug_device(DimmDevice *slot) @@ -141,6 +143,7 @@ static void dimm_plug_device(DimmDevice *slot) dimm_populate(slot); if (bus->dimm_hotplug) bus->dimm_hotplug(bus->dimm_hotplug_qdev, slot, 1); + slot->pending = DIMM_ADD_PENDING; } static int dimm_unplug_device(DeviceState *qdev) @@ -149,6 +152,7 @@ static int dimm_unplug_device(DeviceState *qdev) if (bus->dimm_hotplug) bus->dimm_hotplug(bus->dimm_hotplug_qdev, DIMM(qdev), 0); + DIMM(qdev)->pending = DIMM_REMOVE_PENDING; return 1; } @@ -266,12 +270,33 @@ void dimm_notify(uint32_t idx, uint32_t event) result = g_malloc0(sizeof(*result)); slotcfg = dimmcfg_find_from_name(DEVICE(s)->id); result->dimmname = slotcfg->name; + result->ret = event; switch(event) { case DIMM_REMOVE_SUCCESS: dimm_depopulate(s); QTAILQ_REMOVE(&bus->dimmlist, s, nextdimm); qdev_simple_unplug_cb((DeviceState*)s); + s->pending = DIMM_NO_PENDING; + QTAILQ_INSERT_TAIL(&bus->dimm_hp_result_queue, result, next); + break; + case DIMM_REMOVE_FAIL: + s->pending = DIMM_NO_PENDING; + if (bus->dimm_revert) + bus->dimm_revert(bus->dimm_hotplug_qdev, s, 0); + QTAILQ_INSERT_TAIL(&bus->dimm_hp_result_queue, result, next); + break; + case DIMM_ADD_SUCCESS: + s->pending = DIMM_NO_PENDING; + QTAILQ_INSERT_TAIL(&bus->dimm_hp_result_queue, result, next); + break; + case DIMM_ADD_FAIL: + dimm_depopulate(s); + s->pending = DIMM_NO_PENDING; + if (bus->dimm_revert) + bus->dimm_revert(bus->dimm_hotplug_qdev, s, 1); + QTAILQ_REMOVE(&bus->dimmlist, s, nextdimm); + qdev_simple_unplug_cb((DeviceState*)s); QTAILQ_INSERT_TAIL(&bus->dimm_hp_result_queue, result, next); break; default: @@ -352,6 +377,7 @@ static int dimm_init(DeviceState *s) slot->start = slotcfg->start; slot->size = slotcfg->size; slot->node = slotcfg->node; + slot->pending = DIMM_NO_PENDING; QTAILQ_INSERT_TAIL(&bus->dimmlist, slot, nextdimm); dimm_plug_device(slot); diff --git a/hw/dimm.h b/hw/dimm.h index 21225be..4f696d8 100644 --- a/hw/dimm.h +++ b/hw/dimm.h @@ -18,6 +18,12 @@ typedef enum { DIMM_ADD_FAIL = 3 } dimm_hp_result_code; +typedef enum { + DIMM_NO_PENDING = 0, + DIMM_ADD_PENDING = 1, + DIMM_REMOVE_PENDING = 2, +} dimm_hp_pending_code; + #define TYPE_DIMM "dimm" #define DIMM(obj) \ OBJECT_CHECK(DimmDevice, (obj), TYPE_DIMM) @@ -42,6 +48,7 @@ typedef struct DimmDevice { ram_addr_t size; uint32_t node; /* numa node proximity */ MemoryRegion *mr; /* MemoryRegion for this slot. !NULL only if populated */ + dimm_hp_pending_code pending; /* indicates if a hot operation is pending for this dimm */ QTAILQ_ENTRY (DimmDevice) nextdimm; } DimmDevice; @@ -66,6 +73,7 @@ typedef struct DimmBus { BusState qbus; DeviceState *dimm_hotplug_qdev; dimm_hotplug_fn dimm_hotplug; + dimm_hotplug_fn dimm_revert; dimm_calcoffset_fn dimm_calcoffset; DimmConfiglist dimmconfig_list; QTAILQ_HEAD(Dimmlist, DimmDevice) dimmlist; @@ -80,7 +88,7 @@ struct dimm_hp_result { void dimm_calc_offsets(dimm_calcoffset_fn calcfn); void dimm_notify(uint32_t idx, uint32_t event); -void dimm_bus_hotplug(dimm_hotplug_fn hotplug, DeviceState *qdev); +void dimm_bus_hotplug(dimm_hotplug_fn hotplug, dimm_hotplug_fn revert, DeviceState *qdev); void setup_fwcfg_hp_dimms(uint64_t *fw_cfg_slots); int dimm_add(char *id); void main_memory_bus_create(Object *parent); -- 1.7.9

1 0

[RFC PATCH v3 14/19] Add _OST dimm method
by Vasilis Liaskovitis 21 Sep '12

21 Sep '12

Add support for _OST method. _OST method will write into the correct I/O byte to signal success / failure of hot-add or hot-remove to qemu. Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> --- src/acpi-dsdt.dsl | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/ssdt-mem.dsl | 4 ++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl index 5d3e92b..0d37bbc 100644 --- a/src/acpi-dsdt.dsl +++ b/src/acpi-dsdt.dsl @@ -762,6 +762,28 @@ DefinitionBlock ( MPE, 8 } + + /* Memory hot-remove notify failure byte */ + OperationRegion(MEEF, SystemIO, 0xafa1, 1) + Field (MEEF, ByteAcc, NoLock, Preserve) + { + MEF, 8 + } + + /* Memory hot-add notify success byte */ + OperationRegion(MPIS, SystemIO, 0xafa2, 1) + Field (MPIS, ByteAcc, NoLock, Preserve) + { + MIS, 8 + } + + /* Memory hot-add notify failure byte */ + OperationRegion(MPIF, SystemIO, 0xafa3, 1) + Field (MPIF, ByteAcc, NoLock, Preserve) + { + MIF, 8 + } + Method(MESC, 0) { // Local5 = active memdevice bitmap Store (MES, Local5) @@ -802,6 +824,34 @@ DefinitionBlock ( Store(Arg0, MPE) Sleep(200) } + Method (MOST, 3, Serialized) { + // _OST method - OS status indication + Switch (And(Arg0, 0xFF)) { + Case(0x3) + { + Switch(And(Arg1, 0xFF)) { + Case(0x1) { + Store(Arg2, MEF) + // Revert MEON flag for this memory device to one + Store(One, Index(MEON, Arg2)) + } + } + } + Case(0x1) + { + Switch(And(Arg1, 0xFF)) { + Case(0x0) { + Store(Arg2, MIS) + } + Case(0x1) { + Store(Arg2, MIF) + // Revert MEON flag for this memory device to zero + Store(Zero, Index(MEON, Arg2)) + } + } + } + } + } } diff --git a/src/ssdt-mem.dsl b/src/ssdt-mem.dsl index ee322f0..041d301 100644 --- a/src/ssdt-mem.dsl +++ b/src/ssdt-mem.dsl @@ -38,6 +38,7 @@ DefinitionBlock ("ssdt-mem.aml", "SSDT", 0x02, "BXPC", "CSSDT", 0x1) External(CMST, MethodObj) External(MPEJ, MethodObj) + External(MOST, MethodObj) Name(_CRS, ResourceTemplate() { QwordMemory( @@ -60,6 +61,9 @@ DefinitionBlock ("ssdt-mem.aml", "SSDT", 0x02, "BXPC", "CSSDT", 0x1) Method (_EJ0, 1, NotSerialized) { MPEJ(ID, Arg0) } + Method (_OST, 3) { + MOST(Arg0, Arg1, ID) + } } } -- 1.7.9

1 0

[RFC PATCH v3 13/19] balloon: update with hotplugged memory
by Vasilis Liaskovitis 21 Sep '12

21 Sep '12

query-balloon and "info balloon" should report total memory available to the guest. balloon inflate/ deflate can also use all memory available to the guest (initial + hotplugged memory) Ballon driver has been minimaly tested with the patch, please review and test. Caveat: if the guest does not online hotplugged-memory, it's easy for a balloon inflate command to OOM a guest. Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> --- hw/virtio-balloon.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index dd1a650..bca21bc 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -22,6 +22,7 @@ #include "virtio-balloon.h" #include "kvm.h" #include "exec-memory.h" +#include "dimm.h" #if defined(__linux__) #include <sys/mman.h> @@ -147,10 +148,11 @@ static void virtio_balloon_set_config(VirtIODevice *vdev, VirtIOBalloon *dev = to_virtio_balloon(vdev); struct virtio_balloon_config config; uint32_t oldactual = dev->actual; + uint64_t hotplugged_ram_size = get_hp_memory_total(); memcpy(&config, config_data, 8); dev->actual = le32_to_cpu(config.actual); if (dev->actual != oldactual) { - qemu_balloon_changed(ram_size - + qemu_balloon_changed(ram_size + hotplugged_ram_size - (dev->actual << VIRTIO_BALLOON_PFN_SHIFT)); } } @@ -188,17 +190,20 @@ static void virtio_balloon_stat(void *opaque, BalloonInfo *info) info->actual = ram_size - ((uint64_t) dev->actual << VIRTIO_BALLOON_PFN_SHIFT); + info->actual += get_hp_memory_total(); } static void virtio_balloon_to_target(void *opaque, ram_addr_t target) { VirtIOBalloon *dev = opaque; + uint64_t hotplugged_ram_size = get_hp_memory_total(); - if (target > ram_size) { - target = ram_size; + if (target > ram_size + hotplugged_ram_size) { + target = ram_size + hotplugged_ram_size; } if (target) { - dev->num_pages = (ram_size - target) >> VIRTIO_BALLOON_PFN_SHIFT; + dev->num_pages = (ram_size + hotplugged_ram_size - target) >> + VIRTIO_BALLOON_PFN_SHIFT; virtio_notify_config(&dev->vdev); } } -- 1.7.9

1 0

[RFC PATCH v3 12/19] Implement "info memory-total" and "query-memory-total"
by Vasilis Liaskovitis 21 Sep '12

21 Sep '12

Returns total physical memory available to guest in bytes, including hotplugged memory. Note that the number reported here may be different from what the guest sees e.g. if the guest has not logically onlined hotplugged memory. This functionality is provided independently of a balloon device, since a guest can be using ACPI memory hotplug without using a balloon device. Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> --- hmp-commands.hx | 2 ++ hmp.c | 7 +++++++ hmp.h | 1 + hw/dimm.c | 21 +++++++++++++++++++++ hw/dimm.h | 1 + monitor.c | 7 +++++++ qapi-schema.json | 11 +++++++++++ qmp-commands.hx | 20 ++++++++++++++++++++ 8 files changed, 70 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index cfb1b67..988d207 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1464,6 +1464,8 @@ show qdev device model list show roms @item info memory-hotplug show memory-hotplug +@item info memory-total +show memory-total @end table ETEXI diff --git a/hmp.c b/hmp.c index 4b3d63d..cc31ddc 100644 --- a/hmp.c +++ b/hmp.c @@ -1185,3 +1185,10 @@ void hmp_info_memory_hotplug(Monitor *mon) qapi_free_MemHpInfoList(info); } + +void hmp_info_memory_total(Monitor *mon) +{ + uint64_t ram_total; + ram_total = (uint64_t)qmp_query_memory_total(NULL); + monitor_printf(mon, "MemTotal: %lu \n", ram_total); +} diff --git a/hmp.h b/hmp.h index 986705a..ab96dba 100644 --- a/hmp.h +++ b/hmp.h @@ -74,5 +74,6 @@ void hmp_closefd(Monitor *mon, const QDict *qdict); void hmp_send_key(Monitor *mon, const QDict *qdict); void hmp_screen_dump(Monitor *mon, const QDict *qdict); void hmp_info_memory_hotplug(Monitor *mon); +void hmp_info_memory_total(Monitor *mon); #endif diff --git a/hw/dimm.c b/hw/dimm.c index fbd93a8..21626f6 100644 --- a/hw/dimm.c +++ b/hw/dimm.c @@ -28,6 +28,7 @@ static DimmBus *main_memory_bus; /* the following list is used to hold dimm config info before machine * initialization. After machine init, the list is emptied and not used anymore.*/ static DimmConfiglist dimmconfig_list = QTAILQ_HEAD_INITIALIZER(dimmconfig_list); +extern ram_addr_t ram_size; static void dimmbus_dev_print(Monitor *mon, DeviceState *dev, int indent); static char *dimmbus_get_fw_dev_path(DeviceState *dev); @@ -233,6 +234,26 @@ void setup_fwcfg_hp_dimms(uint64_t *fw_cfg_slots) } } +uint64_t get_hp_memory_total(void) +{ + DimmBus *bus = main_memory_bus; + DimmDevice *slot; + uint64_t info = 0; + + QTAILQ_FOREACH(slot, &bus->dimmlist, nextdimm) { + info += slot->size; + } + return info; +} + +int64_t qmp_query_memory_total(Error **errp) +{ + uint64_t info; + info = ram_size + get_hp_memory_total(); + + return (int64_t)info; +} + void dimm_notify(uint32_t idx, uint32_t event) { DimmBus *bus = main_memory_bus; diff --git a/hw/dimm.h b/hw/dimm.h index 95251ba..21225be 100644 --- a/hw/dimm.h +++ b/hw/dimm.h @@ -86,5 +86,6 @@ int dimm_add(char *id); void main_memory_bus_create(Object *parent); void dimm_config_create(char *id, uint64_t size, uint64_t node, uint32_t dimm_idx, uint32_t populated); +uint64_t get_hp_memory_total(void); #endif diff --git a/monitor.c b/monitor.c index be9a1d9..4f5ea60 100644 --- a/monitor.c +++ b/monitor.c @@ -2747,6 +2747,13 @@ static mon_cmd_t info_cmds[] = { .mhandler.info = hmp_info_memory_hotplug, }, { + .name = "memory-total", + .args_type = "", + .params = "", + .help = "show total memory size", + .mhandler.info = hmp_info_memory_total, + }, + { .name = NULL, }, }; diff --git a/qapi-schema.json b/qapi-schema.json index 3706a2a..c1d2571 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2581,3 +2581,14 @@ # Since: 1.3 ## { 'command': 'query-memory-hotplug', 'returns': ['MemHpInfo'] } + +## +# @query-memory-total: +# +# Returns total memory in bytes, including hotplugged dimms +# +# Returns: int +# +# Since: 1.3 +## +{ 'command': 'query-memory-total', 'returns': 'int' } diff --git a/qmp-commands.hx b/qmp-commands.hx index e50dcc2..20b7eea 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2576,3 +2576,23 @@ Example: } EQMP + + { + .name = "query-memory-total", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_input_query_memory_total + }, +SQMP +query-memory-total +---------- + +Return total memory in bytes, including hotplugged dimms + +Example: + +-> { "execute": "query-memory-total" } +<- { + "return": 1073741824 + } + +EQMP -- 1.7.9

1 0

[RFC PATCH v3 11/19] Implement qmp and hmp commands for notification lists
by Vasilis Liaskovitis 21 Sep '12

21 Sep '12

Guest can respond to ACPI hotplug events e.g. with _EJ or _OST method. This patch implements a tail queue to store guest notifications for memory hot-add and hot-remove requests. Guest responses for memory hotplug command on a per-dimm basis can be detected with the new hmp command "info memhp" or the new qmp command "query-memhp" Examples: (qemu) device_add dimm,id=ram0 (qemu) info memory-hotplug dimm: ram0 hot-add success or dimm: ram0 hot-add failure (qemu) device_del ram3 (qemu) info memory-hotplug dimm: ram3 hot-remove success or dimm: ram3 hot-remove failure Results are removed from the queue once read. This patch only queues _EJ events that signal hot-remove success. For _OST event queuing, which cover the hot-remove failure and hot-add success/failure cases, the _OST patches in this series are are also needed. These notification items should probably be part of migration state (not yet implemented). Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> --- hmp-commands.hx | 2 + hmp.c | 17 ++++++++++++++ hmp.h | 1 + hw/dimm.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++- hw/dimm.h | 2 +- monitor.c | 7 ++++++ qapi-schema.json | 26 ++++++++++++++++++++++ qmp-commands.hx | 37 ++++++++++++++++++++++++++++++++ 8 files changed, 152 insertions(+), 2 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index ed67e99..cfb1b67 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1462,6 +1462,8 @@ show device tree show qdev device model list @item info roms show roms +@item info memory-hotplug +show memory-hotplug @end table ETEXI diff --git a/hmp.c b/hmp.c index ba6fbd3..4b3d63d 100644 --- a/hmp.c +++ b/hmp.c @@ -1168,3 +1168,20 @@ void hmp_screen_dump(Monitor *mon, const QDict *qdict) qmp_screendump(filename, &err); hmp_handle_error(mon, &err); } + +void hmp_info_memory_hotplug(Monitor *mon) +{ + MemHpInfoList *info; + MemHpInfoList *item; + MemHpInfo *dimm; + + info = qmp_query_memory_hotplug(NULL); + for (item = info; item; item = item->next) { + dimm = item->value; + monitor_printf(mon, "dimm: %s %s %s\n", dimm->dimm, + dimm->request, dimm->result); + dimm->dimm = NULL; + } + + qapi_free_MemHpInfoList(info); +} diff --git a/hmp.h b/hmp.h index 48b9c59..986705a 100644 --- a/hmp.h +++ b/hmp.h @@ -73,5 +73,6 @@ void hmp_getfd(Monitor *mon, const QDict *qdict); void hmp_closefd(Monitor *mon, const QDict *qdict); void hmp_send_key(Monitor *mon, const QDict *qdict); void hmp_screen_dump(Monitor *mon, const QDict *qdict); +void hmp_info_memory_hotplug(Monitor *mon); #endif diff --git a/hw/dimm.c b/hw/dimm.c index 288b997..fbd93a8 100644 --- a/hw/dimm.c +++ b/hw/dimm.c @@ -65,6 +65,7 @@ static void dimm_bus_initfn(Object *obj) DimmBus *bus = DIMM_BUS(obj); QTAILQ_INIT(&bus->dimmconfig_list); QTAILQ_INIT(&bus->dimmlist); + QTAILQ_INIT(&bus->dimm_hp_result_queue); QTAILQ_FOREACH_SAFE(dimm_cfg, &dimmconfig_list, nextdimmcfg, next_dimm_cfg) { QTAILQ_REMOVE(&dimmconfig_list, dimm_cfg, nextdimmcfg); @@ -236,20 +237,78 @@ void dimm_notify(uint32_t idx, uint32_t event) { DimmBus *bus = main_memory_bus; DimmDevice *s; + DimmConfig *slotcfg; + struct dimm_hp_result *result; + s = dimm_find_from_idx(idx); assert(s != NULL); + result = g_malloc0(sizeof(*result)); + slotcfg = dimmcfg_find_from_name(DEVICE(s)->id); + result->dimmname = slotcfg->name; switch(event) { case DIMM_REMOVE_SUCCESS: dimm_depopulate(s); - qdev_simple_unplug_cb((DeviceState*)s); QTAILQ_REMOVE(&bus->dimmlist, s, nextdimm); + qdev_simple_unplug_cb((DeviceState*)s); + QTAILQ_INSERT_TAIL(&bus->dimm_hp_result_queue, result, next); break; default: + g_free(result); break; } } +MemHpInfoList *qmp_query_memory_hotplug(Error **errp) +{ + DimmBus *bus = main_memory_bus; + MemHpInfoList *head = NULL, *cur_item = NULL, *info; + struct dimm_hp_result *item, *nextitem; + + QTAILQ_FOREACH_SAFE(item, &bus->dimm_hp_result_queue, next, nextitem) { + + info = g_malloc0(sizeof(*info)); + info->value = g_malloc0(sizeof(*info->value)); + info->value->dimm = g_malloc0(sizeof(char) * 32); + info->value->request = g_malloc0(sizeof(char) * 16); + info->value->result = g_malloc0(sizeof(char) * 16); + switch (item->ret) { + case DIMM_REMOVE_SUCCESS: + strcpy(info->value->request, "hot-remove"); + strcpy(info->value->result, "success"); + break; + case DIMM_REMOVE_FAIL: + strcpy(info->value->request, "hot-remove"); + strcpy(info->value->result, "failure"); + break; + case DIMM_ADD_SUCCESS: + strcpy(info->value->request, "hot-add"); + strcpy(info->value->result, "success"); + break; + case DIMM_ADD_FAIL: + strcpy(info->value->request, "hot-add"); + strcpy(info->value->result, "failure"); + break; + default: + break; + } + strcpy(info->value->dimm, item->dimmname); + /* XXX: waiting for the qapi to support GSList */ + if (!cur_item) { + head = cur_item = info; + } else { + cur_item->next = info; + cur_item = info; + } + + /* hotplug notification copied to qmp list, delete original item */ + QTAILQ_REMOVE(&bus->dimm_hp_result_queue, item, next); + g_free(item); + } + + return head; +} + static int dimm_init(DeviceState *s) { DimmBus *bus = main_memory_bus; @@ -286,6 +345,7 @@ static void dimm_class_init(ObjectClass *klass, void *data) dc->props = dimm_properties; dc->unplug = dimm_unplug_device; + dc->bus_type = TYPE_DIMM_BUS; dc->init = dimm_init; } diff --git a/hw/dimm.h b/hw/dimm.h index 5e991a6..95251ba 100644 --- a/hw/dimm.h +++ b/hw/dimm.h @@ -69,6 +69,7 @@ typedef struct DimmBus { dimm_calcoffset_fn dimm_calcoffset; DimmConfiglist dimmconfig_list; QTAILQ_HEAD(Dimmlist, DimmDevice) dimmlist; + QTAILQ_HEAD(dimm_hp_result_head, dimm_hp_result) dimm_hp_result_queue; } DimmBus; struct dimm_hp_result { @@ -86,5 +87,4 @@ void main_memory_bus_create(Object *parent); void dimm_config_create(char *id, uint64_t size, uint64_t node, uint32_t dimm_idx, uint32_t populated); - #endif diff --git a/monitor.c b/monitor.c index 67064e2..be9a1d9 100644 --- a/monitor.c +++ b/monitor.c @@ -2740,6 +2740,13 @@ static mon_cmd_t info_cmds[] = { .mhandler.info = do_trace_print_events, }, { + .name = "memory-hotplug", + .args_type = "", + .params = "", + .help = "show memory hotplug status", + .mhandler.info = hmp_info_memory_hotplug, + }, + { .name = NULL, }, }; diff --git a/qapi-schema.json b/qapi-schema.json index a9f465a..3706a2a 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2555,3 +2555,29 @@ # Since: 0.14.0 ## { 'command': 'screendump', 'data': {'filename': 'str'} } + +## +# @MemHpInfo: +# +# Information about status of a memory hotplug command +# +# @dimm: the Dimm associated with the result +# +# @result: the result of the hotplug command +# +# Since: 1.3 +# +## +{ 'type': 'MemHpInfo', + 'data': {'dimm': 'str', 'request': 'str', 'result': 'str'} } + +## +# @query-memory-hotplug: +# +# Returns a list of information about pending hotplug commands +# +# Returns: a list of @MemhpInfo +# +# Since: 1.3 +## +{ 'command': 'query-memory-hotplug', 'returns': ['MemHpInfo'] } diff --git a/qmp-commands.hx b/qmp-commands.hx index 6e21ddb..e50dcc2 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2539,3 +2539,40 @@ EQMP .args_type = "", .mhandler.cmd_new = qmp_marshal_input_query_target, }, + { + .name = "query-memory-hotplug", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_input_query_memory_hotplug + }, +SQMP +query-memory-hotplug +---------- + +Show memory hotplug command notifications. + +Return a json-array. Each DIMM that has a pending notification is represented +by a json-object, which contains: + +- "dimm": Dimm name (json-str) +- "request": type of hot request: hot-add or hot-remove (json-str) +- "result": result of the hotplug request for this Dimm success or failure (json-str) + +Example: + +-> { "execute": "query-memory-hotplug" } +<- { + "return":[ + { + "result": "failure", + "request": "hot-remove", + "dimm": "dimm10" + }, + { + "result": "success", + "request": "hot-add", + "dimm": "dimm3" + } + ] + } + +EQMP -- 1.7.9

1 0

[RFC PATCH v3 10/19] fix live-migration when "populated=on" is missing
by Vasilis Liaskovitis 21 Sep '12

21 Sep '12

Live migration works after memory hot-add events, as long as the qemu command line "-dimm" arguments are changed on the destination host to specify "populated=on" for the dimms that have been hot-added. If a command-line change has not occured, the destination host does not yet have the corresponding ramblock in its ram_list. Activate the dimm on the destination during ram_load. Perhaps several fields of the DimmDevice should be part of a VMStateDescription to handle migration in a cleaner way. But the problem is that ramblocks are checked before qdev vmstates. Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> --- arch_init.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/arch_init.c b/arch_init.c index 5a1173e..b63caa7 100644 --- a/arch_init.c +++ b/arch_init.c @@ -45,6 +45,7 @@ #include "hw/pcspk.h" #include "qemu/page_cache.h" #include "qmp-commands.h" +#include "hw/dimm.h" #ifdef DEBUG_ARCH_INIT #define DPRINTF(fmt, ...) \ @@ -740,10 +741,27 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) } if (!block) { - fprintf(stderr, "Unknown ramblock \"%s\", cannot " + /* this can happen if a dimm was hot-added at source host */ + bool ramblock_found = false; + if (dimm_add(id)) { + fprintf(stderr, "Cannot add unknown ramblock \"%s\", " + "cannot accept migration\n", id); + ret = -EINVAL; + goto done; + } + /* rescan ram_list, verify ramblock is there now */ + QLIST_FOREACH(block, &ram_list.blocks, next) { + if (!strncmp(id, block->idstr, sizeof(id))) { + ramblock_found = true; + break; + } + } + if (!ramblock_found) { + fprintf(stderr, "Unknown ramblock \"%s\", cannot " "accept migration\n", id); - ret = -EINVAL; - goto done; + ret = -EINVAL; + goto done; + } } total_ram_bytes -= length; -- 1.7.9

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS September 2012