2024-02-12 21:11:39

by Oliver Upton

Subject: [PATCH] KVM: selftests: Print timer ctl register in ISTATUS assertion

Zenghui noted that the test assertion for the ISTATUS bit is printing
the current timer value instead of the control register in the case of
failure. While the assertion is sound, printing CNT isn't informative.

Change things around to actually print the CTL register value instead.

Reported-by: Zenghui Yu <[email protected]>
Closes: https://lore.kernel.org/kvmarm/[email protected]/
Signed-off-by: Oliver Upton <[email protected]>
---

Applies to kvmarm/next.

tools/testing/selftests/kvm/aarch64/arch_timer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testing/selftests/kvm/aarch64/arch_timer.c
index d5e8f365aa01..ab4b604d8ec0 100644
--- a/tools/testing/selftests/kvm/aarch64/arch_timer.c
+++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c
@@ -160,7 +160,7 @@ static void guest_validate_irq(unsigned int intid,
__GUEST_ASSERT(xcnt >= cval,
"xcnt = 0x%lx, cval = 0x%lx, xcnt_diff_us = 0x%lx",
xcnt, cval, xcnt_diff_us);
- __GUEST_ASSERT(xctl & CTL_ISTATUS, "xcnt = 0x%lx", xcnt);
+ __GUEST_ASSERT(xctl & CTL_ISTATUS, "xctl = 0x%lx", xctl);

WRITE_ONCE(shared_data->nr_iter, shared_data->nr_iter + 1);
}

base-commit: 680f749c272378a796388a3244bab53b5a952d67
--
2.43.0.687.g38aa6559b0-goog

2024-02-13 01:15:38

by Zenghui Yu

Subject: Re: [PATCH] KVM: selftests: Print timer ctl register in ISTATUS assertion

On 2024/2/13 05:09, Oliver Upton wrote:
> Zenghui noted that the test assertion for the ISTATUS bit is printing
> the current timer value instead of the control register in the case of
> failure. While the assertion is sound, printing CNT isn't informative.
>
> Change things around to actually print the CTL register value instead.
>
> Reported-by: Zenghui Yu <[email protected]>
> Closes: https://lore.kernel.org/kvmarm/[email protected]/
> Signed-off-by: Oliver Upton <[email protected]>

Reviewed-by: Zenghui Yu <[email protected]>

2024-02-13 01:51:57

by Oliver Upton

Subject: Re: [PATCH] KVM: selftests: Print timer ctl register in ISTATUS assertion

On Mon, 12 Feb 2024 21:09:33 +0000, Oliver Upton wrote:
> Zenghui noted that the test assertion for the ISTATUS bit is printing
> the current timer value instead of the control register in the case of
> failure. While the assertion is sound, printing CNT isn't informative.
>
> Change things around to actually print the CTL register value instead.
>
>
> [...]

Applied to kvmarm/next, thanks!

[1/1] KVM: selftests: Print timer ctl register in ISTATUS assertion
https://git.kernel.org/kvmarm/kvmarm/c/8cdc71fbf655

--
Best,
Oliver