| Message ID | 1435567472-20338-3-git-send-email-bharata@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On Mon, 29 Jun 2015 14:14:28 +0530 Bharata B Rao <bharata@linux.vnet.ibm.com> wrote: > Enable memory hotplug for pseries 2.4 and add LMB DR connectors. Maybe write out the word LMB DR the first time you use it? > With memory hotplug, enforce RAM size, NUMA node memory size and maxmem > to be a multiple of SPAPR_MEMORY_BLOCK_SIZE (256M) since that's the > granularity in which LMBs are represented and hot-added. > > LMB DR connectors will be used by the memory hotplug code. > > Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com> > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> > [spapr_drc_reset implementation] > --- > hw/ppc/spapr.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++ > include/hw/ppc/spapr.h | 1 + > 2 files changed, 89 insertions(+) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 241ecad..bee868c 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -59,6 +59,7 @@ > #include "hw/nmi.h" > > #include "hw/compat.h" > +#include "qemu-common.h" > > #include <libfdt.h> > > @@ -1436,10 +1437,85 @@ static void spapr_cpu_init(sPAPRMachineState *spapr, PowerPCCPU *cpu) > qemu_register_reset(spapr_cpu_reset, cpu); > } > > +/* > + * Reset routine for LMB DR devices. > + * > + * Unlike PCI DR devices, LMB DR devices explicitly register this reset > + * routine. Reset for PCI DR devices will be handled by PHB reset routine > + * when it walks all its children devices. LMB devices reset occurs > + * as part of spapr_ppc_reset(). > + */ > +static void spapr_drc_reset(void *opaque) > +{ > + sPAPRDRConnector *drc = opaque; > + DeviceState *d = DEVICE(drc); > + > + if (d) { > + device_reset(d); > + } > +} > + > +static void spapr_create_lmb_dr_connectors(sPAPRMachineState *spapr) > +{ > + MachineState *machine = MACHINE(spapr); > + uint64_t lmb_size = SPAPR_MEMORY_BLOCK_SIZE; > + uint32_t nr_rma_lmbs = spapr->rma_size/lmb_size; > + uint32_t nr_lmbs = machine->maxram_size/lmb_size - nr_rma_lmbs; > + uint32_t nr_assigned_lmbs = machine->ram_size/lmb_size - nr_rma_lmbs; > + int i; > + > + for (i = 0; i < nr_lmbs; i++) { > + sPAPRDRConnector *drc; > + uint64_t addr; > + > + if (i < nr_assigned_lmbs) { > + addr = (i + nr_rma_lmbs) * lmb_size; > + } else { > + addr = (i - nr_assigned_lmbs) * lmb_size + > + spapr->hotplug_memory.base; > + } > + drc = spapr_dr_connector_new(OBJECT(spapr), SPAPR_DR_CONNECTOR_TYPE_LMB, > + addr/lmb_size); > + qemu_register_reset(spapr_drc_reset, drc); > + } > +} > + > +/* > + * If RAM size, maxmem size and individual node mem sizes aren't aligned > + * to SPAPR_MEMORY_BLOCK_SIZE(256MB), then refuse to start the guest > + * since we can't support such unaligned sizes with DRCONF_MEMORY. > + */ > +static void spapr_validate_node_memory(MachineState *machine) > +{ > + int i; > + > + if (machine->maxram_size % SPAPR_MEMORY_BLOCK_SIZE || > + machine->ram_size % SPAPR_MEMORY_BLOCK_SIZE) { > + error_report("Can't support memory configuration where RAM size " > + "0x" RAM_ADDR_FMT " or maxmem size " > + "0x" RAM_ADDR_FMT " isn't aligned to %lld MB", > + machine->ram_size, machine->maxram_size, > + SPAPR_MEMORY_BLOCK_SIZE/M_BYTE); > + exit(EXIT_FAILURE); > + } > + > + for (i = 0; i < nb_numa_nodes; i++) { > + if (numa_info[i].node_mem && > + numa_info[i].node_mem % SPAPR_MEMORY_BLOCK_SIZE) { > + error_report("Can't support memory configuration where memory " > + "size %lx of node %d isn't aligned to %lld MB", > + numa_info[i].node_mem, i, > + SPAPR_MEMORY_BLOCK_SIZE/M_BYTE); > + exit(EXIT_FAILURE); > + } > + } > +} > + > /* pSeries LPAR / sPAPR hardware init */ > static void ppc_spapr_init(MachineState *machine) > { > sPAPRMachineState *spapr = SPAPR_MACHINE(machine); > + sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(machine); > const char *kernel_filename = machine->kernel_filename; > const char *kernel_cmdline = machine->kernel_cmdline; > const char *initrd_filename = machine->initrd_filename; > @@ -1518,6 +1594,10 @@ static void ppc_spapr_init(MachineState *machine) > smp_threads), > XICS_IRQS); > > + if (smc->dr_lmb_enabled) { > + spapr_validate_node_memory(machine); > + } > + > /* init CPUs */ > if (machine->cpu_model == NULL) { > machine->cpu_model = kvm_enabled() ? "host" : "POWER7"; > @@ -1567,6 +1647,10 @@ static void ppc_spapr_init(MachineState *machine) > &spapr->hotplug_memory.mr); > } > > + if (smc->dr_lmb_enabled) { > + spapr_create_lmb_dr_connectors(spapr); > + } > + > filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, "spapr-rtas.bin"); > if (!filename) { > error_report("Could not find LPAR rtas '%s'", "spapr-rtas.bin"); > @@ -1840,6 +1924,7 @@ static void spapr_nmi(NMIState *n, int cpu_index, Error **errp) > static void spapr_machine_class_init(ObjectClass *oc, void *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > + sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(oc); > FWPathProviderClass *fwc = FW_PATH_PROVIDER_CLASS(oc); > NMIClass *nc = NMI_CLASS(oc); > > @@ -1853,6 +1938,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) > mc->kvm_type = spapr_kvm_type; > mc->has_dynamic_sysbus = true; > > + smc->dr_lmb_enabled = false; > fwc->get_dev_path = spapr_get_fw_dev_path; > nc->nmi_monitor_handler = spapr_nmi; > } > @@ -1988,11 +2074,13 @@ static const TypeInfo spapr_machine_2_3_info = { > static void spapr_machine_2_4_class_init(ObjectClass *oc, void *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > + sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(oc); > > mc->name = "pseries-2.4"; > mc->desc = "pSeries Logical Partition (PAPR compliant) v2.4"; > mc->alias = "pseries"; > mc->is_default = 1; > + smc->dr_lmb_enabled = true; > } > > static const TypeInfo spapr_machine_2_4_info = { > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index 8a1929b..a142e91 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -35,6 +35,7 @@ struct sPAPRMachineClass { > MachineClass parent_class; > > /*< public >*/ > + bool dr_lmb_enabled; /* enable dynamic-reconfig/hotplug of LMBs */ > }; > > /** Patch looks fine to me. Reviewed-by: Thomas Huth <thuth@redhat.com>
On Mon, Jun 29, 2015 at 02:14:28PM +0530, Bharata B Rao wrote: > Enable memory hotplug for pseries 2.4 and add LMB DR connectors. > With memory hotplug, enforce RAM size, NUMA node memory size and maxmem > to be a multiple of SPAPR_MEMORY_BLOCK_SIZE (256M) since that's the > granularity in which LMBs are represented and hot-added. > > LMB DR connectors will be used by the memory hotplug code. > > Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com> > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> > [spapr_drc_reset implementation] Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
On Mon, 29 Jun 2015 14:14:28 +0530 Bharata B Rao <bharata@linux.vnet.ibm.com> wrote: > Enable memory hotplug for pseries 2.4 and add LMB DR connectors. > With memory hotplug, enforce RAM size, NUMA node memory size and maxmem > to be a multiple of SPAPR_MEMORY_BLOCK_SIZE (256M) since that's the > granularity in which LMBs are represented and hot-added. > > LMB DR connectors will be used by the memory hotplug code. > > Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com> > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> > [spapr_drc_reset implementation] > --- > hw/ppc/spapr.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++ > include/hw/ppc/spapr.h | 1 + > 2 files changed, 89 insertions(+) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 241ecad..bee868c 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c ... > +/* > + * If RAM size, maxmem size and individual node mem sizes aren't aligned > + * to SPAPR_MEMORY_BLOCK_SIZE(256MB), then refuse to start the guest > + * since we can't support such unaligned sizes with DRCONF_MEMORY. > + */ > +static void spapr_validate_node_memory(MachineState *machine) > +{ > + int i; > + > + if (machine->maxram_size % SPAPR_MEMORY_BLOCK_SIZE || > + machine->ram_size % SPAPR_MEMORY_BLOCK_SIZE) { > + error_report("Can't support memory configuration where RAM size " > + "0x" RAM_ADDR_FMT " or maxmem size " > + "0x" RAM_ADDR_FMT " isn't aligned to %lld MB", > + machine->ram_size, machine->maxram_size, > + SPAPR_MEMORY_BLOCK_SIZE/M_BYTE); > + exit(EXIT_FAILURE); > + } > + > + for (i = 0; i < nb_numa_nodes; i++) { > + if (numa_info[i].node_mem && > + numa_info[i].node_mem % SPAPR_MEMORY_BLOCK_SIZE) { > + error_report("Can't support memory configuration where memory " > + "size %lx of node %d isn't aligned to %lld MB", > + numa_info[i].node_mem, i, > + SPAPR_MEMORY_BLOCK_SIZE/M_BYTE); FYI, this causes a compiler warning when compiling for a 32-bit host: hw/ppc/spapr.c: In function 'spapr_validate_node_memory': hw/ppc/spapr.c:1638:26: warning: format '%lx' expects argument of type 'long unsigned int', but argument 2 has type 'uint64_t' [-Wformat=] I think you have to use PRIx64 or something similar here. Thomas
On Mon, Jul 06, 2015 at 05:49:48PM +0200, Thomas Huth wrote: > On Mon, 29 Jun 2015 14:14:28 +0530 > Bharata B Rao <bharata@linux.vnet.ibm.com> wrote: > > > Enable memory hotplug for pseries 2.4 and add LMB DR connectors. > > With memory hotplug, enforce RAM size, NUMA node memory size and maxmem > > to be a multiple of SPAPR_MEMORY_BLOCK_SIZE (256M) since that's the > > granularity in which LMBs are represented and hot-added. > > > > LMB DR connectors will be used by the memory hotplug code. > > > > Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com> > > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> > > [spapr_drc_reset implementation] > > --- > > hw/ppc/spapr.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++ > > include/hw/ppc/spapr.h | 1 + > > 2 files changed, 89 insertions(+) > > > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > > index 241ecad..bee868c 100644 > > --- a/hw/ppc/spapr.c > > +++ b/hw/ppc/spapr.c > ... > > +/* > > + * If RAM size, maxmem size and individual node mem sizes aren't aligned > > + * to SPAPR_MEMORY_BLOCK_SIZE(256MB), then refuse to start the guest > > + * since we can't support such unaligned sizes with DRCONF_MEMORY. > > + */ > > +static void spapr_validate_node_memory(MachineState *machine) > > +{ > > + int i; > > + > > + if (machine->maxram_size % SPAPR_MEMORY_BLOCK_SIZE || > > + machine->ram_size % SPAPR_MEMORY_BLOCK_SIZE) { > > + error_report("Can't support memory configuration where RAM size " > > + "0x" RAM_ADDR_FMT " or maxmem size " > > + "0x" RAM_ADDR_FMT " isn't aligned to %lld MB", > > + machine->ram_size, machine->maxram_size, > > + SPAPR_MEMORY_BLOCK_SIZE/M_BYTE); > > + exit(EXIT_FAILURE); > > + } > > + > > + for (i = 0; i < nb_numa_nodes; i++) { > > + if (numa_info[i].node_mem && > > + numa_info[i].node_mem % SPAPR_MEMORY_BLOCK_SIZE) { > > + error_report("Can't support memory configuration where memory " > > + "size %lx of node %d isn't aligned to %lld MB", > > + numa_info[i].node_mem, i, > > + SPAPR_MEMORY_BLOCK_SIZE/M_BYTE); > > FYI, this causes a compiler warning when compiling for a 32-bit host: > > hw/ppc/spapr.c: In function 'spapr_validate_node_memory': > hw/ppc/spapr.c:1638:26: warning: format '%lx' expects argument of type 'long unsigned int', but argument 2 has type 'uint64_t' [-Wformat=] > > I think you have to use PRIx64 or something similar here. I've added a patch to correct this to spapr-next.
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 241ecad..bee868c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -59,6 +59,7 @@ #include "hw/nmi.h" #include "hw/compat.h" +#include "qemu-common.h" #include <libfdt.h> @@ -1436,10 +1437,85 @@ static void spapr_cpu_init(sPAPRMachineState *spapr, PowerPCCPU *cpu) qemu_register_reset(spapr_cpu_reset, cpu); } +/* + * Reset routine for LMB DR devices. + * + * Unlike PCI DR devices, LMB DR devices explicitly register this reset + * routine. Reset for PCI DR devices will be handled by PHB reset routine + * when it walks all its children devices. LMB devices reset occurs + * as part of spapr_ppc_reset(). + */ +static void spapr_drc_reset(void *opaque) +{ + sPAPRDRConnector *drc = opaque; + DeviceState *d = DEVICE(drc); + + if (d) { + device_reset(d); + } +} + +static void spapr_create_lmb_dr_connectors(sPAPRMachineState *spapr) +{ + MachineState *machine = MACHINE(spapr); + uint64_t lmb_size = SPAPR_MEMORY_BLOCK_SIZE; + uint32_t nr_rma_lmbs = spapr->rma_size/lmb_size; + uint32_t nr_lmbs = machine->maxram_size/lmb_size - nr_rma_lmbs; + uint32_t nr_assigned_lmbs = machine->ram_size/lmb_size - nr_rma_lmbs; + int i; + + for (i = 0; i < nr_lmbs; i++) { + sPAPRDRConnector *drc; + uint64_t addr; + + if (i < nr_assigned_lmbs) { + addr = (i + nr_rma_lmbs) * lmb_size; + } else { + addr = (i - nr_assigned_lmbs) * lmb_size + + spapr->hotplug_memory.base; + } + drc = spapr_dr_connector_new(OBJECT(spapr), SPAPR_DR_CONNECTOR_TYPE_LMB, + addr/lmb_size); + qemu_register_reset(spapr_drc_reset, drc); + } +} + +/* + * If RAM size, maxmem size and individual node mem sizes aren't aligned + * to SPAPR_MEMORY_BLOCK_SIZE(256MB), then refuse to start the guest + * since we can't support such unaligned sizes with DRCONF_MEMORY. + */ +static void spapr_validate_node_memory(MachineState *machine) +{ + int i; + + if (machine->maxram_size % SPAPR_MEMORY_BLOCK_SIZE || + machine->ram_size % SPAPR_MEMORY_BLOCK_SIZE) { + error_report("Can't support memory configuration where RAM size " + "0x" RAM_ADDR_FMT " or maxmem size " + "0x" RAM_ADDR_FMT " isn't aligned to %lld MB", + machine->ram_size, machine->maxram_size, + SPAPR_MEMORY_BLOCK_SIZE/M_BYTE); + exit(EXIT_FAILURE); + } + + for (i = 0; i < nb_numa_nodes; i++) { + if (numa_info[i].node_mem && + numa_info[i].node_mem % SPAPR_MEMORY_BLOCK_SIZE) { + error_report("Can't support memory configuration where memory " + "size %lx of node %d isn't aligned to %lld MB", + numa_info[i].node_mem, i, + SPAPR_MEMORY_BLOCK_SIZE/M_BYTE); + exit(EXIT_FAILURE); + } + } +} + /* pSeries LPAR / sPAPR hardware init */ static void ppc_spapr_init(MachineState *machine) { sPAPRMachineState *spapr = SPAPR_MACHINE(machine); + sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(machine); const char *kernel_filename = machine->kernel_filename; const char *kernel_cmdline = machine->kernel_cmdline; const char *initrd_filename = machine->initrd_filename; @@ -1518,6 +1594,10 @@ static void ppc_spapr_init(MachineState *machine) smp_threads), XICS_IRQS); + if (smc->dr_lmb_enabled) { + spapr_validate_node_memory(machine); + } + /* init CPUs */ if (machine->cpu_model == NULL) { machine->cpu_model = kvm_enabled() ? "host" : "POWER7"; @@ -1567,6 +1647,10 @@ static void ppc_spapr_init(MachineState *machine) &spapr->hotplug_memory.mr); } + if (smc->dr_lmb_enabled) { + spapr_create_lmb_dr_connectors(spapr); + } + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, "spapr-rtas.bin"); if (!filename) { error_report("Could not find LPAR rtas '%s'", "spapr-rtas.bin"); @@ -1840,6 +1924,7 @@ static void spapr_nmi(NMIState *n, int cpu_index, Error **errp) static void spapr_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); + sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(oc); FWPathProviderClass *fwc = FW_PATH_PROVIDER_CLASS(oc); NMIClass *nc = NMI_CLASS(oc); @@ -1853,6 +1938,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) mc->kvm_type = spapr_kvm_type; mc->has_dynamic_sysbus = true; + smc->dr_lmb_enabled = false; fwc->get_dev_path = spapr_get_fw_dev_path; nc->nmi_monitor_handler = spapr_nmi; } @@ -1988,11 +2074,13 @@ static const TypeInfo spapr_machine_2_3_info = { static void spapr_machine_2_4_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); + sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(oc); mc->name = "pseries-2.4"; mc->desc = "pSeries Logical Partition (PAPR compliant) v2.4"; mc->alias = "pseries"; mc->is_default = 1; + smc->dr_lmb_enabled = true; } static const TypeInfo spapr_machine_2_4_info = { diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 8a1929b..a142e91 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -35,6 +35,7 @@ struct sPAPRMachineClass { MachineClass parent_class; /*< public >*/ + bool dr_lmb_enabled; /* enable dynamic-reconfig/hotplug of LMBs */ }; /**