diff options
| author | Maxim Levitsky <mlevitsk@redhat.com> | 2020-08-27 18:27:19 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-12 18:20:53 +0200 |
| commit | 772b81bb2f9b191a046ba7bba1f232eb7b109b84 (patch) | |
| tree | cd17debceb45b43f8110051fd3e6ec4b404f3280 /arch | |
| parent | SVM: nSVM: correctly restore GIF on vmexit from nesting after migration (diff) | |
| download | linux-772b81bb2f9b191a046ba7bba1f232eb7b109b84.tar.xz linux-772b81bb2f9b191a046ba7bba1f232eb7b109b84.zip | |
SVM: nSVM: setup nested msr permission bitmap on nested state load
This code was missing and was forcing the L2 run with L1's msr
permission bitmap
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20200827162720.278690-3-mlevitsk@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/svm/nested.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 95fdf068fe4c..e90bc436f584 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -1134,6 +1134,9 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu, load_nested_vmcb_control(svm, &ctl); nested_prepare_vmcb_control(svm); + if (!nested_svm_vmrun_msrpm(svm)) + return -EINVAL; + out_set_gif: svm_set_gif(svm, !!(kvm_state->flags & KVM_STATE_NESTED_GIF_SET)); return 0; |