From: Liam Merwick <liam.merwick@oracle.com>
To: Maxim Levitsky <mlevitsk@redhat.com>, kvm@vger.kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-kernel@vger.kernel.org,
Chenyi Qiang <chenyi.qiang@intel.com>,
Yang Zhong <yang.zhong@intel.com>,
x86@kernel.org, Shuah Khan <shuah@kernel.org>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Colton Lewis <coltonlewis@google.com>,
Borislav Petkov <bp@alien8.de>, Peter Xu <peterx@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Jim Mattson <jmattson@google.com>,
linux-kselftest@vger.kernel.org, Ingo Molnar <mingo@redhat.com>,
Wei Wang <wei.w.wang@intel.com>,
David Matlack <dmatlack@google.com>,
Liam Merwick <liam.merwick@oracle.com>
Subject: Re: [PATCH v2 7/9] KVM: x86: allow L1 to not intercept triple fault
Date: Mon, 21 Nov 2022 16:33:41 +0000 [thread overview]
Message-ID: <ecaf1315-5880-9286-2f0b-93135a0cc7c8@oracle.com> (raw)
In-Reply-To: <20221103141351.50662-8-mlevitsk@redhat.com>
On 03/11/2022 14:13, Maxim Levitsky wrote:
> This is SVM correctness fix - although a sane L1 would intercept
> SHUTDOWN event, it doesn't have to, so we have to honour this.
>
> Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
> ---
> arch/x86/kvm/svm/nested.c | 6 ++++++
> arch/x86/kvm/vmx/nested.c | 1 +
> arch/x86/kvm/x86.c | 11 ++++++-----
> 3 files changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
> index bcc4f6620f8aec..3aa9184d1e4ed7 100644
> --- a/arch/x86/kvm/svm/nested.c
> +++ b/arch/x86/kvm/svm/nested.c
> @@ -1092,6 +1092,12 @@ int nested_svm_vmexit(struct vcpu_svm *svm)
>
> static void nested_svm_triple_fault(struct kvm_vcpu *vcpu)
> {
> + struct vcpu_svm *svm = to_svm(vcpu);
> +
> + if (!vmcb12_is_intercept(&svm->nested.ctl, INTERCEPT_SHUTDOWN))
> + return;
> +
> + kvm_clear_request(KVM_REQ_TRIPLE_FAULT, vcpu);
> nested_svm_simple_vmexit(to_svm(vcpu), SVM_EXIT_SHUTDOWN);
You could replace 'to_svm(vcpu)' with 'svm' here
But LGTM either way.
Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
> }
>
> diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
> index 1ebe141a0a015f..7924dea9367813 100644
> --- a/arch/x86/kvm/vmx/nested.c
> +++ b/arch/x86/kvm/vmx/nested.c
> @@ -4855,6 +4855,7 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 vm_exit_reason,
>
> static void nested_vmx_triple_fault(struct kvm_vcpu *vcpu)
> {
> + kvm_clear_request(KVM_REQ_TRIPLE_FAULT, vcpu);
> nested_vmx_vmexit(vcpu, EXIT_REASON_TRIPLE_FAULT, 0, 0);
> }
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 3fd900504e683b..f0a0102a78f5c3 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -9741,7 +9741,7 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu)
>
> int kvm_check_nested_events(struct kvm_vcpu *vcpu)
> {
> - if (kvm_check_request(KVM_REQ_TRIPLE_FAULT, vcpu)) {
> + if (kvm_test_request(KVM_REQ_TRIPLE_FAULT, vcpu)) {
> kvm_x86_ops.nested_ops->triple_fault(vcpu);
> return 1;
> }
> @@ -10255,15 +10255,16 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
> r = 0;
> goto out;
> }
> - if (kvm_check_request(KVM_REQ_TRIPLE_FAULT, vcpu)) {
> - if (is_guest_mode(vcpu)) {
> + if (kvm_test_request(KVM_REQ_TRIPLE_FAULT, vcpu)) {
> + if (is_guest_mode(vcpu))
> kvm_x86_ops.nested_ops->triple_fault(vcpu);
> - } else {
> +
> + if (kvm_check_request(KVM_REQ_TRIPLE_FAULT, vcpu)) {
> vcpu->run->exit_reason = KVM_EXIT_SHUTDOWN;
> vcpu->mmio_needed = 0;
> r = 0;
> - goto out;
> }
> + goto out;
> }
> if (kvm_check_request(KVM_REQ_APF_HALT, vcpu)) {
> /* Page is swapped out. Do synthetic halt */
next prev parent reply other threads:[~2022-11-21 16:34 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-03 14:13 [PATCH v2 0/9] nSVM: Security and correctness fixes Maxim Levitsky
2022-11-03 14:13 ` [PATCH v2 1/9] KVM: x86: nSVM: leave nested mode on vCPU free Maxim Levitsky
2022-11-21 16:30 ` Liam Merwick
2022-11-03 14:13 ` [PATCH v2 2/9] KVM: x86: nSVM: harden svm_free_nested against freeing vmcb02 while still in use Maxim Levitsky
2022-11-21 16:30 ` Liam Merwick
2022-11-03 14:13 ` [PATCH v2 3/9] KVM: x86: add kvm_leave_nested Maxim Levitsky
2022-11-21 16:31 ` Liam Merwick
2022-11-03 14:13 ` [PATCH v2 4/9] KVM: x86: forcibly leave nested mode on vCPU reset Maxim Levitsky
2022-11-21 16:31 ` Liam Merwick
2022-11-03 14:13 ` [PATCH v2 5/9] KVM: selftests: move idt_entry to header Maxim Levitsky
2022-11-21 16:32 ` Liam Merwick
2022-11-03 14:13 ` [PATCH v2 6/9] kvm: selftests: add svm nested shutdown test Maxim Levitsky
2022-11-03 14:28 ` Maxim Levitsky
2022-11-21 16:33 ` Liam Merwick
2022-11-03 14:13 ` [PATCH v2 7/9] KVM: x86: allow L1 to not intercept triple fault Maxim Levitsky
2022-11-21 16:33 ` Liam Merwick [this message]
2022-11-03 14:13 ` [PATCH v2 8/9] KVM: selftests: add svm part to triple_fault_test Maxim Levitsky
2022-11-21 16:34 ` Liam Merwick
2022-11-03 14:13 ` [PATCH v2 9/9] KVM: x86: remove exit_int_info warning in svm_handle_exit Maxim Levitsky
2022-11-06 15:53 ` Liam Merwick
2022-11-09 9:15 ` Maxim Levitsky
2022-11-21 16:34 ` Liam Merwick
2022-11-15 14:55 ` [PATCH v2 0/9] nSVM: Security and correctness fixes Maxim Levitsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ecaf1315-5880-9286-2f0b-93135a0cc7c8@oracle.com \
--to=liam.merwick@oracle.com \
--cc=bp@alien8.de \
--cc=chenyi.qiang@intel.com \
--cc=coltonlewis@google.com \
--cc=dave.hansen@linux.intel.com \
--cc=dmatlack@google.com \
--cc=hpa@zytor.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=mlevitsk@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=seanjc@google.com \
--cc=shuah@kernel.org \
--cc=tglx@linutronix.de \
--cc=wei.w.wang@intel.com \
--cc=x86@kernel.org \
--cc=yang.zhong@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).