Prepare for update to COCONUT linux host and QEMU 9.0 #415
Conversation
This file contains 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
QEMU 9.0 with IGVM support uses a different command line to previous QEMU versions. The IGVM file is now specified as a separate object. Also, init-flags has been removed and there have been some other changes to the arguments required to launch an SEV-SNP guest. This commit updates scripts/launch.sh to provide the correct arguments when QEMU 9 or greater is detected. Signed-off-by: Roy Hopkins <[email protected]>
The commit b7e4be0a224fe5 in the kernel introduces a change that means that sev-es and sev-snp guests do not now intercept the debug ctl MSR. This means for kernels that include this commit this test will always fail. This commit removes the test. The read_msr functionality is tested by the remaining test_rdmsr_apic() test case. Signed-off-by: Roy Hopkins <[email protected]>
MSR_TSC_AUX is only intercepted on systems that do not support Virtual TSC_AUX, such as Milan based systems. Genoa systems do support Virtual TSC_AUX. Therefore the read_msr/write_msr tests fail on these systems. This commit replaces the read_msr/write_msr tests with MSR_APIC_BASE to test the write functionality and fixes the test for rdtscp by ignoring whether the MSR read was intercepted. Signed-off-by: Roy Hopkins <[email protected]>
| if (( (QEMU_MAJOR > 8) || ((QEMU_MAJOR == 8) && (QEMU_MINOR >= 2)) )); then | ||
| if (( QEMU_MAJOR >= 9 )); then | ||
| MACHINE=q35,confidential-guest-support=sev0,memory-backend=mem0,igvm-cfg=igvm0 | ||
| IGVM_OBJECT= |
There was a problem hiding this comment.
I guess it's a left over. Can we remove this line (67)?
| @@ -103,7 +115,8 @@ $SUDO_CMD \ | |||
| -cpu EPYC-v4 \ | |||
| -machine $MACHINE \ | |||
| -object $MEMORY \ | |||
| -object sev-snp-guest,id=sev0,cbitpos=$C_BIT_POS,reduced-phys-bits=1,init-flags=5,igvm-file=$IGVM \ | |||
| -object sev-snp-guest,id=sev0,cbitpos=$C_BIT_POS,reduced-phys-bits=1$INIT_FLAGS$IGVM_FILE \ | |||
There was a problem hiding this comment.
Not a strong opinion, but what about defining an SEV_SNP_OBJECT and assign it for each QEMU version, so it's a bit clear also for the reader the differences between the versions?
I mean something like this:
if (( QEMU_MAJOR >= 9 )); then
...
SEV_SNP_OBJECT="-object sev-snp-guest,id=sev0,cbitpos=$C_BIT_POS,reduced-phys-bits=1"
elif (( (QEMU_MAJOR > 8) || ((QEMU_MAJOR == 8) && (QEMU_MINOR >= 2)) )); then
...
SEV_SNP_OBJECT="-object sev-snp-guest,id=sev0,cbitpos=$C_BIT_POS,reduced-phys-bits=1,init-flags=5,igvm-file=$IGVM"
...
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.
This PR consists of commits that are required to launch and run tests when hosted on a system with the following kernel and QEMU versions:
Linux-6.10-rc2:
coconut-svsm/linux#6
QEMU 9.0:
coconut-svsm/qemu#15
The intercept behaviour of some MSRs has changed since the previous COCONUT linux version, hence tests needed to be updated. Also, the QEMU command line has changed requiring a change in the launch script. The script is still compatible with early versions of QEMU/kernel.
I've also added an extra commit that fixes failing test-in-svsm cases when run on a Genoa system.