Port-forward fixes merged into 1.7 release branch #4482
Merged
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
The function pointer is called for every device being restored, however all use-sites of it pointed to the same function (VmResources::update_from_restored_device), so the indirection/abstraction is not needed. Removing this function point removes restrictions on the signature of the function, and thus makes adding error handling easier (for example, we can now update update_from_restored_device to validate whether the devices read from the snapshot are actually consistent with the rest of the vm configuration). The entire `SharedDeviceType` enum can probably be removed too, but lets keep the changes minimal in this commit, as its for the 1.7 release branch. Signed-off-by: Patrick Roy <[email protected]>
Insert a check into the snapshot restore routine that checks that a snapshot file cannot indicate both huge pages being enabled, while also listing a balloon device. If this condition is detected, refuse to load the snapshot and print an error suggesting that the snapshot file is corrupt. Signed-off-by: Patrick Roy <[email protected]>
When switching from Versionize to bincode in firecracker-microvm#4230, we accidentally dropped a check limiting how much memory the deserialization routine can allocate [[1]]. This commit reimplements this check for the new bincode-based deserialization routine, with a limit matching that of the old Versionize check. [1]: https://github.com/firecracker-microvm/versionize/blob/main/src/primitives.rs#L14C33-L14C43 Signed-off-by: Patrick Roy <[email protected]>
roypat
added
the
Status: Awaiting review
ShadowCurse
approved these changes
Mar 1, 2024
bchalios
approved these changes
Mar 1, 2024
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #4482 +/- ##
=======================================
Coverage 81.63% 81.63%
=======================================
Files 243 243
Lines 29791 29794 +3
=======================================
+ Hits 24319 24322 +3
Misses 5472 5472
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
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.
Cherry-picks changes from #4476 and #4480 into
mainLicense 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
PR.
CHANGELOG.md.TODOs link to an issue.contribution quality standards.
rust-vmm.