From patchwork Thu Nov 10 19:02:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 13039175 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 B3597C43219 for ; Thu, 10 Nov 2022 19:04:33 +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=M5uXVVtVHdZX4P/925CMrv68KOPE5fgIwPl/cZQz5xQ=; b=YbOrEiMYtWyygU fc0G1Q/kbAArq5Km8AJf0Vux2k2DIrInYxNtZHeA6AlW1zWW1XHLEyipjxKhGw+ZIOvoZPKdN7H5O FofpFFuONKzOgpb98KnaequIC/s3kWvxUsTuRXozAOW/zhay7u4c4vBztA4rCltCk2HFE7ciwVPHi rytB6/QgYsJLrq3Eeb/tz1WFW3rSOO0JDxbk0V8LIHkScN/a2jS/4gWfI2jTjL0oamUX1Gf8DpNJ5 ZNxF3hECvw63wTm4/n3ou0icw6blbBxEu78J8k9u/jo+M5aRjtx7u8f044JoaJuKLnteFbQEvRfLt FF17WY44MCqMaLEBpESQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1otCpW-008Rvl-0q; Thu, 10 Nov 2022 19:03:14 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1otCpS-008Rss-9V for linux-arm-kernel@lists.infradead.org; Thu, 10 Nov 2022 19:03:12 +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 E672761E12; Thu, 10 Nov 2022 19:03:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2DAFCC433C1; Thu, 10 Nov 2022 19:03:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668106988; bh=kCyoC7Owlf6Rzfvz/B9oBU6dzXwkKh/MKTKr2w1oykQ=; h=From:To:Cc:Subject:Date:From; b=jsuupxlwK3KY/ceOwMtt2hRLQ4+AxO+Rgg8C39EyvKcAz7wOZ5MlAJI1zSxc7zKHD BjRIIxnjqEAzU++YCgqcoko092QW9j1p2r3TAhwe2q+xAzzQpNWEZm8mqlzcUjouEP iB7MOBnwsZT3RWas0X1IUstTYPFuFxL4BB2RC/nRboL5JrqV5xgdXHdaWoIA+D3MfT c420D0Hi6SmDKxv9F39LU1nJRs7nshTNFXnZLEUa2CZCzyN3OP9MUgOGGUS4j2bTz1 kedIjSTLJpd7YjLhfEZfCJUfvU6kNgJeaLdFpq/SJA+YVwOGECkAO6RSpr2jU/DW2x kS1wVgowc7x5A== 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 v6 00/26] KVM: arm64: Introduce pKVM hyp VM and vCPU state at EL2 Date: Thu, 10 Nov 2022 19:02:33 +0000 Message-Id: <20221110190259.26861-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-20221110_110310_435727_54D19B1E X-CRM114-Status: GOOD ( 21.37 ) 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 six of the pKVM EL2 state series, extending the pKVM hypervisor 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. Previous versions are archived at: 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/ v5: https://lore.kernel.org/r/20221020133827.5541-1-will@kernel.org The changes since v5 include: * Fix teardown ordering so that the host 'kvm' structure remains pins while the memcache is being filled. * Fixed a kerneldoc typo. * Included a patch from Oliver to rework the 'pkvm_mem_transition' structure and it's handling of the completer address. * Tweaked some commit messages and added new R-b tags. As before, the final patch is RFC since it illustrates a very naive use of the new hypervisor structures and subsequent changes will improve on this once we have the guest private memory story sorted out. Oliver: I'm pretty sure we're going to need to revert your completer address cleanup as soon as we have guest-host sharing. We want to keep the 'pkvm_mem_transition' structure 'const', but we will only know the host address (PA) after walking the guest stage-2 and so we're going to want to track that separately. Anyway, I've included it here at the end so Marc can decide what he wants to do! Cheers, Will, Quentin and Fuad 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 Oliver Upton (1): KVM: arm64: Clean out the odd handling of completer_addr 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 | 558 +++++++++++++++--- arch/arm64/kvm/hyp/nvhe/mm.c | 168 +++++- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 29 +- arch/arm64/kvm/hyp/nvhe/pkvm.c | 436 ++++++++++++++ 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, 1765 insertions(+), 261 deletions(-) create mode 100644 arch/arm64/kvm/hyp/include/nvhe/pkvm.h