github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-03 09:54:33 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: bring support for legacy vsock device.

Browse Source 
Bring support for legacy vsock and add Vsock to the ResourceConfig
enum type, and add the processing flow of the Vsock device to the
prepare_before_start_vm function.

Fixes: #8474

Signed-off-by: alex.lyn <alex.lyn@antgroup.com>
This commit is contained in:
alex.lyn
2023-12-04 15:40:28 +08:00
parent 6c08cf35d5
commit 0fabfa336d
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/runtime-rs/crates/resource/src/lib.rs
View File

@@ -17,7 +17,7 @@ pub mod manager;
mod manager_inner; mod manager_inner;
pub mod network; pub mod network;
pub mod resource_persist; pub mod resource_persist;
use hypervisor::{BlockConfig, HybridVsockConfig}; use hypervisor::{BlockConfig, HybridVsockConfig, VsockConfig};
use network::NetworkConfig; use network::NetworkConfig;
pub mod rootfs; pub mod rootfs;
pub mod share_fs; pub mod share_fs;
@@ -33,6 +33,7 @@ pub enum ResourceConfig {
ShareFs(SharedFsInfo), ShareFs(SharedFsInfo),
VmRootfs(BlockConfig), VmRootfs(BlockConfig),
HybridVsock(HybridVsockConfig), HybridVsock(HybridVsockConfig),
Vsock(VsockConfig),
} }
#[derive(Debug, Clone, Copy, PartialEq)] #[derive(Debug, Clone, Copy, PartialEq)]

5
src/runtime-rs/crates/resource/src/manager_inner.rs
View File

@@ -134,6 +134,11 @@ impl ResourceManagerInner {
.await .await
.context("do handle hybrid-vsock device failed.")?; .context("do handle hybrid-vsock device failed.")?;
} }
ResourceConfig::Vsock(v) => {
do_handle_device(&self.device_manager, &DeviceConfig::VsockCfg(v))
.await
.context("do handle vsock device failed.")?;
}
}; };
} }

8
src/runtime-rs/crates/runtimes/virt_container/src/sandbox.rs
View File

@@ -14,6 +14,7 @@ use async_trait::async_trait;
use common::message::{Action, Message}; use common::message::{Action, Message};
use common::{Sandbox, SandboxNetworkEnv}; use common::{Sandbox, SandboxNetworkEnv};
use containerd_shim_protos::events::task::TaskOOM; use containerd_shim_protos::events::task::TaskOOM;
use hypervisor::VsockConfig;
use hypervisor::{dragonball::Dragonball, BlockConfig, Hypervisor, HYPERVISOR_DRAGONBALL}; use hypervisor::{dragonball::Dragonball, BlockConfig, Hypervisor, HYPERVISOR_DRAGONBALL};
use hypervisor::{utils::get_hvsock_path, HybridVsockConfig, DEFAULT_GUEST_VSOCK_CID}; use hypervisor::{utils::get_hvsock_path, HybridVsockConfig, DEFAULT_GUEST_VSOCK_CID};
use kata_sys_util::hooks::HookStates; use kata_sys_util::hooks::HookStates;
@@ -28,6 +29,7 @@ use tracing::instrument;
use crate::health_check::HealthCheck; use crate::health_check::HealthCheck;
pub(crate) const VIRTCONTAINER: &str = "virt_container"; pub(crate) const VIRTCONTAINER: &str = "virt_container";
pub struct SandboxRestoreArgs { pub struct SandboxRestoreArgs {
pub sid: String, pub sid: String,
pub toml_config: TomlConfig, pub toml_config: TomlConfig,
@@ -224,6 +226,7 @@ impl VirtSandbox {
async fn prepare_vm_socket_config(&self) -> Result<ResourceConfig> { async fn prepare_vm_socket_config(&self) -> Result<ResourceConfig> {
// It will check the hypervisor's capabilities to see if it supports hybrid-vsock. // It will check the hypervisor's capabilities to see if it supports hybrid-vsock.
// If it does not, it'll assume that it only supports legacy vsock.
let vm_socket = if self let vm_socket = if self
.hypervisor .hypervisor
.capabilities() .capabilities()
@@ -236,7 +239,10 @@ impl VirtSandbox {
uds_path: get_hvsock_path(&self.sid), uds_path: get_hvsock_path(&self.sid),
}) })
} else { } else {
return Err(anyhow!("unsupported vm socket")); // Qemu uses the vsock device model.
ResourceConfig::Vsock(VsockConfig {
guest_cid: libc::VMADDR_CID_ANY,
})
}; };
Ok(vm_socket) Ok(vm_socket)