From patchwork Thu Aug 30 14:38:40 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: 10581827 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 69FD35A4 for ; Thu, 30 Aug 2018 14:43:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E6212B560 for ; Thu, 30 Aug 2018 14:43:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E9282BC25; Thu, 30 Aug 2018 14:43:47 +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 900592B560 for ; Thu, 30 Aug 2018 14:43:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9FC8C6B521A; Thu, 30 Aug 2018 10:43:45 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 97D726B521C; Thu, 30 Aug 2018 10:43:45 -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 81C736B521D; Thu, 30 Aug 2018 10:43:45 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id 42B726B521A for ; Thu, 30 Aug 2018 10:43:45 -0400 (EDT) Received: by mail-pf1-f200.google.com with SMTP id b29-v6so4898738pfm.1 for ; Thu, 30 Aug 2018 07:43:45 -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=n6IXDgZT0hp23i14cWdr8rhOvzHaklaoUIrR8nz6G/k=; b=a40NQY9zoQo01XsUoxBpO7k726xzG9o/kDhN0bgOYDQ3lr6jekH2x5rqnkS6h0lCrx f0hjfVi+KyODKg3eliYxLgJ//UZpOgvulRGFSn/DYABMjQkKrQ114UlDYW3IGmkj1bE7 5oPW4Bvwg9jkSoo2aF/Vwguqy0UdobpMBs1Pw4Lv4LVoPqE6nDPyRtWpJc3SBEjSYuhx s+4B6U9l1jt/wHt6P9ma9yYuKH1sxrIDkOw71YuFuUFaBHAN1a/6NnaMyBi4696N6g1p C/sCZ21qecURQhv8SsWs8nXGsJeDImqyVjECUauLiQByZKu77CvZbAJQ/OzlrUU7K/ND saiw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.65 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: APzg51AMM2T8caLuk3rrW5iH8R9BO45WJlsC+uOKuVlV7sRFUS0Rf5bh 8XVavmiXOMDvxlaPaF83VHErk1QYikoK0Y2+U2RWdG1nFes33QIvWRIgD7aDrsJc8qqUPpIVjk1 ahxf8DnI/1DZFDuiGpwLWKT/saqB2jweUrtQumhEcDS9qsFiWxII+V5wJ28Q4WN8V6Q== X-Received: by 2002:a17:902:5a3:: with SMTP id f32-v6mr10695560plf.286.1535640224935; Thu, 30 Aug 2018 07:43:44 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZtTJlwAcP2Gy1A+LpcQhjPNaYT52effZjri03FE5O/33wV8RbQRcUWkAcR/76rs7SaSZ7I X-Received: by 2002:a17:902:5a3:: with SMTP id f32-v6mr10695512plf.286.1535640224033; Thu, 30 Aug 2018 07:43:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535640224; cv=none; d=google.com; s=arc-20160816; b=i4+0BRFEp4AOxMImkCajJWBnEQej+EKyfSGSLWa+WCASIEhhMbqmz3OXUxLAUuBtHh Ay42KVCK2NE+RhKXeZ7hh1ZtJp7L+7BnFN7wRLZvncHRu8rovFzCUNrhesZ2jvvg5MvH PG59s+0LGcn07Tfadd3Ap2w5Ua1st6anqo+vMyBCfGDQJk2lVZsJn8stWoWItJHpJuR+ QDQm2jgciOLrJAF0zxcFlBCJqLwOpQoUZ3C2b2N8jIoUH33WimH7Ksnqu3e+sGaonKmT +gKgJrjGKRh97xUeizVrfO5PcLOgyS4T15SulEZhapc6MqHlD2aXh55zqL5SE0v0yiAW Oh4A== 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:arc-authentication-results; bh=n6IXDgZT0hp23i14cWdr8rhOvzHaklaoUIrR8nz6G/k=; b=tvZP2NLLJHN2ux+FKEqAmIDtpxSx42WF8QA9zQV5rUn1i7wF6fHnsik05vZEcle/uG JgDK1GILYjgJ7VxQQovlphs/1P8thXhUIubUxvWW8Zsxiv1sZ+bZOiRr7wOSFTuhsLr2 M+P01JOppfpa4GPJ9hSC2Eo5YP4yzqESJrQeeP8ZGgn89mTNRhsyOVwcsw9V8O+iLR4F 5/A+l+Oj3ab41IbO0KI9bl32I9HRums/2ucOah8lI+4NlD+WqBbN9VoRc8CeRFeX896X fl1Ocfx4puAuiDnZ09xkt5Uzlsh320TUXyoOUMeXHKSwsBfQO3DwxS4Gajb3bkd8l/01 kIJA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga03.intel.com (mga03.intel.com. [134.134.136.65]) by mx.google.com with ESMTPS id c15-v6si6092534plo.232.2018.08.30.07.43.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 07:43:43 -0700 (PDT) Received-SPF: pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.65 as permitted sender) client-ip=134.134.136.65; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 134.134.136.65 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 orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Aug 2018 07:43:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,307,1531810800"; d="scan'208";a="67186660" Received: from 2b52.sc.intel.com ([143.183.136.52]) by fmsmga008.fm.intel.com with ESMTP; 30 Aug 2018 07:43:39 -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 , Florian Weimer , "H.J. Lu" , Jann Horn , Jonathan Corbet , Kees Cook , Mike Kravetz , Nadav Amit , Oleg Nesterov , Pavel Machek , Peter Zijlstra , "Ravi V. Shankar" , Vedvyas Shanbhogue Cc: Yu-cheng Yu Subject: [RFC PATCH v3 00/24] Control Flow Enforcement: Shadow Stack Date: Thu, 30 Aug 2018 07:38:40 -0700 Message-Id: <20180830143904.3168-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 patches can be found in the following link. https://lkml.org/lkml/2018/7/10/1031 Summary of changes from v2: Move Shadow Stack page fault handling logic to arch/x86. Update can_follow_write_pte/pmd; move logic to arch/x86. Fix problems in WRUSS in-line assembly. Fix issues in ELF parser. Split out IBT/PTRACE patches to a second set. Other small fixes. Yu-cheng Yu (24): x86/cpufeatures: Add CPUIDs for Control-flow Enforcement Technology (CET) x86/fpu/xstate: Change some names to separate XSAVES system and user states x86/fpu/xstate: Enable XSAVES system states x86/fpu/xstate: Add XSAVES system states for shadow stack Documentation/x86: Add CET description x86/cet: Control protection exception handler x86/cet/shstk: Add Kconfig option for user-mode shadow stack mm: Introduce VM_SHSTK for shadow stack memory 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 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 | 252 +++++++++++++ arch/x86/Kconfig | 28 ++ arch/x86/Makefile | 7 + arch/x86/entry/entry_64.S | 2 +- arch/x86/ia32/ia32_signal.c | 13 + arch/x86/include/asm/cet.h | 42 +++ 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 | 6 +- arch/x86/include/asm/fpu/types.h | 22 ++ arch/x86/include/asm/fpu/xstate.h | 31 +- arch/x86/include/asm/mmu_context.h | 3 + arch/x86/include/asm/msr-index.h | 14 + arch/x86/include/asm/pgtable.h | 175 +++++++-- arch/x86/include/asm/pgtable_types.h | 31 +- arch/x86/include/asm/processor.h | 5 + arch/x86/include/asm/sighandling.h | 5 + arch/x86/include/asm/special_insns.h | 37 ++ 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 | 17 + arch/x86/kernel/Makefile | 4 + arch/x86/kernel/cet.c | 285 +++++++++++++++ arch/x86/kernel/cet_prctl.c | 79 ++++ arch/x86/kernel/cpu/common.c | 24 ++ arch/x86/kernel/cpu/scattered.c | 1 + arch/x86/kernel/elf.c | 338 ++++++++++++++++++ arch/x86/kernel/fpu/core.c | 11 +- arch/x86/kernel/fpu/init.c | 10 - arch/x86/kernel/fpu/signal.c | 6 +- arch/x86/kernel/fpu/xstate.c | 152 +++++--- arch/x86/kernel/idt.c | 4 + arch/x86/kernel/process.c | 8 + arch/x86/kernel/process_64.c | 7 + arch/x86/kernel/relocate_kernel_64.S | 2 +- arch/x86/kernel/signal.c | 96 +++++ arch/x86/kernel/traps.c | 58 +++ arch/x86/kvm/vmx.c | 2 +- arch/x86/lib/x86-opcode-map.txt | 26 +- arch/x86/mm/extable.c | 11 + arch/x86/mm/fault.c | 27 ++ arch/x86/mm/pgtable.c | 36 ++ drivers/gpu/drm/i915/gvt/gtt.c | 2 +- fs/binfmt_elf.c | 15 + fs/proc/task_mmu.c | 3 + include/asm-generic/pgtable.h | 52 +++ include/linux/mm.h | 26 ++ include/uapi/linux/elf.h | 1 + mm/gup.c | 8 +- mm/huge_memory.c | 12 +- mm/internal.h | 8 + mm/memory.c | 3 + tools/objtool/arch/x86/lib/x86-opcode-map.txt | 26 +- 59 files changed, 1943 insertions(+), 150 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