From: Santosh Shukla <santosh.shukla@amd.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Sean Christopherson <seanjc@google.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
Tom Lendacky <thomas.lendacky@amd.com>, <kvm@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <santosh.shukla@amd.com>,
<mlevitsk@redhat.com>, <mail@maciej.szmigiero.name>
Subject: [PATCHv4 5/8] KVM: SVM: Add VNMI support in inject_nmi
Date: Mon, 29 Aug 2022 15:38:47 +0530 [thread overview]
Message-ID: <20220829100850.1474-6-santosh.shukla@amd.com> (raw)
In-Reply-To: <20220829100850.1474-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 810b93774a95..4aa7606a9aa2 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -3479,7 +3479,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
next prev parent reply other threads:[~2022-08-29 10:11 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-29 10:08 [PATCHv4 0/8] Virtual NMI feature Santosh Shukla
2022-08-29 10:08 ` [PATCHv4 1/8] x86/cpu: Add CPUID feature bit for VNMI Santosh Shukla
2022-08-31 23:42 ` Jim Mattson
2022-09-01 12:45 ` Shukla, Santosh
2022-09-01 17:43 ` Jim Mattson
2022-09-05 7:49 ` Shukla, Santosh
2022-08-29 10:08 ` [PATCHv4 2/8] KVM: SVM: Add VNMI bit definition Santosh Shukla
2022-08-29 10:08 ` [PATCHv4 3/8] KVM: SVM: Add VNMI support in get/set_nmi_mask Santosh Shukla
2022-08-29 10:08 ` [PATCHv4 4/8] KVM: SVM: Report NMI not allowed when Guest busy handling VNMI Santosh Shukla
2022-08-29 10:08 ` Santosh Shukla [this message]
2022-08-29 10:08 ` [PATCHv4 6/8] KVM: nSVM: implement nested VNMI Santosh Shukla
2022-08-29 10:08 ` [PATCHv4 7/8] KVM: nSVM: emulate VMEXIT_INVALID case for " Santosh Shukla
2022-08-29 10:08 ` [PATCHv4 8/8] KVM: SVM: Enable VNMI feature Santosh Shukla
2022-10-06 18:40 ` [PATCHv4 0/8] Virtual NMI feature Sean Christopherson
2022-10-10 5:46 ` Santosh Shukla
2022-10-10 15:51 ` Sean Christopherson
2022-10-16 5:49 ` Santosh Shukla
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=20220829100850.1474-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;
as well as URLs for NNTP newsgroup(s).