mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-07-02 16:02:37 +00:00
vfio_user: Use new Rust-VMM crate
This contains the same code as was included in tree. Fixes: #5123 Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
Rob Bradford
parent
9d18012c52
commit
996bdc6e08
4
Cargo.lock
generated
4
Cargo.lock
generated
|
|
@ -1383,13 +1383,11 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "vfio_user"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/rust-vmm/vfio-user?branch=main#afbbd5722885e961ce12baea12efe01d52ce14b0"
|
||||
dependencies = [
|
||||
"argh",
|
||||
"bitflags",
|
||||
"env_logger",
|
||||
"libc",
|
||||
"log",
|
||||
"pci",
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
|
|
|
|||
|
|
@ -89,7 +89,6 @@ members = [
|
|||
"serial_buffer",
|
||||
"test_infra",
|
||||
"tracer",
|
||||
"vfio_user",
|
||||
"vhdx",
|
||||
"vhost_user_block",
|
||||
"vhost_user_net",
|
||||
|
|
|
|||
|
|
@ -15,7 +15,8 @@ byteorder = "1.4.3"
|
|||
hypervisor = { path = "../hypervisor" }
|
||||
vfio-bindings = { git = "https://github.com/rust-vmm/vfio", branch = "main", features = ["fam-wrappers"] }
|
||||
vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
|
||||
vfio_user = { path = "../vfio_user" }
|
||||
vfio_user = { git = "https://github.com/rust-vmm/vfio-user", branch = "main" }
|
||||
|
||||
vmm-sys-util = "0.11.0"
|
||||
libc = "0.2.139"
|
||||
log = "0.4.17"
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
[package]
|
||||
name = "vfio_user"
|
||||
version = "0.1.0"
|
||||
authors = ["The Cloud Hypervisor Authors"]
|
||||
edition = "2021"
|
||||
|
||||
[[example]]
|
||||
name = "gpio"
|
||||
|
||||
[dependencies]
|
||||
bitflags = "1.3.2"
|
||||
libc = "0.2.139"
|
||||
log = "0.4.17"
|
||||
serde = { version = "1.0.151", features = ["rc"] }
|
||||
serde_derive = "1.0.149"
|
||||
serde_json = "1.0.93"
|
||||
thiserror = "1.0.38"
|
||||
vfio-bindings = { git = "https://github.com/rust-vmm/vfio", branch = "main", features = ["fam-wrappers"] }
|
||||
vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic"] }
|
||||
vmm-sys-util = "0.11.0"
|
||||
|
||||
[dev-dependencies]
|
||||
argh = "0.1.9"
|
||||
env_logger = "0.10.0"
|
||||
pci = { path = "../pci" }
|
||||
|
|
@ -1,220 +0,0 @@
|
|||
// Copyright © 2023 Intel Corporation
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
//
|
||||
|
||||
use argh::FromArgs;
|
||||
use log::info;
|
||||
use pci::PciBarConfiguration;
|
||||
use std::{fs::File, io::Write, mem::size_of, num::Wrapping, path::PathBuf};
|
||||
use vfio_bindings::bindings::vfio::{
|
||||
vfio_region_info, VFIO_IRQ_INFO_EVENTFD, VFIO_IRQ_SET_ACTION_TRIGGER,
|
||||
VFIO_IRQ_SET_DATA_EVENTFD, VFIO_PCI_BAR2_REGION_INDEX, VFIO_PCI_CONFIG_REGION_INDEX,
|
||||
VFIO_PCI_INTX_IRQ_INDEX, VFIO_PCI_NUM_IRQS, VFIO_PCI_NUM_REGIONS, VFIO_REGION_INFO_FLAG_READ,
|
||||
VFIO_REGION_INFO_FLAG_WRITE,
|
||||
};
|
||||
use vfio_user::{IrqInfo, Server, ServerBackend};
|
||||
|
||||
#[derive(Copy, Clone)]
|
||||
enum PciVfioUserSubclass {
|
||||
VfioUserSubclass = 0xff,
|
||||
}
|
||||
|
||||
impl pci::PciSubclass for PciVfioUserSubclass {
|
||||
fn get_register_value(&self) -> u8 {
|
||||
*self as u8
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(FromArgs)]
|
||||
/// GPIO test device
|
||||
struct Args {
|
||||
/// path to socket
|
||||
#[argh(option)]
|
||||
socket_path: String,
|
||||
}
|
||||
|
||||
struct TestBackend {
|
||||
configuration: pci::PciConfiguration,
|
||||
irq: Option<File>,
|
||||
count: Wrapping<u8>,
|
||||
}
|
||||
|
||||
impl TestBackend {
|
||||
fn new() -> TestBackend {
|
||||
let subclass = PciVfioUserSubclass::VfioUserSubclass;
|
||||
|
||||
let mut configuration = pci::PciConfiguration::new(
|
||||
0x494f,
|
||||
0xdc8,
|
||||
0x0,
|
||||
pci::PciClassCode::Other,
|
||||
&subclass as &dyn pci::PciSubclass,
|
||||
None,
|
||||
pci::PciHeaderType::Device,
|
||||
0,
|
||||
0,
|
||||
None,
|
||||
None,
|
||||
);
|
||||
|
||||
configuration
|
||||
.add_pci_bar(&PciBarConfiguration::new(
|
||||
VFIO_PCI_BAR2_REGION_INDEX as usize,
|
||||
0x100,
|
||||
pci::PciBarRegionType::IoRegion,
|
||||
pci::PciBarPrefetchable::NotPrefetchable,
|
||||
))
|
||||
.unwrap();
|
||||
|
||||
configuration.set_irq(1, pci::PciInterruptPin::IntA);
|
||||
TestBackend {
|
||||
configuration,
|
||||
irq: None,
|
||||
count: Wrapping(0),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ServerBackend for TestBackend {
|
||||
fn region_read(
|
||||
&mut self,
|
||||
region: u32,
|
||||
offset: u64,
|
||||
data: &mut [u8],
|
||||
) -> Result<(), std::io::Error> {
|
||||
info!("read region = {region} offset = {offset}");
|
||||
|
||||
if region == VFIO_PCI_CONFIG_REGION_INDEX {
|
||||
let reg_idx = offset as usize / 4;
|
||||
let v = self.configuration.read_config_register(reg_idx);
|
||||
let reg_offset = offset as usize % 4;
|
||||
data.copy_from_slice(&v.to_le_bytes()[reg_offset..reg_offset + data.len()]);
|
||||
} else if region == VFIO_PCI_BAR2_REGION_INDEX && offset == 0 {
|
||||
info!("gpio value read: count = {}", self.count);
|
||||
self.count += 1;
|
||||
if self.count.0 % 3 == 0 {
|
||||
data[0] = 1;
|
||||
if let Some(irq) = &mut self.irq {
|
||||
info!("Triggering interrupt for count = {}", self.count);
|
||||
irq.write_all(&1u64.to_le_bytes()).unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn region_write(
|
||||
&mut self,
|
||||
region: u32,
|
||||
offset: u64,
|
||||
data: &[u8],
|
||||
) -> Result<(), std::io::Error> {
|
||||
info!("write region = {region} offset = {offset}");
|
||||
if region == VFIO_PCI_CONFIG_REGION_INDEX {
|
||||
self.configuration
|
||||
.write_config_register(offset as usize / 4, offset % 4, data);
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn dma_map(
|
||||
&mut self,
|
||||
flags: vfio_user::DmaMapFlags,
|
||||
offset: u64,
|
||||
address: u64,
|
||||
size: u64,
|
||||
fd: Option<&File>,
|
||||
) -> Result<(), std::io::Error> {
|
||||
info!("dma_map flags = {flags:?} offset = {offset} address = {address} size = {size} fd = {fd:?}");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn dma_unmap(
|
||||
&mut self,
|
||||
flags: vfio_user::DmaUnmapFlags,
|
||||
address: u64,
|
||||
size: u64,
|
||||
) -> Result<(), std::io::Error> {
|
||||
info!("dma_unmap flags = {flags:?} address = {address} size = {size}");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn reset(&mut self) -> Result<(), std::io::Error> {
|
||||
info!("reset");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn set_irqs(
|
||||
&mut self,
|
||||
index: u32,
|
||||
flags: u32,
|
||||
start: u32,
|
||||
count: u32,
|
||||
fds: Vec<File>,
|
||||
) -> Result<(), std::io::Error> {
|
||||
info!("set_irqs index = {index} flags = {flags} start = {start} count = {count} fds = {fds:?}");
|
||||
if flags & (VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER) > 0 {
|
||||
if count == 1 {
|
||||
self.irq = Some(fds[0].try_clone().unwrap());
|
||||
} else {
|
||||
self.irq = None;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
fn create_regions() -> Vec<vfio_region_info> {
|
||||
let mut regions = Vec::with_capacity(VFIO_PCI_NUM_REGIONS as usize);
|
||||
for index in 0..VFIO_PCI_NUM_REGIONS {
|
||||
let mut region = vfio_region_info {
|
||||
argsz: size_of::<vfio_region_info>() as u32,
|
||||
index,
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
if index == VFIO_PCI_CONFIG_REGION_INDEX || index == VFIO_PCI_BAR2_REGION_INDEX {
|
||||
region.size = 256;
|
||||
region.flags = VFIO_REGION_INFO_FLAG_READ | VFIO_REGION_INFO_FLAG_WRITE;
|
||||
}
|
||||
|
||||
regions.push(region);
|
||||
}
|
||||
|
||||
regions
|
||||
}
|
||||
|
||||
fn create_irqs() -> Vec<IrqInfo> {
|
||||
let mut irqs = Vec::with_capacity(VFIO_PCI_NUM_IRQS as usize);
|
||||
for index in 0..VFIO_PCI_NUM_IRQS {
|
||||
let mut irq = IrqInfo {
|
||||
index,
|
||||
count: 0,
|
||||
flags: 0,
|
||||
};
|
||||
|
||||
if index == VFIO_PCI_INTX_IRQ_INDEX {
|
||||
irq.count = 1;
|
||||
irq.flags = VFIO_IRQ_INFO_EVENTFD
|
||||
}
|
||||
|
||||
irqs.push(irq);
|
||||
}
|
||||
|
||||
irqs
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let a: Args = argh::from_env();
|
||||
env_logger::init();
|
||||
let regions = create_regions();
|
||||
let irqs = create_irqs();
|
||||
|
||||
let path = PathBuf::from(a.socket_path);
|
||||
let s = Server::new(&path, true, irqs, regions).unwrap();
|
||||
let mut test_backend = TestBackend::new();
|
||||
s.run(&mut test_backend).unwrap();
|
||||
}
|
||||
1243
vfio_user/src/lib.rs
1243
vfio_user/src/lib.rs
File diff suppressed because it is too large
Load Diff
|
|
@ -45,7 +45,7 @@ uuid = "1.3.0"
|
|||
versionize = "0.1.9"
|
||||
versionize_derive = "0.1.4"
|
||||
vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
|
||||
vfio_user = { path = "../vfio_user" }
|
||||
vfio_user = { git = "https://github.com/rust-vmm/vfio-user", branch = "main" }
|
||||
vhdx = { path = "../vhdx" }
|
||||
virtio-devices = { path = "../virtio-devices" }
|
||||
virtio-queue = "0.7.0"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user