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 BCA00C7618A for ; Sun, 19 Mar 2023 00:16:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6187B280012; Sat, 18 Mar 2023 20:16:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 579A2280001; Sat, 18 Mar 2023 20:16:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3A838280012; Sat, 18 Mar 2023 20:16:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 1E0BF280001 for ; Sat, 18 Mar 2023 20:16:31 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id F1443C0CF8 for ; Sun, 19 Mar 2023 00:16:30 +0000 (UTC) X-FDA: 80583731340.10.14CFDE4 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by imf11.hostedemail.com (Postfix) with ESMTP id 097164000E for ; Sun, 19 Mar 2023 00:16:28 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=FeaTa4Cw; 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=1679184989; 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=ebrXWkOUB+pBTQx21r8Cu08K8bkARURBsW0wQIMrvgs=; b=BWjlA4SCchV5QVdRYtkWq5MzAaY9C5mP2bg4IA/tJX9V+mbJVS19OUWanzUHxWo/fv4T0y hdfiIObQLRLw9jqlFCgtyS6XKmrZl0MGwdCYh2QITn5XQW5Hn+fHTZkdFaVi097MgFpBVV J8CrboCawfB+F/81Ng79Ro2MfCzRS14= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=FeaTa4Cw; 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=1679184989; a=rsa-sha256; cv=none; b=IayZ0iw1y/Mu5WzoHx5ALN9Dhq52SRmREKJDsKDDgJmmt7Er01NJLd1EOZEWw59ECyA2qG d9c3MeUKz6/ZFE05ZrnHlkvDquWRorbVdyvw7fvLVOrLIDXzdM9lvZxce3yNdP0wEdMv// 1u9pFsh3qLoYIf77wRd/tAL/IfEdQx8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679184989; x=1710720989; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=HJSW741k8aVu5mpNpwjQ9huZphqr/UOu519JqYv/Vlg=; b=FeaTa4CwF2GWFQPoucyBIMaXpiw1Dr1OKYy93n4cYi00yNgtJ2p29lsC om7Z5907+jY9QF5xg3pVkYZwxZPn9Y+Itja7DbmbgZQ6t0tIUF67DFtH6 ImzxVALRue4+Mlbaq0XvQ5ENnXzSRDP91pfnKAvzakF1biNNvjGMADQyB 9hcBYVpZh/XxkhATHOsqmbJ8rqr40l2AfxdVFb79v2eAc+QsfaOvCiaGr 5I7BWGaDijYzBAtC+fj0GjvfQk+8PZKBc6ZXDlkF4IkHoRWGUYKgPB4bx YTLjjJ9qfVDHYoNjvKVhAz0ixULTnmieBmh2qo/gTfWQF4e5ut+3CX4Kf w==; X-IronPort-AV: E=McAfee;i="6600,9927,10653"; a="338491175" X-IronPort-AV: E=Sophos;i="5.98,272,1673942400"; d="scan'208";a="338491175" 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:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10653"; a="749672862" X-IronPort-AV: E=Sophos;i="5.98,272,1673942400"; d="scan'208";a="749672862" 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:26 -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 Subject: [PATCH v8 20/40] x86/mm: Teach pte_mkwrite() about stack memory Date: Sat, 18 Mar 2023 17:15:15 -0700 Message-Id: <20230319001535.23210-21-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: 097164000E X-Rspam-User: X-Stat-Signature: e3nrfkusar3dgmmm6zudx8o8w6uuog8b X-HE-Tag: 1679184988-981315 X-HE-Meta: U2FsdGVkX1/hvlDyKgoFjLBMpAERE094WjqQpFAUYi2Z1tACUjvfaWLekALw3j0NVBXu+8FU6FASuR2oZh1SHGmxFh8uF9LtcfOrbiZJDx7fpPJmnhJwdPC09PlhSHn/tdb0IB3tif01hkY7ER+J8AQhmyq7EKLR2DfQ7AGjVgtuEQqoJWXBJbOvv48KJSpQg/rM/hS/ukbU3QZiey6AAK2iEMYhn8ZmicphLSB4jHBr9ENaMnNvza2UfCCakFcVTPCyrsDhTUehoVUSuWm7aEgdCaOdVKNyz80F7vWb/4GSXICAOe70PzuuxAWK/0Tis3yC1PseQpO7rbhi/oRIPHS8GU5O3qm9aarRm/LYzwGxvYOXz2Rh3p6g6/LsqWzEhV8MKZIoz3KYl1dUO5qfo1uFJXFo5aPxH76x2uBby69PWCnWb6N0DyC9QmdF4yB1IkiANbDCFyvF5wr8D2XAGV6zliD1WpIJnlCd1sPRq9A/JUfCcAF3tqD1ojvCdjhgHftl9tmFXrHuIHZvq2EHAidYz3BeBLTqsDSs5vFZWFoSPEm8eRLDz0FuIwjNG8CTlGpGFXcjVH1fBWFPcJYIErYLdkjaT/tij9vrpmebAnupVCLlkWGNpTGoKrC3OIowdMtSfUb77+eEeXOQhaBrpE3YqH3TqMK5dcxxAu6MfCByUdeqqOMLjFSBNDe78KrWcGAYh8XprIf/pe6i9dLalCG6qhT3WgsGitWf39GonKSN7/ZtjX9csF/8cXOKOoDNu9rWlMlQ9dElePV9FhcqRgVpYWTiVfYCEKs0DBqVAxr9xvxZBC/2z9D8TTKyQi0OSFHL3ruNUot6GjGWEV9125V3mw1lB40vVZqUBfGiQR9iXd8duwCLwWMbw4eINSkr3Fz9x22YVcKXE7IYbZwH8ZXB5hGaZszgfgUMqEGkP9waMAKsRwZ0i4s752XXosepSHnKvVQyzgqrFYvWPhi HSA03kC5 ZhH42M+odrC8VZjZSgL6UuUS92MMccqk5opu7hqszk2OX/6V4g1DsMsk+zA1BKw36Ti7K9xj6kRx0Tb1BfEVtbS5y/bIfWZo1Xah1zBgBnJgZQjNaiiVsA80xb8gl5tuqjPf/wkC9D+fw6rQb6P7Cp0nzbRAE31gz1H86uccizYth5oI6P6CGSbWHy2Q3z5khJBlkqHG00/nkJcMEym3OmtI5HmGOwYJUaPBOVe05Ex+o3R7JIeP3vmtICzvEcBcqPb9yG7L+OpNsIWLnd4MX8iRP1luNlKw1s5g95odqacVRRGW5hzjGiCfTCQhXMEbRZqDRKg8VMKYVjTpxtl/0LvpMKWmsa/iInR6RGA+aK5ppQ/Bzr1amNoXmbSF/10v33KxnZEFHqGQoPSu+fRNGUXHnO1pcssTWYau/sPG2DYGZwc0101fokMdwKEHSK6C64CZivat4PTAnnd0= 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: If a VMA has the VM_SHADOW_STACK flag, it is shadow stack memory. So when it is made writable with pte_mkwrite(), it should create shadow stack memory, not conventionally writable memory. Now that all the places where shadow stack memory might be created pass a VMA into pte_mkwrite(), it can know when it should do this. So make pte_mkwrite() create shadow stack memory when the VMA has the VM_SHADOW_STACK flag. Do the same thing for pmd_mkwrite(). This requires referencing VM_SHADOW_STACK in these functions, which are currently defined in pgtable.h, however mm.h (where VM_SHADOW_STACK is located) can't be pulled in without causing problems for files that reference pgtable.h. So also move pte/pmd_mkwrite() into pgtable.c, where they can safely reference VM_SHADOW_STACK. Signed-off-by: Rick Edgecombe Reviewed-by: Kees Cook Acked-by: Mike Rapoport (IBM) Acked-by: Deepak Gupta Tested-by: Pengfei Xu Tested-by: John Allen Tested-by: Kees Cook --- v8: - Update commit log verbiage (Boris) v6: - New patch --- arch/x86/include/asm/pgtable.h | 20 ++------------------ arch/x86/mm/pgtable.c | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 05dfdbdf96b4..d81e7ec27507 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -456,15 +456,7 @@ static inline pte_t pte_mkwrite_kernel(pte_t pte) struct vm_area_struct; -static inline pte_t pte_mkwrite(pte_t pte, struct vm_area_struct *vma) -{ - pte = pte_mkwrite_kernel(pte); - - if (pte_dirty(pte)) - pte = pte_clear_saveddirty(pte); - - return pte; -} +pte_t pte_mkwrite(pte_t pte, struct vm_area_struct *vma); static inline pte_t pte_mkhuge(pte_t pte) { @@ -601,15 +593,7 @@ static inline pmd_t pmd_mkyoung(pmd_t pmd) return pmd_set_flags(pmd, _PAGE_ACCESSED); } -static inline pmd_t pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma) -{ - pmd = pmd_set_flags(pmd, _PAGE_RW); - - if (pmd_dirty(pmd)) - pmd = pmd_clear_saveddirty(pmd); - - return pmd; -} +pmd_t pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma); static inline pud_t pud_set_flags(pud_t pud, pudval_t set) { diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index e4f499eb0f29..98856bcc8102 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -880,3 +880,29 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) #endif /* CONFIG_X86_64 */ #endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */ + +pte_t pte_mkwrite(pte_t pte, struct vm_area_struct *vma) +{ + if (vma->vm_flags & VM_SHADOW_STACK) + return pte_mkwrite_shstk(pte); + + pte = pte_mkwrite_kernel(pte); + + if (pte_dirty(pte)) + pte = pte_clear_saveddirty(pte); + + return pte; +} + +pmd_t pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma) +{ + if (vma->vm_flags & VM_SHADOW_STACK) + return pmd_mkwrite_shstk(pmd); + + pmd = pmd_set_flags(pmd, _PAGE_RW); + + if (pmd_dirty(pmd)) + pmd = pmd_clear_saveddirty(pmd); + + return pmd; +} -- 2.17.1