From: Gavin Shan <gshan@redhat.com>
To: kvmarm@lists.cs.columbia.edu
Cc: linux-kernel@vger.kernel.org, maz@kernel.org, will@kernel.org,
pbonzini@redhat.com, james.morse@arm.com, mark.rutland@arm.com,
Jonathan.Cameron@huawei.com, shan.gavin@gmail.com
Subject: [PATCH v3 19/21] KVM: arm64: Support SDEI event cancellation
Date: Fri, 7 May 2021 16:31:22 +0800 [thread overview]
Message-ID: <20210507083124.43347-20-gshan@redhat.com> (raw)
In-Reply-To: <20210507083124.43347-1-gshan@redhat.com>
The injected SDEI event is to send notification to guest. The SDEI
event might not be needed after it's injected. This introduces API
to support cancellation on the injected SDEI event if it's not fired
to the guest yet.
This mechanism will be needed when we're going to support asynchronous
page fault.
Signed-off-by: Gavin Shan <gshan@redhat.com>
---
arch/arm64/include/asm/kvm_sdei.h | 1 +
arch/arm64/kvm/sdei.c | 49 +++++++++++++++++++++++++++++++
2 files changed, 50 insertions(+)
diff --git a/arch/arm64/include/asm/kvm_sdei.h b/arch/arm64/include/asm/kvm_sdei.h
index 51087fe971ba..353744c7bad9 100644
--- a/arch/arm64/include/asm/kvm_sdei.h
+++ b/arch/arm64/include/asm/kvm_sdei.h
@@ -126,6 +126,7 @@ int kvm_sdei_register_notifier(struct kvm *kvm, unsigned long num,
kvm_sdei_notifier notifier);
int kvm_sdei_inject(struct kvm_vcpu *vcpu,
unsigned long num, bool immediate);
+int kvm_sdei_cancel(struct kvm_vcpu *vcpu, unsigned long num);
void kvm_sdei_deliver(struct kvm_vcpu *vcpu);
long kvm_sdei_vm_ioctl(struct kvm *kvm, unsigned long arg);
long kvm_sdei_vcpu_ioctl(struct kvm_vcpu *vcpu, unsigned long arg);
diff --git a/arch/arm64/kvm/sdei.c b/arch/arm64/kvm/sdei.c
index 7c2789cd1421..4f5a582daa97 100644
--- a/arch/arm64/kvm/sdei.c
+++ b/arch/arm64/kvm/sdei.c
@@ -907,6 +907,55 @@ int kvm_sdei_inject(struct kvm_vcpu *vcpu,
return ret;
}
+int kvm_sdei_cancel(struct kvm_vcpu *vcpu, unsigned long num)
+{
+ struct kvm *kvm = vcpu->kvm;
+ struct kvm_sdei_kvm *ksdei = kvm->arch.sdei;
+ struct kvm_sdei_vcpu *vsdei = vcpu->arch.sdei;
+ struct kvm_sdei_kvm_event *kske = NULL;
+ struct kvm_sdei_vcpu_event *ksve = NULL;
+ int ret = 0;
+
+ if (!(ksdei && vsdei)) {
+ ret = -EPERM;
+ goto out;
+ }
+
+ /* Find the vCPU event */
+ spin_lock(&vsdei->lock);
+ ksve = kvm_sdei_find_vcpu_event(vcpu, num);
+ if (!ksve) {
+ ret = -EINVAL;
+ goto unlock;
+ }
+
+ /* Event can't be cancelled if it has been delivered */
+ if (ksve->state.refcount <= 1 &&
+ (vsdei->critical_event == ksve ||
+ vsdei->normal_event == ksve)) {
+ ret = -EINPROGRESS;
+ goto unlock;
+ }
+
+ /* Free the vCPU event if necessary */
+ kske = ksve->kske;
+ ksve->state.refcount--;
+ if (!ksve->state.refcount) {
+ list_del(&ksve->link);
+ kfree(ksve);
+ }
+
+unlock:
+ spin_unlock(&vsdei->lock);
+ if (kske) {
+ spin_lock(&ksdei->lock);
+ kske->state.refcount--;
+ spin_unlock(&ksdei->lock);
+ }
+out:
+ return ret;
+}
+
void kvm_sdei_deliver(struct kvm_vcpu *vcpu)
{
struct kvm *kvm = vcpu->kvm;
--
2.23.0
next prev parent reply other threads:[~2021-05-07 6:33 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-07 8:31 [PATCH v3 00/21] Support SDEI Virtualization Gavin Shan
2021-05-07 8:31 ` [PATCH v3 01/21] KVM: arm64: Introduce template for inline functions Gavin Shan
2021-05-07 8:31 ` [PATCH v3 02/21] KVM: arm64: Add SDEI virtualization infrastructure Gavin Shan
2021-05-07 8:31 ` [PATCH v3 03/21] KVM: arm64: Support SDEI_VERSION hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 04/21] KVM: arm64: Support SDEI_EVENT_REGISTER hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 05/21] KVM: arm64: Support SDEI_EVENT_{ENABLE, DISABLE} hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 06/21] KVM: arm64: Support SDEI_EVENT_CONTEXT hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 07/21] KVM: arm64: Support SDEI_EVENT_UNREGISTER hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 08/21] KVM: arm64: Support SDEI_EVENT_STATUS hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 09/21] KVM: arm64: Support SDEI_EVENT_GET_INFO hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 10/21] KVM: arm64: Support SDEI_EVENT_ROUTING_SET hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 11/21] KVM: arm64: Support SDEI_PE_{MASK, UNMASK} hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 12/21] KVM: arm64: Support SDEI_{PRIVATE, SHARED}_RESET hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 13/21] KVM: arm64: Impment SDEI event delivery Gavin Shan
2021-05-07 8:31 ` [PATCH v3 14/21] KVM: arm64: Support SDEI_EVENT_{COMPLETE, COMPLETE_AND_RESUME} hypercall Gavin Shan
2021-05-07 8:31 ` [PATCH v3 15/21] KVM: arm64: Support SDEI event notifier Gavin Shan
2021-05-07 8:31 ` [PATCH v3 16/21] KVM: arm64: Support SDEI ioctl commands on VM Gavin Shan
2021-05-07 8:31 ` [PATCH v3 17/21] KVM: arm64: Support SDEI ioctl commands on vCPU Gavin Shan
2021-05-07 8:31 ` [PATCH v3 18/21] KVM: arm64: Support SDEI event injection Gavin Shan
2021-05-07 8:31 ` Gavin Shan [this message]
2021-05-07 8:31 ` [PATCH v3 20/21] KVM: arm64: Export SDEI capability Gavin Shan
2021-05-07 8:31 ` [PATCH v3 21/21] KVM: selftests: Add SDEI test case Gavin Shan
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=20210507083124.43347-20-gshan@redhat.com \
--to=gshan@redhat.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=james.morse@arm.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=pbonzini@redhat.com \
--cc=shan.gavin@gmail.com \
--cc=will@kernel.org \
/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
all inboxes | Powered by JetHome®