Vhost user block #4170
Merged
Vhost user block #4170
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ShadowCurse
force-pushed
the
vhost_user_blk
branch
2 times, most recently
from
bc4074a to
3aa7d42
Compare
kalyazin
reviewed
Oct 13, 2023
|
I know it is a tedious thing to do, but at some point (if you haven't already) we need to make sure every commit builds and unit tests pass. |
kalyazin
reviewed
Oct 13, 2023
ShadowCurse
force-pushed
the
vhost_user_blk
branch
6 times, most recently
from
f1e5873 to
3ae0d8d
Compare
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #4170 +/- ##
==========================================
- Coverage 82.98% 82.20% -0.79%
==========================================
Files 230 236 +6
Lines 28710 29203 +493
==========================================
+ Hits 23826 24007 +181
- Misses 4884 5196 +312
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
ShadowCurse
force-pushed
the
vhost_user_blk
branch
7 times, most recently
from
c4058d1 to
a11cc77
Compare
kalyazin
reviewed
Oct 18, 2023
ShadowCurse
force-pushed
the
vhost_user_blk
branch
5 times, most recently
from
2adb53c to
d7f610f
Compare
4 tasks
ShadowCurse
force-pushed
the
vhost_user_blk
branch
3 times, most recently
from
d9884a3 to
4c1a788
Compare
ShadowCurse
force-pushed
the
vhost_user_blk
branch
from
52f7142 to
837b5e9
Compare
Created a separate block config struct and updated Block::new method to accept it instead of separate parameters. Updated block restoration code as well. Signed-off-by: Egor Lazarchuk <[email protected]>
This is done to better differentiate between virtio devices and vhost-user devices. Signed-off-by: Egor Lazarchuk <[email protected]>
In order to allow creation of other block device subtypes, we wrap former Block structure into an enum. At the moment it contains a single variant `VirtioBlock`. Further on it will be extended with other device subtypes. Signed-off-by: Egor Lazarchuk <[email protected]> Co-authored-by: Nikita Kalyazin <[email protected]>
Added vhost-user wrapper for the interraction with backend. Signed-off-by: Egor Lazarchuk <[email protected]> Co-authored-by: Nikita Kalyazin <[email protected]> Co-authored-by: Diana Popa <[email protected]>
Added implementation for vhost-user-block device. Signed-off-by: Egor Lazarchuk <[email protected]> Co-authored-by: Nikita Kalyazin <[email protected]> Co-authored-by: Diana Popa <[email protected]>
Now `BlockDeviceType` has both virtio-block and vhost-user-block. Because we can not test vhost-user-block at this time, we skip vhost-user-block in the unit tests. Signed-off-by: Egor Lazarchuk <[email protected]>
Even though we don't support creation of snapshots with vhost-user-block device we add it to the restoration path for future use. Signed-off-by: Egor Lazarchuk <[email protected]>
Updated `BlockDeviceConfig` with vhost-user-block specific field. Updated methods to convert `BlockDeviceConfig` into `VirtIOBlockConfig` or `VhostUserBlockConfig`. Updated integration tests with new ordering of fields in the `BlockDeviceConfig`. Signed-off-by: Egor Lazarchuk <[email protected]>
This is done to make it clear where the imports are comming from. Signed-off-by: Egor Lazarchuk <[email protected]>
CacheType is shared between VirtioBlock and VhostUserBlock. Signed-off-by: Egor Lazarchuk <[email protected]>
Simplified `DiskProperties` implementation. Removed a lot of getters from `VirtIOBlock` Removed `CacheTypeState` because it is same as `CacheType` Signed-off-by: Egor Lazarchuk <[email protected]>
Now virtio_block is named similar to vhost_user_block Signed-off-by: Egor Lazarchuk <[email protected]>
Moved duplicated code into a macro in `attach_block_devices` Signed-off-by: Egor Lazarchuk <[email protected]>
Now `MmioTransport` stores info if the device uses vhost_user implementation. Based on this info the interrupt status reported to the guest is either an updatde interrupt status (for usual virtio devices) or `VIRTIO_MMIO_INT_VRING`(0x1) for vhost_user devices. This is done because vhost_user devices can not update interrupt status variable in the FC. Signed-off-by: Egor Lazarchuk <[email protected]>
Updated swagger for `drive` api with new descriptions and fields for vhost-user-block. Signed-off-by: Egor Lazarchuk <[email protected]>
For some reason this file was not formatted. Signed-off-by: Egor Lazarchuk <[email protected]>
Added `sendmsg` syscall to the seccomp. It is needed for vhost-user-block. Signed-off-by: Egor Lazarchuk <[email protected]>
Added a simple test that boots a VM with vhost-user-block as root block device. Signed-off-by: Egor Lazarchuk <[email protected]>
In firecracker-microvm#2702 the behaviour of the `Unsafe` cache type was changed. If selected the `flush` feature is not advertised to the guest. This commit just adds missing documentation change. Signed-off-by: Egor Lazarchuk <[email protected]>
Added a trait that helps with mocking `vhost::Master` struct. Added unit tests for feature negotiated methods. Signed-off-by: Egor Lazarchuk <[email protected]>
Made `VhostUserBlock` generic on `VhostUserHandleBackend`. Added unit tests for `VhostUserBlock` creation and feature negotiation. Signed-off-by: Egor Lazarchuk <[email protected]>
Moved `create_test_socket` into test module Signed-off-by: Egor Lazarchuk <[email protected]>
ShadowCurse
force-pushed
the
vhost_user_blk
branch
from
837b5e9 to
edec970
Compare
bchalios
approved these changes
Nov 7, 2023
kalyazin
approved these changes
Nov 8, 2023
3 tasks
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
This PR adds vhost-user-bock device implementation with unit tests and initial integration test.
In order to configure new device type, old
/driveendpoint is used with new parametersocket.Depending if certain fields are present in the request body, different types of device can be configured. More details in the swagger file.
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
CHANGELOG.md.TODOs link to an issue.rust-vmm.