Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp1090125pxu; Wed, 2 Dec 2020 10:45:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJzmIa2tcXsgLGc7KmpUGd7unFKzHfWImswvuVp/yJefkXkzw7DLlUQGZA0Fh7XF/Itvwixt X-Received: by 2002:a50:fb13:: with SMTP id d19mr1296508edq.133.1606934700694; Wed, 02 Dec 2020 10:45:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606934700; cv=none; d=google.com; s=arc-20160816; b=bBFnVsQTX0rSucTu/nA+PmSSxG/+fxMgQPTH5EyHt38y1dEpwySKxlf69FArWpPc4/ QXIU3TjPfXnrYcqYFGNww2E91hNwRLebUxT7V4Ix0CiQ5O+8afl3Urg061hvvr42zJtY ftqahlWMg1H/WEPW78IO3t9VpENPuigG/i52Z5X8VJLrhyGpnNzKyxxPr/SFA0jRPOwE e5x2+noBiEl6bgV2jznquoReVSzi9oluO2SILNd3AkszvKhux8mJLlF29v5QANvbW5+V JryWpQbXjJkH5lY535Z2fNDgrrqr5S7w0uwxqhM8cJEg0ixyfNqHE9bdq61NxhpDKUdj w8zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=e1Z0+ryeRyyzeQLn6jGhUYGvGo5ZwSh+Fr7aG6B2ob4=; b=KC3VZBTw3h0PjcxoOZV0pKqytNTmJsfODP4v8uxU6WBYvrnlXif5IY/1QHVQy3pKDG 10vBWXsH8kTvtIQuCSUs5xtr/K2sk7d/4ou0lWiktucGBlIkjKRHIvH74b/G0sbJ3zsZ TMM3Zg38dyXjVA2B9Hj6ZRDQH6AIq0bUGFb02219cVPoKJ05fqI3h8BiQPai+ruhuKfU muGIHLxtBVtYBRENt+uwC/bS5Pylyun395z1aqFlg6cZySXQRiVj5mGZZQGiXk03qTmt E8pgTqj3u+3oRrCT7Kuuho0mqk5mR/pStUiPAY1TXJRXU/VqpJuh8NEK8CxQCccP1CNK IBiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=uGQ3Uqtk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bz24si517326ejc.72.2020.12.02.10.44.37; Wed, 02 Dec 2020 10:45:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=uGQ3Uqtk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729101AbgLBSmJ (ORCPT + 99 others); Wed, 2 Dec 2020 13:42:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726104AbgLBSmI (ORCPT ); Wed, 2 Dec 2020 13:42:08 -0500 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BCF9C0613CF for ; Wed, 2 Dec 2020 10:41:28 -0800 (PST) Received: by mail-wr1-x441.google.com with SMTP id e7so5158313wrv.6 for ; Wed, 02 Dec 2020 10:41:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=e1Z0+ryeRyyzeQLn6jGhUYGvGo5ZwSh+Fr7aG6B2ob4=; b=uGQ3UqtkSS7C/9Ig5EagS0UZtcKog6tYN0YJ626ZVKEoUo01ksdAhL62U2BxgB5dZg rKCLi4m9XeDs/EVYQVjrjSkppckrQyzq1uXhbodHw/LtotYn5WhiljcYpg28ij4XDQo7 OSdj5eDzaFH9msYoZn7Z6yudMw6tKQHBtH7xHOsqC4bKN1o5QG7ieDpwai3tdBZiHSDA dn27L6K5sICUVX7LIEqbXYPZOzt9obFHGSxSaBJkYVYVhvggHwdhf8/r6EZpjifRJ3wp uFf5r+AlBEcTPVpofHwdMXXwAzsaSQMTW86s2Up8AIuC3yWifBI2drM9MxYFcrEADztu ONVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=e1Z0+ryeRyyzeQLn6jGhUYGvGo5ZwSh+Fr7aG6B2ob4=; b=iVXaQ+gHZ+YwNTrDSPTZSZb7mWRLLJT8wUZ371uE3bNfDOCSD7k9INJHAO3xPrDnso TSfa/d4T2UmR0nAnJhamuoA9n+ERpG/8l8bhSgVof4XLKrhLnCVn/wQeTc1kvxgfHl9U 4yhi4i2/rxFThWjTuGXVLrlcPtrT9k9lLs5NMzeONRtkOdtFHswZ6NHPi1etFSiuKpd8 kOkkQhoP1e6djcDASXsPT9+zTIyEif5PkTR0HAT/cq0UMmqXC4JqH49r58lrIBYJF3Bp VUd3StozDt3s6PRri01+JUkQxob9ZiEYVSnUmhijwOD0YLioiL+G1X3jMnBRDlu6Tq1m OE7A== X-Gm-Message-State: AOAM531cO1qOemKVVCqkKLDHYgVx/Y+8+HirPQ2dlkvbEM9l4tQiNV0a mp998qFNLEEB50sODcBGSbWArA== X-Received: by 2002:adf:fd0e:: with SMTP id e14mr4975271wrr.119.1606934486886; Wed, 02 Dec 2020 10:41:26 -0800 (PST) Received: from localhost ([2a01:4b00:8523:2d03:5ddd:b7c5:e3c9:e87a]) by smtp.gmail.com with ESMTPSA id l23sm2800059wmh.40.2020.12.02.10.41.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Dec 2020 10:41:25 -0800 (PST) From: David Brazdil To: kvmarm@lists.cs.columbia.edu Cc: Jonathan Corbet , Catalin Marinas , Will Deacon , Marc Zyngier , James Morse , Julien Thierry , Suzuki K Poulose , Dennis Zhou , Tejun Heo , Christoph Lameter , Mark Rutland , Lorenzo Pieralisi , Sudeep Holla , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel-team@android.com, David Brazdil Subject: [PATCH v4 00/26] Opt-in always-on nVHE hypervisor Date: Wed, 2 Dec 2020 18:40:56 +0000 Message-Id: <20201202184122.26046-1-dbrazdil@google.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As we progress towards being able to keep guest state private to the host running nVHE hypervisor, this series allows the hypervisor to install itself on newly booted CPUs before the host is allowed to run on them. All functionality described below is opt-in, guarded by an early param 'kvm-arm.mode=protected'. Future patches specific to the new protected mode should be hidden behind the same param. The hypervisor starts trapping host SMCs and intercepting host's PSCI calls which boot CPUs. It replaces the host's entry point with its own, initializes the EL2 state of the new CPU and installs the nVHE hyp vector before ERETing to the host's entry point. The kernel checks new cores' features against the finalized system capabilities. To avoid the need to move this code/data to EL2, the implementation only allows to boot cores that were online at the time of KVM initialization and therefore had been checked already. Other PSCI SMCs are forwarded to EL3, though only the known set of SMCs implemented in the kernel is allowed. Non-PSCI SMCs are also forwarded to EL3. Future changes will need to ensure the safety of all SMCs wrt. protected guests. The host is still allowed to reset EL2 back to the stub vector, eg. for hibernation or kexec, but will not disable nVHE when there are no VMs. Tested on Rock Pi 4B, based on kvmarm/queue, itself on top of 5.10-rc4. Patches also available at: https://android-kvm.googlesource.com/linux topic/psci-on-master_v4 changes since v3: * generic 'kvm-arm.mode' kernel param instead of 'kvm-arm.protected' * implement SYSTEM_SUSPEND * refactor PSCI driver to expose fn IDs more cleanly * init MAIR_EL2, TCR_EL2 from nVHE params struct changes since v2: * avoid non-spec error in CPU_SUSPEND * refuse to init without PSCI * compute hyp VA args of hyp-init in hyp instead of using params struct * use hyp_symbol_addr in per-cpu calls * simplify memory.h/sysreg.h includes * rebase on kvmarm/queue, use trap handler args macros changes since v1: * early param sets a capability instead of a static key * assume SMCCC v1.2 for host SMC forwarding * fix reserved SMC ID range for PSCI * split init_el2_state into smaller macros, move to el2_setup.h * many small cleanups changes since RFC: * add early param to make features opt-in * simplify CPU_ON/SUSPEND implementation * replace spinlocks with CAS atomic * make cpu_logical_map ro_after_init David Brazdil (26): kvm: arm64: Add kvm-arm.mode early kernel parameter kvm: arm64: Add ARM64_KVM_PROTECTED_MODE CPU capability psci: Support psci_ops.get_version for v0.1 psci: Split functions to v0.1 and v0.2+ variants psci: Replace psci_function_id array with a struct psci: Add accessor for psci_0_1_function_ids arm64: Make cpu_logical_map() take unsigned int arm64: Extract parts of el2_setup into a macro kvm: arm64: Remove vector_ptr param of hyp-init kvm: arm64: Move hyp-init params to a per-CPU struct kvm: arm64: Init MAIR/TCR_EL2 from params struct kvm: arm64: Add .hyp.data..ro_after_init ELF section kvm: arm64: Support per_cpu_ptr in nVHE hyp code kvm: arm64: Create nVHE copy of cpu_logical_map kvm: arm64: Add SMC handler in nVHE EL2 kvm: arm64: Bootstrap PSCI SMC handler in nVHE EL2 kvm: arm64: Add offset for hyp VA <-> PA conversion kvm: arm64: Forward safe PSCI SMCs coming from host kvm: arm64: Extract __do_hyp_init into a helper function kvm: arm64: Add function to enter host from KVM nVHE hyp code kvm: arm64: Intercept host's CPU_ON SMCs kvm: arm64: Intercept host's CPU_SUSPEND PSCI SMCs kvm: arm64: Intercept host's SYSTEM_SUSPEND PSCI SMCs kvm: arm64: Keep nVHE EL2 vector installed kvm: arm64: Trap host SMCs in protected mode kvm: arm64: Fix EL2 mode availability checks .../admin-guide/kernel-parameters.txt | 10 + arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/el2_setup.h | 182 ++++++++++ arch/arm64/include/asm/kvm_arm.h | 1 + arch/arm64/include/asm/kvm_asm.h | 10 +- arch/arm64/include/asm/kvm_host.h | 10 + arch/arm64/include/asm/kvm_hyp.h | 4 +- arch/arm64/include/asm/kvm_mmu.h | 24 ++ arch/arm64/include/asm/percpu.h | 6 + arch/arm64/include/asm/sections.h | 1 + arch/arm64/include/asm/smp.h | 4 +- arch/arm64/include/asm/virt.h | 26 ++ arch/arm64/kernel/asm-offsets.c | 5 + arch/arm64/kernel/cpufeature.c | 22 ++ arch/arm64/kernel/head.S | 144 +------- arch/arm64/kernel/image-vars.h | 6 +- arch/arm64/kernel/setup.c | 2 +- arch/arm64/kernel/vmlinux.lds.S | 10 + arch/arm64/kvm/arm.c | 139 +++++++- .../arm64/kvm/hyp/include/nvhe/trap_handler.h | 18 + arch/arm64/kvm/hyp/nvhe/Makefile | 3 +- arch/arm64/kvm/hyp/nvhe/host.S | 47 +++ arch/arm64/kvm/hyp/nvhe/hyp-init.S | 152 +++++--- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 45 ++- arch/arm64/kvm/hyp/nvhe/hyp-smp.c | 40 +++ arch/arm64/kvm/hyp/nvhe/hyp.lds.S | 1 + arch/arm64/kvm/hyp/nvhe/psci-relay.c | 324 ++++++++++++++++++ arch/arm64/kvm/hyp/nvhe/switch.c | 5 +- arch/arm64/kvm/va_layout.c | 30 +- drivers/firmware/psci/psci.c | 126 ++++--- include/linux/psci.h | 9 + 31 files changed, 1150 insertions(+), 259 deletions(-) create mode 100644 arch/arm64/include/asm/el2_setup.h create mode 100644 arch/arm64/kvm/hyp/include/nvhe/trap_handler.h create mode 100644 arch/arm64/kvm/hyp/nvhe/hyp-smp.c create mode 100644 arch/arm64/kvm/hyp/nvhe/psci-relay.c -- 2.29.2.454.gaff20da3a2-goog