From: Andrew Jones <andrew.jones@linux.dev>
To: Qingwei Hu <qingwei.hu@bytedance.com>
Cc: kvm@vger.kernel.org, kvm-riscv@lists.infradead.org,
James Raphael Tiovalen <jamestiotio@gmail.com>
Subject: Re: [kvm-unit-tests PATCH v2] riscv: sbi: Fix timer delay measurement race
Date: Fri, 20 Nov 2026 15:50:28 +0100 [thread overview]
Message-ID: <awBeIov4bo7vKhz3@orel> (raw)
In-Reply-To: <20261026033738.96294-1-qingwei.hu@bytedance.com>
On Mon, Oct 26, 2026 at 11:37:38AM +0800, Qingwei Hu wrote:
> The timer test samples the counter before checking timer_works in the
> wait loop. If the timer interrupt arrives between these operations, the
> handler sets timer_works and the loop exits with a timestamp taken before
> the interrupt. That timestamp can precede the deadline, causing a false
> "timer delay honored" failure in both the normal and masked IRQ tests.
>
> Check timer_works first in the wait loop and sample the counter again
> after the loop exits. Use this timestamp to calculate the elapsed time
> so that an interrupt cannot cause the test to use a stale timestamp.
>
> Fixes: 14fa12b1351c ("riscv: sbi: Add test for timer extension")
> Suggested-by: Andrew Jones <andrew.jones@linux.dev>
> Signed-off-by: Qingwei Hu <qingwei.hu@bytedance.com>
> ---
> Changes in v2:
> - Check timer_works first and sample the counter after the wait loop,
> as suggested by Andrew Jones.
> - Drop the timestamp field and counter read from the interrupt handler.
>
> Testing:
> - Cross-built riscv/sbi.flat and built it natively on a RISC-V host.
> - Ran the SBI tests with KVM five times each with 1 and 32 vCPUs.
> All runs passed, with 15 tests skipped per run. Both timer delay
> checks passed in all runs.
>
> riscv/sbi.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/riscv/sbi.c b/riscv/sbi.c
> index 3b8aadce..5633b1f9 100644
> --- a/riscv/sbi.c
> +++ b/riscv/sbi.c
> @@ -292,8 +292,9 @@ static void timer_check_set_timer(bool mask_timer_irq)
> if (ret.error)
> report_info("set timer%s failed with %ld\n", mask_test_str, ret.error);
>
> - while ((end = timer_get_cycles()) <= (begin + d + margin) && !timer_info.timer_works)
> + while (!timer_info.timer_works && timer_get_cycles() <= begin + d + margin)
> cpu_relax();
> + end = timer_get_cycles();
>
> report(timer_info.timer_works, "timer interrupt received%s", mask_test_str);
> report(timer_info.timer_irq_set, "pending timer interrupt bit set in irq handler%s", mask_test_str);
> --
> 2.39.5
>
Queued. https://gitlab.com/jones-drew/kvm-unit-tests/-/commits/riscv/queue
Thanks,
drew
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Jones <andrew.jones@linux.dev>
To: Qingwei Hu <qingwei.hu@bytedance.com>
Cc: kvm@vger.kernel.org, kvm-riscv@lists.infradead.org,
James Raphael Tiovalen <jamestiotio@gmail.com>
Subject: Re: [kvm-unit-tests PATCH v2] riscv: sbi: Fix timer delay measurement race
Date: Fri, 20 Nov 2026 15:50:28 +0100 [thread overview]
Message-ID: <awBeIov4bo7vKhz3@orel> (raw)
In-Reply-To: <20261026033738.96294-1-qingwei.hu@bytedance.com>
On Mon, Oct 26, 2026 at 11:37:38AM +0800, Qingwei Hu wrote:
> The timer test samples the counter before checking timer_works in the
> wait loop. If the timer interrupt arrives between these operations, the
> handler sets timer_works and the loop exits with a timestamp taken before
> the interrupt. That timestamp can precede the deadline, causing a false
> "timer delay honored" failure in both the normal and masked IRQ tests.
>
> Check timer_works first in the wait loop and sample the counter again
> after the loop exits. Use this timestamp to calculate the elapsed time
> so that an interrupt cannot cause the test to use a stale timestamp.
>
> Fixes: 14fa12b1351c ("riscv: sbi: Add test for timer extension")
> Suggested-by: Andrew Jones <andrew.jones@linux.dev>
> Signed-off-by: Qingwei Hu <qingwei.hu@bytedance.com>
> ---
> Changes in v2:
> - Check timer_works first and sample the counter after the wait loop,
> as suggested by Andrew Jones.
> - Drop the timestamp field and counter read from the interrupt handler.
>
> Testing:
> - Cross-built riscv/sbi.flat and built it natively on a RISC-V host.
> - Ran the SBI tests with KVM five times each with 1 and 32 vCPUs.
> All runs passed, with 15 tests skipped per run. Both timer delay
> checks passed in all runs.
>
> riscv/sbi.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/riscv/sbi.c b/riscv/sbi.c
> index 3b8aadce..5633b1f9 100644
> --- a/riscv/sbi.c
> +++ b/riscv/sbi.c
> @@ -292,8 +292,9 @@ static void timer_check_set_timer(bool mask_timer_irq)
> if (ret.error)
> report_info("set timer%s failed with %ld\n", mask_test_str, ret.error);
>
> - while ((end = timer_get_cycles()) <= (begin + d + margin) && !timer_info.timer_works)
> + while (!timer_info.timer_works && timer_get_cycles() <= begin + d + margin)
> cpu_relax();
> + end = timer_get_cycles();
>
> report(timer_info.timer_works, "timer interrupt received%s", mask_test_str);
> report(timer_info.timer_irq_set, "pending timer interrupt bit set in irq handler%s", mask_test_str);
> --
> 2.39.5
>
Queued. https://gitlab.com/jones-drew/kvm-unit-tests/-/commits/riscv/queue
Thanks,
drew
--
kvm-riscv mailing list
kvm-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kvm-riscv
next prev parent reply other threads:[~2026-11-20 14:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-26 3:37 [kvm-unit-tests PATCH v2] riscv: sbi: Fix timer delay measurement race Qingwei Hu
2026-10-26 3:37 ` Qingwei Hu
2026-11-20 14:50 ` Andrew Jones [this message]
2026-11-20 14:50 ` Andrew Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=awBeIov4bo7vKhz3@orel \
--to=andrew.jones@linux.dev \
--cc=jamestiotio@gmail.com \
--cc=kvm-riscv@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=qingwei.hu@bytedance.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.