Commit 70ed7238 authored by Joey Gouly's avatar Joey Gouly Committed by Will Deacon
Browse files

KVM: arm64: Sanitise ID_AA64MMFR3_EL1 



Add the missing sanitisation of ID_AA64MMFR3_EL1, making sure we
solely expose S1POE and TCRX (we currently don't support anything
else).

[joey: Took Marc's patch for S1PIE, and changed it for S1POE]

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarJoey Gouly <joey.gouly@arm.com>
Link: https://lore.kernel.org/r/20240822151113.1479789-11-joey.gouly@arm.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 55f4b215

arch/arm64/kvm/sys_regs.c

+5 −1
Original line number Diff line number Diff line
@@ -1556,6 +1556,9 @@ static u64 __kvm_read_sanitised_id_reg(const struct kvm_vcpu *vcpu, 
	case SYS_ID_AA64MMFR2_EL1:

		val &= ~ID_AA64MMFR2_EL1_CCIDX_MASK;

		break;

	case SYS_ID_AA64MMFR3_EL1:

		val &= ID_AA64MMFR3_EL1_TCRX | ID_AA64MMFR3_EL1_S1POE;

		break;

	case SYS_ID_MMFR4_EL1:

		val &= ~ARM64_FEATURE_MASK(ID_MMFR4_EL1_CCIDX);

		break;
@@ -2427,7 +2430,8 @@ static const struct sys_reg_desc sys_reg_descs[] = { 
					ID_AA64MMFR2_EL1_IDS |

					ID_AA64MMFR2_EL1_NV |

					ID_AA64MMFR2_EL1_CCIDX)),

	ID_SANITISED(ID_AA64MMFR3_EL1),

	ID_WRITABLE(ID_AA64MMFR3_EL1, (ID_AA64MMFR3_EL1_TCRX	|

				       ID_AA64MMFR3_EL1_S1POE)),

	ID_SANITISED(ID_AA64MMFR4_EL1),

	ID_UNALLOCATED(7,5),

	ID_UNALLOCATED(7,6),