github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-29 12:14:48 +00:00
Code Issues Projects Releases Wiki Activity

cpu_topo: add handle_cpu_topology function

Browse Source 
add handle_cpu_topology funciton to make it easier to understand the
set_vm_configuration function.

Signed-off-by: Chao Wu <chaowu@linux.alibaba.com>
This commit is contained in:
Chao Wu 2022-07-06 11:20:50 +08:00
parent 5d3b53ee7b
commit e14e98bbeb
1 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/dragonball/src/api/v1/vmm_action.rs
View File

@ -16,6 +16,9 @@ use crate::event_manager::EventManager;
use crate::vm::{CpuTopology, KernelConfigInfo, VmConfigInfo}; use crate::vm::{CpuTopology, KernelConfigInfo, VmConfigInfo};
use crate::vmm::Vmm; use crate::vmm::Vmm;
use self::VmConfigError::*;
use self::VmmActionError::MachineConfig;
#[cfg(feature = "virtio-blk")] #[cfg(feature = "virtio-blk")]
pub use crate::device_manager::blk_dev_mgr::{ pub use crate::device_manager::blk_dev_mgr::{
BlockDeviceConfigInfo, BlockDeviceConfigUpdateInfo, BlockDeviceError, BlockDeviceMgr, BlockDeviceConfigInfo, BlockDeviceConfigUpdateInfo, BlockDeviceError, BlockDeviceMgr,
@ -335,9 +338,6 @@ impl VmmService {
vmm: &mut Vmm, vmm: &mut Vmm,
machine_config: VmConfigInfo, machine_config: VmConfigInfo,
) -> VmmRequestResult { ) -> VmmRequestResult {
use self::VmConfigError::*;
use self::VmmActionError::MachineConfig;
let vm = vmm.get_vm_mut().ok_or(VmmActionError::InvalidVMID)?; let vm = vmm.get_vm_mut().ok_or(VmmActionError::InvalidVMID)?;
if vm.is_vm_initialized() { if vm.is_vm_initialized() {
return Err(MachineConfig(UpdateNotAllowedPostBoot)); return Err(MachineConfig(UpdateNotAllowedPostBoot));
@ -356,27 +356,7 @@ impl VmmService {
if config.cpu_topology != machine_config.cpu_topology { if config.cpu_topology != machine_config.cpu_topology {
let cpu_topology = &machine_config.cpu_topology; let cpu_topology = &machine_config.cpu_topology;
// Check if dies_per_socket, cores_per_die, threads_per_core and socket number is valid config.cpu_topology = handle_cpu_topology(cpu_topology, config.vcpu_count)?.clone();
if cpu_topology.threads_per_core < 1 || cpu_topology.threads_per_core > 2 {
return Err(MachineConfig(InvalidThreadsPerCore(
cpu_topology.threads_per_core,
)));
}
let vcpu_count_from_topo = cpu_topology
.sockets
.checked_mul(cpu_topology.dies_per_socket)
.ok_or(MachineConfig(VcpuCountExceedsMaximum))?
.checked_mul(cpu_topology.cores_per_die)
.ok_or(MachineConfig(VcpuCountExceedsMaximum))?
.checked_mul(cpu_topology.threads_per_core)
.ok_or(MachineConfig(VcpuCountExceedsMaximum))?;
if vcpu_count_from_topo > MAX_SUPPORTED_VCPUS {
return Err(MachineConfig(VcpuCountExceedsMaximum));
}
if vcpu_count_from_topo < config.vcpu_count {
return Err(MachineConfig(InvalidCpuTopology(vcpu_count_from_topo)));
}
config.cpu_topology = cpu_topology.clone();
} else { } else {
// the same default // the same default
let mut default_cpu_topology = CpuTopology { let mut default_cpu_topology = CpuTopology {
@ -627,3 +607,31 @@ impl VmmService {
.map_err(VmmActionError::FsDevice) .map_err(VmmActionError::FsDevice)
} }
} }
fn handle_cpu_topology(
cpu_topology: &CpuTopology,
vcpu_count: u8,
) -> std::result::Result<&CpuTopology, VmmActionError> {
// Check if dies_per_socket, cores_per_die, threads_per_core and socket number is valid
if cpu_topology.threads_per_core < 1 || cpu_topology.threads_per_core > 2 {
return Err(MachineConfig(InvalidThreadsPerCore(
cpu_topology.threads_per_core,
)));
}
let vcpu_count_from_topo = cpu_topology
.sockets
.checked_mul(cpu_topology.dies_per_socket)
.ok_or(MachineConfig(VcpuCountExceedsMaximum))?
.checked_mul(cpu_topology.cores_per_die)
.ok_or(MachineConfig(VcpuCountExceedsMaximum))?
.checked_mul(cpu_topology.threads_per_core)
.ok_or(MachineConfig(VcpuCountExceedsMaximum))?;
if vcpu_count_from_topo > MAX_SUPPORTED_VCPUS {
return Err(MachineConfig(VcpuCountExceedsMaximum));
}
if vcpu_count_from_topo < vcpu_count {
return Err(MachineConfig(InvalidCpuTopology(vcpu_count_from_topo)));
}
Ok(cpu_topology)
}