Skip to content

XXX Backport of cloud-hypervisor#8031 (Fix Deadlock betweem DeviceManager::pause() and MMIO) #151

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

Closed
phip1611 wants to merge 1 commit into from
Closed

XXX Backport of cloud-hypervisor#8031 (Fix Deadlock betweem DeviceManager::pause() and MMIO) #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion virtio-devices/src/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,9 @@ impl Pausable for VirtioCommon {
"Pausing virtio-{}",
VirtioDeviceType::from(self.device_type)
);
self.paused.store(true, Ordering::SeqCst);
if self.paused.swap(true, Ordering::SeqCst) {
return Ok(());
}
if let Some(pause_evt) = &self.pause_evt {
pause_evt
.write(1)
Expand Down
4 changes: 2 additions & 2 deletions vmm/src/acpi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,7 @@ fn create_acpi_tables_internal(
// VIOT
if let Some((iommu_bdf, devices_bdf)) = device_manager.lock().unwrap().iommu_attached_devices()
{
let viot = create_viot_table(iommu_bdf, devices_bdf);
let viot = create_viot_table(&iommu_bdf, &devices_bdf);

let viot_addr = prev_tbl_addr.checked_add(prev_tbl_len).unwrap();
tables_bytes.extend_from_slice(viot.as_slice());
Expand Down Expand Up @@ -1183,7 +1183,7 @@ pub fn create_acpi_tables_tdx(
// VIOT
if let Some((iommu_bdf, devices_bdf)) = device_manager.lock().unwrap().iommu_attached_devices()
{
tables.push(create_viot_table(iommu_bdf, devices_bdf));
tables.push(create_viot_table(&iommu_bdf, &devices_bdf));
}

tables
Expand Down
Loading
Loading