Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp6401223ybv; Wed, 12 Feb 2020 11:29:35 -0800 (PST) X-Google-Smtp-Source: APXvYqzMAQNZov20VWpxtkreJkX3+H8wcN49QPaBb2FwH0I3YFfq9pADFV3j6aXgbN2B2ogRQ2+R X-Received: by 2002:aca:c692:: with SMTP id w140mr426334oif.139.1581535775063; Wed, 12 Feb 2020 11:29:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581535775; cv=none; d=google.com; s=arc-20160816; b=Hn4+qtjuxEvedmscm1zRQZm9loCtzGVyJXIMXjEcwsFXtzyUsCqBBxMNkJYcmsUEIL UCxOMQU+bfExkTDgtGu4uPrA5SqoNQWgqA+1tcpWILpz3l2OMNQ9mefAxpeafZnA+dd7 cVXk7ClzQhdo9NYk47ZILzMeC+oxo5ywozlqAFlpLU5X7QWwOfi732JOB2pHxf09I/CJ I4L+9qKk95w9Xlir2dqyuHBafi0G2zYhBWGtNUgsv4IcEfaIL0I9bAkzVCqh2Bo9eWf3 0ornX4YZcolKKmJh4FfYyErVTHBuexhMXzMvsSqjlYrCHHTHjbtgNoYc7JK3xoTM0jeZ b1MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=yPWzTJjQPyyHmAxdcRxE8fIuEunn01992mUSIGYAVZQ=; b=eBgHohsHPBWLh8MiD0UMvW5Xn2iwpX9XSrxJAXqtgVJ2ZyroDZooDjRkm29r81xpuq Mkw1BJwqG/BX2Q3iXbmCl+hdyBWSpRFJxN9FOCfO14Gl9yaCaC1lXLFWJnPEacZTzPpQ t/dzXfcNBLUT3WTUugk3BuPWqoz48ZAFbw6zFG/drMLM56ZILL5KElAGR5YVvvzU2B6/ UyX2/9B5u7wkAWbwsgghXWpcws/5vOwdgrz1AZ198zIx1ko+3zQdhRPpalmfS3raJX/q gjzO1PkDeh1dkITY/Sm1cwC0R2egibt2S7qs5ro5hZDJfkRFa3UmYLIAE9e96wtEqh6S 5aAQ== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w20si28623oic.103.2020.02.12.11.29.22; Wed, 12 Feb 2020 11:29:35 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728958AbgBLT3N (ORCPT + 99 others); Wed, 12 Feb 2020 14:29:13 -0500 Received: from foss.arm.com ([217.140.110.172]:36884 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727361AbgBLT3M (ORCPT ); Wed, 12 Feb 2020 14:29:12 -0500 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 2B6FF30E; Wed, 12 Feb 2020 11:29:12 -0800 (PST) Received: from localhost (unknown [10.37.6.21]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A353A3F68E; Wed, 12 Feb 2020 11:29:11 -0800 (PST) From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Alexander Viro , Paul Elliott , Peter Zijlstra , Yu-cheng Yu , Amit Kachhap , Vincenzo Frascino , Marc Zyngier , Eugene Syromiatnikov , Szabolcs Nagy , "H . J . Lu " , Andrew Jones , Kees Cook , Arnd Bergmann , Jann Horn , Richard Henderson , =?UTF-8?q?Kristina=20Mart=C5=A1enko?= , Thomas Gleixner , Florian Weimer , Sudakshina Das , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-fsdevel@vger.kernel.org, Mark Brown Subject: [PATCH v6 00/11] arm64: Branch Target Identification support Date: Wed, 12 Feb 2020 19:28:55 +0000 Message-Id: <20200212192906.53366-1-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. Changes: v6: - Rebase onto v5.6-rc1. - Fix typos s/BYTPE/BTYPE/ in commit log for "arm64: BTI: Decode BYTPE bits when printing PSTATE". v5: - Changed a bunch of -EIO to -ENOEXEC in the ELF parsing code. - Move PSR_BTYPE defines to UAPI. - Use compat_user_mode() rather than open coding. - Fix a typo s/BYTPE/BTYPE/ in syscall.c v4: - Dropped patch fixing existing documentation as it has already been merged. - Convert WARN_ON() to WARN_ON_ONCE() in "ELF: Add ELF program property parsing support". - Added display of guarded pages to ptdump. - Updated for conversion of exception handling from assembler to C. Notes: * 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. Dave Martin (10): ELF: UAPI and Kconfig additions for ELF program properties ELF: Add ELF program property parsing support 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 BTYPE bits when printing PSTATE arm64: unify native/compat 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 Mark Brown (1): arm64: mm: Display guarded pages in ptdump Documentation/arm64/cpu-feature-registers.rst | 2 + Documentation/arm64/elf_hwcaps.rst | 5 + arch/arm64/Kconfig | 25 +++ 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/exception.h | 1 + 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 | 1 + 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 | 9 ++ arch/arm64/kernel/cpufeature.c | 33 ++++ arch/arm64/kernel/cpuinfo.c | 1 + arch/arm64/kernel/entry-common.c | 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 | 127 +++++++-------- arch/arm64/mm/dump.c | 5 + 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/linux/elf.h | 11 ++ 33 files changed, 551 insertions(+), 75 deletions(-) create mode 100644 arch/arm64/include/asm/mman.h create mode 100644 arch/arm64/include/uapi/asm/mman.h -- 2.20.1