Received: by 10.223.176.5 with SMTP id f5csp3172103wra; Mon, 29 Jan 2018 09:49:43 -0800 (PST) X-Google-Smtp-Source: AH8x224n0eZIo0IuNHt4b92a38F7yCOqhGL/Ew+ZWGHvczwYUxBzohuRtQ+WToNcIMYGQT8tPM5a X-Received: by 10.98.226.24 with SMTP id a24mr27839238pfi.192.1517248183535; Mon, 29 Jan 2018 09:49:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517248183; cv=none; d=google.com; s=arc-20160816; b=KreKdbyKr+9QgSfN8s/6GJ7fpXr9QLMi7wfO6SRkNtE2AxFCspJk1ESZPxfm1lrLL1 AYgwFd4V1AjGsn/+Uq5IhEcMKlaCPd5n0fPXaDOCgJeMfRSFOoXHxAmZ/rVoGP7PmfZg u55UVxbcTibp5a1+zWFYBmll4p+zINJr3OSzriOerWY3BxADdmufhCOE1j4MAj9fxp1a 69Nr+TCHkJO05AtuFL3W+yHn3MhLLlVZJaYkX3HkSlrV3OPrjC3byWKXI9mP4EYzdfri LX4d6Gh+nisV7UFuhEwwLpZ2KnOwx9L/a8GyJAySS3dpDlMNq5LwsckNKLL2MyJDHsY0 iZWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=XuzxuyFwn+aNqK0aUf/ADqlwl+IjfKDQzb3PqPp1qtk=; b=gQm1t8StD+ybEVKv3NK5m1sveDq0SzoOFwUDXQLPlVqfptTcndeyUCToI72wKow85n dYzdfODwbG4hfLmDC4RQQmz9a7FdIGXzMfIcOmYu2nBYfZLwLh93MHAVycKVO5CnwXsF hUS7R+TdSXm21Cv733DhXeNhZOw3ILYN81hxLaRT9K8/70o9Ffup2jg7e5EF0drkok5w pfz6ED0ahEkpPWt5/3E+EKWWkLBepFHx4iV6UUneHfFWa+G4sWudzS2JAEXiNmF2MrLr ZF/cnS/Nb7ihij66Ldj2iY+SXXMxiGye9M7yL2HSzmeB6HXUWVZQO1oVThLcV0V5jbrv ICgg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n64si12343432pfb.184.2018.01.29.09.49.29; Mon, 29 Jan 2018 09:49:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751478AbeA2RqP (ORCPT + 99 others); Mon, 29 Jan 2018 12:46:15 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:43432 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751411AbeA2RqO (ORCPT ); Mon, 29 Jan 2018 12:46:14 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CEBFE1435; Mon, 29 Jan 2018 09:46:13 -0800 (PST) Received: from approximate.cambridge.arm.com (approximate.cambridge.arm.com [10.1.207.62]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B9EF83F487; Mon, 29 Jan 2018 09:46:11 -0800 (PST) From: Marc Zyngier To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu Cc: Catalin Marinas , Will Deacon , Peter Maydell , Christoffer Dall , Lorenzo Pieralisi , Mark Rutland , Robin Murphy , Ard Biesheuvel , Jon Masters Subject: [PATCH v2 00/16] arm64: Add SMCCC v1.1 support and CVE-2017-5715 (Spectre variant 2) mitigation Date: Mon, 29 Jan 2018 17:45:43 +0000 Message-Id: <20180129174559.1866-1-marc.zyngier@arm.com> X-Mailer: git-send-email 2.14.2 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ARM has recently published a SMC Calling Convention (SMCCC) specification update[1] that provides an optimised calling convention and optional, discoverable support for mitigating CVE-2017-5715. ARM Trusted Firmware (ATF) has already gained such an implementation[2]. This series addresses a few things: - It provides a KVM implementation of PSCI v1.0, which is a prerequisite for being able to discover SMCCC v1.1, together with a new userspace API to control the PSCI revision number that the guest sees. - It allows KVM to advertise SMCCC v1.1, which is de-facto supported already (it never corrupts any of the guest registers). - It implements KVM support for the ARCH_WORKAROUND_1 function that is used to mitigate CVE-2017-5715 in a guest (if such mitigation is available on the host). - It implements SMCCC v1.1 and ARCH_WORKAROUND_1 discovery support in the kernel itself. - It finally provides firmware callbacks for CVE-2017-5715 for both kernel and KVM. This method is intended to fully replace the initial PSCI_GET_VERSION approach. Although PSCI_GET_VERSION still works, it has an obvious overhead and is called on some of the hottest paths. We expect ARCH_WORKAROUND_1 to be much faster. Patch 1 is already merged, and included here for reference. Patches on top of arm64/for-next/core. Tested on Seattle and Juno, the latter with ATF implementing SMCCC v1.1. [1]: https://developer.arm.com/-/media/developer/pdf/ARM%20DEN%200070A%20Firmware%20interfaces%20for%20mitigating%20CVE-2017-5715_V1.0.pdf Hopefully this link is a persistent one. It is otherwise linked to from [3], which is persistent. [2]: https://github.com/ARM-software/arm-trusted-firmware/pull/1240 [3]: https://developer.arm.com/support/security-update/frequently-asked-questions * From v1: - Fixed 32bit build - Fix function number sign extension (Ard) - Inline SMCCC v1.1 primitives (cpp soup) - Prevent SMCCC spamming on feature probing - Random fixes and tidying up Marc Zyngier (16): arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls arm: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls arm/arm64: KVM: Consolidate the PSCI include files arm/arm64: KVM: Add PSCI_VERSION helper arm/arm64: KVM: Add smccc accessors to PSCI code arm/arm64: KVM: Implement PSCI 1.0 support arm/arm64: KVM: Add PSCI version selection API arm/arm64: KVM: Advertise SMCCC v1.1 arm/arm64: KVM: Turn kvm_psci_version into a static inline arm64: KVM: Report SMCCC_ARCH_WORKAROUND_1 BP hardening support arm64: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling firmware/psci: Expose PSCI conduit firmware/psci: Expose SMCCC version through psci_ops arm/arm64: smccc: Make function identifiers an unsigned quantity arm/arm64: smccc: Implement SMCCC v1.1 inline primitive arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support Documentation/virtual/kvm/api.txt | 3 +- Documentation/virtual/kvm/arm/psci.txt | 30 +++++ arch/arm/include/asm/kvm_host.h | 3 + arch/arm/include/asm/kvm_psci.h | 27 ----- arch/arm/include/uapi/asm/kvm.h | 6 + arch/arm/kvm/guest.c | 13 +++ arch/arm/kvm/handle_exit.c | 8 +- arch/arm64/include/asm/kvm_host.h | 3 + arch/arm64/include/asm/kvm_psci.h | 44 ++++++- arch/arm64/include/uapi/asm/kvm.h | 6 + arch/arm64/kernel/bpi.S | 20 ++++ arch/arm64/kernel/cpu_errata.c | 68 ++++++++++- arch/arm64/kvm/guest.c | 14 ++- arch/arm64/kvm/handle_exit.c | 9 +- arch/arm64/kvm/hyp/hyp-entry.S | 20 +++- arch/arm64/kvm/hyp/switch.c | 20 ++-- drivers/firmware/psci.c | 49 +++++++- include/kvm/arm_psci.h | 63 ++++++++++ include/linux/arm-smccc.h | 181 ++++++++++++++++++++++++++++- include/linux/psci.h | 13 +++ virt/kvm/arm/arm.c | 2 +- virt/kvm/arm/psci.c | 202 +++++++++++++++++++++++++++++---- 22 files changed, 721 insertions(+), 83 deletions(-) create mode 100644 Documentation/virtual/kvm/arm/psci.txt delete mode 100644 arch/arm/include/asm/kvm_psci.h create mode 100644 include/kvm/arm_psci.h -- 2.14.2