SeaBIOS

seabios@seabios.org

4 participants
3801 discussions

Re: [SeaBIOS] [RFC PATCH 0/9] ACPI memory hotplug
by Vasilis Liaskovitis 20 Apr '12

20 Apr '12

On Thu, Apr 19, 2012 at 04:08:38PM +0200, Vasilis Liaskovitis wrote: > > series is based on uq/master for qemu-kvm, and master for seabios. Can be found > also at: forgot to paste the repo links in the original coverletter, here they are if someone wants them: https://github.com/vliaskov/qemu-kvm/commits/memory-hotplug https://github.com/vliaskov/seabios/commits/memory-hotplug thanks, - Vasilis

1 0

Re: [SeaBIOS] [Qemu-devel] [RFC PATCH 2/9] Implement acpi-dsdt functions for memory hotplug.
by Igor Mammedov 20 Apr '12

20 Apr '12

On 04/19/2012 04:08 PM, Vasilis Liaskovitis wrote: > Extend the DSDT to include methods for handling memory hot-add and hot-remove > notifications and memory device status requests. These functions are called > from the memory device SSDT methods. > > Eject has only been tested with level gpe event, but will be changed to edge gpe > event soon, according to recent master patch for other ACPI hotplug events. > > Signed-off-by: Vasilis Liaskovitis<vasilis.liaskovitis(a)profitbricks.com> > --- > src/acpi-dsdt.dsl | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++- > 1 files changed, 66 insertions(+), 2 deletions(-) > > diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl > index 4bdc268..184daf0 100644 > --- a/src/acpi-dsdt.dsl > +++ b/src/acpi-dsdt.dsl > @@ -709,9 +709,72 @@ DefinitionBlock ( > } > Return(One) > } > - } > > + /* Objects filled in by run-time generated SSDT */ > + External(MTFY, MethodObj) > + External(MEON, PkgObj) > + > + Method (CMST, 1, NotSerialized) { > + // _STA method - return ON status of memdevice > + // Local0 = MEON flag for this cpu > + Store(DerefOf(Index(MEON, Arg0)), Local0) > + If (Local0) { Return(0xF) } Else { Return(0x0) } > + } > + /* Memory eject notify method */ > + OperationRegion(MEMJ, SystemIO, 0xaf40, 32) > + Field (MEMJ, ByteAcc, NoLock, Preserve) > + { > + MPE, 256 > + } > + > + Method (MPEJ, 2, NotSerialized) { > + // _EJ0 method - eject callback > + Store(ShiftLeft(1,Arg0), MPE) > + Sleep(200) > + } MPE is write only and only one memslot is ejected at a time. Why 256 bit-field is here then? Could we use just 1 byte and write a slot number into it and save some io address space this way? > + > + /* Memory hotplug notify method */ > + OperationRegion(MEST, SystemIO, 0xaf20, 32) It's more a suggestion: move it a bit farther to allow maybe 1024 cpus in the future. That will prevent compatibility a headache, if we decide to expand support to more then 256 cpus. Or event better to make this address configurable in run-time and build this var along with SSDT (converting along the way all other hard-coded io ports to the same generic run-time interface). This wish is out of scope of this patch-set, but what do you think about the idea? > + Field (MEST, ByteAcc, NoLock, Preserve) > + { > + MES, 256 > + } > + > + Method(MESC, 0) { > + // Local5 = active memdevice bitmap > + Store (MES, Local5) > + // Local2 = last read byte from bitmap > + Store (Zero, Local2) > + // Local0 = memory device iterator > + Store (Zero, Local0) > + While (LLess(Local0, SizeOf(MEON))) { > + // Local1 = MEON flag for this memory device > + Store(DerefOf(Index(MEON, Local0)), Local1) > + If (And(Local0, 0x07)) { > + // Shift down previously read bitmap byte > + ShiftRight(Local2, 1, Local2) > + } Else { > + // Read next byte from memdevice bitmap > + Store(DerefOf(Index(Local5, ShiftRight(Local0, 3))), Local2) > + } > + // Local3 = active state for this memory device > + Store(And(Local2, 1), Local3) > > + If (LNotEqual(Local1, Local3)) { > + // State change - update MEON with new state > + Store(Local3, Index(MEON, Local0)) > + // Do MEM notify > + If (LEqual(Local3, 1)) { > + MTFY(Local0, 1) > + } Else { > + MTFY(Local0, 3) > + } > + } > + Increment(Local0) > + } > + Return(One) > + } > + } > /**************************************************************** > * General purpose events > ****************************************************************/ > @@ -732,7 +795,8 @@ DefinitionBlock ( > Return(\_SB.PRSC()) > } > Method(_L03) { > - Return(0x01) > + // Memory hotplug event > + Return(\_SB.MESC()) > } > Method(_L04) { > Return(0x01) -- ----- Igor

2 1

[PATCH 0/4] Redesign of pciinit.c (take 3)
by Alexey Korolev 20 Apr '12

20 Apr '12

Hi, This patch series redesigns the existing pciinit.c code and introduces linked list operations. Changes are more about structures definitions rather than functionality. There are no more arrays of bases and counts in new implementation. The new implementation is based on dynamic allocation of pci_region_entry structures. Each pci_region_entry structure could be a PCI bar or a downstream PCI region (bridge). Each entry has a set of attributes: type (IO, MEM, PREFMEM), is64bit, size, base address, PCI device owner, and a pointer to the pci_bus it belongs to. 1. Introduce List operations 2. Add pci_region_entry and linked lists operations in place while still using the array system to do the allocations. 3. Switch to lists operations 4. Get rid of size element from bus->r structure, now we use entry->size for the same purpose src/pci.h | 5 - src/pciinit.c | 258 ++++++++++++++++++++++++++------------------------------- src/util.h | 21 +++++ 3 files changed, 137 insertions(+), 147 deletions(-)

5 19

Re: [SeaBIOS] [RFC PATCH 7/9] Implement memslot command-line option and memslot hmp command
by Avi Kivity 19 Apr '12

19 Apr '12

On 04/19/2012 05:08 PM, Vasilis Liaskovitis wrote: > Implement -memslot qemu-kvm command line option to define hotplug-able memory > slots. > Syntax: "-memslot id=name,start=addr,size=sz,node=nodeid" > > e.g. "-memslot id=hot1,start=4294967296,size=1073741824,node=0" > will define a 1G memory slot starting at physical address 4G, belonging to numa > node 0. Defining no node will automatically add a memslot to node 0. start=4G,size=1G ought to work too, no? -- error compiling committee.c: too many arguments to function

2 1

Re: [SeaBIOS] [Qemu-devel] [RFC PATCH 0/9] ACPI memory hotplug
by Anthony Liguori 19 Apr '12

19 Apr '12

On 04/19/2012 09:08 AM, Vasilis Liaskovitis wrote: > This is a prototype for ACPI memory hotplug on x86_64 target. Based on some > earlier work and comments from Gleb. > > Memslot devices are modeled with a new qemu command line > > "-memslot id=name,start=start_addr,size=sz,node=pxm" Hi, For 1.2, I'd really like to focus on refactoring the PC machine as described in this series: https://github.com/aliguori/qemu/commits/qom-rebase.12 I'd like to represent the guest memory as a "DIMM" device. In terms of this proposal, I would then expect that the i440fx device would have a num_dimms property that controlled how many link<DIMM>'s it had. Hotplug would consist of creating a DIMM at run time and connecting it to the appropriate link. One thing that's not clear to me is how the start/size fits in. On bare metal, is this something that's calculated by the firmware during start up and then populated in ACPI? Does it do something like take the largest possible DIMM size that it supports and fill out the table? At any rate, I think we should focus on modeling this in QOM verses adding a new option and hacking at the existing memory init code. Regards, Anthony Liguori

2 1

Re: [SeaBIOS] [RFC PATCH 6/9] pc: pass paravirt info for hotplug memory slots to BIOS
by Avi Kivity 19 Apr '12

19 Apr '12

On 04/19/2012 05:08 PM, Vasilis Liaskovitis wrote: > The numa_fw_cfg paravirt interface is extended to include SRAT information for > all hotplug-able memslots. There are 3 words for each hotplug-able memory slot, > denoting start address, size and node proximity. nb_numa_nodes is set to 1 by > default (not 0), so that we always pass srat info to SeaBIOS. > > This information is used by Seabios to build hotplug memory device objects at runtime. > Please document this ABI. I don't see an existing place, suggest docs/specs/fwcfg.txt (only your additions need to be documented). -- error compiling committee.c: too many arguments to function

1 0

[RFC PATCH 9/9] enable memory devices if e820 entry is present
by Vasilis Liaskovitis 19 Apr '12

19 Apr '12

On a reboot, seabios regenerates srat/ssdt objects. If a valid e820 entry is found spanning the whole address range of a hotplug memory device, the device will be enabled. This ensures persistency of hotplugged memory slots across VM reboots. Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> --- src/acpi.c | 6 +++++- src/memmap.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index 5580099..2ebed2e 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -601,7 +601,11 @@ build_memssdt(void) for (i = 0; i < nb_memdevs; i++) { mem_base = (((u64)(entry->base_addr_high) << 32 )| entry->base_addr_low); mem_len = (((u64)(entry->length_high) << 32 )| entry->length_low); - *(ssdt_ptr++) = 0x00; + if (find_e820(mem_base, mem_len, E820_RAM)) { + *(ssdt_ptr++) = 0x01; + } + else + *(ssdt_ptr++) = 0x00; entry++; } build_header((void*)ssdt, SSDT_SIGNATURE, ssdt_ptr - ssdt, 1); diff --git a/src/memmap.c b/src/memmap.c index 56865b4..9790da1 100644 --- a/src/memmap.c +++ b/src/memmap.c @@ -131,6 +131,21 @@ add_e820(u64 start, u64 size, u32 type) //dump_map(); } +// Check if an e820 entry exists that covers the memory range +// [start, start+size) with same type as type. +int +find_e820(u64 start, u64 size, u32 type) +{ + int i; + for (i=0; i<e820_count; i++) { + struct e820entry *e = &e820_list[i]; + if ((e->start <= start) && (e->size >= (size + start - e->start)) && + (e->type == type)) + return 1; + } + return 0; +} + // Report on final memory locations. void memmap_finalize(void) -- 1.7.9

1 0

[RFC PATCH 8/9] pc: adjust e820 map on hot-add and hot-remove
by Vasilis Liaskovitis 19 Apr '12

19 Apr '12

Hotplugged memory is not persistent in the e820 memory maps. After hotplugging a memslot and rebooting the VM, the hotplugged device is not present. A possible solution is to add an e820 for the new memslot in the acpi_piix4 hot-add handler. On a reset, Seabios (see next patch in series) will enable all memory devices for which it finds an e820 entry that covers the devices's address range. On hot-remove, the acpi_piix4 handler will try to remove the e820 entry corresponding to the device. This will work when no VM reboots happen between hot-add and hot-remove, but it is not a sufficient solution in general: Seabios and GuestOS merge adjacent e820 entries on machine reboot, so the sequence hot-add/ rebootVM / hot-remove will fail to remove a corresponding e820 entry at the hot-remove phase. Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> --- hw/acpi_piix4.c | 6 ++++++ hw/pc.c | 28 ++++++++++++++++++++++++++++ hw/pc.h | 1 + 3 files changed, 35 insertions(+), 0 deletions(-) diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 2921d18..2b5fd04 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -619,6 +619,9 @@ static void piix4_memslot_eject(uint32_t addr, uint32_t val) s = memslot_find_from_idx(start + idx); assert(s != NULL); memslot_depopulate(s); + if (e820_del_entry(s->start, s->size, E820_RAM) == -EBUSY) + PIIX4_DPRINTF("failed to remove e820 entry for memslot %u\n", + s->idx); } val = val >> 1; idx++; @@ -634,6 +637,9 @@ static int piix4_memslot_hotplug(DeviceState *qdev, SysBusDevice *dev, int if (add) { enable_mem_device(s, slot->idx); + if (e820_add_entry(slot->start, slot->size, E820_RAM) == -EBUSY) + PIIX4_DPRINTF("failed to add e820 entry for memslot %u\n", + slot->idx); } else { disable_mem_device(s, slot->idx); diff --git a/hw/pc.c b/hw/pc.c index f1f550a..04d243f 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -593,6 +593,34 @@ int e820_add_entry(uint64_t address, uint64_t length, uint32_t type) return index; } +int e820_del_entry(uint64_t address, uint64_t length, uint32_t type) +{ + int index = le32_to_cpu(e820_table.count); + int search; + struct e820_entry *entry; + + if (index == 0) + return -EBUSY; + search = index - 1; + entry = &e820_table.entry[search]; + while (search >= 0) { + if ((entry->address == cpu_to_le64(address)) && + (entry->length == cpu_to_le64(length)) && + (entry->type == cpu_to_le32(type))){ + if (search != index - 1) { + memcpy(&e820_table.entry[search], &e820_table.entry[search + 1], + sizeof(struct e820_entry) * (index - search)); + } + index--; + e820_table.count = cpu_to_le32(index); + return 1; + } + search--; + entry = &e820_table.entry[search]; + } + return -EBUSY; +} + static void bochs_bios_setup_hp_memslots(uint64_t *fw_cfg_slots); static void *bochs_bios_init(void) diff --git a/hw/pc.h b/hw/pc.h index 74d3369..4925e8c 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -226,5 +226,6 @@ void pc_system_firmware_init(MemoryRegion *rom_memory); #define E820_UNUSABLE 5 int e820_add_entry(uint64_t, uint64_t, uint32_t); +int e820_del_entry(uint64_t, uint64_t, uint32_t); #endif -- 1.7.9

1 0

[RFC PATCH 7/9] Implement memslot command-line option and memslot hmp command
by Vasilis Liaskovitis 19 Apr '12

19 Apr '12

Implement -memslot qemu-kvm command line option to define hotplug-able memory slots. Syntax: "-memslot id=name,start=addr,size=sz,node=nodeid" e.g. "-memslot id=hot1,start=4294967296,size=1073741824,node=0" will define a 1G memory slot starting at physical address 4G, belonging to numa node 0. Defining no node will automatically add a memslot to node 0. Also implement a new hmp monitor command for hot-add and hot-remove of memory slots Syntax: "memslot slotname action" where action is add/delete and slotname is the qdev-id of the memory slot. Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> --- Makefile.objs | 2 +- hmp-commands.hx | 15 +++++++++++++++ monitor.c | 8 ++++++++ monitor.h | 1 + qemu-config.c | 25 +++++++++++++++++++++++++ qemu-options.hx | 8 ++++++++ sysemu.h | 1 + vl.c | 40 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 99 insertions(+), 1 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 5c3bcda..98ce865 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -240,7 +240,7 @@ hw-obj-$(CONFIG_USB_OHCI) += usb/hcd-ohci.o hw-obj-$(CONFIG_USB_EHCI) += usb/hcd-ehci.o hw-obj-$(CONFIG_USB_XHCI) += usb/hcd-xhci.o hw-obj-$(CONFIG_FDC) += fdc.o -hw-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o +hw-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o memslot.o hw-obj-$(CONFIG_APM) += pm_smbus.o apm.o hw-obj-$(CONFIG_DMA) += dma.o hw-obj-$(CONFIG_I82374) += i82374.o diff --git a/hmp-commands.hx b/hmp-commands.hx index a6f5a84..cadf4ca 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -618,6 +618,21 @@ Add device. ETEXI { + .name = "memslot", + .args_type = "id:s,action:s", + .params = "id,action", + .help = "add memslot device", + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_memslot_add, + }, + +STEXI +@item memslot_add @var{config} +@findex memslot_add + +Add memslot. +ETEXI + { .name = "device_del", .args_type = "id:s", .params = "device", diff --git a/monitor.c b/monitor.c index 8946a10..f672186 100644 --- a/monitor.c +++ b/monitor.c @@ -30,6 +30,7 @@ #include "hw/pci.h" #include "hw/watchdog.h" #include "hw/loader.h" +#include "hw/memslot.h" #include "gdbstub.h" #include "net.h" #include "net/slirp.h" @@ -4675,3 +4676,10 @@ int monitor_read_block_device_key(Monitor *mon, const char *device, return monitor_read_bdrv_key_start(mon, bs, completion_cb, opaque); } + +int do_memslot_add(Monitor *mon, const QDict *qdict, QObject **ret_data) +{ +#if defined(TARGET_I386) || defined(TARGET_X86_64) + return memslot_do(mon, qdict); +#endif +} diff --git a/monitor.h b/monitor.h index 0d49800..1e14a63 100644 --- a/monitor.h +++ b/monitor.h @@ -80,5 +80,6 @@ int monitor_read_password(Monitor *mon, ReadLineFunc *readline_func, int qmp_qom_set(Monitor *mon, const QDict *qdict, QObject **ret); int qmp_qom_get(Monitor *mon, const QDict *qdict, QObject **ret); +int do_memslot_add(Monitor *mon, const QDict *qdict, QObject **ret_data); #endif /* !MONITOR_H */ diff --git a/qemu-config.c b/qemu-config.c index be84a03..1f26187 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -613,6 +613,30 @@ QemuOptsList qemu_boot_opts = { }, }; +static QemuOptsList qemu_memslot_opts = { + .name = "memslot", + .head = QTAILQ_HEAD_INITIALIZER(qemu_memslot_opts.head), + .desc = { + { + .name = "id", + .type = QEMU_OPT_STRING, + },{ + .name = "start", + .type = QEMU_OPT_SIZE, + .help = "physical address start for this memslot", + },{ + .name = "size", + .type = QEMU_OPT_SIZE, + .help = "memory size for this memslot", + },{ + .name = "node", + .type = QEMU_OPT_NUMBER, + .help = "NUMA node number (i.e. proximity) for this memslot", + }, + { /* end of list */ } + }, +}; + static QemuOptsList *vm_config_groups[32] = { &qemu_drive_opts, &qemu_chardev_opts, @@ -628,6 +652,7 @@ static QemuOptsList *vm_config_groups[32] = { &qemu_machine_opts, &qemu_boot_opts, &qemu_iscsi_opts, + &qemu_memslot_opts, NULL, }; diff --git a/qemu-options.hx b/qemu-options.hx index a169792..aff0546 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2728,3 +2728,11 @@ HXCOMM This is the last statement. Insert new options before this line! STEXI @end table ETEXI + +DEF("memslot", HAS_ARG, QEMU_OPTION_memslot, + "-memslot start=num,size=num,id=name\n" + "specify unpopulated memory slot", + QEMU_ARCH_ALL) + + + diff --git a/sysemu.h b/sysemu.h index bc2c788..7247099 100644 --- a/sysemu.h +++ b/sysemu.h @@ -136,6 +136,7 @@ extern QEMUClock *rtc_clock; extern int nb_numa_nodes; extern uint64_t node_mem[MAX_NODES]; extern uint64_t node_cpumask[MAX_NODES]; +extern int nb_hp_memslots; #define MAX_OPTION_ROMS 16 typedef struct QEMUOptionRom { diff --git a/vl.c b/vl.c index 50df453..85ac0f9 100644 --- a/vl.c +++ b/vl.c @@ -126,6 +126,7 @@ int main(int argc, char **argv) #include "hw/xen.h" #include "hw/qdev.h" #include "hw/loader.h" +#include "hw/memslot.h" #include "bt-host.h" #include "net.h" #include "net/slirp.h" @@ -247,6 +248,7 @@ QTAILQ_HEAD(, FWBootEntry) fw_boot_order = QTAILQ_HEAD_INITIALIZER(fw_boot_order int nb_numa_nodes; uint64_t node_mem[MAX_NODES]; uint64_t node_cpumask[MAX_NODES]; +int nb_hp_memslots; uint8_t qemu_uuid[16]; @@ -512,6 +514,36 @@ static void configure_rtc_date_offset(const char *startdate, int legacy) } } +static void configure_memslot(QemuOpts *opts) +{ + const char *value, *id; + uint64_t start, size, node; + + id = qemu_opts_id(opts); + value = qemu_opt_get(opts, "start"); + if (!value) { + fprintf(stderr, "qemu: invalid start address for memslot '%s'\n", id); + exit(1); + } + start = atoll(value); + value = qemu_opt_get(opts, "size"); + if (!value) { + fprintf(stderr, "qemu: invalid size for memslot '%s'\n", id); + exit(1); + } + size = atoi(value); + value = qemu_opt_get(opts, "node"); + if (!value) { + fprintf(stderr, "qemu: no node proximity defined for memslot '%s'\n", id); + node = 0; + } + else node = atoi(value); + fprintf(stderr, "qemu: memslot %s start %lu size %lu node %lu \n", id, + start, size, node); + memslot_create((char*)id, start, size, node, nb_hp_memslots); + nb_hp_memslots++; +} + static void configure_rtc(QemuOpts *opts) { const char *value; @@ -2330,6 +2362,7 @@ int main(int argc, char **argv, char **envp) nb_numa_nodes = 0; nb_nics = 0; + nb_hp_memslots = 0; autostart= 1; @@ -2521,6 +2554,13 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_kernel: qemu_opts_set(qemu_find_opts("machine"), 0, "kernel", optarg); break; + case QEMU_OPTION_memslot: + opts = qemu_opts_parse(qemu_find_opts("memslot"), optarg, 0); + if (!opts) { + exit(1); + } + configure_memslot(opts); + break; case QEMU_OPTION_initrd: qemu_opts_set(qemu_find_opts("machine"), 0, "initrd", optarg); break; -- 1.7.9

1 0

[RFC PATCH 6/9] pc: pass paravirt info for hotplug memory slots to BIOS
by Vasilis Liaskovitis 19 Apr '12

19 Apr '12

The numa_fw_cfg paravirt interface is extended to include SRAT information for all hotplug-able memslots. There are 3 words for each hotplug-able memory slot, denoting start address, size and node proximity. nb_numa_nodes is set to 1 by default (not 0), so that we always pass srat info to SeaBIOS. This information is used by Seabios to build hotplug memory device objects at runtime. Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> --- hw/pc.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ vl.c | 4 +++- 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 67f0479..f1f550a 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -46,6 +46,7 @@ #include "ui/qemu-spice.h" #include "memory.h" #include "exec-memory.h" +#include "memslot.h" /* output Bochs bios info messages */ //#define DEBUG_BIOS @@ -592,12 +593,15 @@ int e820_add_entry(uint64_t address, uint64_t length, uint32_t type) return index; } +static void bochs_bios_setup_hp_memslots(uint64_t *fw_cfg_slots); + static void *bochs_bios_init(void) { void *fw_cfg; uint8_t *smbios_table; size_t smbios_len; uint64_t *numa_fw_cfg; + uint64_t *hp_memslots_fw_cfg; int i, j; register_ioport_write(0x400, 1, 2, bochs_bios_write, NULL); @@ -630,28 +634,71 @@ static void *bochs_bios_init(void) fw_cfg_add_bytes(fw_cfg, FW_CFG_HPET, (uint8_t *)&hpet_cfg, sizeof(struct hpet_fw_config)); /* allocate memory for the NUMA channel: one (64bit) word for the number - * of nodes, one word for each VCPU->node and one word for each node to - * hold the amount of memory. + * of nodes, one word for the number of hotplug memory slots, one word + * for each VCPU->node, one word for each node to hold the amount of memory. + * Finally three words for each hotplug memory slot, denoting start address, + * size and node proximity. */ - numa_fw_cfg = g_malloc0((1 + max_cpus + nb_numa_nodes) * 8); + numa_fw_cfg = g_malloc0((2 + max_cpus + nb_numa_nodes + 3 * nb_hp_memslots) * 8); numa_fw_cfg[0] = cpu_to_le64(nb_numa_nodes); + numa_fw_cfg[1] = cpu_to_le64(nb_hp_memslots); + for (i = 0; i < max_cpus; i++) { for (j = 0; j < nb_numa_nodes; j++) { if (node_cpumask[j] & (1 << i)) { - numa_fw_cfg[i + 1] = cpu_to_le64(j); + numa_fw_cfg[i + 2] = cpu_to_le64(j); break; } } } for (i = 0; i < nb_numa_nodes; i++) { - numa_fw_cfg[max_cpus + 1 + i] = cpu_to_le64(node_mem[i]); + numa_fw_cfg[max_cpus + 2 + i] = cpu_to_le64(node_mem[i]); } + + hp_memslots_fw_cfg = numa_fw_cfg + 2 + max_cpus + nb_numa_nodes; + if (nb_hp_memslots) + bochs_bios_setup_hp_memslots(hp_memslots_fw_cfg); + fw_cfg_add_bytes(fw_cfg, FW_CFG_NUMA, (uint8_t *)numa_fw_cfg, - (1 + max_cpus + nb_numa_nodes) * 8); + (2 + max_cpus + nb_numa_nodes + 3 * nb_hp_memslots) * 8); return fw_cfg; } +static void bochs_bios_setup_hp_memslots(uint64_t *fw_cfg_slots) +{ + int i = 0; + Error *err = NULL; + DeviceState *dev; + MemSlotState *slot; + char *type; + BusState *bus = sysbus_get_default(); + + QTAILQ_FOREACH(dev, &bus->children, sibling) { + type = object_property_get_str(OBJECT(dev), "type", &err); + if (err) { + error_free(err); + fprintf(stderr, "error getting device type\n"); + exit(1); + } + + if (!strcmp(type, "memslot")) { + if (!dev->id) { + error_free(err); + fprintf(stderr, "error getting memslot device id\n"); + exit(1); + } + if (!strcmp(dev->id, "initialslot")) continue; + slot = MEMSLOT(dev); + fw_cfg_slots[3 * slot->idx] = cpu_to_le64(slot->start); + fw_cfg_slots[3 * slot->idx + 1] = cpu_to_le64(slot->size); + fw_cfg_slots[3 * slot->idx + 2] = cpu_to_le64(slot->node); + i++; + } + } + assert(i == nb_hp_memslots); +} + static long get_file_size(FILE *f) { long where, size; diff --git a/vl.c b/vl.c index ae91a8a..50df453 100644 --- a/vl.c +++ b/vl.c @@ -3428,8 +3428,10 @@ int main(int argc, char **argv, char **envp) register_savevm_live(NULL, "ram", 0, 4, NULL, ram_save_live, NULL, ram_load, NULL); + if (!nb_numa_nodes) + nb_numa_nodes = 1; - if (nb_numa_nodes > 0) { + { int i; if (nb_numa_nodes > MAX_NODES) { -- 1.7.9

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS