From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Igor Mammedov" <imammedo@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PULL 53/61] hpet: guard IRQ handling with BQL
Date: Sat, 13 Sep 2025 10:09:34 +0200 [thread overview]
Message-ID: <20250913080943.11710-54-pbonzini@redhat.com> (raw)
In-Reply-To: <20250913080943.11710-1-pbonzini@redhat.com>
From: Igor Mammedov <imammedo@redhat.com>
Commit [1] made qemu fail with abort:
xen_evtchn_set_gsi: Assertion `bql_locked()' failed.
when running ./tests/functional/x86_64/test_kvm_xen.py tests.
To fix it make sure that BQL is held when manipulating IRQs.
Fixes: 7defb58baf (hpet: switch to fine-grained device locking)
Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Link: https://lore.kernel.org/r/20250910142506.86274-1-imammedo@redhat.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/timer/hpet.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 789a31d0a08..1acba4fa9db 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -40,6 +40,7 @@
#include "qom/object.h"
#include "qemu/lockable.h"
#include "qemu/seqlock.h"
+#include "qemu/main-loop.h"
#include "trace.h"
struct hpet_fw_config hpet_fw_cfg = {.count = UINT8_MAX};
@@ -222,12 +223,15 @@ static void update_irq(struct HPETTimer *timer, int set)
timer->fsb & 0xffffffff, MEMTXATTRS_UNSPECIFIED,
NULL);
} else if (timer->config & HPET_TN_TYPE_LEVEL) {
+ BQL_LOCK_GUARD();
qemu_irq_raise(s->irqs[route]);
} else {
+ BQL_LOCK_GUARD();
qemu_irq_pulse(s->irqs[route]);
}
} else {
if (!timer_fsb_route(timer)) {
+ BQL_LOCK_GUARD();
qemu_irq_lower(s->irqs[route]);
}
}
@@ -534,10 +538,12 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
/* i8254 and RTC output pins are disabled
* when HPET is in legacy mode */
if (activating_bit(old_val, new_val, HPET_CFG_LEGACY)) {
+ BQL_LOCK_GUARD();
qemu_set_irq(s->pit_enabled, 0);
qemu_irq_lower(s->irqs[0]);
qemu_irq_lower(s->irqs[RTC_ISA_IRQ]);
} else if (deactivating_bit(old_val, new_val, HPET_CFG_LEGACY)) {
+ BQL_LOCK_GUARD();
qemu_irq_lower(s->irqs[0]);
qemu_set_irq(s->pit_enabled, 1);
qemu_set_irq(s->irqs[RTC_ISA_IRQ], s->rtc_irq_level);
@@ -683,11 +689,13 @@ static void hpet_handle_legacy_irq(void *opaque, int n, int level)
if (n == HPET_LEGACY_PIT_INT) {
if (!hpet_in_legacy_mode(s)) {
+ BQL_LOCK_GUARD();
qemu_set_irq(s->irqs[0], level);
}
} else {
s->rtc_irq_level = level;
if (!hpet_in_legacy_mode(s)) {
+ BQL_LOCK_GUARD();
qemu_set_irq(s->irqs[RTC_ISA_IRQ], level);
}
}
--
2.51.0
next prev parent reply other threads:[~2025-09-13 8:14 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-13 8:08 [PULL 00/61] CPU, Rust, x86 changes for 2025-09-13 Paolo Bonzini
2025-09-13 8:08 ` [PULL 01/61] target/ppc: limit cpu_interrupt_exittb to system emulation Paolo Bonzini
2025-09-13 8:08 ` [PULL 02/61] target/sparc: limit cpu_check_irqs " Paolo Bonzini
2025-09-13 8:08 ` [PULL 03/61] target/i386: limit a20 " Paolo Bonzini
2025-09-13 8:08 ` [PULL 04/61] target-arm: remove uses of cpu_interrupt() for user-mode emulation Paolo Bonzini
2025-09-13 8:08 ` [PULL 05/61] user-exec: remove cpu_interrupt() stub Paolo Bonzini
2025-09-13 8:08 ` [PULL 06/61] treewide: clear bits of cs->interrupt_request with cpu_reset_interrupt() Paolo Bonzini
2025-09-13 8:08 ` [PULL 07/61] cpu-common: use atomic access for interrupt_request Paolo Bonzini
2025-09-13 8:08 ` [PULL 08/61] cpus: document that qemu_cpu_kick() can be used for BQL-less operation Paolo Bonzini
2025-09-13 8:08 ` [PULL 09/61] accel: use store_release/load_acquire for cross-thread exit_request Paolo Bonzini
2025-09-13 8:08 ` [PULL 10/61] accel: use atomic accesses for exit_request Paolo Bonzini
2025-09-13 8:08 ` [PULL 11/61] accel/tcg: create a thread-kick function for TCG Paolo Bonzini
2025-09-13 8:08 ` [PULL 12/61] accel/tcg: inline cpu_exit() Paolo Bonzini
2025-09-13 8:08 ` [PULL 13/61] cpus: remove TCG-ism from cpu_exit() Paolo Bonzini
2025-09-13 8:08 ` [PULL 14/61] cpus: properly kick CPUs out of inner execution loop Paolo Bonzini
2025-09-13 8:08 ` [PULL 15/61] treewide: rename qemu_wait_io_event/qemu_wait_io_event_common Paolo Bonzini
2025-09-13 8:08 ` [PULL 16/61] bsd-user, linux-user: introduce qemu_process_cpu_events Paolo Bonzini
2025-09-13 8:08 ` [PULL 17/61] cpus: clear exit_request in qemu_process_cpu_events Paolo Bonzini
2025-09-13 8:08 ` [PULL 18/61] accel: make all calls to qemu_process_cpu_events look the same Paolo Bonzini
2025-09-13 8:09 ` [PULL 19/61] tcg/user: do not set exit_request gratuitously Paolo Bonzini
2025-09-13 8:09 ` [PULL 20/61] ci: temporarily remove rust from Ubuntu Paolo Bonzini
2025-09-13 8:09 ` [PULL 21/61] configure: bump Meson to 1.9.0 for use with Rust Paolo Bonzini
2025-09-22 14:07 ` Peter Maydell
2025-09-22 15:14 ` Paolo Bonzini
2025-09-13 8:09 ` [PULL 22/61] meson, cargo: require Rust 1.83.0 Paolo Bonzini
2025-09-13 8:09 ` [PULL 23/61] rust: add missing const markers for MSRV==1.83.0 Paolo Bonzini
2025-09-13 8:09 ` [PULL 24/61] rust: use inline const expressions Paolo Bonzini
2025-09-13 8:09 ` [PULL 25/61] rust: add qdev Device derive macro Paolo Bonzini
2025-09-13 8:09 ` [PULL 26/61] rust: vmstate: convert to use builder pattern Paolo Bonzini
2025-09-13 8:09 ` [PULL 27/61] rust: vmstate: use const_refs_to_static Paolo Bonzini
2025-09-13 8:09 ` [PULL 28/61] rust: qdev: const_refs_to_static Paolo Bonzini
2025-09-13 8:09 ` [PULL 29/61] docs/rust: update msrv Paolo Bonzini
2025-09-13 8:09 ` [PULL 30/61] rust: remove unused global qemu "allocator" Paolo Bonzini
2025-09-13 8:09 ` [PULL 31/61] rust: add workspace authors Paolo Bonzini
2025-09-13 8:09 ` [PULL 32/61] rust: move vmstate_clock!() to qdev module Paolo Bonzini
2025-09-13 8:09 ` [PULL 33/61] rust: move VMState handling to QOM module Paolo Bonzini
2025-09-13 8:09 ` [PULL 34/61] rust: move Cell vmstate impl Paolo Bonzini
2025-09-13 8:09 ` [PULL 35/61] rust: split Rust-only "common" crate Paolo Bonzini
2025-09-13 8:09 ` [PULL 36/61] rust: make build.rs generic over various ./rust/projects Paolo Bonzini
2025-09-13 8:09 ` [PULL 37/61] rust: split "util" crate Paolo Bonzini
2025-09-13 8:09 ` [PULL 38/61] rust: split "migration" crate Paolo Bonzini
2025-09-13 8:09 ` [PULL 39/61] rust: split "bql" crate Paolo Bonzini
2025-09-13 8:09 ` [PULL 40/61] rust: split "qom" crate Paolo Bonzini
2025-09-13 8:09 ` [PULL 41/61] rust: split "chardev" crate Paolo Bonzini
2025-09-13 8:09 ` [PULL 42/61] rust: split "system" crate Paolo Bonzini
2025-09-13 8:09 ` [PULL 43/61] rust: split "hwcore" crate Paolo Bonzini
2025-09-13 8:09 ` [PULL 44/61] rust: rename qemu_api_macros -> qemu_macros Paolo Bonzini
2025-09-13 8:09 ` [PULL 45/61] rust/hpet: drop now unneeded qemu_api dep Paolo Bonzini
2025-09-13 8:09 ` [PULL 46/61] rust/pl011: drop dependency on qemu_api Paolo Bonzini
2025-09-13 8:09 ` [PULL 47/61] rust: repurpose qemu_api -> tests Paolo Bonzini
2025-09-13 8:09 ` [PULL 48/61] rust: re-export qemu_macros internal helper in "bits" Paolo Bonzini
2025-09-13 8:09 ` [PULL 49/61] rust: re-export qemu macros from common/qom/hwcore Paolo Bonzini
2025-09-13 8:09 ` [PULL 50/61] docs: update rust.rst Paolo Bonzini
2025-09-13 8:09 ` [PULL 51/61] rust: meson: remove unnecessary complication in device crates Paolo Bonzini
2025-09-13 8:09 ` [PULL 52/61] rust: do not inline do_init_io Paolo Bonzini
2025-09-13 8:09 ` Paolo Bonzini [this message]
2025-09-13 8:09 ` [PULL 54/61] i386/cpu: Enable SMM cpu address space under KVM Paolo Bonzini
2025-09-18 16:24 ` Michael Tokarev
2025-09-22 15:16 ` Paolo Bonzini
2025-09-26 17:48 ` Peter Maydell
2025-09-28 6:51 ` Xiaoyao Li
2025-09-13 8:09 ` [PULL 55/61] target/i386: Define enum X86ASIdx for x86's address spaces Paolo Bonzini
2025-09-13 8:09 ` [PULL 56/61] multiboot: Fix the split lock Paolo Bonzini
2025-09-13 8:09 ` [PULL 57/61] i386/kvm: Get X86MachineState in kvm_arch_init() without the cast check Paolo Bonzini
2025-09-13 8:09 ` [PULL 58/61] i386/kvm: Drop KVM_CAP_X86_SMM check in kvm_arch_init() Paolo Bonzini
2025-09-13 8:09 ` [PULL 59/61] accel/kvm: Switch to check KVM_CAP_GUEST_MEMFD and KVM_CAP_USER_MEMORY2 on VM Paolo Bonzini
2025-09-13 8:09 ` [PULL 60/61] accel/kvm: Zero out mem explicitly in kvm_set_user_memory_region() Paolo Bonzini
2025-09-13 8:09 ` [PULL 61/61] accel/kvm: Set guest_memfd_offset to non-zero value only when guest_memfd is valid Paolo Bonzini
2025-09-13 9:37 ` [PULL 00/61] CPU, Rust, x86 changes for 2025-09-13 Peter Maydell
2025-09-16 14:37 ` Peter Maydell
2025-09-16 14:53 ` Paolo Bonzini
2025-09-17 16:33 ` Richard Henderson
2025-09-18 12:38 ` Xiaoyao Li
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=20250913080943.11710-54-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=berrange@redhat.com \
--cc=imammedo@redhat.com \
--cc=qemu-devel@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).