[PATCH] KVM: arm64: selftests: Cope with lack of GICv3 in set_id_regs

[PATCH] KVM: arm64: selftests: Cope with lack of GICv3 in set_id_regs

[Oliver Upton]

Broonie reports that the set_id_regs test is failing as of commit
5cb57a1aff75 ("KVM: arm64: Zero ID_AA64PFR0_EL1.GIC when no GICv3 is
presented to the guest"). The test does not anticipate the 'late' ID
register fixup where KVM clobbers the GIC field in absence of GICv3.

While the field technically has FTR_LOWER_SAFE behavior, fix the issue
by setting it to an exact value of 0, matching the effect of the 'late'
fixup.

Reported-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
---
 tools/testing/selftests/kvm/aarch64/set_id_regs.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/kvm/aarch64/set_id_regs.c b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
index d20981663831..2a3fe7914b72 100644
--- a/tools/testing/selftests/kvm/aarch64/set_id_regs.c
+++ b/tools/testing/selftests/kvm/aarch64/set_id_regs.c
@@ -126,6 +126,7 @@ static const struct reg_ftr_bits ftr_id_aa64pfr0_el1[] = {
 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, CSV2, 0),
 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, DIT, 0),
 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, SEL2, 0),
+	REG_FTR_BITS(FTR_EXACT, ID_AA64PFR0_EL1, GIC, 0),
 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, EL3, 0),
 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, EL2, 0),
 	REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_EL1, EL1, 0),
-- 
2.46.0.295.g3b9ea8a38a-goog

Re: [PATCH] KVM: arm64: selftests: Cope with lack of GICv3 in set_id_regs

[Marc Zyngier]

On Thu, 29 Aug 2024 00:46:22 +0000, Oliver Upton wrote:
> Broonie reports that the set_id_regs test is failing as of commit
> 5cb57a1aff75 ("KVM: arm64: Zero ID_AA64PFR0_EL1.GIC when no GICv3 is
> presented to the guest"). The test does not anticipate the 'late' ID
> register fixup where KVM clobbers the GIC field in absence of GICv3.
> 
> While the field technically has FTR_LOWER_SAFE behavior, fix the issue
> by setting it to an exact value of 0, matching the effect of the 'late'
> fixup.
> 
> [...]

Applied to next, thanks!

[1/1] KVM: arm64: selftests: Cope with lack of GICv3 in set_id_regs
      commit: 4641c7ea88d1029500ff64c4d0a1df0584b1bfcc

Cheers,

	M.
-- 
Without deviation from the norm, progress is not possible.

Re: [PATCH] KVM: arm64: selftests: Cope with lack of GICv3 in set_id_regs

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 409 bytes --]

On Thu, Aug 29, 2024 at 12:46:22AM +0000, Oliver Upton wrote:
> Broonie reports that the set_id_regs test is failing as of commit
> 5cb57a1aff75 ("KVM: arm64: Zero ID_AA64PFR0_EL1.GIC when no GICv3 is
> presented to the guest"). The test does not anticipate the 'late' ID
> register fixup where KVM clobbers the GIC field in absence of GICv3.

A bit late but JFTR:

Tested-by: Mark Brown <broonie@kernel.org>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH] KVM: arm64: selftests: Cope with lack of GICv3 in set_id_regs

[Oliver Upton]

On Thu, Aug 29, 2024 at 02:12:09PM +0100, Mark Brown wrote:
> On Thu, Aug 29, 2024 at 12:46:22AM +0000, Oliver Upton wrote:
> > Broonie reports that the set_id_regs test is failing as of commit
> > 5cb57a1aff75 ("KVM: arm64: Zero ID_AA64PFR0_EL1.GIC when no GICv3 is
> > presented to the guest"). The test does not anticipate the 'late' ID
> > register fixup where KVM clobbers the GIC field in absence of GICv3.
> 
> A bit late but JFTR:
> 
> Tested-by: Mark Brown <broonie@kernel.org>

Great, thanks for the report + confirming the fix!

-- 
Thanks,
Oliver