From patchwork Sat Feb 18 21:14:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgecombe, Rick P" X-Patchwork-Id: 13145659 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 D2C15C636CC for ; Sat, 18 Feb 2023 21:16:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E961528000D; Sat, 18 Feb 2023 16:16:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DDDC6280013; Sat, 18 Feb 2023 16:16:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A4DA3280012; Sat, 18 Feb 2023 16:16:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 90DA928000D for ; Sat, 18 Feb 2023 16:16:19 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 71B71A063B for ; Sat, 18 Feb 2023 21:16:19 +0000 (UTC) X-FDA: 80481670878.17.F9ACFA8 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by imf25.hostedemail.com (Postfix) with ESMTP id 7DBD6A0006 for ; Sat, 18 Feb 2023 21:16:17 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=Cr0Lxczn; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf25.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676754977; 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=9UaPp7NFG0LEcPHMvr1nfm8BlHPzTXSOfJPjX78pISI=; b=lqZ29Lyt8Vkosbha55BiwdLYtpEv1wHEx94Mcu2F3LAwq32MOow65ENeXqf0pap6w2+wo+ OqvOTuFe40u2XKr71s4IeojlrKfjdA8LKGiDmX+63Ir95l+TFrXb+Nehics21KROax39gx MccOdC1A2IXSqcqN5DWRpQg4Gaop1Mw= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=Cr0Lxczn; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf25.hostedemail.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676754977; a=rsa-sha256; cv=none; b=34u4Fi9DL7iMahA5jnHPImOCAZBQUEy0SGdJv+VJlNZU5vrdCPUP1RsSVy42VNShf9dPSN /Bgpcf5dsARKunlI2wgQd/o+x9Tv/FeSHMnf+dviwaToItshl07+KNq0WSAZ8h1BwSH4pd gpN0T2H9d8W6xB9Rv0P48VrTOSPX+NU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676754977; x=1708290977; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=FRX2Zip/lmlZmsFz5KdG4yfHn5/JjBj845luOn8deCo=; b=Cr0Lxcznu9OfXxmvCmfiBQBIH7N+tqBJJHfFJyQQfHw/DhkriH23kVN/ pr5IGThypBvgA8gY/PjsEFti8pcOmb4GMAZdPLp1MFwmY1U6LkuB74g4a temFSBbuAjnKg1cLX8bo0hsvf85V2+zaas4bIclIqEFLx3bB0IhTABCDt ODQdLnc9dZyVoq1ePAQ5jhNnfLwrsHFWYBQsGOWMIbW1KUMt0nDIJh6yL aPZodVDhcc9r0V1J2A95Qiy2MzzB2d9zxIyNtXNH0ogKZPfQFcGyyDFa9 /BCBe2HLcQTbeoU7TjmSUUCn8HIwx37OE0Hbkq+1MLmvAsHz84oJv/D/I Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10625"; a="418427530" X-IronPort-AV: E=Sophos;i="5.97,309,1669104000"; d="scan'208";a="418427530" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2023 13:16:13 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10625"; a="664241668" X-IronPort-AV: E=Sophos;i="5.97,309,1669104000"; d="scan'208";a="664241668" Received: from adityava-mobl1.amr.corp.intel.com (HELO rpedgeco-desk.amr.corp.intel.com) ([10.209.80.223]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2023 13:16:12 -0800 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 Cc: rick.p.edgecombe@intel.com Subject: [PATCH v6 20/41] x86/mm: Teach pte_mkwrite() about stack memory Date: Sat, 18 Feb 2023 13:14:12 -0800 Message-Id: <20230218211433.26859-21-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230218211433.26859-1-rick.p.edgecombe@intel.com> References: <20230218211433.26859-1-rick.p.edgecombe@intel.com> X-Rspamd-Queue-Id: 7DBD6A0006 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: mpz1b8ndbjgr6umym4o93iwgkiuh1o8z X-HE-Tag: 1676754977-938553 X-HE-Meta: U2FsdGVkX19Y5T7EAIDtmvFe4Fh8CiKyyVwiD4OkLoK7r96zBXdmT1g9oJijJzz5I1a+sxwtuv0B20aUm7VBmMRxsCNXekFvVHeZwvAXDPU3t3lCby3KAMVVITOcqqNZ8ODO0ofjyX678ga0F35+c9lBuNkytEPOFyZS8jp5+X+LfXC03oVRtNG7C7IjTuOj7HVwhqM87VFYDY1LNtWAcr76cCRqz+GzJ8gSAo0R1Mt+nACvLvHPVtk8Vek/eBDqoQdP9Si8J7XSO3o+7qse83XPi4PRmlhvVuCAin8iZV/UMVwdIUE3Tl5Dj0NNmN1ZZ0MIgOnNSB4N4GH4VYPwFabFy1h3DcbumzHk2wa2HQWqv574rXedYouL1Bh64q2ESXlK7nO9tvXsZEsaMFe501MDnCZruJQiLyp1vi1zha0snMdL5U6wVwieu9KeKQ8aOv5a0MJ/DkcIeFLpvq97gF609p+uhS4qVSfPDI0Q+Av8mOqoPXbvynz3cZhuvxAyspvexxv/sBNLIERcneIN5SbBR7USeJJoQco1iNjwF77fHJ0X4o46ZPZfAgA04+vrE6YINtABc2Qe2syC7B7E7BILF703DxHW0ogylhN3tDoPsncUjA/4IDR8r4LmAgV3sTb6Du7l5gFeIZ4mevWIBLfEChsSPd6VMWky55US57E9y6YqX3zz8Ml8Gro2OFsZzO9SW3ItpLJWCxTVa5/qa2bGQLxE3PbJ5WBvUqiF/ewFNpfboqXdGoZScd3KGdOQ63fcr1yIGgTp0ux5/QSou3TxWRMdE7wR9Bx4+ehoNcZa82E5KV4O60IK4gKj8vqHD1cR/3bvd22PV4W8AvfVMg0htIHnhbufrfT2ccpdAUlFYJwS4VtjUs2q20UTf9eV/BJOysYn/Ttgr6a8d7e+N84nuO3l+yHGEm6YRFpQbLI62wR9Tpt4ClqhnvDEUXOJuOQuA8qNICw1neLee5R 55Y2Ub9Q H9OXz44M8ioRjITXFo3a0gtylTu2Va5s5gn0bLPdLUmORkboXF74ZqsLgfumWBiJw3SHZtelhE2+4gtvoRkeYS059dwEVu7ekgqy268+kF2Z9fm05x/F+OOVFKC6C+5zCYynU5HaTo0f1ci12b5b6oeQAikY6LRt/SDBZ8p/B/LSJLnhtW9IBTcWGpyG6bCtTNCD1nxVRPR42rw/7KQcKY4YfUxIfa5JElLpn7usQgudbgzM7yGjlbIW5ew== 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 pte_mkwrite() takes a VMA, and places where shadow stack memory might be created pass one, pte_mkwrite() 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. Tested-by: Pengfei Xu Signed-off-by: Rick Edgecombe Reviewed-by: Kees Cook Acked-by: Deepak Gupta --- 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 292a3b75d7fa..6b7106457bfb 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; +}