Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751822AbeAENMp (ORCPT + 1 other); Fri, 5 Jan 2018 08:12:45 -0500 Received: from foss.arm.com ([217.140.101.70]:44722 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750837AbeAENMm (ORCPT ); Fri, 5 Jan 2018 08:12:42 -0500 From: Will Deacon To: linux-arm-kernel@lists.infradead.org Cc: catalin.marinas@arm.com, ard.biesheuvel@linaro.org, marc.zyngier@arm.com, lorenzo.pieralisi@arm.com, christoffer.dall@linaro.org, linux-kernel@vger.kernel.org, labbott@redhat.com, Will Deacon Subject: [PATCH v2 00/11] arm64 kpti hardening and variant 2 workarounds Date: Fri, 5 Jan 2018 13:12:30 +0000 Message-Id: <1515157961-20963-1-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Hi again, This is version two of the patches I posted yesterday: http://lists.infradead.org/pipermail/linux-arm-kernel/2018-January/551838.html Changes since v1: * Added comment to BL/RET sequence in trampoline page * Removed writeback addressing modes from Hyp PSCI register save/restore * Avoid save/restore of x18/x19 across Hyp PSCI call * Always print message when kpti is enabled * Added tags Cheers, Will --->8 Marc Zyngier (3): arm64: Move post_ttbr_update_workaround to C code arm64: KVM: Use per-CPU vector when BP hardening is enabled arm64: KVM: Make PSCI_VERSION a fast path Will Deacon (8): arm64: use RET instruction for exiting the trampoline arm64: Kconfig: Reword UNMAP_KERNEL_AT_EL0 kconfig entry arm64: Take into account ID_AA64PFR0_EL1.CSV3 arm64: cpufeature: Pass capability structure to ->enable callback drivers/firmware: Expose psci_get_version through psci_ops structure arm64: Add skeleton to harden the branch predictor against aliasing attacks arm64: cputype: Add missing MIDR values for Cortex-A72 and Cortex-A75 arm64: Implement branch predictor hardening for affected Cortex-A CPUs arch/arm/include/asm/kvm_mmu.h | 10 ++++ arch/arm64/Kconfig | 30 +++++++--- arch/arm64/include/asm/assembler.h | 13 ----- arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/cputype.h | 4 ++ arch/arm64/include/asm/kvm_mmu.h | 38 ++++++++++++ arch/arm64/include/asm/mmu.h | 37 ++++++++++++ arch/arm64/include/asm/sysreg.h | 2 + arch/arm64/kernel/Makefile | 4 ++ arch/arm64/kernel/bpi.S | 79 +++++++++++++++++++++++++ arch/arm64/kernel/cpu_errata.c | 116 +++++++++++++++++++++++++++++++++++++ arch/arm64/kernel/cpufeature.c | 13 ++++- arch/arm64/kernel/entry.S | 12 +++- arch/arm64/kvm/hyp/switch.c | 15 ++++- arch/arm64/mm/context.c | 11 ++++ arch/arm64/mm/fault.c | 1 + arch/arm64/mm/proc.S | 3 +- drivers/firmware/psci.c | 2 + include/linux/psci.h | 1 + virt/kvm/arm/arm.c | 8 ++- 20 files changed, 372 insertions(+), 30 deletions(-) create mode 100644 arch/arm64/kernel/bpi.S -- 2.1.4