This is a note to let you know that I've just added the patch titled
KVM: x86: nSVM: leave nested mode on vCPU free
to the 6.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
kvm-x86-nsvm-leave-nested-mode-on-vcpu-free.patch
and it can be found in the queue-6.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 917401f26a6af5756d89b550a8e1bd50cf42b07e Mon Sep 17 00:00:00 2001
From: Maxim Levitsky <mlevitsk@xxxxxxxxxx>
Date: Thu, 3 Nov 2022 16:13:43 +0200
Subject: KVM: x86: nSVM: leave nested mode on vCPU free
From: Maxim Levitsky <mlevitsk@xxxxxxxxxx>
commit 917401f26a6af5756d89b550a8e1bd50cf42b07e upstream.
If the VM was terminated while nested, we free the nested state
while the vCPU still is in nested mode.
Soon a warning will be added for this condition.
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Maxim Levitsky <mlevitsk@xxxxxxxxxx>
Message-Id: <20221103141351.50662-2-mlevitsk@xxxxxxxxxx>
Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/kvm/svm/svm.c | 1 +
1 file changed, 1 insertion(+)
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -1440,6 +1440,7 @@ static void svm_vcpu_free(struct kvm_vcp
*/
svm_clear_current_vmcb(svm->vmcb);
+ svm_leave_nested(vcpu);
svm_free_nested(svm);
sev_free_vcpu(vcpu);
Patches currently in stable-queue which might be from mlevitsk@xxxxxxxxxx are
queue-6.0/kvm-x86-nsvm-harden-svm_free_nested-against-freeing-vmcb02-while-still-in-use.patch
queue-6.0/kvm-x86-forcibly-leave-nested-mode-on-vcpu-reset.patch
queue-6.0/kvm-x86-nsvm-leave-nested-mode-on-vcpu-free.patch
queue-6.0/kvm-x86-add-kvm_leave_nested.patch
queue-6.0/kvm-x86-remove-exit_int_info-warning-in-svm_handle_exit.patch
