Commit bf48040c authored by Akihiko Odaki's avatar Akihiko Odaki Committed by Oliver Upton
Browse files

KVM: arm64: Mask FEAT_CCIDX 



The CCSIDR access handler masks the associativity bits according to the
bit layout for processors without FEAT_CCIDX. KVM also assumes CCSIDR is
32-bit where it will be 64-bit if FEAT_CCIDX is enabled. Mask FEAT_CCIDX
so that these assumptions hold.

Suggested-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarAkihiko Odaki <akihiko.odaki@daynix.com>
Link: https://lore.kernel.org/r/20230112023852.42012-7-akihiko.odaki@daynix.com


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent 8cc6deda

arch/arm64/kvm/sys_regs.c

+11 −0
Original line number Diff line number Diff line
@@ -1155,6 +1155,12 @@ static u64 read_id_reg(const struct kvm_vcpu *vcpu, struct sys_reg_desc const *r 
		val |= FIELD_PREP(ARM64_FEATURE_MASK(ID_DFR0_EL1_PerfMon),

				  pmuver_to_perfmon(vcpu_pmuver(vcpu)));

		break;

	case SYS_ID_AA64MMFR2_EL1:

		val &= ~ID_AA64MMFR2_EL1_CCIDX_MASK;

		break;

	case SYS_ID_MMFR4_EL1:

		val &= ~ARM64_FEATURE_MASK(ID_MMFR4_EL1_CCIDX);

		break;

	}



	return val;
@@ -1718,6 +1724,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { 


	{ SYS_DESC(SYS_CCSIDR_EL1), access_ccsidr },

	{ SYS_DESC(SYS_CLIDR_EL1), access_clidr },

	{ SYS_DESC(SYS_CCSIDR2_EL1), undef_access },

	{ SYS_DESC(SYS_SMIDR_EL1), undef_access },

	{ SYS_DESC(SYS_CSSELR_EL1), access_csselr, reset_unknown, CSSELR_EL1 },

	{ SYS_DESC(SYS_CTR_EL0), access_ctr },
@@ -2219,6 +2226,10 @@ static const struct sys_reg_desc cp15_regs[] = { 


	{ Op1(1), CRn( 0), CRm( 0), Op2(0), access_ccsidr },

	{ Op1(1), CRn( 0), CRm( 0), Op2(1), access_clidr },



	/* CCSIDR2 */

	{ Op1(1), CRn( 0), CRm( 0),  Op2(2), undef_access },



	{ Op1(2), CRn( 0), CRm( 0), Op2(0), access_csselr, NULL, CSSELR_EL1 },

};