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 F2FAEC77B73 for ; Wed, 19 Apr 2023 22:18:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C9F8D90001E; Wed, 19 Apr 2023 18:18:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C4F1E900003; Wed, 19 Apr 2023 18:18:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AC92590001E; Wed, 19 Apr 2023 18:18:36 -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 9520E900003 for ; Wed, 19 Apr 2023 18:18:36 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 76068120194 for ; Wed, 19 Apr 2023 22:18:36 +0000 (UTC) X-FDA: 80699555832.30.2F753B5 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by imf14.hostedemail.com (Postfix) with ESMTP id A50E610000F for ; Wed, 19 Apr 2023 22:18:34 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=5j01fN0i; spf=pass (imf14.hostedemail.com: domain of atishp@rivosinc.com designates 209.85.210.176 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=1681942714; 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=MzHgRd9E4939KzL4yVjhGODBFacgyWrf3hGucLzcUO8=; b=OF9FA3sTbaWX5DDvWQRqZpCjE9e8Od51eeXljC0jACruMDQIuRx3wdgmvcOoXp8R3KAWw1 jJ8ZJO9tj4br2Gr8wvwv4a0mosV9U0JVTM4xgu0Lrqn4fq9bSTsw+qFZRnl5M5227PNNZx zEAvLtoqy5dFlE9A3KBHtMW5NtwPEB0= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=5j01fN0i; spf=pass (imf14.hostedemail.com: domain of atishp@rivosinc.com designates 209.85.210.176 as permitted sender) smtp.mailfrom=atishp@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681942714; a=rsa-sha256; cv=none; b=5BOpEflHjFdgaBn3KHFQqfPWqdDd4smHrtq+O6J9zOIyatKkOV8YfBneHdJgODatZ66gzQ B1rvlSVkV4RUIBeyxfwCFykKTtzX7zk5ObKlnitBttboRtKvGX2J4UtMoBLyTtZiBBi8RK emp/K/Uw6QdfjP9qhFOCUqnQ7idt1fw= Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-63b73203e0aso2785824b3a.1 for ; Wed, 19 Apr 2023 15:18:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1681942713; x=1684534713; 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=MzHgRd9E4939KzL4yVjhGODBFacgyWrf3hGucLzcUO8=; b=5j01fN0ij/sx5aznVSQ+84ebob97Uk9ftFvgEXxpPwjhV5dco0Y79w6bw9ez6K4LUG x4ifblG/7m++Uyimmc36fD0O2cl/AoZnom3oZdZMqItGTqYdBH4OIN/teuA3aWTggftI cpfXd7inCZOHfFSvtG6jQH1j/NF3x6zzJYA/BAWcjUuRPw/Oif2Cfb9K4X/RvX3EuV6I rB2tIUmFeiD583OWXUG9/aKVA+9N3U2MddLb8BWDGvrP++iluedDlml9YMOSTGq8prU7 8uZJLu/6wc33TCPOi7KP6620z50VzFYs35XGvSNltrv2JUItl6JoRg3XUUwIodj1A03e LxNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681942713; x=1684534713; 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=MzHgRd9E4939KzL4yVjhGODBFacgyWrf3hGucLzcUO8=; b=BYOy+7X77n0FnYawmLCWuEWBdmJMpLCd/PD3b676ug1/sA93Bhv+lMfBCOMKWA4f2R 6lBmFrQcbpo1fUa7tPIMqkYjNq60nwu2AF3zhw1XV6qpvDY2ysV4NpdKUV7jWnzXrCCz w6RhNOiKXCVkg5mEvomRYwDiWwGoVhxBdPAolGfJrOJzWi22DOc8d6Z20pXoiWKCGPLm ILoWe0fAS4vtyjlXspQRNbAxSlXIAFuL0/w1TS+IAqHrtnMZT1ozYxI7sx52jKQIKNtm 6phERIXfHP4QJKuNbKtXGFDW+yXr2juGab2F1+XtT88gf8K3Tb7XyQymwOMmZN39CBka NzyA== X-Gm-Message-State: AAQBX9fSc9ORw6kdzwAaDKvuvAjAgJo4LiJtVyc6KgYzoJdBe/bhwbQP Ry1AeKtA3GmlPFstRdG7kDm5QA== X-Google-Smtp-Source: AKy350Zeg7WcBlbIeS4PGWBrU+nA6D3ZQw2RQUdtMzrRIbcOBcnB4FvzAieagBSVaRSEerSYF/00HQ== X-Received: by 2002:a17:903:25d1:b0:1a6:3e45:8df with SMTP id jc17-20020a17090325d100b001a63e4508dfmr3379688plb.33.1681942713552; Wed, 19 Apr 2023 15:18:33 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 15:18:33 -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 29/48] RISC-V: KVM: Skip AIA CSR updates for TVMs Date: Wed, 19 Apr 2023 15:16:57 -0700 Message-Id: <20230419221716.3603068-30-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-Rspamd-Queue-Id: A50E610000F X-Stat-Signature: rsxo1yc1ojtfzw8hcsgbikx5q1yd3ia5 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1681942714-461610 X-HE-Meta: U2FsdGVkX1/0PqjBU16jn3TWkbwu4MP6TV1ITribnRJ9FdxYjqHjp6QFIX8YvXQQgJC2BCxXFX84lIyIttFOH6AfuV/c/Rt27qSxsa+SJnt/ezPztRJ7L9Q/m7FSojjLNCWlqSICTt6jBil1+rZ+ruzvbRrc4w4HOKlAWA3ixd30sTHHLJslVxt1zCNgpaapwqc5peaM5urxbQDb6YqazseXlHC9WwR7NlDzyGypT1gagfsvx3OnJnOEUNl/bbYPUdncSwWG6COfoG2ZombiSH8jiemBjnuaW85LWVkrSafwqazW5aUy28CeNhw1YvaWcemvOdqSjI1KYCkdc38VB1AA49l8ipIrf7bZZeBaqGjNuJKlz/unZ1kqnfFtJOdsVs+7hr7QvmHV2NKkmrizEAmxESK80n/g5NHwyZ+bjRWxet6ZsgvGt+vE9zwN1AnHU8/Cdol+jKpOiiKjhYe4ET1Vt7Tw72Cl+GW4GivsP+09urrT6WwU112h4EK4HcvuGqzs6NixHCgfcUX4AvZtkqHilHuGjZqoq9vplsd2VmZzZ0N86rhioTTkQ1luX6KKaUkT739+M99Rhjhf4PTupQbtXd4nrIbcXW07cH2J5CkN9fXL6DCoKe8O/K/jouG1Qs5TwdJFCeWo/Qi6ddsmjOOOS15Th5ay6H6VDOMoNJui8MsC0CFauQ+WjLVtdvpO9syTQUGu8SQPqiN4gpNLDUeW8wam9F1xrpnKmwv47nTO8ScQpu/gf86CqQ20sZkogu4UtFKdaQPNk5WwTo0hTKLJ6STwhyczG30cwsbFkHKm+ovxMHeld1Gk0Boy8R4rJu6FsFX4Cgi7OGSIP4x3KT7zLQbRzARQI451MUY3HJOeh330UyyaxkKyoeWqCErRPdu1w7Fucqu0x9UFepKAbkxq/Cpa6OR3gRmFGXjikkLKERHGRhYeFB3KQIpWFSC4w7D6++nc11bE2Z8YcXZ rgmqbt4q v0wJNQCdies2CNGeOwgu3zsCAYoFdBkmDfxes4wbPafqYaSoU+tz/3IEMYvsNwm2MvzHaozOHhJ+sjDd8nasvjN88lCBJ8/gIbfknetvpoLvU4vwDG2KGK70kYxgAFr5d0mKzOwJaNbRDzulpMga/bpyRfp29GpHiHauKnQrxDtFIHP76lw+sov4ZPpmO8nsr/ZyV59qDTDJgbjV3qmV/2K/oWNVNfCB/E2P/I5nAHg0ctr2jTqOgWB9RGL945XGKgOEyH7OR3V1KZdBW2x6ZyyyJqH6M1XvVqsUj4o3g6qj7lEHiQmH0075BgGEjSBNjKuYjsKFFbvFm1HgDbJyFDJP96SU0zcu1QBAwm5NWdjiHh6rR5P/XveNVrSojK4SuOq73Gb8PbtKxVT6FqFeJKdt3r4ZzIKylNgjaozrXEofpnFWguRAd4D26LIDKaOHfh4jPAcNBeSPcN10d/wOWxUab7w== 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: For TVMs, the host must not support AIA CSR emulation. In addition to that, during vcpu load/put the CSR updates are not necessary as the CSR state must not be visible to the host. Signed-off-by: Atish Patra --- arch/riscv/kvm/aia.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/arch/riscv/kvm/aia.c b/arch/riscv/kvm/aia.c index 71216e1..e3da661 100644 --- a/arch/riscv/kvm/aia.c +++ b/arch/riscv/kvm/aia.c @@ -15,6 +15,7 @@ #include #include #include +#include struct aia_hgei_control { raw_spinlock_t lock; @@ -134,7 +135,7 @@ void kvm_riscv_vcpu_aia_load(struct kvm_vcpu *vcpu, int cpu) { struct kvm_vcpu_aia_csr *csr = &vcpu->arch.aia_context.guest_csr; - if (!kvm_riscv_aia_available()) + if (!kvm_riscv_aia_available() || is_cove_vcpu(vcpu)) return; csr_write(CSR_VSISELECT, csr->vsiselect); @@ -152,7 +153,7 @@ void kvm_riscv_vcpu_aia_put(struct kvm_vcpu *vcpu) { struct kvm_vcpu_aia_csr *csr = &vcpu->arch.aia_context.guest_csr; - if (!kvm_riscv_aia_available()) + if (!kvm_riscv_aia_available() || is_cove_vcpu(vcpu)) return; csr->vsiselect = csr_read(CSR_VSISELECT); @@ -370,6 +371,10 @@ int kvm_riscv_vcpu_aia_rmw_ireg(struct kvm_vcpu *vcpu, unsigned int csr_num, if (!kvm_riscv_aia_available()) return KVM_INSN_ILLEGAL_TRAP; + /* TVMs do not support AIA emulation */ + if (is_cove_vcpu(vcpu)) + return KVM_INSN_EXIT_TO_USER_SPACE; + /* First try to emulate in kernel space */ isel = csr_read(CSR_VSISELECT) & ISELECT_MASK; if (isel >= ISELECT_IPRIO0 && isel <= ISELECT_IPRIO15) @@ -529,6 +534,9 @@ void kvm_riscv_aia_enable(void) if (!kvm_riscv_aia_available()) return; + if (unlikely(kvm_riscv_cove_enabled())) + goto enable_gext; + aia_set_hvictl(false); csr_write(CSR_HVIPRIO1, 0x0); csr_write(CSR_HVIPRIO2, 0x0); @@ -539,6 +547,7 @@ void kvm_riscv_aia_enable(void) csr_write(CSR_HVIPRIO2H, 0x0); #endif +enable_gext: /* Enable per-CPU SGEI interrupt */ enable_percpu_irq(hgei_parent_irq, irq_get_trigger_type(hgei_parent_irq)); @@ -559,7 +568,9 @@ void kvm_riscv_aia_disable(void) csr_clear(CSR_HIE, BIT(IRQ_S_GEXT)); disable_percpu_irq(hgei_parent_irq); - aia_set_hvictl(false); + /* The host is not allowed modify hvictl for TVMs */ + if (!unlikely(kvm_riscv_cove_enabled())) + aia_set_hvictl(false); raw_spin_lock_irqsave(&hgctrl->lock, flags); -- 2.25.1