mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-06 02:25:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

devices: vfio: Add device label to error messages

Browse source 
Add device label to vfio related error messages to get device name when
debugging

BUG=None
TEST=./tools/run_tests
TEST=./tools/presubmit

Change-Id: I910cbe35dde2d88155f693f90225a2708663d75d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3288284
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Tinghao Zhang 2021-11-17 11:09:18 +08:00 committed by Commit Bot
parent f3df5127f3
commit f5a3037eec
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
devices/src/pci/vfio_pci.rs
View file

@ -559,12 +559,12 @@ impl VfioPciDevice {
.device .device
.irq_enable(&[interrupt_evt], VFIO_PCI_INTX_IRQ_INDEX) .irq_enable(&[interrupt_evt], VFIO_PCI_INTX_IRQ_INDEX)
{ {
error!("Intx enable failed: {}", e); error!("{} Intx enable failed: {}", self.debug_label(), e);
return; return;
} }
if let Some(ref irq_resample_evt) = self.interrupt_resample_evt { if let Some(ref irq_resample_evt) = self.interrupt_resample_evt {
if let Err(e) = self.device.irq_mask(VFIO_PCI_INTX_IRQ_INDEX) { if let Err(e) = self.device.irq_mask(VFIO_PCI_INTX_IRQ_INDEX) {
error!("Intx mask failed: {}", e); error!("{} Intx mask failed: {}", self.debug_label(), e);
self.disable_intx(); self.disable_intx();
return; return;
} }
@ -572,12 +572,12 @@ impl VfioPciDevice {
.device .device
.resample_virq_enable(irq_resample_evt, VFIO_PCI_INTX_IRQ_INDEX) .resample_virq_enable(irq_resample_evt, VFIO_PCI_INTX_IRQ_INDEX)
{ {
error!("resample enable failed: {}", e); error!("{} resample enable failed: {}", self.debug_label(), e);
self.disable_intx(); self.disable_intx();
return; return;
} }
if let Err(e) = self.device.irq_unmask(VFIO_PCI_INTX_IRQ_INDEX) { if let Err(e) = self.device.irq_unmask(VFIO_PCI_INTX_IRQ_INDEX) {
error!("Intx unmask failed: {}", e); error!("{} Intx unmask failed: {}", self.debug_label(), e);
self.disable_intx(); self.disable_intx();
return; return;
} }
@ -589,7 +589,7 @@ impl VfioPciDevice {
fn disable_intx(&mut self) { fn disable_intx(&mut self) {
if let Err(e) = self.device.irq_disable(VFIO_PCI_INTX_IRQ_INDEX) { if let Err(e) = self.device.irq_disable(VFIO_PCI_INTX_IRQ_INDEX) {
error!("Intx disable failed: {}", e); error!("{} Intx disable failed: {}", self.debug_label(), e);
} }
self.irq_type = None; self.irq_type = None;
} }
@ -627,7 +627,7 @@ impl VfioPciDevice {
}; };
if let Err(e) = self.device.irq_enable(&[irqfd], VFIO_PCI_MSI_IRQ_INDEX) { if let Err(e) = self.device.irq_enable(&[irqfd], VFIO_PCI_MSI_IRQ_INDEX) {
error!("failed to enable msi: {}", e); error!("{} failed to enable msi: {}", self.debug_label(), e);
self.enable_intx(); self.enable_intx();
return; return;
} }
@ -637,7 +637,7 @@ impl VfioPciDevice {
fn disable_msi(&mut self) { fn disable_msi(&mut self) {
if let Err(e) = self.device.irq_disable(VFIO_PCI_MSI_IRQ_INDEX) { if let Err(e) = self.device.irq_disable(VFIO_PCI_MSI_IRQ_INDEX) {
error!("failed to disable msi: {}", e); error!("{} failed to disable msi: {}", self.debug_label(), e);
return; return;
} }
@ -657,7 +657,7 @@ impl VfioPciDevice {
.device .device
.irq_enable(&descriptors, VFIO_PCI_MSIX_IRQ_INDEX) .irq_enable(&descriptors, VFIO_PCI_MSIX_IRQ_INDEX)
{ {
error!("failed to enable msix: {}", e); error!("{} failed to enable msix: {}", self.debug_label(), e);
self.enable_intx(); self.enable_intx();
return; return;
} }
@ -671,7 +671,7 @@ impl VfioPciDevice {
fn disable_msix(&mut self) { fn disable_msix(&mut self) {
if let Err(e) = self.device.irq_disable(VFIO_PCI_MSIX_IRQ_INDEX) { if let Err(e) = self.device.irq_disable(VFIO_PCI_MSIX_IRQ_INDEX) {
error!("failed to disable msix: {}", e); error!("{} failed to disable msix: {}", self.debug_label(), e);
return; return;
} }
@ -706,7 +706,7 @@ impl VfioPciDevice {
let mut to_mmap = match VfioMsixAllocator::new(mmap_offset, mmap_size) { let mut to_mmap = match VfioMsixAllocator::new(mmap_offset, mmap_size) {
Ok(a) => a, Ok(a) => a,
Err(e) => { Err(e) => {
error!("add_bar_mmap_msix failed: {}", e); error!("{} add_bar_mmap_msix failed: {}", self.debug_label(), e);
mmaps.clear(); mmaps.clear();
return mmaps; return mmaps;
} }
@ -720,7 +720,7 @@ impl VfioPciDevice {
(min(msix_offset + msix_size, mmap_offset + mmap_size) + pgmask) & !pgmask; (min(msix_offset + msix_size, mmap_offset + mmap_size) + pgmask) & !pgmask;
if end > begin { if end > begin {
if let Err(e) = to_mmap.allocate_at(begin, end - begin) { if let Err(e) = to_mmap.allocate_at(begin, end - begin) {
error!("add_bar_mmap_msix failed: {}", e); error!("{} add_bar_mmap_msix failed: {}", self.debug_label(), e);
mmaps.clear(); mmaps.clear();
return mmaps; return mmaps;
} }
@ -805,8 +805,12 @@ impl VfioPciDevice {
Ok(_) => mem_map.push(mmap), Ok(_) => mem_map.push(mmap),
Err(e) => { Err(e) => {
error!( error!(
"{}, index: {}, bar_addr:0x{:x}, host:0x{:x}", "{} {}, index: {}, bar_addr:0x{:x}, host:0x{:x}",
e, index, bar_addr, host self.debug_label(),
e,
index,
bar_addr,
host
); );
break; break;
} }