This repository has been archived by the owner on Jan 28, 2023. It is now read-only.
Fix incorrect interruptibility_state before vmx entry. #233
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
hyuan3
approved these changes
Aug 14, 2019
wcwang
reviewed
Aug 16, 2019
core/vcpu.c
Outdated
| if (vmx(vcpu, interruptibility_state).raw & | ||
| GUEST_INTRSTAT_STI_BLOCKING) { | ||
| vmx(vcpu, interruptibility_state).raw &= | ||
| ~GUEST_INTRSTAT_STI_BLOCKING; |
There was a problem hiding this comment.
Use 8-space indent for long line break, while the 4-space indent is for normal line wrap.
|
|
||
| if (!(state->_eflags & EFLAGS_IF)) | ||
| return 1; | ||
|
|
||
| intr_blocking |= GUEST_INTRSTAT_STI_BLOCKING; | ||
| intr_blocking |= GUEST_INTRSTAT_SS_BLOCKING; |
There was a problem hiding this comment.
intr_blocking = GUEST_INTRSTAT_STI_BLOCKING | GUEST_INTRSTAT_SS_BLOCKING;
There was a problem hiding this comment.
I code in this way to prevent line exceeding 80 chars. And possibly more bits will be OR-ed.
According to SDM 26.3.1.5 Checks on Guest Non-Register State, Bit 0 (blocking by STI) must be 0 if the IF flag (bit 9) is 0 in the RFLAGS field. There is an issue during snapshot loading, that IF and interruptibility_state don't pass the checks, which will result in VM-entry failure due to invalid guest state. This WA correct the bit so that vmx entry check could pass. The normal interruptibility_state update is done when advancing the IP. In future, proper approach is expected to replace the WA. Signed-off-by: Colin Xu <colin.xu@intel.com>
wcwang
approved these changes
Aug 16, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
According to SDM 26.3.1.5 Checks on Guest Non-Register State, Bit 0
(blocking by STI) must be 0 if the IF flag (bit 9) is 0 in the RFLAGS
field.
There is an issue during snapshot loading, that IF and
interruptibility_state don't pass the checks, which will result in
VM-entry failure due to invalid guest state.
This WA correct the bit so that vmx entry check could pass. The normal
interruptibility_state update is done when advancing the IP.
In future, proper approach is expected to replace the WA.
Signed-off-by: Colin Xu colin.xu@intel.com