From patchwork Thu Oct 11 15:14:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu-cheng Yu X-Patchwork-Id: 10636843 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DAFD617E1 for ; Thu, 11 Oct 2018 15:20:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BEA5B2B9F7 for ; Thu, 11 Oct 2018 15:20:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B21562B9CF; Thu, 11 Oct 2018 15:20:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1ECDA2B9CD for ; Thu, 11 Oct 2018 15:20:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7D1C16B0007; Thu, 11 Oct 2018 11:20:47 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 75E936B0008; Thu, 11 Oct 2018 11:20:47 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 53A186B000C; Thu, 11 Oct 2018 11:20:47 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id 0DFDB6B0007 for ; Thu, 11 Oct 2018 11:20:47 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id k66-v6so6222690pga.21 for ; Thu, 11 Oct 2018 08:20:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id; bh=ZvGxHMHbGgWElhlMwkLnUqiShUhFub8AVizuaZ98v34=; b=JKf/h8D/hmChsbINMDQlBRaW/AV+vqmWiA9vrLRckELL594STuMM8Lk13D2fqDcaIG PTq/+8NrU8W/mITy2Jm02usoihN0cjkLg9dy8HZ+pHL41TluqWd+Jr0eCwAKHBajK6a2 G6ViSTo/O7TqPO5TXX1r/3cXIp2Q4DZINCHSUisfKv7zTdT/TXGm/btDY3v2qC27644B laO6Du+JqQaf468LtuI20YFuXq/nL5pqMEn33YlqNKiiW0sveXWGL/lv0sHOOBg5n+wM QEvATSuHf7MHGcSF0TI+/ZJ16slG/qGXzMt6dRDA2ZJmMWuJq6uFkDxkAMLXERzH3bCX q2+w== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: ABuFfogYmry/RSdQVfwQGuQDFbnCVNVZ3RuAnrs9FoPfc1zLBbsfbVmC 2HsqaC5vly+E9MwCn+1dCoP/BJLQP98So9ARVqVN60e+dlY4kvYirjAv5TXZ7rInhJftLT7He3w yhomvcnRkwM+qFdlUxa1SWHV/0G9NwlSkCySExyF3PGnmxibdo7BeLFuYUwuiraAJcw== X-Received: by 2002:a62:6383:: with SMTP id x125-v6mr1994202pfb.13.1539271246711; Thu, 11 Oct 2018 08:20:46 -0700 (PDT) X-Google-Smtp-Source: ACcGV62vD4nuK4eRs5MF+SPgqlxTUt6IMBTkp65kC884+cED2iP6bXBJOsdrcwD2GZvcHjKNdAbr X-Received: by 2002:a62:6383:: with SMTP id x125-v6mr1994125pfb.13.1539271245406; Thu, 11 Oct 2018 08:20:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539271245; cv=none; d=google.com; s=arc-20160816; b=T8wISv2pWH+ckwEgiGHx1raTzP8O2jDBDPCqd+uJmGdUQlmnDlVDsgpZ/c2HOqa95t fZbfeDTh1SqqzS/b7QTzvyjk7S4GAYQJZlxKdcj/jpuXUntN/Zh76IyfQ5bZZaUWrZqJ 1H2hbDH78lUqenyyiwwgpNvNRFtgdZy1SYEq+WY1T4+YgukQPeqfAHAA2EHl1qz9I0nd BoB522QA8/03z7ayyG2hLxakM9dvSOBJ5ttHQ4Y4kN5tqEO5lyjFLoSB3gmhImAHcYHf +F8o9j2krfWHKHKdSiWsAVatM66YUwTo6JWSAvc0mJ9t+3X6Zi/ovq2MdYJ+cjRm6LFK vUaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from; bh=ZvGxHMHbGgWElhlMwkLnUqiShUhFub8AVizuaZ98v34=; b=RTrnYYBSc6L+YKrCvECpDA5nHT0SNckgIYZ0YM79davawYH/D1UXoLU0Q66VtTlGTc 7iznPRIa1GDn7DXH4i69VIqvfU7L+IPu2rVu6nT5Smol6yf2IInOJ6ymGBGQlblv1g5L /x0TJqGrW/S94rH1KN860s6u7CiN0qdnmjZm+nk14LxP3lLTjL8PW9WAwagzOJoivSoN hvTf/wwC1PhZmNORM4Oe6THN59d7/SrmxUbGyNb0QC7fBdvL6/9T8g+SjKPmYUxp0LV8 67VSjVNbb2XIAOwLaIot8cRCvqJEkv8Q7p8BD3go/NSZv+9mu+crNHk0LObB6+crrbfe M0EQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga09.intel.com (mga09.intel.com. [134.134.136.24]) by mx.google.com with ESMTPS id m7-v6si30485701pfi.286.2018.10.11.08.20.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Oct 2018 08:20:45 -0700 (PDT) Received-SPF: pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.24 as permitted sender) client-ip=134.134.136.24; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Oct 2018 08:20:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,368,1534834800"; d="scan'208";a="78019071" Received: from 2b52.sc.intel.com ([143.183.136.147]) by fmsmga008.fm.intel.com with ESMTP; 11 Oct 2018 08:20:42 -0700 From: Yu-cheng Yu To: x86@kernel.org, "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, Arnd Bergmann , Andy Lutomirski , Balbir Singh , Cyrill Gorcunov , Dave Hansen , Eugene Syromiatnikov , Florian Weimer , "H.J. Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , Randy Dunlap , "Ravi V. Shankar" , Vedvyas Shanbhogue Cc: Yu-cheng Yu Subject: [PATCH v5 00/27] Control Flow Enforcement: Shadow Stack Date: Thu, 11 Oct 2018 08:14:56 -0700 Message-Id: <20181011151523.27101-1-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.17.1 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP The previous version of CET Shadow Stack patches is at the following link: https://lkml.org/lkml/2018/9/21/776 Summary of changes from v4: Clean up XSAVES system states patches. Update control protection fault handler to provide error code to user. Add CONFIG_VM_AREA_GUARD. Clean up arch_prctl. Fix some typos and macros. Yu-cheng Yu (27): x86/cpufeatures: Add CPUIDs for Control Flow Enforcement Technology (CET) x86/fpu/xstate: Change names to separate XSAVES system and user states x86/fpu/xstate: Introduce XSAVES system states x86/fpu/xstate: Add XSAVES system states for shadow stack Documentation/x86: Add CET description x86/cet: Control protection exception handler mm/mmap: Create a guard area between VMAs x86/cet/shstk: Add Kconfig option for user-mode shadow stack mm: Introduce VM_SHSTK for shadow stack memory mm/mmap: Prevent Shadow Stack VMA merges x86/mm: Change _PAGE_DIRTY to _PAGE_DIRTY_HW x86/mm: Introduce _PAGE_DIRTY_SW drm/i915/gvt: Update _PAGE_DIRTY to _PAGE_DIRTY_BITS x86/mm: Modify ptep_set_wrprotect and pmdp_set_wrprotect for _PAGE_DIRTY_SW x86/mm: Shadow stack page fault error checking mm: Handle shadow stack page fault mm: Handle THP/HugeTLB shadow stack page fault mm: Update can_follow_write_pte/pmd for shadow stack mm: Introduce do_mmap_locked() x86/cet/shstk: User-mode shadow stack support x86/cet/shstk: Introduce WRUSS instruction x86/cet/shstk: Signal handling for shadow stack x86/cet/shstk: ELF header parsing of Shadow Stack x86/cet/shstk: Handle thread shadow stack mm/mmap: Add Shadow stack pages to memory accounting x86/cet/shstk: Add arch_prctl functions for Shadow Stack x86/cet/shstk: Add Shadow Stack instructions to opcode map .../admin-guide/kernel-parameters.txt | 6 + Documentation/index.rst | 1 + Documentation/x86/index.rst | 11 + Documentation/x86/intel_cet.rst | 266 ++++++++++++++ arch/x86/Kconfig | 30 ++ arch/x86/Makefile | 7 + arch/x86/entry/entry_64.S | 2 +- arch/x86/ia32/ia32_signal.c | 13 + arch/x86/include/asm/cet.h | 46 +++ arch/x86/include/asm/cpufeatures.h | 2 + arch/x86/include/asm/disabled-features.h | 8 +- arch/x86/include/asm/elf.h | 5 + arch/x86/include/asm/fpu/internal.h | 5 +- arch/x86/include/asm/fpu/types.h | 22 ++ arch/x86/include/asm/fpu/xstate.h | 26 +- arch/x86/include/asm/mmu_context.h | 3 + arch/x86/include/asm/msr-index.h | 14 + arch/x86/include/asm/pgtable.h | 191 ++++++++-- arch/x86/include/asm/pgtable_types.h | 38 +- arch/x86/include/asm/processor.h | 5 + arch/x86/include/asm/sighandling.h | 5 + arch/x86/include/asm/special_insns.h | 32 ++ arch/x86/include/asm/traps.h | 5 + arch/x86/include/uapi/asm/elf_property.h | 15 + arch/x86/include/uapi/asm/prctl.h | 5 + arch/x86/include/uapi/asm/processor-flags.h | 2 + arch/x86/include/uapi/asm/sigcontext.h | 15 + arch/x86/kernel/Makefile | 4 + arch/x86/kernel/cet.c | 298 +++++++++++++++ arch/x86/kernel/cet_prctl.c | 86 +++++ arch/x86/kernel/cpu/common.c | 25 ++ arch/x86/kernel/elf.c | 341 ++++++++++++++++++ arch/x86/kernel/fpu/core.c | 10 +- arch/x86/kernel/fpu/init.c | 10 - arch/x86/kernel/fpu/signal.c | 6 +- arch/x86/kernel/fpu/xstate.c | 146 +++++--- arch/x86/kernel/idt.c | 4 + arch/x86/kernel/process.c | 7 +- arch/x86/kernel/process_64.c | 7 + arch/x86/kernel/relocate_kernel_64.S | 2 +- arch/x86/kernel/signal.c | 97 +++++ arch/x86/kernel/signal_compat.c | 2 +- arch/x86/kernel/traps.c | 64 ++++ arch/x86/kvm/vmx.c | 2 +- arch/x86/lib/x86-opcode-map.txt | 26 +- arch/x86/mm/fault.c | 27 ++ arch/x86/mm/pgtable.c | 41 +++ drivers/gpu/drm/i915/gvt/gtt.c | 2 +- fs/binfmt_elf.c | 15 + fs/proc/task_mmu.c | 3 + include/asm-generic/pgtable.h | 14 + include/linux/mm.h | 56 ++- include/uapi/asm-generic/siginfo.h | 3 +- include/uapi/linux/elf.h | 1 + mm/Kconfig | 7 + mm/gup.c | 8 +- mm/huge_memory.c | 12 +- mm/memory.c | 7 +- mm/mmap.c | 11 + tools/objtool/arch/x86/lib/x86-opcode-map.txt | 26 +- 60 files changed, 1986 insertions(+), 164 deletions(-) create mode 100644 Documentation/x86/index.rst create mode 100644 Documentation/x86/intel_cet.rst create mode 100644 arch/x86/include/asm/cet.h create mode 100644 arch/x86/include/uapi/asm/elf_property.h create mode 100644 arch/x86/kernel/cet.c create mode 100644 arch/x86/kernel/cet_prctl.c create mode 100644 arch/x86/kernel/elf.c