KVM: arm64: Fix block mapping validity check in stage-1 walker
PATCH 1/1 KVM: arm64: Fix block mapping validity check in stage-1 walker
For the 64K granule size, FEAT_LPA determines whether a level 1 mapping is allowed. Using the result of has_52bit_pa() is too restrictive, as it also checks the selected output addressi size in TCR.(I)PS. Fix it by only checking FEAT_LPA.
Fixes 5da3a3b27a01 ("KVM: arm64: Expand valid block mappings to FEAT_LPA/LPA2 support")
Signed-off-by Wei-Lin Chang <[email protected]>
--- arch/arm64/kvm/at.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm64/kvm/at.c +4 -1
@@ -564,15 +564,18 @@ static int walk_s1(struct kvm_vcpu *vcpu, struct s1_walk_info *wi,/* Block mapping, check the validity of the level */ if (!(desc &BIT (1 ))) {bool valid_block = false; +bool lpa =kvm_has_feat_enum (vcpu->kvm,ID_AA64MMFR0_EL1 ,PARANGE ,52 );switch (BIT (wi->pgshift)) {case SZ_4K : valid_block = level ==1 || level ==2 || (wi->pa52bit && level ==0 );break ;case SZ_16K : -case SZ_64K : valid_block = level ==2 || (wi->pa52bit && level ==1 );break ; +case SZ_64K : + valid_block = level ==2 || (lpa && level ==1 ); +break ; }if (!valid_block)
Signature · 1 line
2.43.0