arm64: mm: limit linear region to 51 bits for KVM in nVHE mode
PATCH v2 1/1 arm64: mm: limit linear region to 51 bits for KVM in nVHE mode
KVM in nVHE mode divides up its VA space into two equal halves, and picks the half that does not conflict with the HYP ID map to map its linear region. This worked fine when the kernel's linear map itself was guaranteed to cover precisely as many bits of VA space, but this was changed by commit f4693c2716b35d08 ("arm64: mm: extend linear region for 52-bit VA configurations").
The result is that, depending on the placement of the ID map, kernel-VA to hyp-VA translations may produce addresses that either conflict with other HYP mappings (including the ID map itself) or generate addresses outside of the 52-bit addressable range, neither of which is likely to lead to anything useful.
Given that 52-bit capable cores are guaranteed to implement VHE, this only affects configurations such as pKVM where we opt into non-VHE mode even if the hardware is VHE capable. So just for these configurations, let's limit the kernel linear map to 51 bits and work around the problem.
---
v2: - take min() of prior value of linear_region_size and BIT(51) to
avoid surprises
- check is_hyp_mode_available() so that the exception is only applied to KVM hosts
arch/arm64/mm/init.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
arch/arm64/mm/init.c +15 -1
@@ -282,7 +282,21 @@ static void __init fdt_enforce_memory_region(void)void __init arm64_memblock_init (void ) { -const s64 linear_region_size =PAGE_END -_PAGE_OFFSET (vabits_actual); +s64 linear_region_size =PAGE_END -_PAGE_OFFSET (vabits_actual); + +/* +* Corner case: 52-bit VA capable systems running KVM in nVHE mode may +* be limited in their ability to support a linear map that exceeds 51 +* bits of VA space, depending on the placement of the ID map. Given +* that the placement of the ID map may be randomized, let's simply +* limit the kernel's linear map to 51 bits as well if we detect this +* configuration. +*/ +if (IS_ENABLED (CONFIG_KVM ) && vabits_actual ==52 && +is_hyp_mode_available () && !is_kernel_in_hyp_mode ()) { +pr_info ("Capping linear region to 51 bits for KVM in nVHE mode on LVA capable hardware.\n" ); + linear_region_size =min_t (u64, linear_region_size,BIT (51 )); + }/* Handle linux,usable-memory-range property */ fdt_enforce_memory_region ();
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 8 lines · Ard Biesheuvel
KVM in nVHE mode divides up its VA space into two equal halves, and picks the half that does not conflict with the HYP ID map to map its linear region. This worked fine when the kernel's linear map itself was guaranteed to cover precisely as many bits of VA space, but this was changed by commit
f4693c2716b35d08("arm64: mm: extend linear region for 52-bit VA configurations").[...]
Applied to arm64 (for-next/core), thanks!
[1/1] arm64: mm: limit linear region to 51 bits for KVM in nVHE mode
https://git.kernel.org/arm64/c/88053ec8cb1b
Signature · 7 lines
Catalin _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel