kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: Handle virtio queues interrupts from transport layer

Browse Source 
Instead of relying on the virtio-queue crate to store the information
about the MSI-X vectors for each queue, we handle this directly from the
PCI transport layer.

This is the first step in getting closer to the upstream version of
virtio-queue so that we can eventually move fully to the upstream
version.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf
2022-01-24 15:30:42 +01:00
parent d3081ff50c
commit de3e003e3e
17 changed files with 73 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
virtio-devices/src/net.rs
View File

@@ -124,6 +124,7 @@ struct NetEpollHandler {
interrupt_cb: Arc<dyn VirtioInterrupt>,
kill_evt: EventFd,
pause_evt: EventFd,
queue_index_base: u16,
queue_pair: Vec<Queue<GuestMemoryAtomic<GuestMemoryMmap>>>,
queue_evt_pair: Vec<EventFd>,
// Always generate interrupts until the driver has signalled to the device.
@@ -134,12 +135,9 @@ struct NetEpollHandler {
}
impl NetEpollHandler {
fn signal_used_queue(
&self,
queue: &Queue<GuestMemoryAtomic<GuestMemoryMmap>>,
) -> result::Result<(), DeviceError> {
fn signal_used_queue(&self, queue_index: u16) -> result::Result<(), DeviceError> {
self.interrupt_cb
.trigger(&VirtioInterruptType::Queue, Some(queue))
.trigger(VirtioInterruptType::Queue(queue_index))
.map_err(|e| {
error!("Failed to signal used queue: {:?}", e);
DeviceError::FailedSignalingUsedQueue(e)
@@ -182,7 +180,7 @@ impl NetEpollHandler {
.map_err(DeviceError::NetQueuePair)?
|| !self.driver_awake
{
self.signal_used_queue(&self.queue_pair[1])?;
self.signal_used_queue(self.queue_index_base + 1)?;
debug!("Signalling TX queue");
} else {
debug!("Not signalling TX queue");
@@ -211,7 +209,7 @@ impl NetEpollHandler {
.map_err(DeviceError::NetQueuePair)?
|| !self.driver_awake
{
self.signal_used_queue(&self.queue_pair[0])?;
self.signal_used_queue(self.queue_index_base)?;
debug!("Signalling RX queue");
} else {
debug!("Not signalling RX queue");
@@ -651,6 +649,7 @@ impl VirtioDevice for Net {
rx_rate_limiter,
tx_rate_limiter,
},
queue_index_base: (i * 2) as u16,
queue_pair,
queue_evt_pair,
interrupt_cb: interrupt_cb.clone(),