github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-13 21:56:32 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: add network device handler in start_vm.

Browse Source 
Add network device handler in start_vm, which is sepcially
for Qemu VM running with added net params to command line.

Fixes: #8865

Signed-off-by: Alex Lyn <alex.lyn@antgroup.com>
This commit is contained in:
Alex Lyn 2024-03-12 22:18:01 +08:00
parent 9f6003adde
commit 69a5e5b955
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/runtime-rs/crates/hypervisor/src/qemu/cmdline_generator.rs
View File

@ -4,11 +4,12 @@
// //
use crate::utils::clear_fd_flags; use crate::utils::clear_fd_flags;
use crate::{kernel_param::KernelParams, HypervisorConfig}; use crate::{kernel_param::KernelParams, HypervisorConfig, NetworkConfig};
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
use async_trait::async_trait; use async_trait::async_trait;
use std::fs::read_to_string; use kata_types::config::hypervisor::NetworkInfo;
use std::fs::{read_to_string, File};
use std::os::unix::io::RawFd; use std::os::unix::io::RawFd;
// These should have been called MiB and GiB for better readability but the // These should have been called MiB and GiB for better readability but the
@ -846,6 +847,18 @@ impl<'a> QemuCmdLine<'a> {
)); ));
} }
pub fn add_network_device(
&mut self,
_config: &NetworkConfig,
network_info: &NetworkInfo,
) -> Result<Vec<File>> {
let _disable_vhost_net = network_info.disable_vhost_net;
let _queues = network_info.network_queues;
let fds: Vec<std::fs::File> = Vec::new();
Ok(fds)
}
pub async fn build(&self) -> Result<Vec<String>> { pub async fn build(&self) -> Result<Vec<String>> {
let mut result = Vec::new(); let mut result = Vec::new();

14
src/runtime-rs/crates/hypervisor/src/qemu/inner.rs
View File

@ -5,11 +5,12 @@
use super::cmdline_generator::QemuCmdLine; use super::cmdline_generator::QemuCmdLine;
use crate::{ use crate::{
hypervisor_persist::HypervisorState, HypervisorConfig, MemoryConfig, VcpuThreadIds, hypervisor_persist::HypervisorState, utils::enter_netns, HypervisorConfig, MemoryConfig,
VsockDevice, HYPERVISOR_QEMU, VcpuThreadIds, VsockDevice, HYPERVISOR_QEMU,
}; };
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
use async_trait::async_trait; use async_trait::async_trait;
use kata_sys_util::netns::NetnsGuard;
use kata_types::{ use kata_types::{
capabilities::{Capabilities, CapabilityBits}, capabilities::{Capabilities, CapabilityBits},
config::KATA_PATH, config::KATA_PATH,
@ -68,6 +69,10 @@ impl QemuInner {
// descriptor needs to stay open until the qemu process launches. // descriptor needs to stay open until the qemu process launches.
// This is why we need to store it in a variable at this scope. // This is why we need to store it in a variable at this scope.
let mut _vhost_fd = None; let mut _vhost_fd = None;
// We need to keep the vhost-net/tuntap file descriptor open until the QEMU process launches.
// However, we're likely not interested in the specific type of file descriptor itself. We just
// want to ensure any fds associated with network devices remain open within the current scope.
let mut _fds_for_qemu: Vec<std::fs::File> = Vec::new();
for device in &mut self.devices { for device in &mut self.devices {
match device { match device {
@ -102,6 +107,11 @@ impl QemuInner {
} }
} }
} }
DeviceType::Network(network) => {
let network_info = &self.config.network_info;
_fds_for_qemu = cmdline.add_network_device(&network.config, network_info)?;
}
_ => info!(sl!(), "qemu cmdline: unsupported device: {:?}", device), _ => info!(sl!(), "qemu cmdline: unsupported device: {:?}", device),
} }
} }