Skip to content

Enable CONFIG_ARM_SMMU and CONFIG_ARM_SMMU_V3 in aarch64.#6829

Merged
christopherco merged 2 commits intomicrosoft:mainfrom
ddaney-fungible:enable-aarch64-iommu-main
Nov 28, 2023
Merged

Enable CONFIG_ARM_SMMU and CONFIG_ARM_SMMU_V3 in aarch64.#6829
christopherco merged 2 commits intomicrosoft:mainfrom
ddaney-fungible:enable-aarch64-iommu-main

Conversation

@ddaney-fungible
Copy link
Copy Markdown
Contributor

@ddaney-fungible ddaney-fungible commented Nov 22, 2023

Set CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT for aarch64 kernel as it is the more secure setting.

Adjust mariner-required-configs.json for aarch64 kernel IOMMU configs.

Update all spec Release strings to match kernel.spec

Update manifests to match kernel-headers version.

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

Enable IOMMU in aarch64 kernel. It is needed to allow VFIO to be used with Mariner.

Change Log
  • Enable CONFIG_ARM_SMMU and CONFIG_ARM_SMMU_V3 in aarch64 kernel.
Does this affect the toolchain?

NO

Associated issues
Test Methodology
  • local build on 2.0 branch

Set CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT for aarch64 kernel as it
is the more secure setting.

Adjust mariner-required-configs.json for aarch64 kernel IOMMU configs.

Update all spec Release strings to match kernel.spec

Update manifests to match kernel-headers version.
@ddaney-fungible ddaney-fungible requested review from a team as code owners November 22, 2023 18:05
@microsoft-github-policy-service microsoft-github-policy-service Bot added the main PR Destined for main label Nov 22, 2023
@ddaney-fungible
Copy link
Copy Markdown
Contributor Author

This is just a rebase of my 2.0 branch PR here: #6823

The kernel package built in the 2.0 branch version, but I haven't yet figured out the proper incantation for a main branch build as a bunch of toolchain RPMs don't exist and cannot be downloaded.

@rlmenge
Copy link
Copy Markdown
Contributor

rlmenge commented Nov 23, 2023

This is just a rebase of my 2.0 branch PR here: #6823

The kernel package built in the 2.0 branch version, but I haven't yet figured out the proper incantation for a main branch build as a bunch of toolchain RPMs don't exist and cannot be downloaded.

main is our development branch. As such, some of the packages may not yet be published. This is why you are seeing download failures. To build on the main branch, use the quickrebuild commands to build the toolchain and packages

sudo make toolchain QUICK_REBUILD_TOOLCHAIN=y CONFIG_FILE=""
sudo make build-packages REBUILD_TOOLS=y CONFIG_FILE= PACKAGE_REBUILD_LIST="kernel"

@christopherco
Copy link
Copy Markdown
Collaborator

Thanks @rlmenge for kicking off the buddy builds. Looks to build clean - https://dev.azure.com/mariner-org/mariner/_build/results?buildId=457103&view=results

@ddaney-fungible
Copy link
Copy Markdown
Contributor Author

It seems to have had a successful build, so I think I can check that box.

Does that make it "Ready to merge"?

@christopherco
Copy link
Copy Markdown
Collaborator

LGTM @ddaney-fungible - Thanks for the contribution!

@christopherco christopherco merged commit ff7d597 into microsoft:main Nov 28, 2023
@rlmenge rlmenge mentioned this pull request Dec 18, 2023
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

main PR Destined for main

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants