mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2026-08-05 02:19:16 +00:00
Advertise `VIRTIO_NET_F_GUEST_ANNOUNCE` on virtio-net devices, surface `VIRTIO_NET_S_ANNOUNCE` through config status, and handle `VIRTIO_NET_CTRL_ANNOUNCE_ACK` on the control queue. This adds the guest-visible state needed for post-migration or post-restore announce requests; the VMM side triggering is added in follow-up commits. The motivation is to reduce post-migration and post-restore connectivity gap. After a live migration or after restoring, it can take the guest several seconds to be reachable again over the network. With these announcements, the network path should be refreshed within a few milliseconds. On-behalf-of: SAP sebastian.eydam@sap.com Signed-off-by: Sebastian Eydam <sebastian.eydam@cyberus-technology.de>
339 lines
13 KiB
Rust
339 lines
13 KiB
Rust
// Copyright (c) 2021 Intel Corporation. All rights reserved.
|
|
//
|
|
// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
|
|
|
|
use std::result;
|
|
use std::sync::Arc;
|
|
use std::sync::atomic::{AtomicBool, Ordering};
|
|
|
|
use log::{debug, error, info, warn};
|
|
use thiserror::Error;
|
|
use virtio_bindings::virtio_net::{
|
|
VIRTIO_NET_CTRL_ANNOUNCE, VIRTIO_NET_CTRL_ANNOUNCE_ACK, VIRTIO_NET_CTRL_GUEST_OFFLOADS,
|
|
VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET, VIRTIO_NET_CTRL_MQ, VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX,
|
|
VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN, VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET, VIRTIO_NET_CTRL_RX,
|
|
VIRTIO_NET_CTRL_RX_ALLMULTI, VIRTIO_NET_CTRL_RX_ALLUNI, VIRTIO_NET_CTRL_RX_NOBCAST,
|
|
VIRTIO_NET_CTRL_RX_NOMULTI, VIRTIO_NET_CTRL_RX_NOUNI, VIRTIO_NET_CTRL_RX_PROMISC,
|
|
VIRTIO_NET_CTRL_VLAN, VIRTIO_NET_CTRL_VLAN_ADD, VIRTIO_NET_CTRL_VLAN_DEL, VIRTIO_NET_ERR,
|
|
VIRTIO_NET_OK,
|
|
};
|
|
use virtio_queue::{Queue, QueueT};
|
|
use vm_memory::{ByteValued, Bytes, GuestMemoryError};
|
|
use vm_virtio::{AccessPlatform, Translatable};
|
|
|
|
use super::virtio_features_to_tap_offload;
|
|
use crate::{GuestMemoryMmap, Tap};
|
|
|
|
#[derive(Error, Debug)]
|
|
pub enum Error {
|
|
/// Read queue failed.
|
|
#[error("Read queue failed")]
|
|
GuestMemory(#[source] GuestMemoryError),
|
|
/// No control header descriptor
|
|
#[error("No control header descriptor")]
|
|
NoControlHeaderDescriptor,
|
|
/// Missing the data descriptor in the chain.
|
|
#[error("Missing the data descriptor in the chain")]
|
|
NoDataDescriptor,
|
|
/// No status descriptor
|
|
#[error("No status descriptor")]
|
|
NoStatusDescriptor,
|
|
/// Failed adding used index
|
|
#[error("Failed adding used index")]
|
|
QueueAddUsed(#[source] virtio_queue::Error),
|
|
/// Failed creating an iterator over the queue
|
|
#[error("Failed creating an iterator over the queue")]
|
|
QueueIterator(#[source] virtio_queue::Error),
|
|
/// Failed enabling notification for the queue
|
|
#[error("Failed enabling notification for the queue")]
|
|
QueueEnableNotification(#[source] virtio_queue::Error),
|
|
}
|
|
|
|
type Result<T> = result::Result<T, Error>;
|
|
|
|
#[repr(C, packed)]
|
|
#[derive(Debug, Clone, Copy, Default)]
|
|
pub struct ControlHeader {
|
|
pub class: u8,
|
|
pub cmd: u8,
|
|
}
|
|
|
|
// SAFETY: ControlHeader only contains a series of integers
|
|
unsafe impl ByteValued for ControlHeader {}
|
|
|
|
fn is_tolerated_ctrl_command(ctrl_hdr: ControlHeader) -> bool {
|
|
match u32::from(ctrl_hdr.class) {
|
|
VIRTIO_NET_CTRL_RX => matches!(
|
|
u32::from(ctrl_hdr.cmd),
|
|
VIRTIO_NET_CTRL_RX_PROMISC
|
|
| VIRTIO_NET_CTRL_RX_ALLMULTI
|
|
| VIRTIO_NET_CTRL_RX_ALLUNI
|
|
| VIRTIO_NET_CTRL_RX_NOMULTI
|
|
| VIRTIO_NET_CTRL_RX_NOUNI
|
|
| VIRTIO_NET_CTRL_RX_NOBCAST
|
|
),
|
|
VIRTIO_NET_CTRL_VLAN => matches!(
|
|
u32::from(ctrl_hdr.cmd),
|
|
VIRTIO_NET_CTRL_VLAN_ADD | VIRTIO_NET_CTRL_VLAN_DEL
|
|
),
|
|
_ => false,
|
|
}
|
|
}
|
|
|
|
pub struct CtrlQueue {
|
|
pub taps: Vec<Tap>,
|
|
pub announce_pending: Arc<AtomicBool>,
|
|
}
|
|
|
|
impl CtrlQueue {
|
|
pub fn new(taps: Vec<Tap>, announce_pending: Arc<AtomicBool>) -> Self {
|
|
CtrlQueue {
|
|
taps,
|
|
announce_pending,
|
|
}
|
|
}
|
|
|
|
pub fn process(
|
|
&mut self,
|
|
mem: &GuestMemoryMmap,
|
|
queue: &mut Queue,
|
|
access_platform: Option<&dyn AccessPlatform>,
|
|
) -> Result<()> {
|
|
while let Some(mut desc_chain) = queue.pop_descriptor_chain(mem) {
|
|
let ctrl_desc = desc_chain.next().ok_or(Error::NoControlHeaderDescriptor)?;
|
|
|
|
let ctrl_hdr: ControlHeader = desc_chain
|
|
.memory()
|
|
.read_obj(
|
|
ctrl_desc
|
|
.addr()
|
|
.translate_gva(access_platform, ctrl_desc.len() as usize)
|
|
.map_err(|e| Error::GuestMemory(GuestMemoryError::IOError(e)))?,
|
|
)
|
|
.map_err(Error::GuestMemory)?;
|
|
|
|
let (ok, status_desc) = match u32::from(ctrl_hdr.class) {
|
|
VIRTIO_NET_CTRL_MQ => {
|
|
let data_desc = desc_chain.next().ok_or(Error::NoDataDescriptor)?;
|
|
let data_desc_addr = data_desc
|
|
.addr()
|
|
.translate_gva(access_platform, data_desc.len() as usize)
|
|
.map_err(|e| Error::GuestMemory(GuestMemoryError::IOError(e)))?;
|
|
|
|
let status_desc = desc_chain.next().ok_or(Error::NoStatusDescriptor)?;
|
|
|
|
let queue_pairs = desc_chain
|
|
.memory()
|
|
.read_obj::<u16>(data_desc_addr)
|
|
.map_err(Error::GuestMemory)?;
|
|
let ok = if u32::from(ctrl_hdr.cmd) != VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET {
|
|
warn!("Unsupported command: {}", ctrl_hdr.cmd);
|
|
false
|
|
} else if (queue_pairs < VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN as u16)
|
|
|| (queue_pairs > VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX as u16)
|
|
{
|
|
warn!("Number of MQ pairs out of range: {queue_pairs}");
|
|
false
|
|
} else {
|
|
info!("Number of MQ pairs requested: {queue_pairs}");
|
|
true
|
|
};
|
|
(ok, status_desc)
|
|
}
|
|
VIRTIO_NET_CTRL_GUEST_OFFLOADS => {
|
|
let data_desc = desc_chain.next().ok_or(Error::NoDataDescriptor)?;
|
|
let data_desc_addr = data_desc
|
|
.addr()
|
|
.translate_gva(access_platform, data_desc.len() as usize)
|
|
.map_err(|e| Error::GuestMemory(GuestMemoryError::IOError(e)))?;
|
|
|
|
let status_desc = desc_chain.next().ok_or(Error::NoStatusDescriptor)?;
|
|
|
|
let features = desc_chain
|
|
.memory()
|
|
.read_obj::<u64>(data_desc_addr)
|
|
.map_err(Error::GuestMemory)?;
|
|
let ok = if u32::from(ctrl_hdr.cmd) == VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET {
|
|
let mut ok = true;
|
|
for tap in self.taps.iter_mut() {
|
|
info!("Reprogramming tap offload with features: {features}");
|
|
tap.set_offload(virtio_features_to_tap_offload(features))
|
|
.map_err(|e| {
|
|
error!("Error programming tap offload: {e:?}");
|
|
ok = false;
|
|
})
|
|
.ok();
|
|
}
|
|
ok
|
|
} else {
|
|
warn!("Unsupported command: {}", ctrl_hdr.cmd);
|
|
false
|
|
};
|
|
(ok, status_desc)
|
|
}
|
|
VIRTIO_NET_CTRL_ANNOUNCE => {
|
|
let status_desc = desc_chain.next().ok_or(Error::NoStatusDescriptor)?;
|
|
let ok = if u32::from(ctrl_hdr.cmd) == VIRTIO_NET_CTRL_ANNOUNCE_ACK {
|
|
self.announce_pending.store(false, Ordering::Release);
|
|
true
|
|
} else {
|
|
warn!("Unsupported command: {}", ctrl_hdr.cmd);
|
|
false
|
|
};
|
|
(ok, status_desc)
|
|
}
|
|
_ => {
|
|
let _data_desc = desc_chain.next().ok_or(Error::NoDataDescriptor)?;
|
|
let status_desc = desc_chain.next().ok_or(Error::NoStatusDescriptor)?;
|
|
let ok = if is_tolerated_ctrl_command(ctrl_hdr) {
|
|
debug!("Ignoring unsupported but tolerated control command {ctrl_hdr:?}");
|
|
true
|
|
} else {
|
|
warn!("Unsupported command {ctrl_hdr:?}");
|
|
false
|
|
};
|
|
(ok, status_desc)
|
|
}
|
|
};
|
|
|
|
desc_chain
|
|
.memory()
|
|
.write_obj(
|
|
if ok { VIRTIO_NET_OK } else { VIRTIO_NET_ERR } as u8,
|
|
status_desc
|
|
.addr()
|
|
.translate_gva(access_platform, status_desc.len() as usize)
|
|
.map_err(|e| Error::GuestMemory(GuestMemoryError::IOError(e)))?,
|
|
)
|
|
.map_err(Error::GuestMemory)?;
|
|
// Per the virtio spec the used length is bytes the device wrote
|
|
// to device-writable descriptors; here just the 1-byte ack.
|
|
queue
|
|
.add_used(desc_chain.memory(), desc_chain.head_index(), 1)
|
|
.map_err(Error::QueueAddUsed)?;
|
|
|
|
if !queue
|
|
.enable_notification(mem)
|
|
.map_err(Error::QueueEnableNotification)?
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod unit_tests {
|
|
use std::mem::size_of;
|
|
use std::sync::Arc;
|
|
use std::sync::atomic::{AtomicBool, Ordering};
|
|
|
|
use virtio_bindings::virtio_ring::{VRING_DESC_F_NEXT, VRING_DESC_F_WRITE};
|
|
use vm_memory::{Bytes, GuestAddress};
|
|
use vm_virtio::queue::testing::VirtQueue as GuestQ;
|
|
|
|
use super::*;
|
|
use crate::GuestMemoryMmap;
|
|
|
|
#[test]
|
|
fn test_process_announce_ack_without_data_descriptor() {
|
|
// Build a minimal control virtqueue with one available request.
|
|
//
|
|
// The descriptor chain models the Linux ANNOUNCE_ACK layout:
|
|
// 1. readable control header descriptor
|
|
// 2. writable status descriptor
|
|
//
|
|
// There is intentionally no command-specific data descriptor between
|
|
// them. The parser must still accept the request, clear the pending
|
|
// flag, and write VIRTIO_NET_OK to the status byte.
|
|
const MEM_SIZE: usize = 0x20_0000;
|
|
const QSIZE: u16 = 2;
|
|
const QUEUE_ADDR: u64 = 0x0010_0000;
|
|
const HEADER_ADDR: u64 = 0x0011_0000;
|
|
const STATUS_ADDR: u64 = 0x0011_1000;
|
|
|
|
let mem = GuestMemoryMmap::from_ranges(&[(GuestAddress(0), MEM_SIZE)]).unwrap();
|
|
let guest_q = GuestQ::new(GuestAddress(QUEUE_ADDR), &mem, QSIZE);
|
|
let mut queue = guest_q.create_queue();
|
|
|
|
// Descriptor 0 points at the control header and continues to the
|
|
// trailing status descriptor.
|
|
guest_q.dtable[0].set(
|
|
HEADER_ADDR,
|
|
size_of::<ControlHeader>() as u32,
|
|
VRING_DESC_F_NEXT.try_into().unwrap(),
|
|
1,
|
|
);
|
|
// Descriptor 1 is the writable ack/status byte produced by the device.
|
|
guest_q.dtable[1].set(STATUS_ADDR, 1, VRING_DESC_F_WRITE.try_into().unwrap(), 0);
|
|
// Publish the descriptor chain by placing head descriptor 0 into the
|
|
// avail ring and advancing idx to one entry.
|
|
guest_q.avail.ring[0].set(0);
|
|
guest_q.avail.idx.set(1);
|
|
|
|
// Seed guest memory with the ANNOUNCE_ACK control header and a sentinel
|
|
// status byte so the test can verify the device overwrites it.
|
|
mem.write_obj(
|
|
ControlHeader {
|
|
class: VIRTIO_NET_CTRL_ANNOUNCE as u8,
|
|
cmd: VIRTIO_NET_CTRL_ANNOUNCE_ACK as u8,
|
|
},
|
|
GuestAddress(HEADER_ADDR),
|
|
)
|
|
.unwrap();
|
|
mem.write_obj(0xff_u8, GuestAddress(STATUS_ADDR)).unwrap();
|
|
|
|
let announce_pending = Arc::new(AtomicBool::new(true));
|
|
let mut ctrl_q = CtrlQueue::new(Vec::new(), Arc::clone(&announce_pending));
|
|
|
|
ctrl_q.process(&mem, &mut queue, None).unwrap();
|
|
|
|
assert!(!announce_pending.load(Ordering::Acquire));
|
|
assert_eq!(
|
|
mem.read_obj::<u8>(GuestAddress(STATUS_ADDR)).unwrap(),
|
|
VIRTIO_NET_OK as u8
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_process_guest_offloads_without_data_descriptor_fails() {
|
|
// Build a malformed control virtqueue request for a data-bearing
|
|
// command. The chain contains only the readable control header and no
|
|
// command-specific payload descriptor.
|
|
//
|
|
// GUEST_OFFLOADS_SET requires a data descriptor, so process() must
|
|
// reject this header-only request with NoDataDescriptor.
|
|
const MEM_SIZE: usize = 0x20_0000;
|
|
const QSIZE: u16 = 1;
|
|
const QUEUE_ADDR: u64 = 0x0012_0000;
|
|
const HEADER_ADDR: u64 = 0x0013_0000;
|
|
|
|
let mem = GuestMemoryMmap::from_ranges(&[(GuestAddress(0), MEM_SIZE)]).unwrap();
|
|
let guest_q = GuestQ::new(GuestAddress(QUEUE_ADDR), &mem, QSIZE);
|
|
let mut queue = guest_q.create_queue();
|
|
|
|
// Publish a single descriptor that contains only the control header.
|
|
guest_q.dtable[0].set(HEADER_ADDR, size_of::<ControlHeader>() as u32, 0, 0);
|
|
guest_q.avail.ring[0].set(0);
|
|
guest_q.avail.idx.set(1);
|
|
|
|
mem.write_obj(
|
|
ControlHeader {
|
|
class: VIRTIO_NET_CTRL_GUEST_OFFLOADS as u8,
|
|
cmd: VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET as u8,
|
|
},
|
|
GuestAddress(HEADER_ADDR),
|
|
)
|
|
.unwrap();
|
|
|
|
let mut ctrl_q = CtrlQueue::new(Vec::new(), Arc::new(AtomicBool::new(false)));
|
|
|
|
assert!(matches!(
|
|
ctrl_q.process(&mem, &mut queue, None),
|
|
Err(Error::NoDataDescriptor)
|
|
));
|
|
}
|
|
}
|