Skip to content

Fix mmio interrupts #5351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 8, 2025
Merged

Fix mmio interrupts #5351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c5f1c3
fix(virtio): avoid panic on device activation failure
bchalios Aug 8, 2025
56830e5
fix(mmio): avoid locking multiple times in same code branch
bchalios Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/vmm/src/devices/virtio/transport/mmio.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,21 +179,18 @@ impl MmioTransport {
}
DRIVER_OK if self.device_status == (ACKNOWLEDGE | DRIVER | FEATURES_OK) => {
self.device_status = status;
let device_activated = self.locked_device().is_activated();
let mut locked_device = self.device.lock().expect("Poisoned lock");
let device_activated = locked_device.is_activated();
if !device_activated {
// temporary variable needed for borrow checker
let activate_result = self
.locked_device()
.activate(self.mem.clone(), self.interrupt.clone());
let activate_result =
locked_device.activate(self.mem.clone(), self.interrupt.clone());
if let Err(err) = activate_result {
self.device_status |= DEVICE_NEEDS_RESET;

// Section 2.1.2 of the specification states that we need to send a device
// configuration change interrupt
let _ = self
.locked_device()
.interrupt_trigger()
.trigger(VirtioInterruptType::Config);
let _ = self.interrupt.trigger(VirtioInterruptType::Config);

error!("Failed to activate virtio device: {}", err)
}
Expand All @@ -204,16 +201,19 @@ impl MmioTransport {
self.device_status |= FAILED;
}
_ if status == 0 => {
if self.locked_device().is_activated() {
let mut device_status = self.device_status;
let reset_result = self.locked_device().reset();
match reset_result {
Some((_interrupt_evt, mut _queue_evts)) => {}
None => {
device_status |= FAILED;
{
let mut locked_device = self.device.lock().expect("Poisoned lock");
if locked_device.is_activated() {
let mut device_status = self.device_status;
let reset_result = locked_device.reset();
match reset_result {
Some((_interrupt_evt, mut _queue_evts)) => {}
None => {
device_status |= FAILED;
}
}
self.device_status = device_status;
}
self.device_status = device_status;
}

// If the backend device driver doesn't support reset,
Expand Down
21 changes: 14 additions & 7 deletions src/vmm/src/devices/virtio/transport/pci/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,15 +1029,22 @@ impl PciDevice for VirtioPciDevice {
// Try and activate the device if the driver status has changed
if self.needs_activation() {
debug!("Activating device");
self.virtio_device()
let interrupt = Arc::clone(self.virtio_interrupt.as_ref().unwrap());
match self
.virtio_device()
.lock()
.unwrap()
.activate(
self.memory.clone(),
Arc::clone(self.virtio_interrupt.as_ref().unwrap()),
)
.unwrap_or_else(|err| error!("Error activating device: {err:?}"));
self.device_activated.store(true, Ordering::SeqCst);
.activate(self.memory.clone(), interrupt.clone())
{
Ok(()) => self.device_activated.store(true, Ordering::SeqCst),
Err(err) => {
error!("Error activating device: {err:?}");

// Section 2.1.2 of the specification states that we need to send a device
// configuration change interrupt
let _ = interrupt.trigger(VirtioInterruptType::Config);
}
}
} else {
debug!("Device doesn't need activation");
}
Expand Down