public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Santosh Shukla <santosh.shukla@amd.com>
To: <pbonzini@redhat.com>, <seanjc@google.com>
Cc: <kvm@vger.kernel.org>, <jmattson@google.com>, <joro@8bytes.org>,
	<linux-kernel@vger.kernel.org>, <mail@maciej.szmigiero.name>,
	<mlevitsk@redhat.com>, <thomas.lendacky@amd.com>,
	<vkuznets@redhat.com>
Subject: [PATCHv5 5/8] KVM: SVM: Add VNMI support in inject_nmi
Date: Thu, 27 Oct 2022 14:08:28 +0530	[thread overview]
Message-ID: <20221027083831.2985-6-santosh.shukla@amd.com> (raw)
In-Reply-To: <20221027083831.2985-1-santosh.shukla@amd.com>

Inject the NMI by setting V_NMI in the VMCB interrupt control. processor
will clear V_NMI to acknowledge processing has started and will keep the
V_NMI_MASK set until the processor is done with processing the NMI event.

Also, handle the nmi_l1_to_l2 case such that when it is true then
NMI to be injected originally comes from L1's VMCB12 EVENTINJ field.
So adding a check for that case.

Signed-off-by: Santosh Shukla <santosh.shukla@amd.com>
---
v4:
- Added `nmi_l1_to_l2` check, discussion thread
https://lore.kernel.org/all/bf9e8a9c-5172-b61a-be6e-87a919442fbd@maciej.szmigiero.name/

v3:
- Removed WARN_ON check.

v2:
- Added WARN_ON check for vnmi pending.
- use `get_vnmi_vmcb` to get correct vmcb so to inject vnmi.

 arch/x86/kvm/svm/svm.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 38fa51e0b70f..cf05a41779f3 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -3478,7 +3478,14 @@ static void pre_svm_run(struct kvm_vcpu *vcpu)
 static void svm_inject_nmi(struct kvm_vcpu *vcpu)
 {
 	struct vcpu_svm *svm = to_svm(vcpu);
+	struct vmcb *vmcb = NULL;
 
+	if (is_vnmi_enabled(svm) && !svm->nmi_l1_to_l2) {
+		vmcb = get_vnmi_vmcb(svm);
+		vmcb->control.int_ctl |= V_NMI_PENDING;
+		++vcpu->stat.nmi_injections;
+		return;
+	}
 	svm->vmcb->control.event_inj = SVM_EVTINJ_VALID | SVM_EVTINJ_TYPE_NMI;
 
 	if (svm->nmi_l1_to_l2)
-- 
2.25.1


  parent reply	other threads:[~2022-10-27  8:42 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-27  8:38 [PATCHv5 0/8] Virtual NMI feature Santosh Shukla
2022-10-27  8:38 ` [PATCHv5 1/8] x86/cpu: Add CPUID feature bit for VNMI Santosh Shukla
2022-10-27  8:38 ` [PATCHv5 2/8] KVM: SVM: Add VNMI bit definition Santosh Shukla
2022-10-27  8:38 ` [PATCHv5 3/8] KVM: SVM: Add VNMI support in get/set_nmi_mask Santosh Shukla
2022-10-27  8:38 ` [PATCHv5 4/8] KVM: SVM: Report NMI not allowed when Guest busy handling VNMI Santosh Shukla
2022-10-27  8:38 ` Santosh Shukla [this message]
2022-10-27  8:38 ` [PATCHv5 6/8] KVM: nSVM: implement nested VNMI Santosh Shukla
2022-10-27  8:38 ` [PATCHv5 7/8] KVM: nSVM: emulate VMEXIT_INVALID case for " Santosh Shukla
2022-10-27  8:38 ` [PATCHv5 8/8] KVM: SVM: Enable VNMI feature Santosh Shukla
2022-11-14  8:02 ` [PATCHv5 0/8] Virtual NMI feature Santosh Shukla
2022-11-14 14:31   ` Maxim Levitsky
2022-11-16  5:40     ` Santosh Shukla
2022-11-16  9:21       ` Maxim Levitsky
2022-11-16 15:44         ` Santosh Shukla
2022-11-16 15:55           ` Tom Lendacky
2022-11-16 16:59             ` Sean Christopherson

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=20221027083831.2985-6-santosh.shukla@amd.com \
    --to=santosh.shukla@amd.com \
    --cc=jmattson@google.com \
    --cc=joro@8bytes.org \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mail@maciej.szmigiero.name \
    --cc=mlevitsk@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=seanjc@google.com \
    --cc=thomas.lendacky@amd.com \
    --cc=vkuznets@redhat.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