Commit 768a20f3 authored by David Gibson's avatar David Gibson
Browse files

spapr: Include "pre-plugged" DIMMS in ram size calculation at reset 



At guest reset time, we allocate a hash page table (HPT) for the guest
based on the guest's RAM size.  If dynamic HPT resizing is not available we
use the maximum RAM size, if it is we use the current RAM size.

But the "current RAM size" calculation is incorrect - we just use the
"base" ram_size from the machine structure.  This doesn't include any
pluggable DIMMs that are already plugged at reset time.

This means that if you try to start a 'pseries' machine with a DIMM
specified on the command line that's much larger than the "base" RAM size,
then the guest will get a woefully inadequate HPT.  This can lead to a
guest freeze during boot as it runs out of HPT space during initial MMU
setup.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Tested-by: default avatarGreg Kurz <groug@kaod.org>
parent be1b21e8

hw/ppc/spapr.c

+4 −1
Original line number Diff line number Diff line
@@ -1386,7 +1386,10 @@ void spapr_setup_hpt_and_vrma(sPAPRMachineState *spapr) 
            && !spapr_ovec_test(spapr->ov5_cas, OV5_HPT_RESIZE))) {

        hpt_shift = spapr_hpt_shift_for_ramsize(MACHINE(spapr)->maxram_size);

    } else {

        hpt_shift = spapr_hpt_shift_for_ramsize(MACHINE(spapr)->ram_size);

        uint64_t current_ram_size;



        current_ram_size = MACHINE(spapr)->ram_size + get_plugged_memory_size();

        hpt_shift = spapr_hpt_shift_for_ramsize(current_ram_size);

    }

    spapr_reallocate_hpt(spapr, hpt_shift, &error_fatal);