Skip to content
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

fix aarch64 not able to restore snaps when SVE enabled #4413

Merged

Conversation

ShadowCurse
Copy link
Contributor

@ShadowCurse ShadowCurse commented Jan 29, 2024

Changes

Firecracker is incorrectly handling KVM_REG_ARM64_SVE_VLS register during snapshot restoration. KVM_REG_ARM64_SVE_VLS must be set after vcpu is initialized, but before it is finalized.

This PR fixes this issue.
Additionally cpu-feature related tests were updated to test cpu features after snapshot of a vm with cpu template was restored.

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

  • If a specific issue led to this PR, this PR closes the issue.
  • The description of changes is clear and encompassing.
  • Any required documentation changes (code and docs) are included in this PR.
  • API changes follow the Runbook for Firecracker API changes.
  • User-facing changes are mentioned in CHANGELOG.md.
  • All added/changed functionality is tested.
  • New TODOs link to an issue.
  • Commits meet contribution quality standards.

  • This functionality cannot be added in rust-vmm.

@ShadowCurse ShadowCurse self-assigned this Jan 29, 2024
Copy link

codecov bot commented Jan 29, 2024

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (08385e0) 81.51% compared to head (8344690) 81.52%.

Files Patch % Lines
src/vmm/src/vstate/vcpu/aarch64.rs 94.73% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4413   +/-   ##
=======================================
  Coverage   81.51%   81.52%           
=======================================
  Files         241      241           
  Lines       29282    29296   +14     
=======================================
+ Hits        23870    23883   +13     
- Misses       5412     5413    +1     
Flag Coverage Δ
4.14-c5n.metal 78.79% <ø> (?)
4.14-c7g.metal ?
4.14-m5d.metal ?
4.14-m5n.metal 78.78% <ø> (?)
4.14-m6a.metal 77.90% <ø> (ø)
4.14-m6g.metal 76.86% <95.45%> (+<0.01%) ⬆️
4.14-m6i.metal 78.78% <ø> (ø)
4.14-m7g.metal 76.86% <95.45%> (?)
5.10-c5n.metal 81.48% <ø> (?)
5.10-c7g.metal ?
5.10-m5d.metal ?
5.10-m5n.metal 81.47% <ø> (?)
5.10-m6a.metal 80.69% <ø> (ø)
5.10-m6g.metal 79.79% <95.45%> (+<0.01%) ⬆️
5.10-m6i.metal 81.47% <ø> (ø)
5.10-m7g.metal 79.79% <95.45%> (?)
6.1-c5n.metal 81.48% <ø> (?)
6.1-m5n.metal 81.47% <ø> (?)
6.1-m6a.metal 80.69% <ø> (ø)
6.1-m6g.metal 79.79% <95.45%> (+<0.01%) ⬆️
6.1-m6i.metal 81.47% <ø> (ø)
6.1-m7g.metal 79.79% <95.45%> (?)

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.

@ShadowCurse ShadowCurse force-pushed the snap_restore_with_templates branch 2 times, most recently from d185057 to 59804fc Compare January 29, 2024 14:18
@ShadowCurse ShadowCurse changed the title fix aarch64 not able to restore snaps with SVE enabled fix aarch64 not able to restore snaps when SVE enabled Jan 29, 2024
@ShadowCurse ShadowCurse force-pushed the snap_restore_with_templates branch 3 times, most recently from 5c6d263 to a7af7b4 Compare January 29, 2024 14:55
@ShadowCurse ShadowCurse marked this pull request as ready for review January 29, 2024 15:00
@ShadowCurse ShadowCurse added Status: Awaiting review Indicates that a pull request is ready to be reviewed Type: Fix Indicates a fix to existing code labels Jan 29, 2024
CHANGELOG.md Show resolved Hide resolved
src/vmm/src/arch/aarch64/regs.rs Show resolved Hide resolved
src/vmm/src/vstate/vcpu/aarch64.rs Outdated Show resolved Hide resolved
roypat
roypat previously approved these changes Jan 29, 2024
Replace `set_registers` with `set_register` in order
to have more control over each register restoration
process.

Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
Split `vcpu_init` and `vcpu_finalize` into separate methods
for better flexibility.

Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
KVM_REG_ARM64_SVE_VLS needs to be treated differently from
other SVE registers. It needs to be set before vcpu is
finalized.

Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
Add verification of cpu features after loading a snapshot
of a vm with cpu-template applied.

Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
Add verification of cpu features after loading a snapshot
of a vm with cpu-template applied.

Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
Add firecracker SVE related bug fix
to the CHANGELOG.

Signed-off-by: Egor Lazarchuk <yegorlz@amazon.co.uk>
@pb8o pb8o merged commit faee85f into firecracker-microvm:main Jan 30, 2024
7 checks passed
@ShadowCurse ShadowCurse deleted the snap_restore_with_templates branch January 30, 2024 10:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Awaiting review Indicates that a pull request is ready to be reviewed Type: Fix Indicates a fix to existing code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants