mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spapr: Clean up RMA size calculation

Browse Source 
Move the calculation of the Real Mode Area (RMA) size into a helper
function.  While we're there clean it up and correct it in a few ways:
  * Add comments making it clearer where the various constraints come from
  * Remove a pointless check that the RMA fits within Node 0 (we've just
    clamped it so that it does)

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
David Gibson 2019-11-29 11:49:04 +11:00
parent 1052ab67f4
commit 425f0b7adb
1 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
hw/ppc/spapr.c
View File

@ -2648,6 +2648,42 @@ static PCIHostState *spapr_create_default_phb(void)
return PCI_HOST_BRIDGE(dev); return PCI_HOST_BRIDGE(dev);
} }
static hwaddr spapr_rma_size(SpaprMachineState *spapr, Error **errp)
{
MachineState *machine = MACHINE(spapr);
SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
hwaddr rma_size = machine->ram_size;
hwaddr node0_size = spapr_node0_size(machine);
/* RMA has to fit in the first NUMA node */
rma_size = MIN(rma_size, node0_size);
/*
* VRMA access is via a special 1TiB SLB mapping, so the RMA can
* never exceed that
*/
rma_size = MIN(rma_size, 1 * TiB);
/*
* Clamp the RMA size based on machine type. This is for
* migration compatibility with older qemu versions, which limited
* the RMA size for complicated and mostly bad reasons.
*/
if (smc->rma_limit) {
rma_size = MIN(rma_size, smc->rma_limit);
}
if (rma_size < MIN_RMA_SLOF) {
error_setg(errp,
"pSeries SLOF firmware requires >= %" HWADDR_PRIx
"ldMiB guest RMA (Real Mode Area memory)",
MIN_RMA_SLOF / MiB);
return 0;
}
return rma_size;
}
/* pSeries LPAR / sPAPR hardware init */ /* pSeries LPAR / sPAPR hardware init */
static void spapr_machine_init(MachineState *machine) static void spapr_machine_init(MachineState *machine)
{ {
@ -2659,7 +2695,6 @@ static void spapr_machine_init(MachineState *machine)
PCIHostState *phb; PCIHostState *phb;
int i; int i;
MemoryRegion *sysmem = get_system_memory(); MemoryRegion *sysmem = get_system_memory();
hwaddr node0_size = spapr_node0_size(machine);
long load_limit, fw_size; long load_limit, fw_size;
char *filename; char *filename;
Error *resize_hpt_err = NULL; Error *resize_hpt_err = NULL;
@ -2699,22 +2734,7 @@ static void spapr_machine_init(MachineState *machine)
exit(1); exit(1);
} }
spapr->rma_size = node0_size; spapr->rma_size = spapr_rma_size(spapr, &error_fatal);
/*
* Clamp the RMA size based on machine type. This is for
* migration compatibility with older qemu versions, which limited
* the RMA size for complicated and mostly bad reasons.
*/
if (smc->rma_limit) {
spapr->rma_size = MIN(spapr->rma_size, smc->rma_limit);
}
if (spapr->rma_size > node0_size) {
error_report("Numa node 0 has to span the RMA (%#08"HWADDR_PRIx")",
spapr->rma_size);
exit(1);
}
/* Setup a load limit for the ramdisk leaving room for SLOF and FDT */ /* Setup a load limit for the ramdisk leaving room for SLOF and FDT */
load_limit = MIN(spapr->rma_size, RTAS_MAX_ADDR) - FW_OVERHEAD; load_limit = MIN(spapr->rma_size, RTAS_MAX_ADDR) - FW_OVERHEAD;
@ -2951,13 +2971,6 @@ static void spapr_machine_init(MachineState *machine)
} }
} }
if (spapr->rma_size < MIN_RMA_SLOF) {
error_report(
"pSeries SLOF firmware requires >= %ldMiB guest RMA (Real Mode Area memory)",
MIN_RMA_SLOF / MiB);
exit(1);
}
if (kernel_filename) { if (kernel_filename) {
uint64_t lowaddr = 0; uint64_t lowaddr = 0;