Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp672490pxb; Wed, 3 Feb 2021 14:59:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJwp9skKR9ic63MfuflkObiBCAbZRaB8Dw2cnp8cT2QvKa+9dipSPO2i1/LfRdYStIl867L4 X-Received: by 2002:a17:906:70d4:: with SMTP id g20mr5462208ejk.361.1612393161955; Wed, 03 Feb 2021 14:59:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612393161; cv=none; d=google.com; s=arc-20160816; b=hrrcfSNLsxTl1K7LO9i+pfDbl0sK0zbaceZLBzMLn8yJYyjKfUkQiDfy5d6h/x+qPA AeDpRS0UwEDVqVec77hBre6wsdI2PTIiTYMd7tv+tVtKGJgSkkSY8n3XIeuROvsCsHTq KVspdFFEccqCS0ikMnUp5vdDhuAnIOXspnhXQ74tkyW7N6PPD22sA7vHZRtEkWiWs3yO YfH/OPzbTuBxhZa4KaOmU3l9+97Aey03+wZl4ZzvrEIEUM/jYc6toPA6iJPA3TcSYnl1 04IAsaEOnEBKkIvBhPPW4/MSoA6XTrKRY8J95MgAvBEKtO0/B1Sd+uTNj6IDngf3woFA aRcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr; bh=QbylHZ7rjwmKKqP2KKJU+ue+wumRkIHB9LKRuLi3aXY=; b=BtNyKjRp4JVbXAG1yAoqM4WQsiweUPiZhTz5SJwPApwVusr/5KK4Gb338rkrSkqULE fnnPMXw4UM11HAgCMLKpncDy3pSOP10vGfyhn3JeqbBF/5HCwPFPwDqThCuOma4tHKvO kK5x0HS72zukFn1UzbkNIS9tit+ZjQ4v9us26uRfoPkGzPcyRvHDu+aGw7Ah7aF4MWT6 r0YC2MOhLzyCNxt+h0SADO/8n1diFQid2xa0qvx3c7iPEy2tiU76gAHWAZD+flCYN1xI 5Bld3WaGOQ5vOODw/z77fIWxCMrZMbopRaBGg5g2WCkiyI8/x+L9THAe5x6hDYskP5mj EGvw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y6si40977eju.9.2021.02.03.14.58.56; Wed, 03 Feb 2021 14:59:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233117AbhBCW5I (ORCPT + 99 others); Wed, 3 Feb 2021 17:57:08 -0500 Received: from mga06.intel.com ([134.134.136.31]:30210 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231908AbhBCW5F (ORCPT ); Wed, 3 Feb 2021 17:57:05 -0500 IronPort-SDR: NgEbTjUbUVoqPQis9pTHHec8vOhEMCnWYRLW5ip4UHGl6/f2CoM+JsV4O6m4SJhm+tIxZRHusF Z2mczaOql8sA== X-IronPort-AV: E=McAfee;i="6000,8403,9884"; a="242642342" X-IronPort-AV: E=Sophos;i="5.79,399,1602572400"; d="scan'208";a="242642342" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Feb 2021 14:56:20 -0800 IronPort-SDR: kI4NAah8tTLUaitc1y53FWAuO/9w2KZ+zEOuXfWO2vGJF80RNo3ypHxid1LAhUB7YIbLGWPlYp H+jKx1FkLlIA== X-IronPort-AV: E=Sophos;i="5.79,399,1602572400"; d="scan'208";a="507921045" Received: from yyu32-desk.sc.intel.com ([143.183.136.146]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Feb 2021 14:56:19 -0800 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 , Borislav Petkov , 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 , Dave Martin , Weijiang Yang , Pengfei Xu Cc: Yu-cheng Yu Subject: [PATCH v19 00/25] Control-flow Enforcement: Shadow Stack Date: Wed, 3 Feb 2021 14:55:22 -0800 Message-Id: <20210203225547.32221-1-yu-cheng.yu@intel.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Control-flow Enforcement (CET) is a new Intel processor feature that blocks return/jump-oriented programming attacks. Details are in "Intel 64 and IA-32 Architectures Software Developer's Manual" [1]. CET can protect applications and the kernel. This series enables only application-level protection, and has three parts: - Shadow stack [2], - Indirect branch tracking [3], and - Selftests [4]. I have run tests on these patches for quite some time, and they have been very stable. Linux distributions with CET are available now, and Intel processors with CET are already on the market. It would be nice if CET support can be accepted into the kernel. I will be working to address any issues should they come up. Changes in v19: - Patch #2: update Kconfig text, remove CPU_SUP_INTEL dependency. - Patch #5: update commit log, add information for XSAVES supervisor states. - Patch #21: update commit log, add information for shadow stack restore token and signal context extension. - Patch #24: change IS_ENABLED() to cpu_feature_enabled(), EOPNOTSUPP to ENOTSUPP, copy_status_to_user() to cet_copy_status_to_user(), remove unnecessary type casts. - Rebase to Linus tree v5.11-rc6. [1] Intel 64 and IA-32 Architectures Software Developer's Manual: https://software.intel.com/en-us/download/intel-64-and-ia-32- architectures-sdm-combined-volumes-1-2a-2b-2c-2d-3a-3b-3c-3d-and-4 [2] CET Shadow Stack patches v18: https://lkml.kernel.org/r/20210127212524.10188-1-yu-cheng.yu@intel.com/ [3] Indirect Branch Tracking patches v18. https://lkml.kernel.org/r/20210127213028.11362-1-yu-cheng.yu@intel.com/ [4] I am holding off the selftests changes and working to get Reviewed-by's. The earlier version of the selftests patches: https://lkml.kernel.org/r/20200521211720.20236-1-yu-cheng.yu@intel.com/ [5] The kernel ptrace patch is tested with an Intel-internal updated GDB. I am holding off the kernel ptrace patch to re-test it with my earlier patch for fixing regset holes. Yu-cheng Yu (25): Documentation/x86: Add CET description x86/cet/shstk: Add Kconfig option for user-mode control-flow protection x86/cpufeatures: Add CET CPU feature flags for Control-flow Enforcement Technology (CET) x86/cpufeatures: Introduce X86_FEATURE_CET and setup functions x86/fpu/xstate: Introduce CET MSR and XSAVES supervisor states x86/cet: Add control-protection fault handler x86/mm: Remove _PAGE_DIRTY from kernel RO pages x86/mm: Introduce _PAGE_COW drm/i915/gvt: Change _PAGE_DIRTY to _PAGE_DIRTY_BITS x86/mm: Update pte_modify for _PAGE_COW x86/mm: Update ptep_set_wrprotect() and pmdp_set_wrprotect() for transition from _PAGE_DIRTY to _PAGE_COW mm: Introduce VM_SHSTK for shadow stack memory x86/mm: Shadow Stack page fault error checking x86/mm: Update maybe_mkwrite() for shadow stack mm: Fixup places that call pte_mkwrite() directly mm: Add guard pages around a shadow stack. mm/mmap: Add shadow stack pages to memory accounting mm: Update can_follow_write_pte() for shadow stack mm: Re-introduce vm_flags to do_mmap() x86/cet/shstk: User-mode shadow stack support x86/cet/shstk: Handle signals for shadow stack ELF: Introduce arch_setup_elf_property() x86/cet/shstk: Handle thread shadow stack x86/cet/shstk: Add arch_prctl functions for shadow stack mm: Introduce PROT_SHSTK for shadow stack .../admin-guide/kernel-parameters.txt | 6 + Documentation/x86/index.rst | 1 + Documentation/x86/intel_cet.rst | 136 +++++++ arch/arm64/include/asm/elf.h | 5 + arch/x86/Kconfig | 28 ++ arch/x86/Kconfig.assembler | 5 + arch/x86/ia32/ia32_signal.c | 17 + arch/x86/include/asm/cet.h | 42 +++ arch/x86/include/asm/cpufeatures.h | 4 +- arch/x86/include/asm/disabled-features.h | 17 +- arch/x86/include/asm/elf.h | 13 + arch/x86/include/asm/fpu/internal.h | 10 + arch/x86/include/asm/fpu/types.h | 23 +- arch/x86/include/asm/fpu/xstate.h | 6 +- arch/x86/include/asm/idtentry.h | 4 + arch/x86/include/asm/mman.h | 85 +++++ arch/x86/include/asm/mmu_context.h | 3 + arch/x86/include/asm/msr-index.h | 19 + arch/x86/include/asm/page_64_types.h | 10 + arch/x86/include/asm/pgtable.h | 194 +++++++++- arch/x86/include/asm/pgtable_types.h | 48 ++- arch/x86/include/asm/processor.h | 5 + arch/x86/include/asm/special_insns.h | 32 ++ arch/x86/include/asm/trap_pf.h | 2 + arch/x86/include/uapi/asm/mman.h | 28 +- arch/x86/include/uapi/asm/prctl.h | 4 + arch/x86/include/uapi/asm/processor-flags.h | 2 + arch/x86/include/uapi/asm/sigcontext.h | 9 + arch/x86/kernel/Makefile | 2 + arch/x86/kernel/cet.c | 343 ++++++++++++++++++ arch/x86/kernel/cet_prctl.c | 60 +++ arch/x86/kernel/cpu/common.c | 16 + arch/x86/kernel/cpu/cpuid-deps.c | 2 + arch/x86/kernel/cpu/intel.c | 3 + arch/x86/kernel/fpu/signal.c | 100 +++++ arch/x86/kernel/fpu/xstate.c | 10 +- arch/x86/kernel/idt.c | 4 + arch/x86/kernel/process.c | 14 +- arch/x86/kernel/process_64.c | 32 ++ arch/x86/kernel/signal.c | 10 + arch/x86/kernel/signal_compat.c | 2 +- arch/x86/kernel/traps.c | 60 +++ arch/x86/mm/fault.c | 19 + arch/x86/mm/mmap.c | 2 + arch/x86/mm/pat/set_memory.c | 2 +- arch/x86/mm/pgtable.c | 25 ++ drivers/gpu/drm/i915/gvt/gtt.c | 2 +- fs/aio.c | 2 +- fs/binfmt_elf.c | 4 + fs/proc/task_mmu.c | 3 + include/linux/elf.h | 6 + include/linux/mm.h | 38 +- include/linux/pgtable.h | 35 ++ include/uapi/asm-generic/siginfo.h | 3 +- include/uapi/linux/elf.h | 9 + ipc/shm.c | 2 +- mm/gup.c | 8 +- mm/huge_memory.c | 10 +- mm/memory.c | 5 +- mm/migrate.c | 3 +- mm/mmap.c | 23 +- mm/mprotect.c | 2 +- mm/nommu.c | 4 +- mm/util.c | 2 +- 64 files changed, 1541 insertions(+), 84 deletions(-) create mode 100644 Documentation/x86/intel_cet.rst create mode 100644 arch/x86/include/asm/cet.h create mode 100644 arch/x86/include/asm/mman.h create mode 100644 arch/x86/kernel/cet.c create mode 100644 arch/x86/kernel/cet_prctl.c -- 2.21.0