From patchwork Mon Nov 19 21:47:43 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: 10689513 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 003C014BD for ; Mon, 19 Nov 2018 21:54:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB8912A583 for ; Mon, 19 Nov 2018 21:54:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CDF422A6EC; Mon, 19 Nov 2018 21:54:15 +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 9B13C2A583 for ; Mon, 19 Nov 2018 21:54:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 877DD6B1C86; Mon, 19 Nov 2018 16:54:13 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7FFDE6B1C87; Mon, 19 Nov 2018 16:54:13 -0500 (EST) 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 6A1AF6B1C88; Mon, 19 Nov 2018 16:54:13 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by kanga.kvack.org (Postfix) with ESMTP id 22E516B1C86 for ; Mon, 19 Nov 2018 16:54:13 -0500 (EST) Received: by mail-pl1-f197.google.com with SMTP id x7so1451083pll.23 for ; Mon, 19 Nov 2018 13:54:13 -0800 (PST) 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=cMEBxEJbUq2JcBZQK0zIsRgwgMeaHE3Lw3AKKAzJC4s=; b=YuZ1lyRInUSJ846WUoSc5wswVTNkMovsH2pvv2ltSDD6VAvGZ7UVV2Uql2NPa1Doxm 7SflG3K5XpDakUsT5Z9UwtIxbhG28d8dDC32JvyBw1L0yq7qVjwOn4EGom2TVZFklmcj h6fXQjpCCeONlGsfnfsvfxAr1BulNnZqDLroaNFl3utgrzqPJP+/juzFY88YNSs0ckOK YpF1eXhosy+bbf4JUgK9c6xdtx+/9hmUa8AJ+x+sttVVp56jvkeDCpdAuAUC1WE08ejj qxP3EjJZey7Ff8zEKb41551tOCUegMspYcyPZk/U4SNnHRKryoXvGzYlANNKnmKjrB51 Bqmw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 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: AGRZ1gI2XqtREbA0vIX8zKJyWlW2M0Q1Q+diu50PXwhP2AsiTdMwKDSz xPNXT0QRZBlvuzLQc8RH+NqLtbXLUURFaiH7YSlhGscx6ozXoL/knoD6K0CG0BlfOE5Mv4aMyjR UhVuTh0C/doaPfJ7BCwz6imIwTOUoNxr1CRFv9Fat6ujlK30k9ADwf07/VxFqCr6vDA== X-Received: by 2002:a63:5722:: with SMTP id l34mr21632457pgb.118.1542664452792; Mon, 19 Nov 2018 13:54:12 -0800 (PST) X-Google-Smtp-Source: AJdET5freMzl/TxmySEbfvdoc6HuCkVZFiIEqIhRHslcYM16SyUFLn2kEMpleGf2bLkmgFhSimsg X-Received: by 2002:a63:5722:: with SMTP id l34mr21632416pgb.118.1542664451795; Mon, 19 Nov 2018 13:54:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542664451; cv=none; d=google.com; s=arc-20160816; b=m5fH0l8MpZux7ra6WzKlnxhVVHjQA9GQltWhEVC/IycXJgXl+s+LHvtWKbVMmtOq9v II1dSzLELQ33G0Mdai4ktV4eyuVYMwerptdJYLK8YwK4hzLgPrkpqwrfvaUwZ1+9Y721 R9UwH1vk+3bPeZgS+UNp6iASnKN1RsfoByX2tj6/r2iTSlQYwWXUDxPZi5Yft+EKll2r OKG1mSfOhDI5opVYp1GD1NXKffuw5+V3n/a2STyk1jSObiqA9mealSLe7EdoAeK6sWwr Lzht0uEiOJiKkw9VofZKpQnMve6yldCLlLcOcWtGdGu1SH7KhBgkn8r5c+0Wgkv3/yas U/yQ== 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=cMEBxEJbUq2JcBZQK0zIsRgwgMeaHE3Lw3AKKAzJC4s=; b=dMPpkAV+eA+OLJEGfWpAldrS2Fba5ZUlN262xkrrsmQAk9WPhOtq19OkYZ9XM2MFpW PE5uiHbOR/gaqCIT9TdwdLp9o7U2DV5/RWUcSAX25RwIdyGy5/0tzXuB2Ygtbt9cM96v bphMTTAhMu1L4bHCgcgE2vKu7ISp5G2Re2TSXsEyCuCmfWEv1uGf7OsvDZLW/05wdz5q Vo02j3+r7YTDddg/cQnWlK204Mb2kCgFoVURaRNRWI946t5D96RJP3K07t9HvXxkRa+9 RBECWzkjGhZqB39awanfl1hFeEzsYLIBUbo0F17oBUNda5ACLd8RLGtnieEdzYOZooQP XUhA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=yu-cheng.yu@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga11.intel.com (mga11.intel.com. [192.55.52.93]) by mx.google.com with ESMTPS id o12-v6si32492543plg.114.2018.11.19.13.54.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Nov 2018 13:54:11 -0800 (PST) Received-SPF: pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 as permitted sender) client-ip=192.55.52.93; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yu-cheng.yu@intel.com designates 192.55.52.93 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 orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Nov 2018 13:54:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,254,1539673200"; d="scan'208";a="93319800" Received: from yyu32-desk1.sc.intel.com ([143.183.136.147]) by orsmga008.jf.intel.com with ESMTP; 19 Nov 2018 13:54:10 -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 , 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: [RFC PATCH v6 00/26] Control-flow Enforcement: Shadow Stack Date: Mon, 19 Nov 2018 13:47:43 -0800 Message-Id: <20181119214809.6086-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/10/11/642 Summary of changes from v5: To support more threads, change compat-mode thread shadow stack to a fixed size from RLIMIT_STACK to RLIMIT_STACK / 4. This change applies only to 32-bit pthreads. Some clean-up and small fixes in response to comments. Thanks to all reviewers. Yu-cheng Yu (26): Documentation/x86: Add CET description x86/cpufeatures: Add CET CPU feature flags 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 x86/cet: Add control protection exception handler 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 | 13 + Documentation/x86/intel_cet.rst | 268 +++++++++++++ arch/x86/Kconfig | 29 ++ arch/x86/Makefile | 7 + arch/x86/entry/entry_64.S | 2 +- arch/x86/ia32/ia32_signal.c | 21 + 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 | 15 + 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 | 304 +++++++++++++++ arch/x86/kernel/cet_prctl.c | 86 +++++ arch/x86/kernel/cpu/common.c | 25 ++ arch/x86/kernel/elf.c | 358 ++++++++++++++++++ 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 | 158 +++++--- 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 | 57 +++ 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 | 26 ++ include/uapi/asm-generic/siginfo.h | 3 +- include/uapi/linux/elf.h | 1 + mm/gup.c | 8 +- mm/huge_memory.c | 12 +- mm/memory.c | 7 +- mm/mmap.c | 11 + .../arch/x86/include/asm/disabled-features.h | 8 +- tools/objtool/arch/x86/lib/x86-opcode-map.txt | 26 +- 60 files changed, 2004 insertions(+), 157 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