Skip to content

DRAFT: Add support for virtio-pci transport #5240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 24 commits into
base: feature/pcie
Choose a base branch
from

Conversation

bchalios
Copy link
Contributor

@bchalios bchalios commented Jun 2, 2025

Changes

...

Reason

...

License Acceptance

By submitting this pull request, I confirm that my contribution is made under
the terms of the Apache 2.0 license. For more information on following Developer
Certificate of Origin and signing off your commits, please check
CONTRIBUTING.md.

PR Checklist

  • I have read and understand CONTRIBUTING.md.
  • I have run tools/devtool checkstyle to verify that the PR passes the
    automated style checks.
  • I have described what is done in these changes, why they are needed, and
    how they are solving the problem in a clear and encompassing way.
  • I have updated any relevant documentation (both in code and in the docs)
    in the PR.
  • I have mentioned all user-facing changes in CHANGELOG.md.
  • If a specific issue led to this PR, this PR closes the issue.
  • When making API changes, I have followed the
    Runbook for Firecracker API changes.
  • I have tested all new and changed functionalities in unit tests and/or
    integration tests.
  • I have linked an issue to every new TODO.

  • This functionality cannot be added in rust-vmm.

Copy link

codecov bot commented Jun 2, 2025

Codecov Report

Attention: Patch coverage is 73.94164% with 634 lines in your changes missing coverage. Please review.

Project coverage is 79.95%. Comparing base (ca4f1e7) to head (6d9ed72).

Files with missing lines Patch % Lines
src/vmm/src/devices/virtio/transport/pci/device.rs 58.17% 302 Missing ⚠️
.../src/devices/virtio/transport/pci/common_config.rs 52.15% 89 Missing ⚠️
src/vmm/src/device_manager/mod.rs 66.05% 74 Missing ⚠️
src/vmm/src/device_manager/pci_mngr.rs 91.54% 36 Missing ⚠️
src/vmm/src/builder.rs 75.00% 33 Missing ⚠️
src/vmm/src/vstate/vm.rs 91.48% 24 Missing ⚠️
src/vmm/src/vstate/resources.rs 52.77% 17 Missing ⚠️
src/vmm/src/devices/virtio/balloon/persist.rs 8.33% 11 Missing ⚠️
src/vmm/src/devices/virtio/net/device.rs 38.88% 11 Missing ⚠️
src/vmm/src/devices/virtio/queue.rs 8.33% 11 Missing ⚠️
... and 11 more
Additional details and impacted files
@@               Coverage Diff                @@
##           feature/pcie    #5240      +/-   ##
================================================
+ Coverage         79.23%   79.95%   +0.71%     
================================================
  Files               262      265       +3     
  Lines             29347    31203    +1856     
