Received: by 2002:a05:6a10:c7d3:0:0:0:0 with SMTP id h19csp598399pxy; Sat, 14 Aug 2021 17:20:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyGaO3mgHBxfrOd2oM3o115eoImrHSm+uee2QCENnvN6W6CaIaSkLucCQj7FoHmRBWtFKLY X-Received: by 2002:a17:907:990d:: with SMTP id ka13mr9399954ejc.392.1628986829404; Sat, 14 Aug 2021 17:20:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628986829; cv=none; d=google.com; s=arc-20160816; b=hCD+PUvq1+3VQmkxhoaLPvXPqPRzAc29lcLZjd7AUZ6nVOk3ZBdVmF41praHLKt3IK oXqloYTjRLXrQcz36IqMo4Y00i+w98ZOKWWZIqBfR2ennGpoxYh6htitDyHsgkmwpa0J npkLrUlK6CEDhQ0AtsVTc+s2gE2zX0HwoKiGZTYQiaKmvo+MoEBMB0bwwT8FkQUeOz3Y Klznd1gltVraPwpw5x+CYznOqVOhIZXajeNqxmT1RP/MFzhbFNtMm/0Polz0KuY04dPT 0hgBqm5e+4qYtL7ghbKmrWWa9V0J6JyLzX8xrxIZN6zKeZfNpoqsdn7jMkfV5UkSkOor NQnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=AsFZ37U7mxyyzTMhvtoxw3RKDEAuW68Hg4Inpl9RtJo=; b=Gx1ho/S17ilCLIinOkAGtqcP/7A8CJCozQmUhLapllGQxbbTYfrxI29mPpedkbVD5g cO2AcbKEUsyzD3kuIewdQt9D4F3IDhDSLLJ8+puomQG9FTiG29Xs3NU5WLE4wYliK6dH rEG/CEj35Rl4QhrhIe9A32cdzf8nPeTpHFRCv0C1vAxNDEKRK7NVgJfDOciBWJWfSRn5 Hp84YciietZIdHTijmskrKPiK4keTAuKWeOvdme9zhQQ0V7HAw3OPTF1lMf+lVzwnNG4 hFBlMpdmMTqt+iM+GhDKnHj9YV1n81tDsn+01lB6F7wxmJfjv5kpB+znTJfeY0db1/SE f7Gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QafOvmlL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h2si5921831ejd.254.2021.08.14.17.20.06; Sat, 14 Aug 2021 17:20:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QafOvmlL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235546AbhHOAQX (ORCPT + 99 others); Sat, 14 Aug 2021 20:16:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:38120 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235420AbhHOAPy (ORCPT ); Sat, 14 Aug 2021 20:15:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628986524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AsFZ37U7mxyyzTMhvtoxw3RKDEAuW68Hg4Inpl9RtJo=; b=QafOvmlLSWgLlALKfs5BMVjpKMFkxLeFYESROavonU6u0W6UYOO+33Crf7v3RRXtTqqe50 rMIA+Q89B9QzlD2JsjDMrfpL9uekoqbAQw6Ajjn8mvFdDgvxiT6fIsoHDUXWUyKbr1MGAV zftFH2Mfhw+B9r+nMYYyHAx4yoPiE7g= 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-456-8xuUMPOKMlGxN_b-6coc-g-1; Sat, 14 Aug 2021 20:15:23 -0400 X-MC-Unique: 8xuUMPOKMlGxN_b-6coc-g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3820A3639F; Sun, 15 Aug 2021 00:15:22 +0000 (UTC) Received: from gshan.redhat.com (vpn2-54-103.bne.redhat.com [10.64.54.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4526510074E1; Sun, 15 Aug 2021 00:15:15 +0000 (UTC) From: Gavin Shan To: kvmarm@lists.cs.columbia.edu Cc: linux-kernel@vger.kernel.org, james.morse@arm.com, mark.rutland@arm.com, Jonathan.Cameron@huawei.com, will@kernel.org, maz@kernel.org, pbonzini@redhat.com Subject: [PATCH v4 14/21] KVM: arm64: Support SDEI_EVENT_{COMPLETE, COMPLETE_AND_RESUME} hypercall Date: Sun, 15 Aug 2021 08:13:45 +0800 Message-Id: <20210815001352.81927-15-gshan@redhat.com> In-Reply-To: <20210815001352.81927-1-gshan@redhat.com> References: <20210815001352.81927-1-gshan@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This supports SDEI_EVENT_{COMPLETE, COMPLETE_AND_RESUME} hypercall. They are used by the guest to notify the completion of the SDEI event in the handler. The registers are changed according to the SDEI specification as below: * x0 - x17, PC and PState are restored to what values we had in the interrupted context. * If it's SDEI_EVENT_COMPLETE_AND_RESUME hypercall, IRQ exception is injected. Signed-off-by: Gavin Shan --- arch/arm64/include/asm/kvm_emulate.h | 1 + arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/kvm/hyp/exception.c | 7 +++ arch/arm64/kvm/inject_fault.c | 27 ++++++++++ arch/arm64/kvm/sdei.c | 75 ++++++++++++++++++++++++++++ 5 files changed, 111 insertions(+) diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index fd418955e31e..923b4d08ea9a 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -37,6 +37,7 @@ bool kvm_condition_valid32(const struct kvm_vcpu *vcpu); void kvm_skip_instr32(struct kvm_vcpu *vcpu); void kvm_inject_undefined(struct kvm_vcpu *vcpu); +void kvm_inject_irq(struct kvm_vcpu *vcpu); void kvm_inject_vabt(struct kvm_vcpu *vcpu); void kvm_inject_dabt(struct kvm_vcpu *vcpu, unsigned long addr); void kvm_inject_pabt(struct kvm_vcpu *vcpu, unsigned long addr); diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 46f363aa6524..1824f7e1f9ab 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -437,6 +437,7 @@ struct kvm_vcpu_arch { #define KVM_ARM64_EXCEPT_AA32_UND (0 << 9) #define KVM_ARM64_EXCEPT_AA32_IABT (1 << 9) #define KVM_ARM64_EXCEPT_AA32_DABT (2 << 9) +#define KVM_ARM64_EXCEPT_AA32_IRQ (3 << 9) /* For AArch64: */ #define KVM_ARM64_EXCEPT_AA64_ELx_SYNC (0 << 9) #define KVM_ARM64_EXCEPT_AA64_ELx_IRQ (1 << 9) diff --git a/arch/arm64/kvm/hyp/exception.c b/arch/arm64/kvm/hyp/exception.c index 0418399e0a20..ef458207d152 100644 --- a/arch/arm64/kvm/hyp/exception.c +++ b/arch/arm64/kvm/hyp/exception.c @@ -310,6 +310,9 @@ static void kvm_inject_exception(struct kvm_vcpu *vcpu) case KVM_ARM64_EXCEPT_AA32_DABT: enter_exception32(vcpu, PSR_AA32_MODE_ABT, 16); break; + case KVM_ARM64_EXCEPT_AA32_IRQ: + enter_exception32(vcpu, PSR_AA32_MODE_IRQ, 4); + break; default: /* Err... */ break; @@ -320,6 +323,10 @@ static void kvm_inject_exception(struct kvm_vcpu *vcpu) KVM_ARM64_EXCEPT_AA64_EL1): enter_exception64(vcpu, PSR_MODE_EL1h, except_type_sync); break; + case (KVM_ARM64_EXCEPT_AA64_ELx_IRQ | + KVM_ARM64_EXCEPT_AA64_EL1): + enter_exception64(vcpu, PSR_MODE_EL1h, except_type_irq); + break; default: /* * Only EL1_SYNC makes sense so far, EL2_{SYNC,IRQ} diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c index b47df73e98d7..3a8c55867d2f 100644 --- a/arch/arm64/kvm/inject_fault.c +++ b/arch/arm64/kvm/inject_fault.c @@ -66,6 +66,13 @@ static void inject_undef64(struct kvm_vcpu *vcpu) vcpu_write_sys_reg(vcpu, esr, ESR_EL1); } +static void inject_irq64(struct kvm_vcpu *vcpu) +{ + vcpu->arch.flags |= (KVM_ARM64_EXCEPT_AA64_EL1 | + KVM_ARM64_EXCEPT_AA64_ELx_IRQ | + KVM_ARM64_PENDING_EXCEPTION); +} + #define DFSR_FSC_EXTABT_LPAE 0x10 #define DFSR_FSC_EXTABT_nLPAE 0x08 #define DFSR_LPAE BIT(9) @@ -77,6 +84,12 @@ static void inject_undef32(struct kvm_vcpu *vcpu) KVM_ARM64_PENDING_EXCEPTION); } +static void inject_irq32(struct kvm_vcpu *vcpu) +{ + vcpu->arch.flags |= (KVM_ARM64_EXCEPT_AA32_IRQ | + KVM_ARM64_PENDING_EXCEPTION); +} + /* * Modelled after TakeDataAbortException() and TakePrefetchAbortException * pseudocode. @@ -160,6 +173,20 @@ void kvm_inject_undefined(struct kvm_vcpu *vcpu) inject_undef64(vcpu); } +/** + * kvm_inject_irq - inject an IRQ into the guest + * + * It is assumed that this code is called from the VCPU thread and that the + * VCPU therefore is not currently executing guest code. + */ +void kvm_inject_irq(struct kvm_vcpu *vcpu) +{ + if (vcpu_el1_is_32bit(vcpu)) + inject_irq32(vcpu); + else + inject_irq64(vcpu); +} + void kvm_set_sei_esr(struct kvm_vcpu *vcpu, u64 esr) { vcpu_set_vsesr(vcpu, esr & ESR_ELx_ISS_MASK); diff --git a/arch/arm64/kvm/sdei.c b/arch/arm64/kvm/sdei.c index b5d6d1ed3858..1e8e213c9d70 100644 --- a/arch/arm64/kvm/sdei.c +++ b/arch/arm64/kvm/sdei.c @@ -308,6 +308,75 @@ static unsigned long kvm_sdei_hypercall_context(struct kvm_vcpu *vcpu) return ret; } +static unsigned long kvm_sdei_hypercall_complete(struct kvm_vcpu *vcpu, + bool resume) +{ + 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; + struct kvm_sdei_vcpu_regs *regs; + unsigned long ret = SDEI_SUCCESS; + int index; + + /* Sanity check */ + if (!(ksdei && vsdei)) { + ret = SDEI_NOT_SUPPORTED; + goto out; + } + + spin_lock(&vsdei->lock); + if (vsdei->critical_event) { + ksve = vsdei->critical_event; + regs = &vsdei->state.critical_regs; + vsdei->critical_event = NULL; + vsdei->state.critical_num = KVM_SDEI_INVALID_NUM; + } else if (vsdei->normal_event) { + ksve = vsdei->normal_event; + regs = &vsdei->state.normal_regs; + vsdei->normal_event = NULL; + vsdei->state.normal_num = KVM_SDEI_INVALID_NUM; + } else { + ret = SDEI_DENIED; + goto unlock; + } + + /* Restore registers: x0 -> x17, PC, PState */ + for (index = 0; index < ARRAY_SIZE(regs->regs); index++) + vcpu_set_reg(vcpu, index, regs->regs[index]); + + *vcpu_cpsr(vcpu) = regs->pstate; + *vcpu_pc(vcpu) = regs->pc; + + /* Inject interrupt if needed */ + if (resume) + kvm_inject_irq(vcpu); + + /* + * Update state. We needn't take lock in order to update the KVM + * 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) { + list_del(&ksve->link); + kfree(ksve); + } + + /* Make another request if there is pending event */ + if (!(list_empty(&vsdei->critical_events) && + list_empty(&vsdei->normal_events))) + kvm_make_request(KVM_REQ_SDEI, vcpu); + +unlock: + spin_unlock(&vsdei->lock); +out: + return ret; +} + static unsigned long kvm_sdei_hypercall_unregister(struct kvm_vcpu *vcpu) { struct kvm *kvm = vcpu->kvm; @@ -628,7 +697,13 @@ int kvm_sdei_hypercall(struct kvm_vcpu *vcpu) ret = kvm_sdei_hypercall_context(vcpu); break; case SDEI_1_0_FN_SDEI_EVENT_COMPLETE: + has_result = false; + ret = kvm_sdei_hypercall_complete(vcpu, false); + break; case SDEI_1_0_FN_SDEI_EVENT_COMPLETE_AND_RESUME: + has_result = false; + ret = kvm_sdei_hypercall_complete(vcpu, true); + break; case SDEI_1_0_FN_SDEI_EVENT_UNREGISTER: ret = kvm_sdei_hypercall_unregister(vcpu); break; -- 2.23.0