Skip to content

Fix CPU templates nightly tests on guest kernel 6.1 #4741

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

Merged
merged 3 commits into from
Aug 21, 2024

Conversation

Manciukic
Copy link
Contributor

@Manciukic Manciukic commented Aug 21, 2024

Changes

  • Copy MSR files from 5.10 guest kernel to 6.1 guest kernel
  • Update the only different MSR during the test: MSR_SYSCALL_MASK
  • enable writes to MSRs from boot args (disabled by default on 6.1)

Reason

Nightly CPU templates tests are failing after we merged #4732.
This is required for #4737 .

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.

This change adds the MSR list files for the 6.1 guest kernel. These
were copied from the 5.10 list.

Signed-off-by: Riccardo Mancini <mancio@amazon.com>
This change updates the expected MSR value for MSR_SYSCALL_MASK
(0xc0000084) to 0x257fd5 for the 6.1 guest kernel.

Signed-off-by: Riccardo Mancini <mancio@amazon.com>
Guest kernel 6.1 disabled MSR writes by default.
This change add the boot arg to enable them again in the test that is
using wrmsr.

Signed-off-by: Riccardo Mancini <mancio@amazon.com>
@Manciukic Manciukic requested review from kalyazin and pb8o August 21, 2024 13:07
@Manciukic
Copy link
Contributor Author

The MSR_SYSCALL_MASK is controlled by the kernel and was changed in x86/syscall: Maximize MSR_SYSCALL_MASK.

Copy link

codecov bot commented Aug 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.37%. Comparing base (ce88931) to head (d106329).
Report is 3 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4741   +/-   ##
=======================================
  Coverage   84.37%   84.37%           
=======================================
  Files         249      249           
  Lines       27433    27433           
=======================================
  Hits        23147    23147           
  Misses       4286     4286           
Flag Coverage Δ
5.10-c5n.metal 84.60% <ø> (ø)
5.10-m5n.metal 84.58% <ø> (ø)
5.10-m6a.metal 83.87% <ø> (-0.01%) ⬇️
5.10-m6g.metal 80.91% <ø> (ø)
5.10-m6i.metal 84.58% <ø> (-0.01%) ⬇️
5.10-m7g.metal 80.91% <ø> (ø)
6.1-c5n.metal 84.60% <ø> (ø)
6.1-m5n.metal 84.59% <ø> (ø)
6.1-m6a.metal 83.87% <ø> (ø)
6.1-m6g.metal 80.90% <ø> (ø)
6.1-m6i.metal 84.58% <ø> (ø)
6.1-m7g.metal 80.90% <ø> (-0.01%) ⬇️

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.

@Manciukic Manciukic added the Status: Awaiting review Indicates that a pull request is ready to be reviewed label Aug 21, 2024
@pb8o pb8o merged commit 850d5c5 into firecracker-microvm:main Aug 21, 2024
8 checks passed
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants