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 DFB91C77B75 for ; Wed, 19 Apr 2023 22:18:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CC695900010; Wed, 19 Apr 2023 18:18:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C4EE4900003; Wed, 19 Apr 2023 18:18:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A2E03900010; Wed, 19 Apr 2023 18:18:09 -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 8D82C900003 for ; Wed, 19 Apr 2023 18:18:09 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4439F1A02D2 for ; Wed, 19 Apr 2023 22:18:09 +0000 (UTC) X-FDA: 80699554698.25.915436C Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf28.hostedemail.com (Postfix) with ESMTP id 7D0F1C0004 for ; Wed, 19 Apr 2023 22:18:07 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=YSIfA3fB; spf=pass (imf28.hostedemail.com: domain of atishp@rivosinc.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=atishp@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681942687; a=rsa-sha256; cv=none; b=dBaa0NSf34waaMVa4vxpWD8B1D3+1k00CuDxNwCZr321zB1sPADZSW5j1xTOPLB7ifzO8M v+JJ0H2ch/huSlQbQ9MTT8pHxDbH2pfi6l7qjBC1OajcnM6eq/gXHEREU6xoJq2MExarh1 5lnb4TiGWc68XdMJgfIaMsEWpcv49Bs= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=YSIfA3fB; spf=pass (imf28.hostedemail.com: domain of atishp@rivosinc.com designates 209.85.214.181 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=1681942687; 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=IHi27AH8EgCkCQBErjcLInO9Ogd99Uht/0Y2I/rPxr0=; b=d5Kfl1602E3ftw99uus6fVnZ1Bjqd+ivajLwGGmN5v//+2bsMlktvT6AaKa2C96m7THuNy K6rFyDF38eSLtf1lHTawgbh4P03yDl1tgLu+0mgZrklhOMDkX3EBZI9u0uimz7htGGcRq+ Lndkj5aXDuN4GFvPLq7y2suzTR94gUk= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1a5197f00e9so4659275ad.1 for ; Wed, 19 Apr 2023 15:18:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1681942687; x=1684534687; 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=IHi27AH8EgCkCQBErjcLInO9Ogd99Uht/0Y2I/rPxr0=; b=YSIfA3fBHehSI9sfNw8kNY3SjYw3MKpDND587n51K3eoVf8RJTCG1iSaqqG9yfNjCx jwqPpoi/ITD0shW0NUnRyZli8JT8h1t3/2gNbp76WuPUO0CZ5s8zSvoyiHQFyjfIMwOE 1ZldJnGMaXcDrIoP6ErfdR2UHM3fNFztr08TXf0xVGRFo5tk0moUvzoYm/r0hkRFoy0K cWLNwCIHBfTQ0bCQR3c38U1nAB1slt1q42rqYoamEUYp5QQ79+wtILJqFzbQlYA06O6P OEHwUmVOCGHeSnw6bqeEZSZ4KjU2xfgwWJGo24N5J96VrnqV0nME7zdNFrLcXHLPuPgD RkSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681942687; x=1684534687; 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=IHi27AH8EgCkCQBErjcLInO9Ogd99Uht/0Y2I/rPxr0=; b=F2Rtt6GJNuXmDOFel37ccGuGFi48YjyKJrrFU7N3+Ri05ziBqD7WuNYNW5flvc0CNa Idzw8YJeN5bwg6pgfLrOIOfnxd8xlCgaKBzq8ExTHFHVwmEtDZinKUg8QX8ZF+pAE/1L EzvYamgwRojkU4RkjLGNiGY2Ze/GkVNTGM1a6v208UBYxB/kZT/QW0lwZjRdziFqEi4l ESIIwPkedjXHDb0m3o5+BjvaW3JiVd6wSZ/pSzEIt1KLdeB1zz/YDPl0SxCEHVwWAO3Q wsJw6G+/5LV6Z4O+HrqtJmbBlUBg8Mf3Re3mfhOQHYG0ilf0yB2vlKnv6XnJl+A5y03x btQQ== X-Gm-Message-State: AAQBX9eDS/DSjY1JZOkrNywLIUJCUYtGY/VCng32tuMsWMwY6Nzeuv8L FXi7GgWknUZi/tsvj+4IYZLXwA== X-Google-Smtp-Source: AKy350a7uqnn10B5RYMJKbmqBxpZkXHpV8hWE2JbxUvi5COFiIeLm7AFkPV91DbiIrXf3nFN1rwkeg== X-Received: by 2002:a17:902:ec8b:b0:1a9:23b7:9182 with SMTP id x11-20020a170902ec8b00b001a923b79182mr2674160plg.27.1681942686991; Wed, 19 Apr 2023 15:18:06 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 15:18:06 -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 17/48] RISC-V : KVM: Skip vmid/hgatp management for TVMs Date: Wed, 19 Apr 2023 15:16:45 -0700 Message-Id: <20230419221716.3603068-18-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: 7D0F1C0004 X-Rspamd-Server: rspam01 X-Stat-Signature: u91dyew5xu5a5oo7butfbxt8cqnbnem3 X-HE-Tag: 1681942687-294525 X-HE-Meta: U2FsdGVkX18q5vmA6jPpGF2tEfwEhJzNcuLe6Ghv/fqz8P9ONVBBhNaSNNSv9xYqA+uNZcPsV3A3o1ePYOTBBntWZHFj20ccsJ4mKGN+ZAOo3qWhjxtEKyvfkOrLt2/rDVQLpuOlPahqX/yATbluZeBCdSfwcAiT+QW7MQCgBQBLXbSXIIVM/hztsb7J7JdYDCMWrjHIJZhwq6qXgmXGNTi78end6E/HxoxgZtNHKTXUHMb5PduBQJKPi2Yc0fpS25NMeoO4fvo/V1A0woS/j3glN28X6uYY3Hsdhv3aRu28I5o8TjInkyeod6STAx5yYIMWDjxEuom6FLXqp5AfaoLQbHvxL/Px2KC8XISWEQxIjpp66Gkvb2R7fGBuXSim0HBboiVxjSdAXe36oPH1WuGbnktfhL/fGwqXYbNbNe79MLRKtCpXusKV8UWfvDF6lDph5LFMuAblQGc2/rEudAmkfmV08yxrCvVW1BDFcqveT9wqbRY3P/uxY04luWKBq/3+z/dCo3H0Uu1fJm3MBfuK/7Q1Q8QmpwEJhn14jKeLK0JRPArovWTRia98w6rPxSTSbWUTIlyGI+wqNgy4ML/es1dNowe2PQXf46vIPAVe/yjwAVrcs331KkH1xIfaibsD4YOaX/D00As4CtcvQvv7spl4NnPcnaO4Yw34tCyKBHz4DI1TGjwyTepjF/M8QOecuqVvNUfHsD4+pgxu1lhZnMzr8ohGNp3F7sxGhMmKmTNXf//lhoNEJi+SjSv9sn+WR0HdfhisOXZIMINpCaDTHnTeuGa0Ouv6P+0TZ9ddOQWRwaakNSvBlEySk91HnlEKOh6hkyi3GDGa5gAPsxPJF72ijb1CjWfD1lGhJECcFWRiMY2oALO4crKbpjTaPfv3OnHCYm03c2scoUDVJXP0G53YLcZdLXadD3WXsGvxNjnkgE+hmBWyjl8o6uILIRdhiHdbG6PN3t20Sxz hZ1ttEFe fCUw3dxZfegvQAms5HAwbidUA2qaa8yA2ZbqxYcc+4QF99+phT8VL9mtNQbb8ZeewACQVjvL0trJ6jTDtNpy/Kf5PuHBCWHB15rgTRUdtNainlSKkE5KGbCVq2QNWBXLpjXTU63861wUG578nxt10iU1DMyBDrQHCp7mFx1LjDBoEnJGZxzUJWe7IWqkxyTJc4uKqSjqQUtZWr5sbNnO510z8fBZVXan0GVGLLA5IlCf6wYxM+Fp3VxC3W8mniFbTi6k3dDnShIFt+WVFlhy2qYLm9V5jL2yQqQkCU/uXoVa2956id03sILViEZ8A44ZjGaaEDc3eNrWNDrurE2JLtK0Ss/U4L2rCbfLPgqBtBYbPvv2J221Z3HGU6G5uQ8nB4aCPVAic+tdiQgepq9u/yr69+H8bZg8X6F+dVGTuu8/4TV7QusvlN5LQU/ptYS5cTYmvnMWWpx5Tn5a+oTDFMMkOtw== 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: The TSM manages the vmid for the guests running in CoVE. The host doesn't need to update vmid at all. As a result, the host doesn't need to update the hgatp as well. Return early for vmid/hgatp management functions for confidential guests. Signed-off-by: Atish Patra --- arch/riscv/include/asm/kvm_host.h | 2 +- arch/riscv/kvm/mmu.c | 4 ++++ arch/riscv/kvm/vcpu.c | 2 +- arch/riscv/kvm/vmid.c | 17 ++++++++++++----- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm_host.h index ca2ebe3..047e046 100644 --- a/arch/riscv/include/asm/kvm_host.h +++ b/arch/riscv/include/asm/kvm_host.h @@ -325,7 +325,7 @@ unsigned long kvm_riscv_gstage_pgd_size(void); void __init kvm_riscv_gstage_vmid_detect(void); unsigned long kvm_riscv_gstage_vmid_bits(void); int kvm_riscv_gstage_vmid_init(struct kvm *kvm); -bool kvm_riscv_gstage_vmid_ver_changed(struct kvm_vmid *vmid); +bool kvm_riscv_gstage_vmid_ver_changed(struct kvm *kvm); void kvm_riscv_gstage_vmid_update(struct kvm_vcpu *vcpu); int kvm_riscv_setup_default_irq_routing(struct kvm *kvm, u32 lines); diff --git a/arch/riscv/kvm/mmu.c b/arch/riscv/kvm/mmu.c index 1d5e4ed..4b0f09e 100644 --- a/arch/riscv/kvm/mmu.c +++ b/arch/riscv/kvm/mmu.c @@ -778,6 +778,10 @@ void kvm_riscv_gstage_update_hgatp(struct kvm_vcpu *vcpu) unsigned long hgatp = gstage_mode; struct kvm_arch *k = &vcpu->kvm->arch; + /* COVE VCPU hgatp is managed by TSM. */ + if (is_cove_vcpu(vcpu)) + return; + hgatp |= (READ_ONCE(k->vmid.vmid) << HGATP_VMID_SHIFT) & HGATP_VMID; hgatp |= (k->pgd_phys >> PAGE_SHIFT) & HGATP_PPN; diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index 3b600c6..8cf462c 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -1288,7 +1288,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) kvm_riscv_update_hvip(vcpu); if (ret <= 0 || - kvm_riscv_gstage_vmid_ver_changed(&vcpu->kvm->arch.vmid) || + kvm_riscv_gstage_vmid_ver_changed(vcpu->kvm) || kvm_request_pending(vcpu) || xfer_to_guest_mode_work_pending()) { vcpu->mode = OUTSIDE_GUEST_MODE; diff --git a/arch/riscv/kvm/vmid.c b/arch/riscv/kvm/vmid.c index ddc9871..dc03601 100644 --- a/arch/riscv/kvm/vmid.c +++ b/arch/riscv/kvm/vmid.c @@ -14,6 +14,7 @@ #include #include #include +#include static unsigned long vmid_version = 1; static unsigned long vmid_next; @@ -54,12 +55,13 @@ int kvm_riscv_gstage_vmid_init(struct kvm *kvm) return 0; } -bool kvm_riscv_gstage_vmid_ver_changed(struct kvm_vmid *vmid) +bool kvm_riscv_gstage_vmid_ver_changed(struct kvm *kvm) { - if (!vmid_bits) + /* VMID version can't be changed by the host for TVMs */ + if (!vmid_bits || is_cove_vm(kvm)) return false; - return unlikely(READ_ONCE(vmid->vmid_version) != + return unlikely(READ_ONCE(kvm->arch.vmid.vmid_version) != READ_ONCE(vmid_version)); } @@ -72,9 +74,14 @@ void kvm_riscv_gstage_vmid_update(struct kvm_vcpu *vcpu) { unsigned long i; struct kvm_vcpu *v; + struct kvm *kvm = vcpu->kvm; struct kvm_vmid *vmid = &vcpu->kvm->arch.vmid; - if (!kvm_riscv_gstage_vmid_ver_changed(vmid)) + /* No VMID management for TVMs by the host */ + if (is_cove_vcpu(vcpu)) + return; + + if (!kvm_riscv_gstage_vmid_ver_changed(kvm)) return; spin_lock(&vmid_lock); @@ -83,7 +90,7 @@ void kvm_riscv_gstage_vmid_update(struct kvm_vcpu *vcpu) * We need to re-check the vmid_version here to ensure that if * another vcpu already allocated a valid vmid for this vm. */ - if (!kvm_riscv_gstage_vmid_ver_changed(vmid)) { + if (!kvm_riscv_gstage_vmid_ver_changed(kvm)) { spin_unlock(&vmid_lock); return; } -- 2.25.1