From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB204C6FD18 for ; Wed, 19 Apr 2023 22:18:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B198C900016; Wed, 19 Apr 2023 18:18:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AA2C4900003; Wed, 19 Apr 2023 18:18:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8A5CB900016; Wed, 19 Apr 2023 18:18:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 7A27D900003 for ; Wed, 19 Apr 2023 18:18:18 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 600BDAC4B0 for ; Wed, 19 Apr 2023 22:18:18 +0000 (UTC) X-FDA: 80699555076.03.B6BD6C3 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf28.hostedemail.com (Postfix) with ESMTP id 7B6DCC0017 for ; Wed, 19 Apr 2023 22:18:16 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b="SO8VMn/g"; spf=pass (imf28.hostedemail.com: domain of atishp@rivosinc.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=atishp@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681942696; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=BVskLFhSfykEs4eltGnJpzQVboIqM++EFU/NG1sE5NQ=; b=U5WaXUNfmSqprHSMXzcSz59Xi6k0XU9zw6jSN0UN9sVZGwnbJwlYyQazSFjUCzrJW443tu us81DFbHLL8bsEiBJd9+AozgyHt0tzYZjbudnY6iXd+At1+KSwwHLj/+v6ZHjyeiROctIi ea6AkAuDHGlGbuQv8gLi3pKcJ8TIPO4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681942696; a=rsa-sha256; cv=none; b=kRWJ45UzWy1MUnDbZveuiVmy8dz7GFCjCSRdDIA7nhQnRXD0JNSEaWXxXPoyxXYBV/Q8oB lty8y1F+0q555bEKBznNULPGcMC8+cO4DKXFXbscb0FUutFFHkg/FaX6bN6D7mwPngduYC 4xcE1nKgXdFfR0azZfQmRBNxE9nPaKI= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b="SO8VMn/g"; spf=pass (imf28.hostedemail.com: domain of atishp@rivosinc.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=atishp@rivosinc.com; dmarc=none Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1a920d484bdso4575475ad.1 for ; Wed, 19 Apr 2023 15:18:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1681942695; x=1684534695; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BVskLFhSfykEs4eltGnJpzQVboIqM++EFU/NG1sE5NQ=; b=SO8VMn/gX3e5vrOk29Jpp+EW3CH0aS36Ddf+WvlYfYdV2qV/sEQkL249EYwnIbGQPP IbrgDiUX6yusY5G6N+gv2DqO2gsWL/6qr3Vjo5vnbGXNSTABlKc+Z5vspap8SEcOKeLU So7lcKbcoaSAhkenmIqQER+vNAwXBWV2IvUOGT4NehU2jVE3eYLDxu3zsV9yLUqbsLR7 v7+u/wK5FHf0rE8XEaPscHq9ay3O7yJVyu0alqyYfsf0oZDQ04UuLg/LxXgaBLNutCRN t5gGEdgbWRMkTDfoaMJlc0lkYq+/3m6Gj+9+DtkEoQY+7pVpM5Wn8qS8u2Y8SjuI+hhP lcIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681942695; x=1684534695; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BVskLFhSfykEs4eltGnJpzQVboIqM++EFU/NG1sE5NQ=; b=U0naqX0xYNfmnWLZBGFzjaf7gEZUrMkdHuy/jf67rc8FF6swe43xRqtZheyNTKvVC6 t3ophfFbfCGUsZT9ke+LAYgd9TCd3zF0wY3pUTn6KZdH2EuyvS5AKUUAwRXaZH7GB/3z T9qHMmbek1GTn8UWMnmlaGSRUSeZ/QFvEXVRbMj/c35+JVo+cs2cXjPMmYwUJSAPr84+ V0RFlqxLKY+y9raD/rwYKokj2aLfEtzam5yugK07I9YhHPH4jBcmuiimvq8jwnYmbKt6 /1tWHFgloIxWZnBJNVeipVfI2uTp/ihhlLVWfZE0y1ikFMl6hYM/96vNgxCmW69ZZx6D D/WQ== X-Gm-Message-State: AAQBX9dFb+CRSNVE99193vdWBQdgxaQ9UNkqoap5QkKmxCOC9Ga4w769 341A5nAnoX/oMNvgq02p9tVU+w== X-Google-Smtp-Source: AKy350YJdtE76oL4JZlI/rCsVg2p4hVlt1BCJyTIcyC6OmWTTvtKZe676vtO5k8no3TozALhiDYlgQ== X-Received: by 2002:a17:902:b489:b0:19d:297:f30b with SMTP id y9-20020a170902b48900b0019d0297f30bmr6180769plr.19.1681942695581; Wed, 19 Apr 2023 15:18:15 -0700 (PDT) Received: from atishp.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id jn11-20020a170903050b00b00196807b5189sm11619190plb.292.2023.04.19.15.18.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 15:18:15 -0700 (PDT) From: Atish Patra To: linux-kernel@vger.kernel.org Cc: Atish Patra , Alexandre Ghiti , Andrew Jones , Andrew Morton , Anup Patel , Atish Patra , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Suzuki K Poulose , Will Deacon , Marc Zyngier , Sean Christopherson , linux-coco@lists.linux.dev, Dylan Reid , abrestic@rivosinc.com, Samuel Ortiz , Christoph Hellwig , Conor Dooley , Greg Kroah-Hartman , Guo Ren , Heiko Stuebner , Jiri Slaby , kvm-riscv@lists.infradead.org, kvm@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, Mayuresh Chitale , Palmer Dabbelt , Paolo Bonzini , Paul Walmsley , Rajnesh Kanwal , Uladzislau Rezki Subject: [RFC 21/48] RISC-V: KVM: Handle SBI call forward from the TSM Date: Wed, 19 Apr 2023 15:16:49 -0700 Message-Id: <20230419221716.3603068-22-atishp@rivosinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230419221716.3603068-1-atishp@rivosinc.com> References: <20230419221716.3603068-1-atishp@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 7B6DCC0017 X-Rspamd-Server: rspam09 X-Stat-Signature: ecfwnqzw9jyg6bbee5znkq8t8b55niep X-HE-Tag: 1681942696-510568 X-HE-Meta: U2FsdGVkX1+L3EgKGpG6kZSxCobmbu+LP8EUmeVHieWu6cTw2fJkqZqwFF8MeWgnHMh9OVp3Cy+jZMHp22tbt03lKZuA2W5VbjvGvRchM2oBe4UP0XWafatzIH+/U/yl2CrqfUkvI+rN+6nsNKaAuuy6OkM/s1zCDhJxlOjx5BtoPiCkUPrRF24jUXFg+fW0X/xNTyfFHgi2JFlTR2cuyP/7zb2gTkAanbsROZZnCyjdSkHuo6LDKBhnSecq81J9uqvAPtKFXduMFj5sw8j5RO56wMgk6CbugePMC340TeF386EXDjz8wNCh9XDSERN4FJ9PgCfBx1mtyNo4yIbTrgS30EN+Zfs/MSShQxqGXPc3iEpgl9b3UKMN9Bo2JntnZdmEuYhFBc0TPQE11yR8d7Q0eh7d8KM8pK7RP57sqSv1tGX6QeojPUNjdp5184lHoL8m/qsjEFT16MXXCpAv5P6dnDvCMORgd5iTrgCYDlXerWA0ZDmBpw65t3Bd9xJmvABBM08+D8cs/fW5ljMhsFB+Ra8uFVrb19rCH5CpkznBgRKtQWCye7hqWm5MiL650JgHZXtdSbIxnOSjRfUEtRpQbP/GJzFfLJ4Vj/NrkTDRqve3pyxUVCYbsUmV1S0P516syHi8OcVv4iDsh7QrFtODLo1o3iaU1t7d4WNUYZzRg2lJMBQTKv8jwt5xWbA31NqcPafYQFVH+IRoBr3r2hIz4C7Q1fhpwZtQa5ZL/7AOvCRiZMVRQa2c3QQrFJsUp43xqWbjXTkYR+dxaKgBU3Xa3l93Yf9rnr7YOdpPmRX3fmdDHVqkWGVjJ+VS5ARQW1b2wyORmaq021oFMCGYw4S4auPEhqVTOljeevDwax4K65Ka2d2D3XMX4LrxIlndVKmhsP3NAaoi/m+b3DGxvJvYgBkZ4y2lCeDwmghnXlKfVW2fWZbjyoVAt6femcRvzLRFCMWhYt8C6ZMgcCZ qkqcfrMN VMLzuvvUpSobRDRD1nJQGgdE/LuGfXqZ+e/uQRh7Nbz/8p3kKjQHCuOcgSZHR81YoJY93UtqIPCB56WYCt7v2VXQEunDn5hFIK1/GlJAu/cvHZO6YnhWzpUE8ni8XZQtShgsMqh8YyRDYrRqOCqlm8VlhnF4yEoDDAKIe0/yqZjuck0cT0nJVme5dwcZQwyNzoE2IV7lDocWghoFkqpu5EHR7JvqTlIEcNASB1lohtSO0Me14BgA8og3Z+JljwSTfH6wJ/7pjYKkuW/hMu5U6da+g/HkahM41Y4DBfODLzE+SjgMaL4Z6ZbOK4zHlZyG/9DQr49jJlWJ7lQ8BcFLdSEQVK1/doHDGJv0kHFlGljOdX3qDhn/mfdfOa3CwmiJukk008VxDqQPZIdJkORDszTp0+bZozmmDLJPNLuqPHSvtInESS7CcyWiZASuIG2lL0yuxBe00rkGAgrWqeLRaoL6XIQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: TSM may forward the some SBI calls to the host as the host is the best place to handle these calls. Any calls related to hart state management or console or guest side interface (COVG) falls under this category. Add a cove specific ecall handler to take appropriate actions upon receiving these SBI calls. Signed-off-by: Atish Patra --- arch/riscv/include/asm/kvm_cove.h | 5 +++ arch/riscv/kvm/cove.c | 54 +++++++++++++++++++++++++++++++ arch/riscv/kvm/vcpu_exit.c | 6 +++- arch/riscv/kvm/vcpu_sbi.c | 2 ++ 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/kvm_cove.h b/arch/riscv/include/asm/kvm_cove.h index fc8633d..b63682f 100644 --- a/arch/riscv/include/asm/kvm_cove.h +++ b/arch/riscv/include/asm/kvm_cove.h @@ -126,6 +126,7 @@ int kvm_riscv_cove_vcpu_init(struct kvm_vcpu *vcpu); void kvm_riscv_cove_vcpu_load(struct kvm_vcpu *vcpu); void kvm_riscv_cove_vcpu_put(struct kvm_vcpu *vcpu); void kvm_riscv_cove_vcpu_switchto(struct kvm_vcpu *vcpu, struct kvm_cpu_trap *trap); +int kvm_riscv_cove_vcpu_sbi_ecall(struct kvm_vcpu *vcpu, struct kvm_run *run); int kvm_riscv_cove_vm_measure_pages(struct kvm *kvm, struct kvm_riscv_cove_measure_region *mr); int kvm_riscv_cove_vm_add_memreg(struct kvm *kvm, unsigned long gpa, unsigned long size); @@ -148,6 +149,10 @@ static inline int kvm_riscv_cove_vcpu_init(struct kvm_vcpu *vcpu) {return -1; } static inline void kvm_riscv_cove_vcpu_load(struct kvm_vcpu *vcpu) {} static inline void kvm_riscv_cove_vcpu_put(struct kvm_vcpu *vcpu) {} static inline void kvm_riscv_cove_vcpu_switchto(struct kvm_vcpu *vcpu, struct kvm_cpu_trap *trap) {} +static inline int kvm_riscv_cove_vcpu_sbi_ecall(struct kvm_vcpu *vcpu, struct kvm_run *run) +{ + return -1; +} static inline int kvm_riscv_cove_vm_add_memreg(struct kvm *kvm, unsigned long gpa, unsigned long size) {return -1; } static inline int kvm_riscv_cove_vm_measure_pages(struct kvm *kvm, diff --git a/arch/riscv/kvm/cove.c b/arch/riscv/kvm/cove.c index 44095f6..87fa04b 100644 --- a/arch/riscv/kvm/cove.c +++ b/arch/riscv/kvm/cove.c @@ -147,6 +147,60 @@ void kvm_riscv_cove_vcpu_put(struct kvm_vcpu *vcpu) /* TODO */ } +int kvm_riscv_cove_vcpu_sbi_ecall(struct kvm_vcpu *vcpu, struct kvm_run *run) +{ + void *nshmem; + const struct kvm_vcpu_sbi_extension *sbi_ext; + struct kvm_cpu_context *cp = &vcpu->arch.guest_context; + struct kvm_cpu_trap utrap = { 0 }; + struct kvm_vcpu_sbi_return sbi_ret = { + .out_val = 0, + .err_val = 0, + .utrap = &utrap, + }; + bool ext_is_01 = false; + int ret = 1; + + nshmem = nacl_shmem(); + cp->a0 = nacl_shmem_gpr_read_cove(nshmem, KVM_ARCH_GUEST_A0); + cp->a1 = nacl_shmem_gpr_read_cove(nshmem, KVM_ARCH_GUEST_A1); + cp->a6 = nacl_shmem_gpr_read_cove(nshmem, KVM_ARCH_GUEST_A6); + cp->a7 = nacl_shmem_gpr_read_cove(nshmem, KVM_ARCH_GUEST_A7); + + /* TSM will only forward legacy console to the host */ +#ifdef CONFIG_RISCV_SBI_V01 + if (cp->a7 == SBI_EXT_0_1_CONSOLE_PUTCHAR) + ext_is_01 = true; +#endif + + sbi_ext = kvm_vcpu_sbi_find_ext(vcpu, cp->a7); + if ((sbi_ext && sbi_ext->handler) && ((cp->a7 == SBI_EXT_DBCN) || + (cp->a7 == SBI_EXT_HSM) || (cp->a7 == SBI_EXT_SRST) || ext_is_01)) { + ret = sbi_ext->handler(vcpu, run, &sbi_ret); + } else { + kvm_err("%s: SBI EXT %lx not supported for TVM\n", __func__, cp->a7); + /* Return error for unsupported SBI calls */ + sbi_ret.err_val = SBI_ERR_NOT_SUPPORTED; + goto ecall_done; + } + + if (ret < 0) + goto ecall_done; + + ret = (sbi_ret.uexit) ? 0 : 1; + +ecall_done: + /* + * No need to update the sepc as TSM will take care of SEPC increment + * for ECALLS that won't be forwarded to the user space (e.g. console) + */ + nacl_shmem_gpr_write_cove(nshmem, KVM_ARCH_GUEST_A0, sbi_ret.err_val); + if (!ext_is_01) + nacl_shmem_gpr_write_cove(nshmem, KVM_ARCH_GUEST_A1, sbi_ret.out_val); + + return ret; +} + int kvm_riscv_cove_gstage_map(struct kvm_vcpu *vcpu, gpa_t gpa, unsigned long hva) { struct kvm_riscv_cove_page *tpage; diff --git a/arch/riscv/kvm/vcpu_exit.c b/arch/riscv/kvm/vcpu_exit.c index d00b9ee5..8944e29 100644 --- a/arch/riscv/kvm/vcpu_exit.c +++ b/arch/riscv/kvm/vcpu_exit.c @@ -207,11 +207,15 @@ int kvm_riscv_vcpu_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, case EXC_INST_GUEST_PAGE_FAULT: case EXC_LOAD_GUEST_PAGE_FAULT: case EXC_STORE_GUEST_PAGE_FAULT: + //TODO: If the host runs in HS mode, this won't work as we don't + //read hstatus from the shared memory yet if (vcpu->arch.guest_context.hstatus & HSTATUS_SPV) ret = gstage_page_fault(vcpu, run, trap); break; case EXC_SUPERVISOR_SYSCALL: - if (vcpu->arch.guest_context.hstatus & HSTATUS_SPV) + if (is_cove_vcpu(vcpu)) + ret = kvm_riscv_cove_vcpu_sbi_ecall(vcpu, run); + else if (vcpu->arch.guest_context.hstatus & HSTATUS_SPV) ret = kvm_riscv_vcpu_sbi_ecall(vcpu, run); break; default: diff --git a/arch/riscv/kvm/vcpu_sbi.c b/arch/riscv/kvm/vcpu_sbi.c index 047ba10..d2f43bc 100644 --- a/arch/riscv/kvm/vcpu_sbi.c +++ b/arch/riscv/kvm/vcpu_sbi.c @@ -10,6 +10,8 @@ #include #include #include +#include +#include #include #ifndef CONFIG_RISCV_SBI_V01 -- 2.25.1