External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-03-20 07:58:55 +00:00
Code

vmm: cpu: Refactor vCPU thread starting

Browse Source 
Refactor the vCPU thread starting so that there is the possibility to
bring on extra vCPU threads.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2019-11-26 13:06:24 +00:00
parent 66d5163ee7
commit b6801e355e
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vmm/src/cpu.rs
View File

@ -117,6 +117,9 @@ pub enum Error {
/// Failed to allocate IO port /// Failed to allocate IO port
AllocateIOPort, AllocateIOPort,
/// Asking for more vCPUs that we can have
DesiredVCPUCountExceedsMax,
} }
pub type Result<T> = result::Result<T, Error>; pub type Result<T> = result::Result<T, Error>;
@ -444,7 +447,7 @@ impl CpuManager {
fd, fd,
vcpus_kill_signalled: Arc::new(AtomicBool::new(false)), vcpus_kill_signalled: Arc::new(AtomicBool::new(false)),
vcpus_pause_signalled: Arc::new(AtomicBool::new(false)), vcpus_pause_signalled: Arc::new(AtomicBool::new(false)),
threads: Vec::with_capacity(boot_vcpus as usize), vcpu_states: Vec::with_capacity(max_vcpus as usize),
reset_evt, reset_evt,
selected_cpu: 0, selected_cpu: 0,
})); }));
@ -468,13 +471,17 @@ impl CpuManager {
Ok(cpu_manager) Ok(cpu_manager)
} }
// Starts all the vCPUs that the VM is booting with. Blocks until all vCPUs are running. fn activate_vcpus(&mut self, desired_vcpus: u8, entry_addr: GuestAddress) -> Result<()> {
pub fn start_boot_vcpus(&mut self, entry_addr: GuestAddress) -> Result<()> { if desired_vcpus > self.max_vcpus {
return Err(Error::DesiredVCPUCountExceedsMax);
}
let creation_ts = std::time::Instant::now(); let creation_ts = std::time::Instant::now();
let vcpu_thread_barrier = Arc::new(Barrier::new(
(desired_vcpus - self.present_vcpus() + 1) as usize,
));
let vcpu_thread_barrier = Arc::new(Barrier::new((self.boot_vcpus + 1) as usize)); for cpu_id in self.present_vcpus()..desired_vcpus {
for cpu_id in 0..self.boot_vcpus {
let ioapic = if let Some(ioapic) = &self.ioapic { let ioapic = if let Some(ioapic) = &self.ioapic {
Some(ioapic.clone()) Some(ioapic.clone())
} else { } else {
@ -559,6 +566,11 @@ impl CpuManager {
Ok(()) Ok(())
} }
// Starts all the vCPUs that the VM is booting with. Blocks until all vCPUs are running.
pub fn start_boot_vcpus(&mut self, entry_addr: GuestAddress) -> Result<()> {
self.activate_vcpus(self.boot_vcpus(), entry_addr)
}
pub fn shutdown(&mut self) -> Result<()> { pub fn shutdown(&mut self) -> Result<()> {
// Tell the vCPUs to stop themselves next time they go through the loop // Tell the vCPUs to stop themselves next time they go through the loop
self.vcpus_kill_signalled.store(true, Ordering::SeqCst); self.vcpus_kill_signalled.store(true, Ordering::SeqCst);