From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AED46C7618A for ; Sun, 19 Mar 2023 00:16:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 38124280010; Sat, 18 Mar 2023 20:16:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2BD79280001; Sat, 18 Mar 2023 20:16:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 022AE280010; Sat, 18 Mar 2023 20:16:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E0A5E280001 for ; Sat, 18 Mar 2023 20:16:27 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C2B43120C75 for ; Sun, 19 Mar 2023 00:16:27 +0000 (UTC) X-FDA: 80583731214.08.92E93C3 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by imf11.hostedemail.com (Postfix) with ESMTP id CC20340012 for ; Sun, 19 Mar 2023 00:16:25 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=jdNKSe32; spf=pass (imf11.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.115 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679184986; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:dkim-signature; bh=Mr90LVFmE9gifcOMDGIP+CURvzz5o3WovfUcqTtHWl0=; b=hHnrOZ64c7EXNT5nnCwNqAJZajJ2rIHPU5flkPISq/LYeOiNgOYDi95CMJKbk+cqAlxfNG 8rnvLugk66K2N92qlTC7myYMRH7XMdeWNHXP/Tk4k8djw9zW7bKCWDFXCtCT6yR/oDyP5O Ub/giS8wjLRzXIl0A+QRoHhwhoH9rRA= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=jdNKSe32; spf=pass (imf11.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.115 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679184986; a=rsa-sha256; cv=none; b=vZXduC6G6nuMan8xkAoynefKeyfH1DtlAFVx0UIWlAis4ujS3a4BLMQgad/x+r2r/MToJS WSiwYhFQg7SC/tU0liIFBUQmDcBqOcjkB7u3j2JcC9tzLI2jRQMSaSyiDHqnHQu+GPYdLd 1x1o1F1sV4peKPi5W3SZbdEtd8s+zgY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679184985; x=1710720985; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=zgMYcW7jhLowf3LtAX7K40lEhH7jOSIjySbX8LofR4w=; b=jdNKSe32DX4Lbm2njmNTI3jDpYbc/DX8zmQOvURzDWSxO5VW5HzHA8fu 5eekhBvCFdsphruZg2HtP6xD1LXzCMeshRu8owH/xM/2oryqpdTHvoUAA VMQQC/1GWMNO1AsoOkCDLJADBHUKYTYptLI5Tju/iFkKW5WDkTGHG1r/s oREVnuP+OQWSwpKL59eV1Q20XuITG1/8sZFJF/YWh+kJoZLLwzlRQj6/k BY4+pFUxEqB9X1bGmeOpeQeOH94pVw3UCAAsBWJOZyIGrVvzMyqkVWI1B 1tmCDtkU8+bfRkuThLZsRDTvHC2wj2eZTjDZsDJ1vIY1sDVFG9b3u3Vv7 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10653"; a="338491129" X-IronPort-AV: E=Sophos;i="5.98,272,1673942400"; d="scan'208";a="338491129" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Mar 2023 17:16:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10653"; a="749672855" X-IronPort-AV: E=Sophos;i="5.98,272,1673942400"; d="scan'208";a="749672855" Received: from bmahatwo-mobl1.gar.corp.intel.com (HELO rpedgeco-desk.amr.corp.intel.com) ([10.135.34.5]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Mar 2023 17:16:23 -0700 From: Rick Edgecombe 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 , Weijiang Yang , "Kirill A . Shutemov" , John Allen , kcc@google.com, eranian@google.com, rppt@kernel.org, jamorris@linux.microsoft.com, dethoma@microsoft.com, akpm@linux-foundation.org, Andrew.Cooper3@citrix.com, christina.schimpe@intel.com, david@redhat.com, debug@rivosinc.com, szabolcs.nagy@arm.com Cc: rick.p.edgecombe@intel.com, Yu-cheng Yu Subject: [PATCH v8 18/40] mm: Introduce VM_SHADOW_STACK for shadow stack memory Date: Sat, 18 Mar 2023 17:15:13 -0700 Message-Id: <20230319001535.23210-19-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230319001535.23210-1-rick.p.edgecombe@intel.com> References: <20230319001535.23210-1-rick.p.edgecombe@intel.com> X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: CC20340012 X-Rspam-User: X-Stat-Signature: xyzaxpapr4eeaaxhib4mcqfyobdp8pit X-HE-Tag: 1679184985-566079 X-HE-Meta: U2FsdGVkX192zZp3Fbkmdi7vK4bfvduV0V8RmKtWCow6aUPc69ExGk3yssI1qUyS2VsgrePxPiFDa3OpTVTZmf8U+ZS3bKvRsjA0XCtW8oI3kEmeb1WJEjnTWkAKlgWO5WCtumPD7zw5JJGw8YwR1mPtpjCDKFmFHRgdyiy+zBi2e0SCLqMVQv+jcmaxxhpNacm6oFjhD62vDOCaLBYdE4dsPUResmEti/SjUT7RX+MX0JqpYnvHByheyXjAfujpKq0X4xasfrflQGAjcVVgbdsFExRcxvHWWkqpBi4Rpyg6UDRPw7lpvVFF56nSwXCyFyC3wbkW8YG+yG6ILZUd7uAjfQLzJwhgFbsmGRU1hnFI8zOcTP80tx2YlBllPFf357+ZOn8DZfvBaelDn/tb4KIdvrKHSAR722hBTspX1tW8unytSGPYqqwv8QaUzq3kgwr4ICWExuqx1HCmkiCwCwfaAlsGafPEbSoUJjB7b7/WiWn9fIwbPYKa2Mxfv6Bj+4WA+rdueDtE2LBjUGPb/TjCCwPwo12j1ib3kvPgCMLcOnLgq7NIfl6m6MArCeJT+Hy6WbL0BqwsshkBwg69Qcz6Jh4b7fJOUNhsxen8c3P0OL1QOXaBfRymt6djwrahsx1gkododkH2jd1ZGjMZhm5jqq/TSOSOy+3u7mg6gAzJVQAmzpqrIiTdYK2osSAmyCb34rBLEWaIqL+O+8h5tAujrTk8owJEHAAaWvY98Ndb24vyOh4wjnuS9NK8DoKyZX309SkepQ9Umyo8UAOGjA9L+/22os7bWfzLfLUtT23N6l5CMdx8Z8QVs1Ihya+4t21a0FBBm4cgwMeC5JyN4JS/LsDOX4A/S2LFfaDDoMWjb0pSf12pD/Zm/9iohVknB0/xRz7l+tzvSPTxGwf2aGO2EpgwxY51YlX9fAqIxWLsW/MuB+4iOiBPxmA46q0P0eIheqOfONmvU1nKx1M ktV2XYW4 fAF5kGjOoAKc0LJOCOIk21lAdfdzcAhILoc7V//oPIpCx9J27FNX1uaeM06i9y3dLT7nlZ3fxkm9Qa7JJshVgFjGT3jE+6BXO04bVT95+sjU1VBAPXxouaEQf41B5ujWbjwtOVZDwbZNiBjhkGI+7BNQgAfw8ro+Q3jMu06SQy54wOOFkWFdq2hFblQtKTDMOcV0MMwWtxXfC4o0f7EE7BWW2z2G5VN4AlhEdHN4f8SHHaXJz2YWFKL7aK81zdshYS/Euk1bZWEts3K/J/Vs0Gk0VeVeSzizbDhM9oiR6zr/Xpl/fKGH7VVyMp6HuqUrUdaXPrDyC5O3NZ2D4aU7K/pNc0QgiPlKL7h0Uw083ueAqwqawRkgsGOHLoDGl2gQ37HGq+GRUYJHeVts= 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: From: Yu-cheng Yu New hardware extensions implement support for shadow stack memory, such as x86 Control-flow Enforcement Technology (CET). Add a new VM flag to identify these areas, for example, to be used to properly indicate shadow stack PTEs to the hardware. Shadow stack VMA creation will be tightly controlled and limited to anonymous memory to make the implementation simpler and since that is all that is required. The solution will rely on pte_mkwrite() to create the shadow stack PTEs, so it will not be required for vm_get_page_prot() to learn how to create shadow stack memory. For this reason document that VM_SHADOW_STACK should not be mixed with VM_SHARED. Co-developed-by: Rick Edgecombe Signed-off-by: Yu-cheng Yu Signed-off-by: Rick Edgecombe Reviewed-by: Kees Cook Reviewed-by: Kirill A. Shutemov Acked-by: Mike Rapoport (IBM) Tested-by: Pengfei Xu Tested-by: John Allen Tested-by: Kees Cook --- v7: - Use lightly edited commit log verbiage from (David Hildenbrand) - Add explanation for VM_SHARED limitation (David Hildenbrand) v6: - Add comment about VM_SHADOW_STACK not being allowed with VM_SHARED (David Hildenbrand) v3: - Drop arch specific change in arch_vma_name(). The memory can show as anonymous (Kirill) - Change CONFIG_ARCH_HAS_SHADOW_STACK to CONFIG_X86_USER_SHADOW_STACK in show_smap_vma_flags() (Boris) --- Documentation/filesystems/proc.rst | 1 + fs/proc/task_mmu.c | 3 +++ include/linux/mm.h | 8 ++++++++ 3 files changed, 12 insertions(+) diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 9d5fd9424e8b..8b314df7ccdf 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -564,6 +564,7 @@ encoded manner. The codes are the following: mt arm64 MTE allocation tags are enabled um userfaultfd missing tracking uw userfaultfd wr-protect tracking + ss shadow stack page == ======================================= Note that there is no guarantee that every flag and associated mnemonic will diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 6a96e1713fd5..324b092c2ac9 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -711,6 +711,9 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma) #ifdef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR [ilog2(VM_UFFD_MINOR)] = "ui", #endif /* CONFIG_HAVE_ARCH_USERFAULTFD_MINOR */ +#ifdef CONFIG_X86_USER_SHADOW_STACK + [ilog2(VM_SHADOW_STACK)] = "ss", +#endif }; size_t i; diff --git a/include/linux/mm.h b/include/linux/mm.h index a1b31caae013..097544afb1aa 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -326,11 +326,13 @@ extern unsigned int kobjsize(const void *objp); #define VM_HIGH_ARCH_BIT_2 34 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_BIT_3 35 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_BIT_4 36 /* bit only usable on 64-bit architectures */ +#define VM_HIGH_ARCH_BIT_5 37 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_0 BIT(VM_HIGH_ARCH_BIT_0) #define VM_HIGH_ARCH_1 BIT(VM_HIGH_ARCH_BIT_1) #define VM_HIGH_ARCH_2 BIT(VM_HIGH_ARCH_BIT_2) #define VM_HIGH_ARCH_3 BIT(VM_HIGH_ARCH_BIT_3) #define VM_HIGH_ARCH_4 BIT(VM_HIGH_ARCH_BIT_4) +#define VM_HIGH_ARCH_5 BIT(VM_HIGH_ARCH_BIT_5) #endif /* CONFIG_ARCH_USES_HIGH_VMA_FLAGS */ #ifdef CONFIG_ARCH_HAS_PKEYS @@ -346,6 +348,12 @@ extern unsigned int kobjsize(const void *objp); #endif #endif /* CONFIG_ARCH_HAS_PKEYS */ +#ifdef CONFIG_X86_USER_SHADOW_STACK +# define VM_SHADOW_STACK VM_HIGH_ARCH_5 /* Should not be set with VM_SHARED */ +#else +# define VM_SHADOW_STACK VM_NONE +#endif + #if defined(CONFIG_X86) # define VM_PAT VM_ARCH_1 /* PAT reserves whole VMA at once (x86) */ #elif defined(CONFIG_PPC) -- 2.17.1