github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-01 13:14:33 +00:00
Code Issues Projects Releases Wiki Activity

dragonball: add vcpu support for aarch64

Browse Source 
add configure() function for aarch64 vcpu

Fixes: #4543

Signed-off-by: xuejun-xj <jiyunxue@linux.alibaba.com>
Signed-off-by: jingshan <jingshan@linux.alibaba.com>
This commit is contained in:
xuejun-xj 2022-06-28 10:08:29 +08:00
parent 7dad7c89f3
commit 648d285a24
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/dragonball/src/vcpu/aarch64.rs
View File

@ -8,15 +8,18 @@
use std::sync::mpsc::{channel, Sender}; use std::sync::mpsc::{channel, Sender};
use std::sync::Arc; use std::sync::Arc;
use std::ops::Deref;
use crate::IoManagerCached; use crate::IoManagerCached;
use dbs_utils::time::TimestampUs; use dbs_utils::time::TimestampUs;
use dbs_arch::regs;
use dbs_boot::get_fdt_addr;
use kvm_ioctls::{VcpuFd, VmFd}; use kvm_ioctls::{VcpuFd, VmFd};
use vm_memory::GuestAddress; use vm_memory::{Address, GuestAddress, GuestAddressSpace};
use vmm_sys_util::eventfd::EventFd; use vmm_sys_util::eventfd::EventFd;
use crate::address_space_manager::GuestAddressSpaceImpl; use crate::address_space_manager::GuestAddressSpaceImpl;
use crate::vcpu::vcpu_impl::{Result, Vcpu, VcpuStateEvent}; use crate::vcpu::vcpu_impl::{Result, Vcpu, VcpuStateEvent, VcpuError};
use crate::vcpu::VcpuConfig; use crate::vcpu::VcpuConfig;
#[allow(unused)] #[allow(unused)]
@ -83,7 +86,34 @@ impl Vcpu {
kernel_load_addr: Option<GuestAddress>, kernel_load_addr: Option<GuestAddress>,
_pgtable_addr: Option<GuestAddress>, _pgtable_addr: Option<GuestAddress>,
) -> Result<()> { ) -> Result<()> {
// TODO: add arm vcpu configure() function. issue: #4445 let mut kvi: kvm_bindings::kvm_vcpu_init = kvm_bindings::kvm_vcpu_init::default();
// This reads back the kernel's preferred target type.
vm_fd
.get_preferred_target(&mut kvi)
.map_err(VcpuError::VcpuArmPreferredTarget)?;
// We already checked that the capability is supported.
kvi.features[0] |= 1 << kvm_bindings::KVM_ARM_VCPU_PSCI_0_2;
// Non-boot cpus are powered off initially.
if self.id > 0 {
kvi.features[0] |= 1 << kvm_bindings::KVM_ARM_VCPU_POWER_OFF;
}
self.fd.vcpu_init(&kvi).map_err(VcpuError::VcpuArmInit)?;
if let Some(address) = kernel_load_addr {
regs::setup_regs(
&self.fd,
self.id,
address.raw_value(),
get_fdt_addr(vm_as.memory().deref()),
)
.map_err(VcpuError::REGSConfiguration)?;
}
self.mpidr =
regs::read_mpidr(&self.fd).map_err(VcpuError::REGSConfiguration)?;
Ok(()) Ok(())
} }

3
src/dragonball/src/vcpu/vcpu_impl.rs
View File

@ -452,9 +452,6 @@ impl Vcpu {
Ok(VcpuEmulation::Handled) Ok(VcpuEmulation::Handled)
} }
VcpuExit::MmioWrite(addr, data) => { VcpuExit::MmioWrite(addr, data) => {
#[cfg(target_arch = "aarch64")]
self.check_boot_complete_signal(addr, data);
let _ = self.io_mgr.mmio_write(addr, data); let _ = self.io_mgr.mmio_write(addr, data);
METRICS.vcpu.exit_mmio_write.inc(); METRICS.vcpu.exit_mmio_write.inc();
Ok(VcpuEmulation::Handled) Ok(VcpuEmulation::Handled)