https://github.com/torvalds/linux
Revision 9fd588772636bcbe48669d880efa2e1cc0575ebd authored by Paolo Bonzini on 19 June 2019, 14:52:27 UTC, committed by Paolo Bonzini on 20 June 2019, 16:05:13 UTC
Commit 332d079735f5 ("KVM: nVMX: KVM_SET_NESTED_STATE - Tear down old EVMCS
state before setting new state", 2019-05-02) broke evmcs_test because the
eVMCS setup must be performed even if there is no VMXON region defined,
as long as the eVMCS bit is set in the assist page.
While the simplest possible fix would be to add a check on
kvm_state->flags & KVM_STATE_NESTED_EVMCS in the initial "if" that
covers kvm_state->hdr.vmx.vmxon_pa == -1ull, that is quite ugly.
Instead, this patch moves checks earlier in the function and
conditionalizes them on kvm_state->hdr.vmx.vmxon_pa, so that
vmx_set_nested_state always goes through vmx_leave_nested
and nested_enable_evmcs.
Fixes: 332d079735f5 ("KVM: nVMX: KVM_SET_NESTED_STATE - Tear down old EVMCS state before setting new state")
Cc: Aaron Lewis <aaronlewis@google.com>
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent 9dba988
Tip revision: 9fd588772636bcbe48669d880efa2e1cc0575ebd authored by Paolo Bonzini on 19 June 2019, 14:52:27 UTC
KVM: nVMX: reorganize initial steps of vmx_set_nested_state
KVM: nVMX: reorganize initial steps of vmx_set_nested_state
Tip revision: 9fd5887
| File | Mode | Size |
|---|---|---|
| Documentation | ||
| LICENSES | ||
| arch | ||
| block | ||
| certs | ||
| crypto | ||
| drivers | ||
| fs | ||
| include | ||
| init | ||
| ipc | ||
| kernel | ||
| lib | ||
| mm | ||
| net | ||
| samples | ||
| scripts | ||
| security | ||
| sound | ||
| tools | ||
| usr | ||
| virt | ||
| .clang-format | -rw-r--r-- | 14.6 KB |
| .cocciconfig | -rw-r--r-- | 59 bytes |
| .get_maintainer.ignore | -rw-r--r-- | 71 bytes |
| .gitattributes | -rw-r--r-- | 30 bytes |
| .gitignore | -rw-r--r-- | 1.6 KB |
| .mailmap | -rw-r--r-- | 11.9 KB |
| COPYING | -rw-r--r-- | 423 bytes |
| CREDITS | -rw-r--r-- | 96.9 KB |
| Kbuild | -rw-r--r-- | 1.5 KB |
| Kconfig | -rw-r--r-- | 563 bytes |
| MAINTAINERS | -rw-r--r-- | 498.9 KB |
| Makefile | -rw-r--r-- | 58.8 KB |
| README | -rw-r--r-- | 727 bytes |
Computing file changes ...
