[PATCH v2 1/3] RISC-V: KVM: Order writes to the SBI STA shared structure
From: Koichiro Den
Date: Sat Nov 21 2026 - 12:35:44 EST
The guest checks the sequence before and after reading steal time. If
the final even sequence becomes visible before the updated steal time,
the guest can accept a stale value. CSR accesses are weakly ordered;
toggling sstatus.SUM in get_user() and put_user() does not guarantee
that the guest observes those stores in order.
Pair the read barriers in pv_time_steal_clock() with write barriers.
Fixes: e9f12b5fff8a ("RISC-V: KVM: Implement SBI STA extension")
Signed-off-by: Koichiro Den <den@xxxxxxxxxxxxx>
---
Changes since v1:
- New patch. Split the write barriers out of v1 patch #1 into a
separate fix. (Andrew)
arch/riscv/kvm/vcpu_sbi_sta.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/riscv/kvm/vcpu_sbi_sta.c b/arch/riscv/kvm/vcpu_sbi_sta.c
index 60e50296a008..f1be90b514b2 100644
--- a/arch/riscv/kvm/vcpu_sbi_sta.c
+++ b/arch/riscv/kvm/vcpu_sbi_sta.c
@@ -9,6 +9,7 @@
#include <linux/mm.h>
#include <linux/sizes.h>
+#include <asm/barrier.h>
#include <asm/bug.h>
#include <asm/current.h>
#include <asm/kvm_vcpu_sbi.h>
@@ -65,6 +66,8 @@ void kvm_riscv_vcpu_record_steal_time(struct kvm_vcpu *vcpu)
if (WARN_ON(put_user(cpu_to_le32(sequence), sequence_ptr)))
return;
+ /* Publish the odd sequence before updating stolen time. */
+ smp_wmb();
if (!WARN_ON(get_user(steal_le, steal_ptr))) {
steal = le64_to_cpu(steal_le);
vcpu->arch.sta.last_steal = READ_ONCE(current->sched_info.run_delay);
@@ -72,6 +75,8 @@ void kvm_riscv_vcpu_record_steal_time(struct kvm_vcpu *vcpu)
WARN_ON(put_user(cpu_to_le64(steal), steal_ptr));
}
+ /* Publish stolen time before the sequence becomes even. */
+ smp_wmb();
sequence += 1;
WARN_ON(put_user(cpu_to_le32(sequence), sequence_ptr));
--
2.54.0