mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-05 10:10:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

crosvm: linux: separate creating vcpus from running them

Browse source 
On ARM we need to set up all CPUs before we can initialize the
interrupt controller, which is unfortunately the opposite of the
required ordering on X86.  This separates out the creation of the
VCPUs and puts their FDs into a vector and then launches threads from
that vector later on in the setup sequence.

BUG=chromium:797868
TEST=./build_test passes on all architectures
TEST=crosvm runs on caroline

Change-Id: I108234efd6c53c4681531701c107a11e42c029f5
Reviewed-on: https://chromium-review.googlesource.com/947462
Commit-Ready: Sonny Rao <sonnyrao@chromium.org>
Tested-by: Sonny Rao <sonnyrao@chromium.org>
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
This commit is contained in:
Sonny Rao 2018-02-13 20:37:48 -08:00 committed by chrome-bot
parent aa83c17359
commit bb7da42d1e
1 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/linux.rs
View file

@ -411,13 +411,8 @@ fn setup_mmio_bus(cfg: &Config,
fn setup_vcpu(kvm: &Kvm,
vm: &Vm,
cpu_id: u32,
vcpu_count: u32,
start_barrier: Arc<Barrier>,
exit_evt: EventFd,
kill_signaled: Arc<AtomicBool>,
io_bus: devices::Bus,
mmio_bus: devices::Bus)
-> Result<JoinHandle<()>> {
vcpu_count: u32)
-> Result<Vcpu> {
let vcpu = Vcpu::new(cpu_id as libc::c_ulong, &kvm, &vm)
.map_err(Error::CreateVcpu)?;
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
@ -426,7 +421,17 @@ fn setup_vcpu(kvm: &Kvm,
&vcpu,
cpu_id as u64,
vcpu_count as u64)
.map_err(Error::ConfigureVcpu)?;
.map_err(Error::ConfigureVcpu)?;
Ok(vcpu)
}
fn run_vcpu(vcpu: Vcpu,
cpu_id: u32,
start_barrier: Arc<Barrier>,
io_bus: devices::Bus,
mmio_bus: devices::Bus,
exit_evt: EventFd,
kill_signaled: Arc<AtomicBool>) -> Result<JoinHandle<()>> {
thread::Builder::new()
.name(format!("crosvm_vcpu{}", cpu_id))
.spawn(move || {
@ -647,6 +652,18 @@ pub fn run_config(cfg: Config) -> Result<()> {
#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
let mut vm = Vm::new(&kvm, mem.clone()).map_err(|e| Error::CreateVm(e))?;
let vcpu_count = cfg.vcpu_count.unwrap_or(1);
let mut vcpu_handles = Vec::with_capacity(vcpu_count as usize);
let vcpu_thread_barrier = Arc::new(Barrier::new((vcpu_count + 1) as usize));
let mut vcpus = Vec::with_capacity(vcpu_count as usize);
for cpu_id in 0..vcpu_count {
let vcpu = setup_vcpu(&kvm,
&vm,
cpu_id,
vcpu_count)?;
vcpus.push(vcpu);
}
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
let mut cmdline = x86_64::get_base_linux_cmdline();
#[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
@ -685,7 +702,6 @@ pub fn run_config(cfg: Config) -> Result<()> {
cmdline.insert_str(&param).map_err(Error::Cmdline)?;
}
let vcpu_count = cfg.vcpu_count.unwrap_or(1);
let kernel_image = File::open(cfg.kernel_path.as_path())
.map_err(|e| Error::OpenKernel(cfg.kernel_path.clone(), e))?;
@ -697,20 +713,15 @@ pub fn run_config(cfg: Config) -> Result<()> {
x86_64::setup_system_memory(&mem, vcpu_count, &CString::new(cmdline).unwrap()).
map_err(|e| Error::SetupSystemMemory(e))?;
let mut vcpu_handles = Vec::with_capacity(vcpu_count as usize);
let vcpu_thread_barrier = Arc::new(Barrier::new((vcpu_count + 1) as usize));
for cpu_id in 0..vcpu_count {
let exit_evt = exit_evt.try_clone().map_err(Error::CloneEventFd)?;
let vcpu_handle = setup_vcpu(&kvm,
&vm,
cpu_id,
vcpu_count,
vcpu_thread_barrier.clone(),
exit_evt,
kill_signaled.clone(),
io_bus.clone(),
mmio_bus.clone())?;
vcpu_handles.push(vcpu_handle);
for (cpu_id, vcpu) in vcpus.into_iter().enumerate() {
let handle = run_vcpu(vcpu,
cpu_id as u32,
vcpu_thread_barrier.clone(),
io_bus.clone(),
mmio_bus.clone(),
exit_evt.try_clone().map_err(Error::CloneEventFd)?,
kill_signaled.clone())?;
vcpu_handles.push(handle);
}
vcpu_thread_barrier.wait();