-
Notifications
You must be signed in to change notification settings - Fork 2.1k
[virtio-pmem] Implementation #5463
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
base: main
Are you sure you want to change the base?
Conversation
Codecov Report❌ Patch coverage is Please upload reports for the commit 9a554b4 to get more accurate results. Additional details and impacted files@@ Coverage Diff @@
## main #5463 +/- ##
==========================================
- Coverage 82.79% 82.62% -0.17%
==========================================
Files 263 269 +6
Lines 27226 27729 +503
==========================================
+ Hits 22541 22911 +370
- Misses 4685 4818 +133
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
d8f9547
to
5970613
Compare
a8bedbb
to
1d2aeb2
Compare
msync is used by virtio-pmem device to trigger sync of mmaped file content to the underlying file. Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
1d2aeb2
to
7d83503
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- we should update
docs/device-api.md
. - changelog entry
- any performance tests? we could check how fast we can read or write the entire pmem or maybe we can integrate it with the block tests using fio
libc::MS_SYNC, | ||
) < 0 | ||
{ | ||
result = FAILURE; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should log the error
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added
fn interrupt_trigger(&self) -> &dyn VirtioInterrupt { | ||
self.device_state | ||
.active_state() | ||
.expect("Device is not implemented") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: "is not active"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed
} | ||
} | ||
|
||
fn write_config(&mut self, _offset: u64, _data: &[u8]) {} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we could log unexpected attempts to write
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we don't log such writes in any device, so don't think we should do it here.
let next = self.common.next_kvm_slot.load(Ordering::Relaxed); | ||
if next == self.common.max_memslots { | ||
None | ||
} else { | ||
self.common.next_kvm_slot.store(next + 1, Ordering::Relaxed); | ||
Some(next) | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
to really be atomic we should do a fetch_add
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed
pmem.avail_features = state.virtio_state.avail_features; | ||
pmem.acked_features = state.virtio_state.acked_features; | ||
|
||
pmem.set_mem_region(constructor_args.vm)?; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is the allocator state getting restored?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes
docs/pmem.md
Outdated
"id": "pmem0", | ||
"path_on_host": "./some_file", | ||
"root_device": true, | ||
"read_only": fasle |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- "read_only": fasle
+ "read_only": false
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed
\"root_device\": true, | ||
\"read_only\": false | ||
}" | ||
``` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should probably mention snapshot/restore behaviour as well
and also security considerations about sharing memory (which we do not recommend).
We can also mention performance considerations: ie that even though pages are in memory, the guest still needs to exit to the kernel to set up the pagetable mappings. Using hugetlbfs to back the file would be faster (but will consume memory).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added snapshot, security and performance sections
} | ||
let mmap_len = align_up(file_len, Self::ALIGNMENT); | ||
|
||
let mut flags_1 = libc::MAP_SHARED | libc::MAP_ANONYMOUS | libc::MAP_NORESERVE; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PRIVATE?
nit: having the flags inline with the syscall would make it more readable
assert False | ||
|
||
|
||
def test_pmem_add(uvm_plain_any, microvm_factory): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we check writes are persisted to disk?
> `DAX` support is not uniform for all file systems. Check the documentation for | ||
> the file system you want to use before enabling `DAX`. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it works on ext4, right? does it need any specific options (ie 4096 block size) or just works?
Add implementations of device, event handling, metrics. Add device config and builder types for API use. Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
Update VmResources type with virtio-pmem configuration field to allow virtio-pmem devices be configured through config files and later through API calls. Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
Both virtio-block and virtio-pmem can act as root devices for a VM. Add a check to prevent specifing more than 1 root device for a VM. Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
Add /pmem/id PUT request for virtio-pmem configuration. Add corresponding metrics. Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
Virtio-pmem devices need to allocate a memory region in guest physical memory. The safe place to do this is past 64bit MMIO region. Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
Add a counter for KVM slot ids into VmCommon struct. This is done because virtio-pmem device needs to obtain it's KVM slot id independently from number of slots in GuestMemoryMmap. Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
Add methods to attach virtio-pmem devices to Vmm. Add methods to create KVM memory slot for virtio-pmem devices. Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
Add logic to store and restore virtio-pmem device information in a snapshot. Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
Add functional and API tests for virtio-pmem device and its configuration fields Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
Expose virtio-pmem metrics in the logger, so they are exported in metrics.json. Update integration tests to expect new metrics. Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
Add description of pmem endpoint. Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
7d83503
to
efd93ea
Compare
Add new document about virtio-pmem configuration and usage. Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
Add a note about addition of virtio-pmem device. Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
efd93ea
to
9a554b4
Compare
Changes
Add
virtio-pmem
device support.Closes #5448
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
tools/devtool checkbuild --all
to verify that the PR passesbuild checks on all supported architectures.
tools/devtool checkstyle
to verify that the PR passes theautomated style checks.
how they are solving the problem in a clear and encompassing way.
in the PR.
CHANGELOG.md
.Runbook for Firecracker API changes.
integration tests.
TODO
.rust-vmm
.