dsg/cloud-hypervisor
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vmm: refactor poor naming

Browse source 
These bindings actually refer to atomic bool shared across all
vCPUs to instruct single vCPUs with their next action. As there
are already enough Arc<AtomicBool>, this helps while debugging
things to see that different bindings refer to the same atomic
bool.

In other words: This naming really confused us while debugging.

Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
On-behalf-of: SAP philipp.schuster@sap.com
This commit is contained in:
Philipp Schuster 2025-09-01 19:32:08 +02:00 • committed by Rob Bradford
parent e6ddfe07c3
commit 8481026b60
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
vmm/src/cpu.rs
View file

@ -1052,9 +1052,9 @@ impl CpuManager {
#[cfg(feature = "guest_debug")]
let vm_debug_evt = self.vm_debug_evt.try_clone().unwrap();
let panic_exit_evt = self.exit_evt.try_clone().unwrap();
let vcpu_kill_signalled = self.vcpus_kill_signalled.clone();
let vcpu_pause_signalled = self.vcpus_pause_signalled.clone();
let vcpu_kick_signalled = self.vcpus_kick_signalled.clone();
let vcpus_kill_signalled = self.vcpus_kill_signalled.clone();
let vcpus_pause_signalled = self.vcpus_pause_signalled.clone();
let vcpus_kick_signalled = self.vcpus_kick_signalled.clone();
let vcpu_kill = self.vcpu_states[usize::try_from(vcpu_id).unwrap()]
.kill
@ -1147,7 +1147,7 @@ impl CpuManager {
// loads and stores to different atomics and we need
// to see them in a consistent order in all threads
if vcpu_pause_signalled.load(Ordering::SeqCst) {
if vcpus_pause_signalled.load(Ordering::SeqCst) {
// As a pause can be caused by PIO & MMIO exits then we need to ensure they are
// completed by returning to KVM_RUN. From the kernel docs:
//
@ -1176,13 +1176,13 @@ impl CpuManager {
vcpu_run_interrupted.store(true, Ordering::SeqCst);
vcpu_paused.store(true, Ordering::SeqCst);
while vcpu_pause_signalled.load(Ordering::SeqCst) {
while vcpus_pause_signalled.load(Ordering::SeqCst) {
thread::park();
}
vcpu_run_interrupted.store(false, Ordering::SeqCst);
}
if vcpu_kick_signalled.load(Ordering::SeqCst) {
if vcpus_kick_signalled.load(Ordering::SeqCst) {
vcpu_run_interrupted.store(true, Ordering::SeqCst);
#[cfg(target_arch = "x86_64")]
match vcpu.lock().as_ref().unwrap().vcpu.nmi() {
@ -1195,7 +1195,7 @@ impl CpuManager {
}
// We've been told to terminate
if vcpu_kill_signalled.load(Ordering::SeqCst)
if vcpus_kill_signalled.load(Ordering::SeqCst)
|| vcpu_kill.load(Ordering::SeqCst)
{
vcpu_run_interrupted.store(true, Ordering::SeqCst);
@ -1214,7 +1214,7 @@ impl CpuManager {
info!("VmExit::Debug");
#[cfg(feature = "guest_debug")]
{
vcpu_pause_signalled.store(true, Ordering::SeqCst);
vcpus_pause_signalled.store(true, Ordering::SeqCst);
let raw_tid = get_raw_tid(vcpu_id as usize);
vm_debug_evt.write(raw_tid as u64).unwrap();
}
@ -1275,7 +1275,7 @@ impl CpuManager {
}
// We've been told to terminate
if vcpu_kill_signalled.load(Ordering::SeqCst)
if vcpus_kill_signalled.load(Ordering::SeqCst)
|| vcpu_kill.load(Ordering::SeqCst)
{
vcpu_run_interrupted.store(true, Ordering::SeqCst);