================================================
+ Hits              23254    24947    +1693     
- Misses             6093     6256     +163     
Flag Coverage Δ
5.10-c5n.metal 79.64% <69.93%> (+0.59%) ⬆️
5.10-m5n.metal 79.63% <69.93%> (+0.58%) ⬆️
5.10-m6a.metal 78.83% <69.93%> (+0.65%) ⬆️
5.10-m6g.metal 76.29% <73.35%> (+1.11%) ⬆️
5.10-m6i.metal 79.63% <69.93%> (+0.59%) ⬆️
5.10-m7a.metal-48xl 78.81% <69.93%> (+0.66%) ⬆️
5.10-m7g.metal 76.29% <73.35%> (+1.11%) ⬆️
5.10-m7i.metal-24xl 79.60% <69.93%> (+0.58%) ⬆️
5.10-m7i.metal-48xl 79.60% <69.93%> (+0.59%) ⬆️
5.10-m8g.metal-24xl 76.29% <73.35%> (+1.11%) ⬆️
5.10-m8g.metal-48xl 76.29% <73.35%> (+1.11%) ⬆️
6.1-c5n.metal 79.68% <69.93%> (+0.59%) ⬆️
6.1-m5n.metal 79.68% <69.93%> (+0.59%) ⬆️
6.1-m6a.metal 78.87% <69.93%> (+0.65%) ⬆️
6.1-m6g.metal 76.29% <73.35%> (+1.11%) ⬆️
6.1-m6i.metal 79.67% <69.93%> (+0.58%) ⬆️
6.1-m7a.metal-48xl 78.86% <69.93%> (+0.66%) ⬆️
6.1-m7g.metal 76.29% <73.35%> (+1.11%) ⬆️
6.1-m7i.metal-24xl 79.68% <69.93%> (+0.58%) ⬆️
6.1-m7i.metal-48xl 79.69% <69.93%> (+0.58%) ⬆️
6.1-m8g.metal-24xl 76.29% <73.35%> (+1.11%) ⬆️
6.1-m8g.metal-48xl 76.29% <73.35%> (+1.11%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@bchalios bchalios force-pushed the virtio-pci branch 7 times, most recently from a80faa9 to 15ed3eb Compare June 4, 2025 13:49
@bchalios bchalios force-pushed the virtio-pci branch 6 times, most recently from 61c6be1 to 9d18f11 Compare June 11, 2025 11:25
@bchalios bchalios force-pushed the virtio-pci branch 15 times, most recently from c0ada38 to 507cbce Compare June 19, 2025 09:30
bchalios added 15 commits June 19, 2025 15:29
Add a VirtIO PCI transport implementation. Nothing uses it at the
moment. This requires a few changes in our vended pci and vm-device
crates.

Add a couple of tests that ensure that PCI configuration space is what
expected. We read common fields and make sure the BAR we allocate for
the VirtIO device is what expected.

Signed-off-by: Babis Chalios <[email protected]>
Merge the device-related errors that DeviceManager might return. This
way, we can avoid adding yet another error type for PCI devices and
reduce some the variants of StartMicrovmError.

Suggested-by: Egor Lazarchuk <[email protected]>
Signed-off-by: Babis Chalios <[email protected]>
Commit d8c2714 (refactor: use VirtioInterrupt in VirtIO devices) which
refactored devices to use new VirtioInterrupt type introduced a bug
with the index used to trigger a queue interrupt. Instead of using the
actual queue index, we were using the index of the used descriptor.

Signed-off-by: Babis Chalios <[email protected]>
Apparently, PCI needs Queue::size to be initialized to the maximum
possible size supported by the device, otherwise initialization fails.

Signed-off-by: Babis Chalios <[email protected]>
Remove the flags in FADT that were declaring we do not support MSI and
PCI ASPM.

Signed-off-by: Babis Chalios <[email protected]>
Create VirtIO devices using the PCI transport layer when user launched
microVM with --enable-pci.

Signed-off-by: Babis Chalios <[email protected]>
We are now calling KVM_CHECK_EXTENSION for checking the
KVM_CAP_MSI_DEVID capability. We are also calling KVM_SET_GSI_ROUTING to
set the interrupts routes and KVM_IRQFD to set/unset interrupt lines.

Signed-off-by: Babis Chalios <[email protected]>
Add some unit tests to PciSegment. We now test that the
next_device_bdf() method and the initialization logic work as expected.
We also check that the configuration space of the PCI segment is
correctly registered with the MMIO and, on x86, PIO bus.

Signed-off-by: Babis Chalios <[email protected]>
vm-allocator now allows us to (De)serialize IdAllocator and
AddressAllocator types. Add ResourceAllocator in DeviceManager snapshot
state and restore it when loading a snapshot. Like this we can avoid
doing the ExactMatch allocations during snapshot resumes for reserving
the exact same MMIO ranges.

Moreover, change DeviceManager and PciDevices to provide save/restore
functionality via the Persist trait. Like that we can avoid first
creating the objects and then restoring their state, overwriting their
fields.

Signed-off-by: Babis Chalios <[email protected]>
VirtIO MMIO restore logic activates the device the moment we restore the
device state, if the device was activated when snapshotted. Move the
activation responsibility to the logic the restores the MMIO transport.
The reason for this change is that that's how it will be done for the
PCI transport. Unifying this will allow us reusing the same types for
restoring the non-transport state of devices.

Note that we needed to change the way Net devices are saved/restored.
RxBuffer type of Net devices holds RX descriptors that we have parsed
from the Queue ahead of time. The way we restored this info was
manipulating the queue to re-parse the RX descriptors during the restore
phase. However, we need the device to be activated to do so, which now
isn't. So, instead of storing this info inside the snapshot make sure we
have flushed everything before taking the snapshot.

Also, simplify a bit the types that we use for serializing/deserializing
the state of a device.

Signed-off-by: Babis Chalios <[email protected]>
Support serializing the device-specific and transport state of a VirtIO
device that uses the PCI transport.

Signed-off-by: Babis Chalios <[email protected]>
ResourceAllocator object was part of DeviceManager since it is (mainly)
devices that use it. ResourceAllocator is as well the object that
implements (in a dummy way, for the moment) the DeviceRelocation trait
which PciDevices use to move the address space of a PciDevice when
triggered from the guest.

Problem with DeviceRelocation is that it also needs the Vm file
descriptor to perform the relocation, because we need to move register
the new IO event fd for VirtIO devices.

To make things simpler, move ResourceAllocator inside the Vm object. In
subsequent commit we will remove the DeviceRelocation from
ResourceAllocator and move it to Vm instead.

This has the nice secondary effect that we were able to simplify the
signature of many device-related methods that received Vm and
ResourceAllocator arguments.

Signed-off-by: Babis Chalios <[email protected]>
We had previously added MMIO and Port IO buses inside ResourceAllocator
so that we could implement DeviceRelocation for the type. Now, we will
delegate device relocation responsibilities to ArchVm instead. That is
because device relocation requires access to the Vm file descriptor as
well.

As a result, we can move buses to the Vm object itself. Add MMIO bus to
VmCommon as both architectures use it. Add PortIO bus for x86
architecture only.

Signed-off-by: Babis Chalios <[email protected]>
Implement PCI device relocation logic for Vm type. Up until now, we were
only implementing it in a dummy way.

Signed-off-by: Babis Chalios <[email protected]>
Refactor the test code that inserts VirtIO devices in a Vmm object and
then add a test which creates a Vmm with PCI devices and then serializes
and deserializes the device manager and ensures that everything is as
restored as expected.

Signed-off-by: Babis Chalios <[email protected]>
@bchalios bchalios force-pushed the virtio-pci branch 11 times, most recently from 0ec960e to 6fb7faa Compare June 20, 2025 09:35
Add support for ITS device which provides support for MSI interrupts on
ARM architecture. This is currently supported only on systems with GICv3
interrupt controller

Signed-off-by: Babis Chalios <[email protected]>
Use pci_enabled fixture for boot time, block, and network tests to
create PCI microVM variants as well.

Signed-off-by: Babis Chalios <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant