From: Zhao Liu <zhao1.liu@intel.com>
To: "Paolo Bonzini" <pbonzini@redhat.com>,
"Manos Pitsidianakis" <manos.pitsidianakis@linaro.org>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>,
qemu-devel@nongnu.org, qemu-rust@nongnu.org,
Zhao Liu <zhao1.liu@intel.com>
Subject: [PATCH 22/22] rust/hpet: Enable lockless IO
Date: Thu, 13 Nov 2025 13:19:37 +0800 [thread overview]
Message-ID: <20251113051937.4017675-23-zhao1.liu@intel.com> (raw)
In-Reply-To: <20251113051937.4017675-1-zhao1.liu@intel.com>
Enable lockless IO for HPET to allow BQL free MMIO access.
But BQL context is still needed for some cases during MMIO:
* IRQ handling:
Like C version of HPET did (commit d99041a20328 ("hpet: guard IRQ
handling with BQL"), BQL context is needed during IRQ handling.
But Rust HPET has an extra reason that InterruptSource is placed in
BqlCell, which requires BQL context explicitly. (This also shows
that the BQL limitation in the design of the InterruptSource binding
is reasonable.)
* BqlCell/BqlRefCell access.
Except InterruptSource, HPETState has other BqlCell and BqlRefCell:
hpet_offset (BqlCell<u64>), rtc_irq_level (BqlCell<u32>) and timers
([BqlRefCell<HPETTimer>; HPET_MAX_TIMERS]).
Their data may change during runtime, so the atomic context is
required.
Therefore, use BqlGuard to provide BQL context in the MMIO path.
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
Q: HPET C version doesn't guard BQL for hpet_offset, rtc_irq_level and
timers. Should we add the guard for these fields?
---
rust/hw/timer/hpet/src/device.rs | 67 ++++++++++++++++++++------------
1 file changed, 43 insertions(+), 24 deletions(-)
diff --git a/rust/hw/timer/hpet/src/device.rs b/rust/hw/timer/hpet/src/device.rs
index db3e2c8fa23c..f96dfe1ebd06 100644
--- a/rust/hw/timer/hpet/src/device.rs
+++ b/rust/hw/timer/hpet/src/device.rs
@@ -356,12 +356,12 @@ fn set_irq(&self, regs: &MutexGuard<HPETRegisters>, set: bool) {
);
}
} else if tn_regs.is_int_level_triggered() {
- self.get_state().irqs[route].raise();
+ bql::with_guard(|| self.get_state().irqs[route].raise());
} else {
- self.get_state().irqs[route].pulse();
+ bql::with_guard(|| self.get_state().irqs[route].pulse());
}
} else if !tn_regs.is_fsb_route_enabled() {
- self.get_state().irqs[route].lower();
+ bql::with_guard(|| self.get_state().irqs[route].lower());
}
}
@@ -672,14 +672,20 @@ const fn has_msi_flag(&self) -> bool {
}
fn get_ticks(&self) -> u64 {
- ns_to_ticks(CLOCK_VIRTUAL.get_ns() + self.hpet_offset.get())
+ // Protect hpet_offset in lockless IO case which would not lock BQL.
+ ns_to_ticks(CLOCK_VIRTUAL.get_ns() + bql::with_guard(|| self.hpet_offset.get()))
}
fn get_ns(&self, tick: u64) -> u64 {
- ticks_to_ns(tick) - self.hpet_offset.get()
+ // Protect hpet_offset in lockless IO case which would not lock BQL.
+ ticks_to_ns(tick) - bql::with_guard(|| self.hpet_offset.get())
}
fn handle_legacy_irq(&self, irq: u32, level: u32) {
+ // Protect both rtc_irq_level and irqs[] in lockless IO case which
+ // would not lock BQL.
+ let _bql_guard = bql::BqlGuard::new();
+
let regs = self.regs.lock().unwrap();
if irq == HPET_LEGACY_PIT_INT {
if !regs.is_legacy_mode() {
@@ -718,38 +724,49 @@ fn set_cfg_reg(&self, regs: &mut MutexGuard<HPETRegisters>, shift: u32, len: u32
if activating_bit(old_val, new_val, HPET_CFG_ENABLE_SHIFT) {
// Enable main counter and interrupt generation.
- self.hpet_offset
- .set(ticks_to_ns(regs.counter) - CLOCK_VIRTUAL.get_ns());
+ // Protect hpet_offset in lockless IO case which would not lock BQL.
+ bql::with_guard(|| {
+ self.hpet_offset
+ .set(ticks_to_ns(regs.counter) - CLOCK_VIRTUAL.get_ns())
+ });
for timer in self.timers.iter().take(self.num_timers) {
- let mut t = timer.borrow_mut();
- let id = t.index as usize;
- let tn_regs = ®s.tn_regs[id];
-
- if tn_regs.is_int_enabled() && t.is_int_active(regs) {
- t.update_irq(regs, true);
- }
- t.set_timer(regs);
+ // Protect timer in lockless IO case which would not lock BQL.
+ bql::with_guard(|| {
+ let mut t = timer.borrow_mut();
+ let id = t.index as usize;
+ let tn_regs = ®s.tn_regs[id];
+
+ if tn_regs.is_int_enabled() && t.is_int_active(regs) {
+ t.update_irq(regs, true);
+ }
+ t.set_timer(regs);
+ });
}
} else if deactivating_bit(old_val, new_val, HPET_CFG_ENABLE_SHIFT) {
// Halt main counter and disable interrupt generation.
regs.counter = self.get_ticks();
for timer in self.timers.iter().take(self.num_timers) {
- timer.borrow().del_timer(regs);
+ // Protect timer in lockless IO case which would not lock BQL.
+ bql::with_guard(|| timer.borrow().del_timer(regs));
}
}
// i8254 and RTC output pins are disabled when HPET is in legacy mode
if activating_bit(old_val, new_val, HPET_CFG_LEG_RT_SHIFT) {
- self.pit_enabled.set(false);
- self.irqs[0].lower();
- self.irqs[RTC_ISA_IRQ].lower();
+ bql::with_guard(|| {
+ self.pit_enabled.set(false);
+ self.irqs[0].lower();
+ self.irqs[RTC_ISA_IRQ].lower();
+ });
} else if deactivating_bit(old_val, new_val, HPET_CFG_LEG_RT_SHIFT) {
- // TODO: Add irq binding: qemu_irq_lower(s->irqs[0])
- self.irqs[0].lower();
- self.pit_enabled.set(true);
- self.irqs[RTC_ISA_IRQ].set(self.rtc_irq_level.get() != 0);
+ bql::with_guard(|| {
+ // TODO: Add irq binding: qemu_irq_lower(s->irqs[0])
+ self.irqs[0].lower();
+ self.pit_enabled.set(true);
+ self.irqs[RTC_ISA_IRQ].set(self.rtc_irq_level.get() != 0);
+ });
}
}
@@ -766,7 +783,8 @@ fn set_int_status_reg(
for (index, timer) in self.timers.iter().take(self.num_timers).enumerate() {
if cleared & (1 << index) != 0 {
- timer.borrow().update_irq(regs, false);
+ // Protect timer in lockless IO case which would not lock BQL.
+ bql::with_guard(|| timer.borrow().update_irq(regs, false));
}
}
}
@@ -827,6 +845,7 @@ unsafe fn init(mut this: ParentInit<Self>) {
fn post_init(&self) {
self.init_mmio(&self.iomem);
+ self.iomem.enable_lockless_io();
for irq in self.irqs.iter() {
self.init_irq(irq);
}
--
2.34.1
next prev parent reply other threads:[~2025-11-13 5:00 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-13 5:19 [PATCH 00/22] rust/hpet: Move towards lockless IO, partly Zhao Liu
2025-11-13 5:19 ` [PATCH 01/22] rust/migration: Add Sync implementation for Migratable<> Zhao Liu
2025-11-13 5:19 ` [PATCH 02/22] rust/migration: Fix missing name in the VMSD of Migratable<> Zhao Liu
2025-11-13 5:19 ` [PATCH 03/22] rust/migration: Check name field in VMStateDescriptionBuilder Zhao Liu
2025-11-13 5:19 ` [PATCH 04/22] rust/bql: Add BqlGuard to provide BQL context Zhao Liu
2025-11-13 5:19 ` [PATCH 05/22] rust/bql: Ensure BQL locked early at BqlRefCell borrowing Zhao Liu
2025-11-13 5:19 ` [PATCH 06/22] rust/memory: Add enable_lockless_io binding Zhao Liu
2025-11-13 5:19 ` [PATCH 07/22] rust/hpet: Reduce unnecessary mutable self argument Zhao Liu
2025-11-13 5:19 ` [PATCH 08/22] rust/hpet: Rename HPETRegister to DecodedRegister Zhao Liu
2025-11-13 5:19 ` [PATCH 09/22] rust/hpet: Rename decoded "reg" enumeration to "target" Zhao Liu
2025-11-13 5:19 ` [PATCH 10/22] rust/hpet: Abstract HPETTimerRegisters struct Zhao Liu
2025-11-13 11:24 ` Paolo Bonzini
2025-11-14 4:37 ` Zhao Liu
2025-11-15 7:54 ` Paolo Bonzini
2025-11-13 5:19 ` [PATCH 11/22] rust/hpet: Make timer register accessors as methods of HPETTimerRegisters Zhao Liu
2025-11-13 5:19 ` [PATCH 12/22] rust/hpet: Abstract HPETRegisters struct Zhao Liu
2025-11-13 5:19 ` [PATCH 13/22] rust/hpet: Make global register accessors as methods of HPETRegisters Zhao Liu
2025-11-13 5:19 ` [PATCH 14/22] rust/hpet: Borrow HPETState.regs once in HPETState::post_load() Zhao Liu
2025-11-13 5:19 ` [PATCH 15/22] rust/hpet: Explicitly initialize complex fields in init() Zhao Liu
2025-11-13 5:19 ` [PATCH 16/22] rust/hpet: Pass &BqlRefCell<HPETRegisters> as argument during MMIO access Zhao Liu
2025-11-13 5:19 ` [PATCH 17/22] rust/hpet: Maintain HPETTimerRegisters in HPETRegisters Zhao Liu
2025-11-13 5:19 ` [PATCH 18/22] rust/hpet: Borrow BqlRefCell<HPETRegisters> at top level Zhao Liu
2025-11-13 5:19 ` [PATCH 19/22] rust/hpet: Rename hpet_regs variables to regs Zhao Liu
2025-11-13 5:19 ` [PATCH 20/22] rust/hpet: Apply Migratable<> wrapper and ToMigrationState for HPETRegisters Zhao Liu
2025-11-13 5:19 ` [PATCH 21/22] rust/hpet: Replace BqlRefCell<HPETRegisters> with Mutex<HPETRegisters> Zhao Liu
2025-11-13 9:31 ` Zhao Liu
2025-11-13 11:36 ` Zhao Liu
2025-11-13 5:19 ` Zhao Liu [this message]
2025-11-13 14:29 ` [PATCH 22/22] rust/hpet: Enable lockless IO Paolo Bonzini
2025-11-14 6:39 ` Zhao Liu
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=20251113051937.4017675-23-zhao1.liu@intel.com \
--to=zhao1.liu@intel.com \
--cc=imammedo@redhat.com \
--cc=manos.pitsidianakis@linaro.org \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-rust@nongnu.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).