External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-10 13:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

vfio: align memory region size and address to PAGE_SIZE

Browse Source 
In current implementation, memory region used in vfio is assumed to
align to 4k which may cause error when the PAGE_SIZE is not 4k, like on
Arm, it can be 16k and 64k.

Remove this assumption and align memory resource used by vfio to
PAGE_SIZE then vfio can run on host with 64k PAGE_SIZE.

Fixes: #5292
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
This commit is contained in:
Jianyong Wu 2023-05-19 08:06:37 +00:00 committed by Bo Chen
parent 0ebbb3f8a2
commit acc54ade7b
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pci/src/vfio.rs
View File

@ -14,6 +14,7 @@ use crate::{
use anyhow::anyhow; use anyhow::anyhow;
use byteorder::{ByteOrder, LittleEndian}; use byteorder::{ByteOrder, LittleEndian};
use hypervisor::HypervisorVmError; use hypervisor::HypervisorVmError;
use libc::{sysconf, _SC_PAGESIZE};
use std::any::Any; use std::any::Any;
use std::collections::{BTreeMap, HashMap}; use std::collections::{BTreeMap, HashMap};
use std::io; use std::io;
@ -663,7 +664,12 @@ impl VfioCommon {
PciBarRegionType::Memory64BitRegion => { PciBarRegionType::Memory64BitRegion => {
// BAR allocation must be naturally aligned // BAR allocation must be naturally aligned
mmio_allocator mmio_allocator
.allocate(restored_bar_addr, region_size, Some(region_size)) .allocate(
restored_bar_addr,
region_size,
// SAFETY: FFI call. Trivially safe.
Some(unsafe { sysconf(_SC_PAGESIZE) as GuestUsize }),
)
.ok_or(PciDeviceError::IoAllocationFailed(region_size))? .ok_or(PciDeviceError::IoAllocationFailed(region_size))?
} }
}; };
@ -1316,8 +1322,10 @@ impl VfioPciDevice {
self.iommu_attached self.iommu_attached
} }
fn align_4k(address: u64) -> u64 { fn align_page_size(address: u64) -> u64 {
(address + 0xfff) & 0xffff_ffff_ffff_f000 // SAFETY: FFI call. Trivially safe.
let page_size = unsafe { sysconf(_SC_PAGESIZE) as u64 };
(address + page_size - 1) & !(page_size - 1)
} }
fn is_4k_aligned(address: u64) -> bool { fn is_4k_aligned(address: u64) -> bool {
@ -1377,6 +1385,7 @@ impl VfioPciDevice {
let mut sparse_areas = Vec::new(); let mut sparse_areas = Vec::new();
let mut current_offset = 0; let mut current_offset = 0;
for (range_offset, range_size) in inter_ranges { for (range_offset, range_size) in inter_ranges {
let range_offset = Self::align_page_size(range_offset);
if range_offset > current_offset { if range_offset > current_offset {
sparse_areas.push(VfioRegionSparseMmapArea { sparse_areas.push(VfioRegionSparseMmapArea {
offset: current_offset, offset: current_offset,
@ -1384,13 +1393,13 @@ impl VfioPciDevice {
}); });
} }
current_offset = Self::align_4k(range_offset + range_size); current_offset = Self::align_page_size(range_offset + range_size);
} }
if region_size > current_offset { if region_size > current_offset {
sparse_areas.push(VfioRegionSparseMmapArea { sparse_areas.push(VfioRegionSparseMmapArea {
offset: current_offset, offset: Self::align_page_size(current_offset),
size: region_size - current_offset, size: Self::align_page_size(region_size - current_offset),
}); });
} }