Skip to content

Commit 75b2fdc

Browse files
ouptonMarc Zyngier
authored andcommitted
KVM: arm64: selftests: Cope with arch silliness in EL2 selftest
Implementations without FEAT_FGT aren't required to trap the entire ID register space when HCR_EL2.TID3 is set. This is a terrible idea, as the hypervisor may need to advertise the absence of a feature to the VM using a negative value in a signed field, FEAT_E2H0 being a great example of this. Cope with uncooperative implementations in the EL2 selftest by accepting a zero value when FEAT_FGT is absent and otherwise only tolerating the expected nonzero value. Signed-off-by: Oliver Upton <oliver.upton@linux.dev> Signed-off-by: Marc Zyngier <maz@kernel.org>
1 parent f677b0e commit 75b2fdc

1 file changed

Lines changed: 15 additions & 2 deletions

File tree

tools/testing/selftests/kvm/arm64/hello_el2.c

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,28 @@
1313

1414
static void guest_code(void)
1515
{
16+
u64 mmfr0 = read_sysreg_s(SYS_ID_AA64MMFR0_EL1);
1617
u64 mmfr1 = read_sysreg_s(SYS_ID_AA64MMFR1_EL1);
1718
u64 mmfr4 = read_sysreg_s(SYS_ID_AA64MMFR4_EL1);
19+
u8 e2h0 = SYS_FIELD_GET(ID_AA64MMFR4_EL1, E2H0, mmfr4);
1820

1921
GUEST_ASSERT_EQ(get_current_el(), 2);
2022
GUEST_ASSERT(read_sysreg(hcr_el2) & HCR_EL2_E2H);
2123
GUEST_ASSERT_EQ(SYS_FIELD_GET(ID_AA64MMFR1_EL1, VH, mmfr1),
2224
ID_AA64MMFR1_EL1_VH_IMP);
23-
GUEST_ASSERT_EQ(SYS_FIELD_GET(ID_AA64MMFR4_EL1, E2H0, mmfr4),
24-
ID_AA64MMFR4_EL1_E2H0_NI_NV1);
25+
26+
/*
27+
* Traps of the complete ID register space are IMPDEF without FEAT_FGT,
28+
* which is really annoying to deal with in KVM describing E2H as RES1.
29+
*
30+
* If the implementation doesn't honor the trap then expect the register
31+
* to return all zeros.
32+
*/
33+
if (e2h0 == ID_AA64MMFR4_EL1_E2H0_IMP)
34+
GUEST_ASSERT_EQ(SYS_FIELD_GET(ID_AA64MMFR0_EL1, FGT, mmfr0),
35+
ID_AA64MMFR0_EL1_FGT_NI);
36+
else
37+
GUEST_ASSERT_EQ(e2h0, ID_AA64MMFR4_EL1_E2H0_NI_NV1);
2538

2639
GUEST_DONE();
2740
}

0 commit comments

Comments
 (0)