Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB0D4C433DB for ; Tue, 9 Feb 2021 03:29:00 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 47CC964EAC for ; Tue, 9 Feb 2021 03:29:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 47CC964EAC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id D962F4B6E1; Mon, 8 Feb 2021 22:28:59 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@redhat.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NBmJRhgUvjUA; Mon, 8 Feb 2021 22:28:58 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 98D1F4B6FB; Mon, 8 Feb 2021 22:28:58 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id A7E984B6BE for ; Mon, 8 Feb 2021 22:28:56 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2h-Cl9vak6x9 for ; Mon, 8 Feb 2021 22:28:55 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mm01.cs.columbia.edu (Postfix) with ESMTP id B1D0C4B4B5 for ; Mon, 8 Feb 2021 22:28:55 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612841335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yqVkWw9Llof1+jCCBosWETtvA3U2Y4FFXmc+bQoLU0s=; b=cDEDtS1ih8VV9ebPmLdWr8JNTr7kQQxXOrkbZeMZYjIvB+4KCdaqptSU70GC4e8KKohc4T 49gnkdvj5SwnLQovVw/n/wreSQ6CSv4I+wurxUoi3hPSBrWmF4GhyCYslG4wy+h1mmJiQO qq8IhyTNsHsZwhvy6+71KFW1O2BqbTg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-272-fajxzvQPO0yLbqn-i8l5Qw-1; Mon, 08 Feb 2021 22:28:54 -0500 X-MC-Unique: fajxzvQPO0yLbqn-i8l5Qw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EDC5192D789; Tue, 9 Feb 2021 03:28:52 +0000 (UTC) Received: from gshan.redhat.com (vpn2-54-26.bne.redhat.com [10.64.54.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 57E8C19C66; Tue, 9 Feb 2021 03:28:49 +0000 (UTC) From: Gavin Shan To: kvmarm@lists.cs.columbia.edu Subject: [PATCH v2 15/21] KVM: arm64: Support SDEI event notifier Date: Tue, 9 Feb 2021 11:27:27 +0800 Message-Id: <20210209032733.99996-16-gshan@redhat.com> In-Reply-To: <20210209032733.99996-1-gshan@redhat.com> References: <20210209032733.99996-1-gshan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Cc: maz@kernel.org, linux-kernel@vger.kernel.org, shan.gavin@gmail.com, Jonathan.Cameron@huawei.com, pbonzini@redhat.com, will@kernel.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu The owner of the SDEI event, like asynchronous page fault, need know the state of injected SDEI event. This supports SDEI event state updating by introducing notifier mechanism. It's notable the notifier (handler) should be capable of migration. Signed-off-by: Gavin Shan --- arch/arm64/include/asm/kvm_sdei.h | 12 +++++++ arch/arm64/include/uapi/asm/kvm_sdei.h | 1 + arch/arm64/kvm/sdei.c | 45 +++++++++++++++++++++++++- 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/kvm_sdei.h b/arch/arm64/include/asm/kvm_sdei.h index 7f5f5ad689e6..19f2d9b91f85 100644 --- a/arch/arm64/include/asm/kvm_sdei.h +++ b/arch/arm64/include/asm/kvm_sdei.h @@ -16,6 +16,16 @@ #include #include +struct kvm_vcpu; + +typedef void (*kvm_sdei_notifier)(struct kvm_vcpu *vcpu, + unsigned long num, + unsigned int state); +enum { + KVM_SDEI_NOTIFY_DELIVERED, + KVM_SDEI_NOTIFY_COMPLETED, +}; + struct kvm_sdei_event { struct kvm_sdei_event_state state; struct kvm *kvm; @@ -112,6 +122,8 @@ KVM_SDEI_FLAG_FUNC(enabled) void kvm_sdei_init_vm(struct kvm *kvm); void kvm_sdei_create_vcpu(struct kvm_vcpu *vcpu); int kvm_sdei_hypercall(struct kvm_vcpu *vcpu); +int kvm_sdei_register_notifier(struct kvm *kvm, unsigned long num, + kvm_sdei_notifier notifier); void kvm_sdei_deliver(struct kvm_vcpu *vcpu); void kvm_sdei_destroy_vcpu(struct kvm_vcpu *vcpu); void kvm_sdei_destroy_vm(struct kvm *kvm); diff --git a/arch/arm64/include/uapi/asm/kvm_sdei.h b/arch/arm64/include/uapi/asm/kvm_sdei.h index 9dbda2fb457e..20ad724f63c8 100644 --- a/arch/arm64/include/uapi/asm/kvm_sdei.h +++ b/arch/arm64/include/uapi/asm/kvm_sdei.h @@ -20,6 +20,7 @@ struct kvm_sdei_event_state { uint8_t type; uint8_t signaled; uint8_t priority; + uint64_t notifier; }; struct kvm_sdei_kvm_event_state { diff --git a/arch/arm64/kvm/sdei.c b/arch/arm64/kvm/sdei.c index 1e8e213c9d70..5f7a37dcaa77 100644 --- a/arch/arm64/kvm/sdei.c +++ b/arch/arm64/kvm/sdei.c @@ -314,9 +314,11 @@ static unsigned long kvm_sdei_hypercall_complete(struct kvm_vcpu *vcpu, struct kvm *kvm = vcpu->kvm; struct kvm_sdei_kvm *ksdei = kvm->arch.sdei; struct kvm_sdei_vcpu *vsdei = vcpu->arch.sdei; + struct kvm_sdei_event *kse = NULL; struct kvm_sdei_kvm_event *kske = NULL; struct kvm_sdei_vcpu_event *ksve = NULL; struct kvm_sdei_vcpu_regs *regs; + kvm_sdei_notifier notifier; unsigned long ret = SDEI_SUCCESS; int index; @@ -349,6 +351,13 @@ static unsigned long kvm_sdei_hypercall_complete(struct kvm_vcpu *vcpu, *vcpu_cpsr(vcpu) = regs->pstate; *vcpu_pc(vcpu) = regs->pc; + /* Notifier */ + kske = ksve->kske; + kse = kske->kse; + notifier = (kvm_sdei_notifier)(kse->state.notifier); + if (notifier) + notifier(vcpu, kse->state.num, KVM_SDEI_NOTIFY_COMPLETED); + /* Inject interrupt if needed */ if (resume) kvm_inject_irq(vcpu); @@ -358,7 +367,6 @@ static unsigned long kvm_sdei_hypercall_complete(struct kvm_vcpu *vcpu, * event state as it's not destroyed because of the reference * count. */ - kske = ksve->kske; ksve->state.refcount--; kske->state.refcount--; if (!ksve->state.refcount) { @@ -746,6 +754,35 @@ int kvm_sdei_hypercall(struct kvm_vcpu *vcpu) return 1; } +int kvm_sdei_register_notifier(struct kvm *kvm, + unsigned long num, + kvm_sdei_notifier notifier) +{ + struct kvm_sdei_kvm *ksdei = kvm->arch.sdei; + struct kvm_sdei_event *kse = NULL; + int ret = 0; + + if (!ksdei) { + ret = -EPERM; + goto out; + } + + spin_lock(&ksdei->lock); + + kse = kvm_sdei_find_event(kvm, num); + if (!kse) { + ret = -EINVAL; + goto unlock; + } + + kse->state.notifier = (unsigned long)notifier; + +unlock: + spin_unlock(&ksdei->lock); +out: + return ret; +} + void kvm_sdei_deliver(struct kvm_vcpu *vcpu) { struct kvm *kvm = vcpu->kvm; @@ -755,6 +792,7 @@ void kvm_sdei_deliver(struct kvm_vcpu *vcpu) struct kvm_sdei_kvm_event *kske = NULL; struct kvm_sdei_vcpu_event *ksve = NULL; struct kvm_sdei_vcpu_regs *regs = NULL; + kvm_sdei_notifier notifier; unsigned long pstate; int index = 0; @@ -826,6 +864,11 @@ void kvm_sdei_deliver(struct kvm_vcpu *vcpu) *vcpu_cpsr(vcpu) = pstate; *vcpu_pc(vcpu) = kske->state.entries[index]; + /* Notifier */ + notifier = (kvm_sdei_notifier)(kse->state.notifier); + if (notifier) + notifier(vcpu, kse->state.num, KVM_SDEI_NOTIFY_DELIVERED); + unlock: spin_unlock(&vsdei->lock); } -- 2.23.0 _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm