From patchwork Thu Oct 20 13:38:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 13013522 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 90F97C4332F for ; Thu, 20 Oct 2022 13:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=UsLnxILMwjLtSvMI0hbzSRaNaLtTD0KxYTzUsZ7aV+w=; b=3TSR14V8bKmUlY 9ySds+LHfYhAVxuQOqVZf+zSQATLwMkkXZdldXK8vslKpcVXKhzMJDisFZFw675OdbjEOZbbAhJiF 5Ey8FXBSX/IXZtBw3nMV5VD/ByB9qMx6nrT6+rTCOOjhqWXhP1WewBTmOZq2fRfnSJGEJHo46rxAJ cmFpsLtbkkvegj32BUpqWgM/63L2Ut8WGJRi2s+l+YPAwTefYjkSyYUXPzmCuXwoAuSAE7xGJ/ADQ cSnr8YIHRqJXLit7NeTgtgLUPrfFBt8iIGkEJzOh5qZWl3O1NPFrDddG+9l/YJVjhrX22CGmLywag 3iqdlvqb9yILQuFzSB0A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1olVsz-00FiBh-MS; Thu, 20 Oct 2022 13:47:01 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1olVku-00FZje-E8 for linux-arm-kernel@lists.infradead.org; Thu, 20 Oct 2022 13:38:42 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2E7AA61B91; Thu, 20 Oct 2022 13:38:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 561CBC433D6; Thu, 20 Oct 2022 13:38:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666273117; bh=HpX2uNEc0GUdzYR5KnGOZkH0x1pbX64lowoU6XXIYiM=; h=From:To:Cc:Subject:Date:From; b=C8AQGXzsp9BTueq43xT/ola3YGVM9ZG57Q68jVxmR+9JHIdAcjAhhmNzVbBNdGd6A 1gu8O8RWPe1GWrNMlMdbyYK7dt+1pMJvBvRT/S9/Tk5Qu77xq+g18pFO8MWAuBYOKf DVfXiqWWZs+NmkSBzZvmRnjJOJTsKxT9uleXE7N6H0UfPu+U2kfO1neZ0SvxnMQ0IO nq+sfQ+O/B24nMK8z6SEtF+LnVV8KYB8p8v/UJTTbYumuyLUvUmCt54S8yfwoMlcI/ ka2iCP3rrkhxOH8Asf6qCZgct7hMyqPjVLBQmg0DTbfXMZdXTEmTNkG5/cPov/LMFv 4s/Qrc/GrGd9g== From: Will Deacon To: kvmarm@lists.linux.dev Cc: Will Deacon , Sean Christopherson , Vincent Donnefort , Alexandru Elisei , Catalin Marinas , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , James Morse , Chao Peng , Quentin Perret , Suzuki K Poulose , Mark Rutland , Fuad Tabba , Oliver Upton , Marc Zyngier , kernel-team@android.com, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 00/25] KVM: arm64: Introduce pKVM hyp VM and vCPU state at EL2 Date: Thu, 20 Oct 2022 14:38:02 +0100 Message-Id: <20221020133827.5541-1-will@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221020_063840_593771_F4EACFD6 X-CRM114-Status: GOOD ( 18.82 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, This is version five of the pKVM EL2 state series, following hot on the heels of v4: Mega-patch: https://lore.kernel.org/kvmarm/20220519134204.5379-1-will@kernel.org/ v2: https://lore.kernel.org/all/20220630135747.26983-1-will@kernel.org/ v3: https://lore.kernel.org/kvmarm/20220914083500.5118-1-will@kernel.org/ v4: https://lore.kernel.org/kvm/20221017115209.2099-1-will@kernel.org/ This series extends the pKVM EL2 code so that it can dynamically instantiate and manage VM data structures without the host being able to access them directly. These structures consist of a hyp VM, a set of hyp vCPUs and the stage-2 page-table for the MMU. The pages used to hold the hypervisor structures are returned to the host when the VM is destroyed. Thanks to everyone who provided feedback and tags on the previous version. The main changes in v5 are: * Removed kvm_protected_vm::vm_lock in favour of existing kvm::lock * Removed pkvm_hyp_vm::donated_memory_size as this can be computed * Use inner-shareable barriers and TLB invalidation in the fixmap code * Don't check for the host donating the same host 'kvm' structure twice * Fixed comment relating to maximum number of protected VMs * Added tags * Reworked some of the patch authorship/Co-developed-by tags to better match reality * Remembered to mark the last patch as RFC... Cheers, Will, Quentin, Fuad and Marc Cc: Sean Christopherson Cc: Will Deacon Cc: Vincent Donnefort Cc: Alexandru Elisei Cc: Catalin Marinas Cc: Philippe Mathieu-Daudé Cc: James Morse Cc: Chao Peng Cc: Quentin Perret Cc: Suzuki K Poulose Cc: Mark Rutland Cc: Fuad Tabba Cc: Oliver Upton Cc: Marc Zyngier Cc: kernel-team@android.com Cc: kvm@vger.kernel.org Cc: kvmarm@lists.linux.dev Cc: linux-arm-kernel@lists.infradead.org --->8 Fuad Tabba (3): KVM: arm64: Add hyp_spinlock_t static initializer KVM: arm64: Add infrastructure to create and track pKVM instances at EL2 KVM: arm64: Instantiate pKVM hypervisor VM and vCPU structures from EL1 Quentin Perret (14): KVM: arm64: Move hyp refcount manipulation helpers to common header file KVM: arm64: Allow attaching of non-coalescable pages to a hyp pool KVM: arm64: Back the hypervisor 'struct hyp_page' array for all memory KVM: arm64: Fix-up hyp stage-1 refcounts for all pages mapped at EL2 KVM: arm64: Prevent the donation of no-map pages KVM: arm64: Add helpers to pin memory shared with the hypervisor at EL2 KVM: arm64: Add per-cpu fixmap infrastructure at EL2 KVM: arm64: Add generic hyp_memcache helpers KVM: arm64: Consolidate stage-2 initialisation into a single function KVM: arm64: Instantiate guest stage-2 page-tables at EL2 KVM: arm64: Return guest memory from EL2 via dedicated teardown memcache KVM: arm64: Unmap 'kvm_arm_hyp_percpu_base' from the host KVM: arm64: Explicitly map 'kvm_vgic_global_state' at EL2 KVM: arm64: Don't unnecessarily map host kernel sections at EL2 Will Deacon (8): KVM: arm64: Unify identifiers used to distinguish host and hypervisor KVM: arm64: Implement do_donate() helper for donating memory KVM: arm64: Include asm/kvm_mmu.h in nvhe/mem_protect.h KVM: arm64: Rename 'host_kvm' to 'host_mmu' KVM: arm64: Initialise hypervisor copies of host symbols unconditionally KVM: arm64: Provide I-cache invalidation by virtual address at EL2 KVM: arm64: Maintain a copy of 'kvm_arm_vmid_bits' at EL2 KVM: arm64: Use the pKVM hyp vCPU structure in handle___kvm_vcpu_run() arch/arm64/include/asm/kvm_arm.h | 2 +- arch/arm64/include/asm/kvm_asm.h | 7 +- arch/arm64/include/asm/kvm_host.h | 72 ++- arch/arm64/include/asm/kvm_hyp.h | 3 + arch/arm64/include/asm/kvm_mmu.h | 2 +- arch/arm64/include/asm/kvm_pgtable.h | 22 + arch/arm64/include/asm/kvm_pkvm.h | 38 ++ arch/arm64/kernel/image-vars.h | 15 - arch/arm64/kvm/arm.c | 61 ++- arch/arm64/kvm/hyp/hyp-constants.c | 3 + arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 25 +- arch/arm64/kvm/hyp/include/nvhe/memory.h | 27 + arch/arm64/kvm/hyp/include/nvhe/mm.h | 18 +- arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 68 +++ arch/arm64/kvm/hyp/include/nvhe/spinlock.h | 10 +- arch/arm64/kvm/hyp/nvhe/cache.S | 11 + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 110 +++- arch/arm64/kvm/hyp/nvhe/hyp-smp.c | 2 + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 502 ++++++++++++++++-- arch/arm64/kvm/hyp/nvhe/mm.c | 168 +++++- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 28 +- arch/arm64/kvm/hyp/nvhe/pkvm.c | 434 +++++++++++++++ arch/arm64/kvm/hyp/nvhe/setup.c | 96 ++-- arch/arm64/kvm/hyp/pgtable.c | 21 +- arch/arm64/kvm/mmu.c | 55 +- arch/arm64/kvm/pkvm.c | 138 ++++- arch/arm64/kvm/reset.c | 29 - 27 files changed, 1751 insertions(+), 216 deletions(-) create mode 100644 arch/arm64/kvm/hyp/include/nvhe/pkvm.h