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

runtime-rs: Introduce prepare_vm_socket_config to VirtSandbox.

Browse Source 
Instroduce prepare_vm_socket_config to VirtSandbox for vm
socket config, including Vsock and Hybrid Vsock.
Use the capabilities() trait of the hypervisor to get the
vm socket supported in VMM.

Fixes: #8474

Signed-off-by: alex.lyn <alex.lyn@antgroup.com>
This commit is contained in:
alex.lyn
2023-12-04 15:28:39 +08:00
parent 60f88da5e1
commit 6c08cf35d5
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,13 +102,12 @@ impl VirtSandbox {
) -> Result<Vec<ResourceConfig>> {
let mut resource_configs = vec![];
// Prepare VM hybrid vsock device config and add the hybrid vsock device first.
info!(sl!(), "prepare hybrid vsock resource for sandbox.");
let vm_hvsock = ResourceConfig::HybridVsock(HybridVsockConfig {
guest_cid: DEFAULT_GUEST_VSOCK_CID,
uds_path: get_hvsock_path(id),
});
resource_configs.push(vm_hvsock);
info!(sl!(), "prepare vm socket config for sandbox.");
let vm_socket_config = self
.prepare_vm_socket_config()
.await
.context("failed to prepare vm socket config")?;
resource_configs.push(vm_socket_config);
// prepare network config
if !network_env.network_created {
@@ -223,6 +222,26 @@ impl VirtSandbox {
})
}
async fn prepare_vm_socket_config(&self) -> Result<ResourceConfig> {
// It will check the hypervisor's capabilities to see if it supports hybrid-vsock.
let vm_socket = if self
.hypervisor
.capabilities()
.await?
.is_hybrid_vsock_supported()
{
// Firecracker/Dragonball/CLH use the hybrid-vsock device model.
ResourceConfig::HybridVsock(HybridVsockConfig {
guest_cid: DEFAULT_GUEST_VSOCK_CID,
uds_path: get_hvsock_path(&self.sid),
})
} else {
return Err(anyhow!("unsupported vm socket"));
};
Ok(vm_socket)
}
fn has_prestart_hooks(
&self,
prestart_hooks: Vec<oci::Hook>,