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

Use 6.1 guest kernel configs from AL #4746

Merged
merged 7 commits into from
Aug 30, 2024

Conversation

bchalios
Copy link
Contributor

@bchalios bchalios commented Aug 23, 2024

Changes

Use AmazonLinux tailored guest configs for our 6.1 guest microVM kernels. Also, split the Kconfig for our CI kernels in a base part which will always be reflecting the AmazonLinux config and a set of patches that we apply on top of it before rebuilding our CI kernels. The patches live under resources/guest_configs/patches/.

Reason

AmazonLinux now ships a microVM kernels for 6.1. We want to build with the corresponding Kconfigs and keep track of our CI-specific changes in a form of patches.

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.

@bchalios bchalios marked this pull request as draft August 23, 2024 12:49
Copy link

codecov bot commented Aug 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.34%. Comparing base (d008a8c) to head (3c3e074).
Report is 4 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4746   +/-   ##
=======================================
  Coverage   84.34%   84.34%           
=======================================
  Files         249      249           
  Lines       27461    27461           
=======================================
  Hits        23162    23162           
  Misses       4299     4299           
Flag Coverage Δ
5.10-c5n.metal 84.57% <ø> (+<0.01%) ⬆️
5.10-m5n.metal 84.55% <ø> (ø)
5.10-m6a.metal 83.84% <ø> (ø)
5.10-m6g.metal 80.91% <ø> (ø)
5.10-m6i.metal 84.54% <ø> (ø)
5.10-m7g.metal 80.91% <ø> (ø)
6.1-c5n.metal 84.56% <ø> (-0.01%) ⬇️
6.1-m5n.metal 84.55% <ø> (ø)
6.1-m6a.metal 83.84% <ø> (-0.01%) ⬇️
6.1-m6g.metal 80.91% <ø> (ø)
6.1-m6i.metal 84.54% <ø> (ø)
6.1-m7g.metal 80.91% <ø> (ø)

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.

@bchalios bchalios force-pushed the make-guest-config-patches branch 3 times, most recently from cf0cd86 to fc8b46a Compare August 29, 2024 11:59
@bchalios bchalios marked this pull request as ready for review August 29, 2024 11:59
@bchalios bchalios self-assigned this Aug 29, 2024
@bchalios bchalios added the Status: Awaiting review Indicates that a pull request is ready to be reviewed label Aug 29, 2024
Manciukic
Manciukic previously approved these changes Aug 29, 2024
@bchalios bchalios force-pushed the make-guest-config-patches branch from fc8b46a to 8f11982 Compare August 29, 2024 14:32
This reverts commit 6d78999.

Previously, we made changes on the guest kernel configs comparing to the
AL ones, in order to be able to use these kernels in our CI. In order to
be able to track better what changes we are making in our config, we
want to keep these changes as patches that we apply when we want to
rebuild CI artifacts.

Signed-off-by: Babis Chalios <bchalios@amazon.es>
Move the changes we did in 6d78999 in
patch and change resources/rebuild.sh to apply all the patches under
resources/guest_configs/patches/ before building the kernel.

Signed-off-by: Babis Chalios <bchalios@amazon.es>
AL started building 6.1 microVM kernels. Use that Kconfig as our base
config for building 6.1 kernels. Also create a patch that adapts it for
our CI needs.

Signed-off-by: Babis Chalios <bchalios@amazon.es>
@bchalios bchalios dismissed stale reviews from pb8o and Manciukic via f2889ba August 29, 2024 15:30
@bchalios bchalios force-pushed the make-guest-config-patches branch from 81fbe72 to f2889ba Compare August 29, 2024 15:30
Manciukic
Manciukic previously approved these changes Aug 29, 2024
AmazonLinux has backported the patches for 6.1 and we are now building
from their tree, so we don't need to manually apply the patches when we
re-create CI artifacts.

Signed-off-by: Babis Chalios <bchalios@amazon.es>
@bchalios bchalios merged commit d4f917e into firecracker-microvm:main Aug 30, 2024
7 checks passed
@bchalios bchalios deleted the make-guest-config-patches branch September 3, 2024 09:25
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.

4 participants