mirrors/alioth
1
0
Fork 0
mirror of https://github.com/google/alioth.git synced 2024-11-28 09:26:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(vm): create VCPU and GIC earlier than devices

Browse source 
On aarch64, as required by KVM, all VCPUs and the GIC must be created
before any IRQFD can be created.

Signed-off-by: Changyuan Lyu <changyuanl@google.com>
This commit is contained in:
Changyuan Lyu 2024-06-22 12:19:13 -07:00 committed by Lencerf
parent 914c725936
commit ca2319a82d
2 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
alioth/src/board/board.rs
View file

@ -239,7 +239,6 @@ where
self.memory.add_io_dev(Some(*port), dev.clone())?;
}
self.add_pci_devs()?;
self.arch_init()?;
let init_state = self.load_payload()?;
self.init_boot_vcpu(&mut vcpu, &init_state)?;
self.create_firmware_data(&init_state)?;

39
alioth/src/vm.rs
View file

@ -73,7 +73,7 @@ where
{
board: Arc<Board<H::Vm>>,
event_rx: Receiver<u32>,
event_tx: Sender<u32>,
_event_tx: Sender<u32>,
}
impl<H> Machine<H>
@ -89,7 +89,7 @@ where
let memory = Memory::new(vm_memory);
let arch = ArchBoard::new(&hv, &vm, &config)?;
let board = Board {
let board = Arc::new(Board {
vm,
memory,
arch,
@ -102,14 +102,31 @@ where
pci_bus: PciBus::new(),
pci_devs: RwLock::new(Vec::new()),
fw_cfg: Mutex::new(None),
};
});
let (event_tx, event_rx) = mpsc::channel();
let mut vcpus = board.vcpus.write();
for vcpu_id in 0..board.config.num_cpu {
let (boot_tx, boot_rx) = mpsc::channel();
let event_tx = event_tx.clone();
let board = board.clone();
let handle = thread::Builder::new()
.name(format!("vcpu_{}", vcpu_id))
.spawn(move || board.run_vcpu(vcpu_id, event_tx, boot_rx))?;
event_rx.recv().unwrap();
vcpus.push((handle, boot_tx));
}
drop(vcpus);
board.arch_init()?;
let machine = Machine {
board: Arc::new(board),
board,
event_rx,
event_tx,
_event_tx: event_tx,
};
Ok(machine)
}
@ -190,17 +207,7 @@ where
}
pub fn boot(&mut self) -> Result<(), Error> {
let mut vcpus = self.board.vcpus.write();
for vcpu_id in 0..self.board.config.num_cpu {
let (boot_tx, boot_rx) = mpsc::channel();
let event_tx = self.event_tx.clone();
let board = self.board.clone();
let handle = thread::Builder::new()
.name(format!("vcpu_{}", vcpu_id))
.spawn(move || board.run_vcpu(vcpu_id, event_tx, boot_rx))?;
self.event_rx.recv().unwrap();
vcpus.push((handle, boot_tx));
}
let vcpus = self.board.vcpus.read();
self.board.state.store(STATE_RUNNING, Ordering::Release);
for (_, boot_tx) in vcpus.iter() {
boot_tx.send(()).unwrap();