From patchwork Fri Oct 18 17:25:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 176904 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1159071ill; Fri, 18 Oct 2019 10:26:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqyrigVzGKKeQR/zHenAf/P0WZvubtP7l6BxP/9XXV2uLZUcJgfa52HFfQr3sX5QM9d7f7OF X-Received: by 2002:a17:906:474b:: with SMTP id j11mr9816571ejs.325.1571419581819; Fri, 18 Oct 2019 10:26:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571419581; cv=none; d=google.com; s=arc-20160816; b=TYpb4Wc+3n1R2b1Cqx30CLqZuWWpyO4N7pSTFEfsGahrfjPZjyhhSGJuL/xhOYOr/H J8FppSbjg/s6rj8rm/UUUojrjyWGPe3p5y1abCK/LcyD41uAONSKdq29FlSUCXJhWDqd pcIPYtN8iHQY8JVVZm7q1qCTwN+wSpuZrrZSZxse1KkwHKwFKclSsRuoqBQHyArdLqJ4 WcwfKT6Fs/dU2ibI0qDqhDbP2I6hImX+u/E+vzZD2jyFDSAp1i0CdPKVzcjzGZkH7Lwa oMvqnd0d4eVLHxRxV2/uwTM6pD4bpPR0RfDBIn2nay9WeaUgeNYZR4eNM7vXaiBK6iW9 YBAQ== 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; bh=R3JQ4SEqaODRDKS74mcZb15iSYtIBVyTvy2pHuJXgLs=; b=SoOiVgStpY+Au4+3l7xZhBxEQ3z5KUkSRASmRvO6Jkf2CAXfR7au1A+LxC0IiGDRlb S4YmJON9Z/S0kzYB8+kOP0MLaMdMT0AETz/RAkf9z5NUlWOhOvnJ5a+W0Hbh8EhWMWty fEp+SOBrNa3S7VDsk8PFC7VnDR/L6dBIpkkTdpz3PNzJKzCQh8mzcl4J8mxCN7NI/w6U K48TXoYZvOxX56zzZuvnXFmIvYkhDW+pRL644+SbsSHkyw7R7mIyS1UVUT6jw/fCrDLp w9dIm7jhsnu/o2Pf+BGUy36bO5cuP1Yb6+R+PclVuamzJLZ5VtmolHsN+yVlyS5QoVe/ SRVQ== 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 n8si3905057eju.311.2019.10.18.10.26.21; Fri, 18 Oct 2019 10:26:21 -0700 (PDT) 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 S2410601AbfJRR0U (ORCPT + 26 others); Fri, 18 Oct 2019 13:26:20 -0400 Received: from [217.140.110.172] ([217.140.110.172]:46894 "EHLO foss.arm.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1729210AbfJRR0T (ORCPT ); Fri, 18 Oct 2019 13:26:19 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B161E1063; Fri, 18 Oct 2019 10:25:54 -0700 (PDT) Received: from e103592.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E56E63F718; Fri, 18 Oct 2019 10:25:51 -0700 (PDT) From: Dave Martin To: linux-kernel@vger.kernel.org Cc: Andrew Jones , Arnd Bergmann , Catalin Marinas , Eugene Syromiatnikov , Florian Weimer , "H.J. Lu" , Jann Horn , Kees Cook , =?utf-8?q?Kristina_Mart=C5=A1enko?= , Marc Zyngier , Mark Brown , Paul Elliott , Peter Zijlstra , Richard Henderson , Sudakshina Das , Szabolcs Nagy , Thomas Gleixner , Will Deacon , Yu-cheng Yu , Amit Kachhap , Vincenzo Frascino , linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 00/12] arm64: ARMv8.5-A: Branch Target Identification support Date: Fri, 18 Oct 2019 18:25:33 +0100 Message-Id: <1571419545-20401-1-git-send-email-Dave.Martin@arm.com> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch implements support for ARMv8.5-A Branch Target Identification (BTI), which is a control flow integrity protection feature introduced as part of the ARMv8.5-A extensions. The series is based on v5.4-rc2. A branch for this series is available in Git [3]. This series supersedes the previous v2 posting [1], and also incorporates my proposed ELF GNU property parsing implementation. (See [2] for the ABI spec describing NT_GNU_PROPERTY_TYPE_0). Changes: * Minor cleanups / nitpick fixes only. Since this is an interim update so that Mark Brown can take over development of the series, I haven't fully retested. The series builds with defconfig. There are some outstanding discussion points: see notes in the invidual patches, particularly on patch 5. Notes: * No documentation yet. We could do with some being written before this series gets merged. * GCC 9 can compile backwards-compatible BTI-enabled code with -mbranch-protection=bti or -mbranch-protection=standard. * Binutils trunk supports the new ELF note, but this wasn't in a release the last time I posted this series. (The situation _might_ have changed in the meantime...) Creation of a BTI-enabled binary requires _everything_ linked in to be BTI-enabled. For now ld --force-bti can be used to override this, but some things may break until the required C library support is in place. There is no straightforward way to mark a .s file as BTI-enabled: scraping the output from gcc -S works as a quick hack for now. readelf -n can be used to examing the program properties in an ELF file. * Runtime mmap() and mprotect() can be used to enable BTI on a page-by-page basis using the new PROT_BTI, but the code in the affected pages still needs to be written or compiled to contain the appopriate BTI landing pads. [1] [PATCH v2 00/12] arm64: ARMv8.5-A: Branch Target Identification support https://lore.kernel.org/lkml/1570733080-21015-1-git-send-email-Dave.Martin@arm.com/ [2] Linux Extensions to gABI https://github.com/hjl-tools/linux-abi/wiki/Linux-Extensions-to-gABI [3] Git branch: git://linux-arm.org/linux-dm.git arm64/bti/v3/head http://linux-arm.org/git?p=linux-dm.git;a=shortlog;h=refs/heads/arm64/bti/v3/head Dave Martin (12): ELF: UAPI and Kconfig additions for ELF program properties ELF: Add ELF program property parsing support mm: Reserve asm-generic prot flag 0x10 for arch use arm64: docs: cpu-feature-registers: Document ID_AA64PFR1_EL1 arm64: Basic Branch Target Identification support elf: Allow arch to tweak initial mmap prot flags arm64: elf: Enable BTI at exec based on ELF program properties arm64: BTI: Decode BYTPE bits when printing PSTATE arm64: traps: Fix inconsistent faulting instruction skipping arm64: traps: Shuffle code to eliminate forward declarations arm64: BTI: Reset BTYPE when skipping emulated instructions KVM: arm64: BTI: Reset BTYPE when skipping emulated instructions Documentation/arm64/cpu-feature-registers.rst | 17 ++- Documentation/arm64/elf_hwcaps.rst | 4 + arch/arm64/Kconfig | 31 ++++++ arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/cpufeature.h | 6 ++ arch/arm64/include/asm/elf.h | 50 +++++++++ arch/arm64/include/asm/esr.h | 2 +- arch/arm64/include/asm/hwcap.h | 1 + arch/arm64/include/asm/kvm_emulate.h | 6 +- arch/arm64/include/asm/mman.h | 37 +++++++ arch/arm64/include/asm/pgtable-hwdef.h | 1 + arch/arm64/include/asm/pgtable.h | 2 +- arch/arm64/include/asm/ptrace.h | 8 ++ arch/arm64/include/asm/sysreg.h | 4 + arch/arm64/include/uapi/asm/hwcap.h | 1 + arch/arm64/include/uapi/asm/mman.h | 9 ++ arch/arm64/include/uapi/asm/ptrace.h | 1 + arch/arm64/kernel/cpufeature.c | 33 ++++++ arch/arm64/kernel/cpuinfo.c | 1 + arch/arm64/kernel/entry.S | 11 ++ arch/arm64/kernel/process.c | 36 ++++++- arch/arm64/kernel/ptrace.c | 2 +- arch/arm64/kernel/signal.c | 16 +++ arch/arm64/kernel/syscall.c | 18 ++++ arch/arm64/kernel/traps.c | 126 +++++++++++----------- fs/Kconfig.binfmt | 6 ++ fs/binfmt_elf.c | 145 ++++++++++++++++++++++++-- fs/compat_binfmt_elf.c | 4 + include/linux/elf.h | 43 ++++++++ include/linux/mm.h | 3 + include/uapi/asm-generic/mman-common.h | 1 + include/uapi/linux/elf.h | 11 ++ 32 files changed, 560 insertions(+), 79 deletions(-) create mode 100644 arch/arm64/include/asm/mman.h create mode 100644 arch/arm64/include/uapi/asm/mman.h -- 2.1.4