From patchwork Mon Mar 16 16:50:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 11440763 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BA6D714B4 for ; Mon, 16 Mar 2020 16:51:06 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 93C0220679 for ; Mon, 16 Mar 2020 16:51:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pOTQAta2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 93C0220679 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=PS99NtbizpvVILM7JdYbZsoZjouA4nsXBgEqWaiD088=; b=pOTQAta2tdUK8B a9rp63iOek4K01fnNp7/fpMm8ZY9OY6D8yqkIRuGsycz6Cv9udfFdaLQxKraRRPir9JaWGkUHniw0 hRvQAMPEwjwLHcLmTkeU4T+yc5joF2CUXtIfzOYIexd9x+IqmvkOzfrDbU74XQsYe+aryslm7msNb S9PI9hxEMySdW2pvYKgLjNLsW2atGz8UwIbpVJ3cfj0WLW9QslbE1D0i6zMwanV3K8oU6xmWd693N hknVlQqDsrU5bZ2fcZ1fJ5971Opr30ofpceIk/L+Wukd2jbWHS6M44GIRU/AC72cWZEYs/nGFeML+ Ft18eZQFsbpwK1eCtGhw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jDsxE-0005MR-Mz; Mon, 16 Mar 2020 16:51:04 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jDsxB-0005Kz-PA for linux-arm-kernel@lists.infradead.org; Mon, 16 Mar 2020 16:51:03 +0000 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 E3AF21FB; Mon, 16 Mar 2020 09:50:58 -0700 (PDT) Received: from localhost (unknown [10.37.6.21]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 66E533F67D; Mon, 16 Mar 2020 09:50:58 -0700 (PDT) From: Mark Brown To: Catalin Marinas , Will Deacon Subject: [PATCH v10 00/13] arm64: Branch Target Identification support Date: Mon, 16 Mar 2020 16:50:42 +0000 Message-Id: <20200316165055.31179-1-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200316_095101_908378_C0CBFBA3 X-CRM114-Status: GOOD ( 16.33 ) X-Spam-Score: -2.1 (--) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-2.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [217.140.110.172 listed in list.dnswl.org] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Elliott , Peter Zijlstra , Andrew Jones , Amit Kachhap , Vincenzo Frascino , linux-arch@vger.kernel.org, Marc Zyngier , Eugene Syromiatnikov , Szabolcs Nagy , "H . J . Lu " , Yu-cheng Yu , Kees Cook , Arnd Bergmann , Jann Horn , Richard Henderson , =?utf-8?q?Kristina_Mart?= =?utf-8?q?=C5=A1enko?= , Mark Brown , Alexander Viro , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Florian Weimer , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Sudakshina Das Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This patch series 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: v10: - Fix build for !COMPAT configurations. v9: - Move Kconfig addition to final patch in series. - Add patch from Daniel Kiss adding BTI information to smaps, this has a trivial conflict with a .rst conversion in -next. v8: - Remove a redundant IS_ENABLED(CONFIG_ARM64_BTI) check. v7: - Rebase onto v5.6-rc3. - Move comment about keeping NT_GNU_PROPERTY_TYPE_0 internal into first patch. - Add an explicit check for system_supports_bti() when parsing BTI ELF property for improved robustness. 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 2.33 and later support the new ELF note. 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 appropriate BTI landing pads. Daniel Kiss (1): mm: smaps: Report arm64 guarded pages in smaps Dave Martin (11): 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 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 arm64: BTI: Add Kconfig entry for userspace BTI Mark Brown (1): arm64: mm: Display guarded pages in ptdump Documentation/arm64/cpu-feature-registers.rst | 2 + Documentation/arm64/elf_hwcaps.rst | 5 + Documentation/filesystems/proc.txt | 1 + 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 | 131 ++++++++-------- arch/arm64/mm/dump.c | 5 + fs/Kconfig.binfmt | 6 + fs/binfmt_elf.c | 145 +++++++++++++++++- fs/compat_binfmt_elf.c | 4 + fs/proc/task_mmu.c | 3 + include/linux/elf.h | 43 ++++++ include/linux/mm.h | 3 + include/uapi/linux/elf.h | 11 ++ 35 files changed, 560 insertions(+), 74 deletions(-) create mode 100644 arch/arm64/include/asm/mman.h create mode 100644 arch/arm64/include/uapi/asm/mman.h base-commit: f8788d86ab28f61f7b46eb6be375f8a726783636