From patchwork Wed Dec 11 15:41:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 181251 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp700496ile; Wed, 11 Dec 2019 07:42:56 -0800 (PST) X-Google-Smtp-Source: APXvYqxEvB6fdW56cR5RIReIoIgUhDZt8vofWrzk02O5cGk5fWz9CkZU0PKcDvjS9QdFLS3sqSAR X-Received: by 2002:aca:57d4:: with SMTP id l203mr3259122oib.113.1576078975975; Wed, 11 Dec 2019 07:42:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576078975; cv=none; d=google.com; s=arc-20160816; b=SH8yjzOCJzMI96WNFQS/FJEz66fk4b6tzv3divHDBzbK3vkyobpgdehur2Tqz9Rgg3 kidxUPyhfE894lHNxqyVZvDudYL3T+2W1oWmioSXA+UafJLI/UJN68pbEq4b1OraaP1I nH0ObimRk6ekgrP8F0zY8nbaPIn/LjVZU24g8F3FvaKIQVYTUK70Qsyp6B/AdO+FC0WU +Ags3Wu00GbAf/HPJ/nv7ErDYYPg9HOn7HUiLjPvmbQdde/GRmEEjhUjlScHILxWOIJM f6G4EQGQS3kgmQJ8QfXC6k+DFJpsXtEg/4idvmcu8C/Dy0nLpXmvvmySi6yW+wUE9Fsr OsOA== 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=RfEICkzmHup98QICq8BbJizxTW1J39Jnl2ZCIcYnB2w=; b=GtaGqCUvijQt88GS1HhjTVrFOLpRaHiOnDQCygzzwveOwapZo7juCLjy4v3hsXihgU Oe+DsWFnVilHLnO64UEPtrTIWv9gXuUQ1q6xzDahu2Wz1gwTw4OXNL/ak2+tFRTUxiqG UrBX1FiuAD2IPZwc2G+aOdIDF14lBHquZ35/51tDiUFWx2tPOVbaoAFKnpIB7xjCxnQW vIbb3hbUyAJ+FPemkOKc8zsas9YF+nPVLMOPG0tFl2THFO8ehwLvIas9MHfwac4YFrTR b/BZXcDPuoGwCvGWd55Lu40ks5CwqnTHQJGx+znjZLy1NfHgBh7BHyfqMGH2ZZ5WHZp5 Om4Q== 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 l6si1422002oti.249.2019.12.11.07.42.55; Wed, 11 Dec 2019 07:42:55 -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 S2388483AbfLKPmy (ORCPT + 27 others); Wed, 11 Dec 2019 10:42:54 -0500 Received: from foss.arm.com ([217.140.110.172]:35326 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388672AbfLKPmu (ORCPT ); Wed, 11 Dec 2019 10:42:50 -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 B055430E; Wed, 11 Dec 2019 07:42:49 -0800 (PST) Received: from localhost (unknown [10.37.6.21]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 094183F52E; Wed, 11 Dec 2019 07:42:49 -0800 (PST) From: Mark Brown To: Catalin Marinas , Will Deacon Cc: 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_Mart=C5=A1enko?= , Thomas Gleixner , Florian Weimer , Sudakshina Das , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Mark Brown Subject: [PATCH v4 00/12] arm64: ARMv8.5-A: Branch Target Identification support Date: Wed, 11 Dec 2019 15:41:54 +0000 Message-Id: <20191211154206.46260-1-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 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. This is mainly a repost based on v5.5-rc1. Changes: 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 (11): 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: 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: 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 | 4 + arch/arm64/Kconfig | 29 ++++ 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 | 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-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/asm-generic/mman-common.h | 1 + include/uapi/linux/elf.h | 11 ++ 34 files changed, 554 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