kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

pci: Enable GSI routing (MSI type) for AArch64

Browse Source 
In this commit we saved the BDF of a PCI device and set it to "devid"
in GSI routing entry, because this field is mandatory for GICv3-ITS.

Signed-off-by: Michael Zhao <michael.zhao@arm.com>
This commit is contained in:
Michael Zhao
2020-06-17 21:58:15 +08:00
committed by Rob Bradford
parent 82a0e29c7a
commit cce6237536
9 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
vmm/src/device_manager.rs
View File

@@ -2615,6 +2615,7 @@ impl DeviceManager {
msix_num,
iommu_mapping_cb,
interrupt_manager,
pci_device_bdf,
)
.map_err(DeviceManagerError::VirtioDevice)?;

21
vmm/src/interrupt.rs
View File

@@ -4,7 +4,6 @@
//
use devices::interrupt_controller::InterruptController;
use std::collections::HashMap;
use std::io;
use std::mem::size_of;
@@ -118,7 +117,11 @@ pub trait MsiInterruptGroupOps {
}
pub trait RoutingEntryExt {
fn make_entry(gsi: u32, config: &InterruptSourceConfig) -> Result<Box<Self>>;
fn make_entry(
vm: &Arc<dyn hypervisor::Vm>,
gsi: u32,
config: &InterruptSourceConfig,
) -> Result<Box<Self>>;
}
impl<E> MsiInterruptGroup<E> {
@@ -178,7 +181,7 @@ where
fn update(&self, index: InterruptIndex, config: InterruptSourceConfig) -> Result<()> {
if let Some(route) = self.irq_routes.get(&index) {
let entry = RoutingEntry::<_>::make_entry(route.gsi, &config)?;
let entry = RoutingEntry::<_>::make_entry(&self.vm, route.gsi, &config)?;
self.gsi_msi_routes
.lock()
.unwrap()
@@ -353,6 +356,7 @@ where
pub mod kvm {
use super::*;
use hypervisor::kvm::KVM_MSI_VALID_DEVID;
use hypervisor::kvm::{kvm_irq_routing, kvm_irq_routing_entry, KVM_IRQ_ROUTING_MSI};
type KvmMsiInterruptGroup = MsiInterruptGroup<kvm_irq_routing_entry>;
@@ -360,7 +364,11 @@ pub mod kvm {
pub type KvmMsiInterruptManager = MsiInterruptManager<kvm_irq_routing_entry>;
impl RoutingEntryExt for KvmRoutingEntry {
fn make_entry(gsi: u32, config: &InterruptSourceConfig) -> Result<Box<Self>> {
fn make_entry(
vm: &Arc<dyn hypervisor::Vm>,
gsi: u32,
config: &InterruptSourceConfig,
) -> Result<Box<Self>> {
if let InterruptSourceConfig::MsiIrq(cfg) = &config {
let mut kvm_route = kvm_irq_routing_entry {
gsi,
@@ -372,6 +380,11 @@ pub mod kvm {
kvm_route.u.msi.address_hi = cfg.high_addr;
kvm_route.u.msi.data = cfg.data;
if vm.check_extension(hypervisor::Cap::MsiDevid) {
kvm_route.flags = KVM_MSI_VALID_DEVID;
kvm_route.u.msi.__bindgen_anon_1.devid = cfg.devid;
}
let kvm_entry = KvmRoutingEntry {
route: kvm_route,
masked: false,