External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 05:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: cpu: Add pending removed vcpu check to avoid resize vcpu hang

Browse Source 
Add pending removed vcpu check according to VcpuState.removing, which
can avoid cloud hypervisor hangup during continual vcpu resize.

Fix #5419

Signed-off-by: Yi Wang <foxywang@tencent.com>
This commit is contained in:
Yi Wang 2023-08-10 11:34:09 +08:00 committed by Rob Bradford
parent 0e75e7d079
commit d46dd4b31f
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vmm/src/cpu.rs
View File

@ -124,6 +124,9 @@ pub enum Error {
#[error("Error configuring vCPU: {0}")] #[error("Error configuring vCPU: {0}")]
VcpuConfiguration(#[source] arch::Error), VcpuConfiguration(#[source] arch::Error),
#[error("Still pending removed vcpu")]
VcpuPendingRemovedVcpu,
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
#[error("Error fetching preferred target: {0}")] #[error("Error fetching preferred target: {0}")]
VcpuArmPreferredTarget(#[source] hypervisor::HypervisorVmError), VcpuArmPreferredTarget(#[source] hypervisor::HypervisorVmError),
@ -549,6 +552,7 @@ impl BusDevice for CpuManager {
struct VcpuState { struct VcpuState {
inserting: bool, inserting: bool,
removing: bool, removing: bool,
pending_removal: Arc<AtomicBool>,
handle: Option<thread::JoinHandle<()>>, handle: Option<thread::JoinHandle<()>>,
kill: Arc<AtomicBool>, kill: Arc<AtomicBool>,
vcpu_run_interrupted: Arc<AtomicBool>, vcpu_run_interrupted: Arc<AtomicBool>,
@ -1138,9 +1142,21 @@ impl CpuManager {
// Mark vCPUs for removal, actual removal happens on ejection // Mark vCPUs for removal, actual removal happens on ejection
for cpu_id in desired_vcpus..self.present_vcpus() { for cpu_id in desired_vcpus..self.present_vcpus() {
self.vcpu_states[usize::from(cpu_id)].removing = true; self.vcpu_states[usize::from(cpu_id)].removing = true;
self.vcpu_states[usize::from(cpu_id)]
.pending_removal
.store(true, Ordering::SeqCst);
} }
} }
pub fn check_pending_removed_vcpu(&mut self) -> bool {
for state in self.vcpu_states.iter() {
if state.active() && state.pending_removal.load(Ordering::SeqCst) {
return true;
}
}
false
}
fn remove_vcpu(&mut self, cpu_id: u8) -> Result<()> { fn remove_vcpu(&mut self, cpu_id: u8) -> Result<()> {
info!("Removing vCPU: cpu_id = {}", cpu_id); info!("Removing vCPU: cpu_id = {}", cpu_id);
let state = &mut self.vcpu_states[usize::from(cpu_id)]; let state = &mut self.vcpu_states[usize::from(cpu_id)];
@ -1151,6 +1167,7 @@ impl CpuManager {
// Once the thread has exited, clear the "kill" so that it can reused // Once the thread has exited, clear the "kill" so that it can reused
state.kill.store(false, Ordering::SeqCst); state.kill.store(false, Ordering::SeqCst);
state.pending_removal.store(false, Ordering::SeqCst);
Ok(()) Ok(())
} }
@ -1187,6 +1204,10 @@ impl CpuManager {
return Ok(false); return Ok(false);
} }
if self.check_pending_removed_vcpu() {
return Err(Error::VcpuPendingRemovedVcpu);
}
match desired_vcpus.cmp(&self.present_vcpus()) { match desired_vcpus.cmp(&self.present_vcpus()) {
cmp::Ordering::Greater => { cmp::Ordering::Greater => {
let vcpus = self.create_vcpus(desired_vcpus, None)?; let vcpus = self.create_vcpus(desired_vcpus, None)?;