x86: set ApicId in cpuid for each vcpu #5512
Merged
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
|
I took a build of @jongwu's branch and it appears to address the issue. I am no longer hitting this with the same repro conditions described in the issue. Summary: |
rbradford
reviewed
Jun 15, 2023
| let cpuid = core::arch::x86_64::__cpuid(1); | ||
| cpu_ebx = cpuid.ebx | ||
| } | ||
| cpu_ebx &= 0xffffff; |
There was a problem hiding this comment.
Can simplify this a bit...
let mut cpu_ebx = { unsafe core::arch::x86_64::__cpuid(1) }.ebx;
There was a problem hiding this comment.
Done, thanks @rbradford
rbradford
approved these changes
Jun 15, 2023
|
After this has landed, one can see then whether the Windows guest integration tests can be restored on CI. Also, for AMD, encoding the APIC ID into the topology is required, so this value set here could be probably reused at some other place. Thanks |
Program the APIC ID (CPUID leaf 0x1 EBX) with the CPU id. This resolves an issue where the EDKII firmware expects the APIC ID to vary per-CPU. Fixes: cloud-hypervisor#5475 Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
likebreath
approved these changes
Jun 15, 2023
This was referenced Jun 30, 2023
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.
When start clh from edk2 with vcpu number larger than 2, edk2 will crash at Ap initialization. The root cause is that when get ApicId from cpuid, it returns a wrong value that ApicId is the same for each Ap. Further more, stack selection depends on ApicId, that leads to all Aps share the same stack space.
Explicitly set ApicId in cpuid for each vcpu can solve this issue.
Fixes: #5475