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 X-Spam-Level: X-Spam-Status: No, score=-14.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87A2CC2D0A3 for ; Mon, 16 Nov 2020 20:43:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2F8982225B for ; Mon, 16 Nov 2020 20:43:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="va51Yehh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731946AbgKPUn0 (ORCPT ); Mon, 16 Nov 2020 15:43:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726200AbgKPUnZ (ORCPT ); Mon, 16 Nov 2020 15:43:25 -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 575B3C0613CF for ; Mon, 16 Nov 2020 12:43:24 -0800 (PST) Received: by mail-wr1-x441.google.com with SMTP id b6so20285233wrt.4 for ; Mon, 16 Nov 2020 12:43:24 -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=ez4ezJGM8Jye68W6k3JKSGLh1n6D0kATjez8aR9Nk54=; b=va51YehhJ8FuXErziEVWdMd9wXcAcl4xZugOQZ9QYh78uUUBQf4izOIsceIj+DHENe nVjDRANKSDKWBZZ21bMns1g3Mz+TdXqyIxJfNgMgv/p5XDCwEVQo99V2HiPBEcWCwAdd GyZB3uAV/RqwGwjUDJMSBuywaXNBBJWNLAKST1NG0orO5Lqa0jG9vv9eTNvMQYHEGvcd MdAPMiuE89gOqAp+ue95nMTLAI4gmZx2aADaKMGLS24JNy0bmghOh0zHYvF4Zzat+XBJ rKsI7VCFh+MhIsPDmV+KrXxZAL6DvY7HQ1k9Omh3EdNbRSNfQIAkJr17/gEx9SiUt1+G Eq4A== 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=ez4ezJGM8Jye68W6k3JKSGLh1n6D0kATjez8aR9Nk54=; b=UlrpD0i09jDn17VRHCU7razmzUvXxVTgrs2gBFseNkkrE2+JLtGMw4KViGXNfF3zTl f0BKwdXFypcJvKOn1dgJ7cXJvkOwuh/fiz9Bdb7ldoQoFqtU9YgaoMjLTcecZR8lTD/F t2V8DNKc2MZOsjY/GWRtijMm6s85XlJwi8riXXfQNysbLcind/WCNHKuwiH91DPUWsZe 4vA66oovpOrpQyEIk/IhvqKzqQbgu9q76Y78NRJbvI3Vw0bdO0JwJz51dAJBwNbYHhg7 nc4HsK5dQ5WmDKhOaFkpECvgZYJaLcXGAq9GPR8WffYnR5Nl3vla+1AXuLLuFSab3pri dgbw== X-Gm-Message-State: AOAM531rXmaO/fatRS9Ay4gcHS98Kjh82F+2/9o6TSMujY66QhEek+2M /LbR/T72vJlNptkyOf7HW6kt68x+8uU3QBm5ehI= X-Google-Smtp-Source: ABdhPJzjQSGFtJU+tB0SjZoeZ35rs2S4wU4sI06EPwHTB2KSFHgQdm+IXGMc26iCRHlhPIq+4sBJLg== X-Received: by 2002:a05:6000:345:: with SMTP id e5mr20485510wre.333.1605559402826; Mon, 16 Nov 2020 12:43:22 -0800 (PST) Received: from localhost ([2a01:4b00:8523:2d03:bc40:bd71:373a:1b33]) by smtp.gmail.com with ESMTPSA id l24sm566784wmi.7.2020.11.16.12.43.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Nov 2020 12:43:21 -0800 (PST) From: David Brazdil To: kvmarm@lists.cs.columbia.edu Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Marc Zyngier , James Morse , Julien Thierry , Suzuki K Poulose , Catalin Marinas , Will Deacon , Dennis Zhou , Tejun Heo , Christoph Lameter , Mark Rutland , Lorenzo Pieralisi , Quentin Perret , Andrew Scull , Andrew Walbran , kernel-team@android.com, David Brazdil Subject: [PATCH v2 00/24] Opt-in always-on nVHE hypervisor Date: Mon, 16 Nov 2020 20:42:54 +0000 Message-Id: <20201116204318.63987-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.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 CPU_ON/SUSPEND calls. 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. private 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 5.10-rc4. 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 (24): psci: Support psci_ops.get_version for v0.1 psci: Accessor for configured PSCI function IDs arm64: Make cpu_logical_map() take unsigned int arm64: Move MAIR_EL1_SET to asm/memory.h kvm: arm64: Initialize MAIR_EL2 using a constant kvm: arm64: Move hyp-init params to a per-CPU struct kvm: arm64: Refactor handle_trap to use a switch kvm: arm64: Add SMC handler in nVHE EL2 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: 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 parts of el2_setup into a macro kvm: arm64: Extract __do_hyp_init into a helper function kvm: arm64: Add CPU entry point in nVHE hyp kvm: arm64: Add function to enter host from KVM nVHE hyp code kvm: arm64: Intercept host's PSCI_CPU_ON SMCs kvm: arm64: Intercept host's CPU_SUSPEND PSCI SMCs kvm: arm64: Add kvm-arm.protected early kernel parameter kvm: arm64: Keep nVHE EL2 vector installed kvm: arm64: Trap host SMCs in protected mode. kvm: arm64: Fix EL2 mode availability checks arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/el2_setup.h | 185 +++++++++++++++++ arch/arm64/include/asm/kvm_arm.h | 1 + arch/arm64/include/asm/kvm_asm.h | 16 +- arch/arm64/include/asm/kvm_hyp.h | 8 + arch/arm64/include/asm/memory.h | 29 ++- 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/sysreg.h | 30 +++ arch/arm64/include/asm/virt.h | 26 +++ arch/arm64/kernel/asm-offsets.c | 5 + arch/arm64/kernel/cpufeature.c | 29 +++ arch/arm64/kernel/head.S | 144 ++----------- arch/arm64/kernel/image-vars.h | 3 + arch/arm64/kernel/setup.c | 2 +- arch/arm64/kernel/vmlinux.lds.S | 10 + arch/arm64/kvm/arm.c | 94 +++++++-- arch/arm64/kvm/hyp/nvhe/Makefile | 3 +- arch/arm64/kvm/hyp/nvhe/host.S | 47 +++++ arch/arm64/kvm/hyp/nvhe/hyp-init.S | 90 +++++++-- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 47 ++++- 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 | 289 +++++++++++++++++++++++++++ arch/arm64/kvm/hyp/nvhe/switch.c | 5 +- arch/arm64/kvm/va_layout.c | 30 ++- arch/arm64/mm/proc.S | 15 +- drivers/firmware/psci/psci.c | 21 +- include/linux/psci.h | 10 + 30 files changed, 977 insertions(+), 217 deletions(-) create mode 100644 arch/arm64/include/asm/el2_setup.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.299.gdc1121823c-goog