diff options
author | Xiong Zhang <xiong.y.zhang@intel.corp-partner.google.com> | 2019-04-23 17:14:50 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-10-01 03:59:47 +0000 |
commit | 17b0daf88c97be0ace69d4b19b3352053668e96b (patch) | |
tree | 93c7de722eaa589bf45de3246b847bf3cfa6889a /src/linux.rs | |
parent | 71a6f0a790eb3f9a6fccbaf08aa915396a9d6749 (diff) | |
download | crosvm-17b0daf88c97be0ace69d4b19b3352053668e96b.tar crosvm-17b0daf88c97be0ace69d4b19b3352053668e96b.tar.gz crosvm-17b0daf88c97be0ace69d4b19b3352053668e96b.tar.bz2 crosvm-17b0daf88c97be0ace69d4b19b3352053668e96b.tar.lz crosvm-17b0daf88c97be0ace69d4b19b3352053668e96b.tar.xz crosvm-17b0daf88c97be0ace69d4b19b3352053668e96b.tar.zst crosvm-17b0daf88c97be0ace69d4b19b3352053668e96b.zip |
vfio: Integrate VFIO device into pci device model
Create VFIO device and VFIO PCI device in create_devices() function, and intergrate it into PciRootBridge, so guest could see this vfio device. Add a vfio config parameter, this config point to passthrough or mdev device sysfs path. For passthrough case, first user unbind host device from its driver, then bind host device to vfio-pci. Like: echo 0000:00:02.0 > /sys/bus/pci/devices/0000:00:02.0/driver/unbind ech0 8086 1912 > /sys/bus/pci/drivers/vfio-pci/new_id Finally pass the sysfs to crosvm through --vfio=/sys/bus/pci/devices/0000:00:02.0 For mdev case, user create a mdev device through echo $UUID > mdev_type/create, then pass this mdev device to crosvm like --vfio=/sys/bus/pci/devices/0000:00:02.0/$UUID BUG=chromium:992270 TEST=none Change-Id: I0f59d6e93f62f9ab0727ad3a867d204f4ff6ad2d Signed-off-by: Xiong Zhang <xiong.y.zhang@intel.corp-partner.google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1581140 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Diffstat (limited to 'src/linux.rs')
-rw-r--r-- | src/linux.rs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/linux.rs b/src/linux.rs index 58e0971..f2433f7 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -27,7 +27,10 @@ use libc::{self, c_int, gid_t, uid_t}; use audio_streams::DummyStreamSource; use devices::virtio::{self, VirtioDevice}; -use devices::{self, HostBackendDeviceProvider, PciDevice, VirtioPciDevice, XhciController}; +use devices::{ + self, HostBackendDeviceProvider, PciDevice, VfioDevice, VfioPciDevice, VirtioPciDevice, + XhciController, +}; use io_jail::{self, Minijail}; use kvm::*; use libcras::CrasClient; @@ -91,6 +94,7 @@ pub enum Error { CreateTimerFd(sys_util::Error), CreateTpmStorage(PathBuf, io::Error), CreateUsbProvider(devices::usb::host_backend::error::Error), + CreateVfioDevice(devices::vfio::VfioError), DeviceJail(io_jail::Error), DevicePivotRoot(io_jail::Error), Disk(io::Error), @@ -172,6 +176,7 @@ impl Display for Error { write!(f, "failed to create tpm storage dir {}: {}", p.display(), e) } CreateUsbProvider(e) => write!(f, "failed to create usb provider: {}", e), + CreateVfioDevice(e) => write!(f, "Failed to create vfio device {}", e), DeviceJail(e) => write!(f, "failed to jail device: {}", e), DevicePivotRoot(e) => write!(f, "failed to pivot root device: {}", e), Disk(e) => write!(f, "failed to load disk image: {}", e), @@ -979,6 +984,13 @@ fn create_devices( let usb_controller = Box::new(XhciController::new(mem.clone(), usb_provider)); pci_devices.push((usb_controller, simple_jail(&cfg, "xhci.policy")?)); + if cfg.vfio.is_some() { + let vfio_path = cfg.vfio.as_ref().unwrap().as_path(); + let vfiodevice = Box::new(VfioDevice::new(vfio_path, vm).map_err(Error::CreateVfioDevice)?); + let vfiopcidevice = Box::new(VfioPciDevice::new(vfiodevice)); + pci_devices.push((vfiopcidevice, simple_jail(&cfg, "vfio_device.policy")?)); + } + Ok(pci_devices) } |