| Message ID | 20170216024921.GB19110@fergus.ozlabs.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, 2017-02-16 at 02:49:21 UTC, Paul Mackerras wrote: > Currently, if the kernel is running on a POWER9 processor under a > hypervisor, it may try to use the radix MMU even though it doesn't have > the necessary code to do so (it doesn't negotiate use of radix, and it > doesn't do the H_REGISTER_PROC_TBL hcall). If the hypervisor supports > both radix and HPT, then it will set up the guest to use HPT (since the > guest doesn't request radix in the CAS call), but if the radix feature > bit is set in the ibm,pa-features property (which is valid, since > ibm,pa-features is defined to represent the capabilities of the > processor) the guest will try to use radix, resulting in a crash when > it turns the MMU on. > > This makes the minimal fix for the current code, which is to disable > radix unless we are running in hypervisor mode. > > Fixes: 2bfd65e45e87 ("powerpc/mm/radix: Add radix callbacks for early init routines") > Cc: stable@vger.kernel.org # v4.7+ > Signed-off-by: Paul Mackerras <paulus@ozlabs.org> Applied to powerpc fixes, thanks. https://git.kernel.org/powerpc/c/3f91a89d424a79f8082525db5a375e cheers
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index 93abf8a..8e15880 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -347,7 +347,8 @@ early_param("disable_radix", parse_disable_radix); void __init mmu_early_init_devtree(void) { /* Disable radix mode based on kernel command line. */ - if (disable_radix) + /* We don't yet have the machinery to do radix as a guest. */ + if (disable_radix || !(mfmsr() & MSR_HV)) cur_cpu_spec->mmu_features &= ~MMU_FTR_TYPE_RADIX; if (early_radix_enabled())
Currently, if the kernel is running on a POWER9 processor under a hypervisor, it may try to use the radix MMU even though it doesn't have the necessary code to do so (it doesn't negotiate use of radix, and it doesn't do the H_REGISTER_PROC_TBL hcall). If the hypervisor supports both radix and HPT, then it will set up the guest to use HPT (since the guest doesn't request radix in the CAS call), but if the radix feature bit is set in the ibm,pa-features property (which is valid, since ibm,pa-features is defined to represent the capabilities of the processor) the guest will try to use radix, resulting in a crash when it turns the MMU on. This makes the minimal fix for the current code, which is to disable radix unless we are running in hypervisor mode. Fixes: 2bfd65e45e87 ("powerpc/mm/radix: Add radix callbacks for early init routines") Cc: stable@vger.kernel.org # v4.7+ Signed-off-by: Paul Mackerras <paulus@ozlabs.org> --- arch/powerpc/mm/init_64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)