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 0AF94C74A5B for ; Sun, 19 Mar 2023 00:16:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F1A13280009; Sat, 18 Mar 2023 20:16:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EA1EB280001; Sat, 18 Mar 2023 20:16:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C804B280009; Sat, 18 Mar 2023 20:16:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B1395280001 for ; Sat, 18 Mar 2023 20:16:16 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 73EDE40C76 for ; Sun, 19 Mar 2023 00:16:16 +0000 (UTC) X-FDA: 80583730752.10.26B97C0 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by imf05.hostedemail.com (Postfix) with ESMTP id 35C96100005 for ; Sun, 19 Mar 2023 00:16:13 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=aBhlqFre; spf=pass (imf05.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=1679184974; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=vY6sCeD2TLN/+eCA+S8sO9I7Rz5ryINUnVTgEv9BsKg=; b=6Sv+OTJ83qxfUn9drFUlHrfPVXud5tS6c3fnhZT49YApxV8beZXaDpZx3TGTSDz3O7rEux uwVuQzVZfMzjFhqvs31LHHAspTOq42qg82JZuKxcLiwybyPgvjLBZ6JADRg0dKAR7RH8Qk LmIgq1lQEARYSVQhfBTr2l9RRFMocnc= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=aBhlqFre; spf=pass (imf05.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=1679184974; a=rsa-sha256; cv=none; b=MiR3VqcejGCGGEnZq8Zcx4kRBW4H3nhueesQHBfBuHzJIMGSYl7UhY/J7+3179rNIAZxcx HeB2fKU8spREpaFNXuiYYfCuJmB5WFzKKzofVyJQ9VKuRSqyxRbgQOw1Oubad772Diyt7c 3VvYfA813sR4xoCgJEsXC+OMFl/IB/A= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679184974; x=1710720974; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3uhcjpuPc6iiKv5YasMIVAsUAr3DhRKyR9YoK1X/nYQ=; b=aBhlqFreREzLW78s7yAOPHYjFk4GAKRyM6eHe9CfbzosVgLSV0s4C/vk G22+oBJvpNgHdbW9i5dXz0rZfvZ9olCX2js2Xe15SZNIMmFWgSQtXlECZ DDBjrrKhX8fNcA5xRHle4pXyCe/OfkK1DUPlweXA1jGJLJ0pTZbqN0wqm JBaPEDVKJB2h+eGXsA89PZefZH6dqhF16nHiG0icFQkU82jLk6YviJ7tk 3P2JMeT21xR5jGrikqUFGByK418TKM3pC6KKQ0dYtQj7XeUjvtrYEw+sD 7fy9locGsF7pytV49AY1WD9JeP71bqtLUDKSqdBHDfz7Be0gY801135PE g==; X-IronPort-AV: E=McAfee;i="6600,9927,10653"; a="338490971" X-IronPort-AV: E=Sophos;i="5.98,272,1673942400"; d="scan'208";a="338490971" 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:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10653"; a="749672821" X-IronPort-AV: E=Sophos;i="5.98,272,1673942400"; d="scan'208";a="749672821" 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:11 -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 11/40] mm: Introduce pte_mkwrite_kernel() Date: Sat, 18 Mar 2023 17:15:06 -0700 Message-Id: <20230319001535.23210-12-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> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 35C96100005 X-Stat-Signature: nctycnoi7sthau3csb1jbmy4p4zst5gx X-Rspam-User: X-HE-Tag: 1679184973-614499 X-HE-Meta: U2FsdGVkX1+CPEIeNx4TX46Niu5Wj+wVXvGAfVYzPUowwm/5YRbJIJLSV/1UaOPpzg3qkE5Enf8XiTzlOkKOaJKJnTA29Xo/UWtzF80FHsnHQhW+o9gzQmexdZYRDDLerFvKdrwHr+MWUX7m9G0pcLXYo1ygYXnx/saItOdBCaUzVWsFKASYSh7iVypHnD4hkZDw/8DqHkXRhstlbtg+4/7By4EVu4oPNWiXWFsjoQtXUS+KMO42fI/LpTe/fyWZlLIh6hXIy0VZLfQKts+5+Mmg33jP5x5HZieoKwz/P/IJbZZeN3XyWEhEz7eErHTJ2hv/k6S567CGH/cUbmS04BUXrrc9uZBYkAnDbLwPVDLZCXW9GEFR3hEptCg1hz7YtYCmfAgo24vSqdqOfvFBBV+B+NM1MioQZpj5wjB/oD2A18yTy9rsyHdubN4ux6Kok6LER5MBnJaeXtj1+4T3XdmHE1GrUy+qg4v9DOLeYfK2X/RzjDeK+CbLz/JoxUp+OE2YN1/kUx6s7H9jYv32PO/4LC6/MaNo3qLK4ZOkY96ydrYT6CSnpI51olI14O1iMnaDhQklt8072gLMfHCAcM4F4e2JQe3+TkKeRN+DY72zyYxYOZ2xt5nq6myA42Fht+8AfrtJkHO+RkAYe60gGE1u86V7AGa909jf6IMwqo0Igy/3qVEKcKHHMeha8yQgAkx1oGCzdB8Gdy/fD92UD29QkE28KaJ8qFpMb/LEoM0/r6fR4foKs/nErjSEXJLSYC0Ysf/AUnaZcP4QSk3q8BSu16ypJEkonQDZ/KK59CCGe8rc0sSEJ2AAQ3URfiNM9Or2xtsyFvSEYLxpPw7XpYRmcaR0f20V6cD9dNleLxQNwaStZmHVuOBDRauQxRbYB0XpY5Ku9jwE549TMwj+UKtNP4gAp1A4d8JpwKu4r6dtJiUGT13fPvs5TzcrHTcp1nzw8GRbv2HEIB5weK4 zCqcRHxt TSgdGPHOMeW/go58QhDoCEDvCaPaFnF+O31ING7O9z0Y9KRicxRbHQOZh4fbT5nYd+j9XMVb61fhsd9T4Dl+n1hk0JZPQNw+sYXk5inzxKbuEQlxd3uNIi50QHnjPqdQ458oN9e2DwRSxAWoanjOhuAu6dQjMLrD2UvTjoQ6ERK1fs9H+W7754JquzjHeZyBajjqvA8xFBHvScVD6Mf/SiSvtrNYNnOOTHiV8wmq4c9Zubf41bpLW5UlWGgYst9vTKYOy8Jgv14zSXIwbB9Z5npaNkVFQOgzULAm5DgJ/Nw4HBjLdQdyQe6Qh3DT8SowRCsMp622ocdbABBCevzobAfGHYdMiSTwXC6uG7XKpw/sn6Rpwo86Rqj8RZjYTpgTM8agIbwmccQ2lhiNo4Sue8uMUXGLx5fX1RPCmlIp2KN49zHP+ZWyCEw9JPAHB3OJ0pLZsw1gc6LrmA6IIVk8Fjv8Y1REmTk5Kfzx2/mbBQR8fx1j4g+XS7zaxaiStDHhADuBVSDCYAdk7Dlv1FX6KzP7mUw== 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: The x86 Control-flow Enforcement Technology (CET) feature includes a new type of memory called shadow stack. This shadow stack memory has some unusual properties, which requires some core mm changes to function properly. One of these changes is to allow for pte_mkwrite() to create different types of writable memory (the existing conventionally writable type and also the new shadow stack type). Future patches will convert pte_mkwrite() to take a VMA in order to facilitate this, however there are places in the kernel where pte_mkwrite() is called outside of the context of a VMA. These are for kernel memory. So create a new variant called pte_mkwrite_kernel() and switch the kernel users over to it. Have pte_mkwrite() and pte_mkwrite_kernel() be the same for now. Future patches will introduce changes to make pte_mkwrite() take a VMA. Only do this for architectures that need it because they call pte_mkwrite() in arch code without an associated VMA. Since it will only currently be used in arch code, so do not include it in arch_pgtable_helpers.rst. Suggested-by: David Hildenbrand Signed-off-by: Rick Edgecombe Reviewed-by: Kees Cook Acked-by: Mike Rapoport (IBM) Acked-by: David Hildenbrand Acked-by: Deepak Gupta Tested-by: Pengfei Xu Tested-by: John Allen Tested-by: Kees Cook Link: https://lore.kernel.org/lkml/0e29a2d0-08d8-bcd6-ff26-4bea0e4037b0@redhat.com/ --- Hi Non-x86 Arch’s, x86 has a feature that allows for the creation of a special type of writable memory (shadow stack) that is only writable in limited specific ways. Previously, changes were proposed to core MM code to teach it to decide when to create normally writable memory or the special shadow stack writable memory, but David Hildenbrand suggested[0] to change pXX_mkwrite() to take a VMA, so awareness of shadow stack memory can be moved into x86 code. Since pXX_mkwrite() is defined in every arch, it requires some tree-wide changes. So that is why you are seeing some patches out of a big x86 series pop up in your arch mailing list. There is no functional change. After this refactor, the shadow stack series goes on to use the arch helpers to push shadow stack memory details inside arch/x86. Testing was just 0-day build testing. Hopefully that is enough context. Thanks! [0] https://lore.kernel.org/lkml/0e29a2d0-08d8-bcd6-ff26-4bea0e4037b0@redhat.com/ v6: - New patch --- arch/arm64/include/asm/pgtable.h | 7 ++++++- arch/arm64/mm/trans_pgd.c | 4 ++-- arch/s390/include/asm/pgtable.h | 7 ++++++- arch/s390/mm/pageattr.c | 2 +- arch/x86/include/asm/pgtable.h | 7 ++++++- arch/x86/xen/mmu_pv.c | 2 +- 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index b6ba466e2e8a..cccf8885792e 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -180,13 +180,18 @@ static inline pmd_t set_pmd_bit(pmd_t pmd, pgprot_t prot) return pmd; } -static inline pte_t pte_mkwrite(pte_t pte) +static inline pte_t pte_mkwrite_kernel(pte_t pte) { pte = set_pte_bit(pte, __pgprot(PTE_WRITE)); pte = clear_pte_bit(pte, __pgprot(PTE_RDONLY)); return pte; } +static inline pte_t pte_mkwrite(pte_t pte) +{ + return pte_mkwrite_kernel(pte); +} + static inline pte_t pte_mkclean(pte_t pte) { pte = clear_pte_bit(pte, __pgprot(PTE_DIRTY)); diff --git a/arch/arm64/mm/trans_pgd.c b/arch/arm64/mm/trans_pgd.c index 4ea2eefbc053..5c07e68d80ea 100644 --- a/arch/arm64/mm/trans_pgd.c +++ b/arch/arm64/mm/trans_pgd.c @@ -40,7 +40,7 @@ static void _copy_pte(pte_t *dst_ptep, pte_t *src_ptep, unsigned long addr) * read only (code, rodata). Clear the RDONLY bit from * the temporary mappings we use during restore. */ - set_pte(dst_ptep, pte_mkwrite(pte)); + set_pte(dst_ptep, pte_mkwrite_kernel(pte)); } else if (debug_pagealloc_enabled() && !pte_none(pte)) { /* * debug_pagealloc will removed the PTE_VALID bit if @@ -53,7 +53,7 @@ static void _copy_pte(pte_t *dst_ptep, pte_t *src_ptep, unsigned long addr) */ BUG_ON(!pfn_valid(pte_pfn(pte))); - set_pte(dst_ptep, pte_mkpresent(pte_mkwrite(pte))); + set_pte(dst_ptep, pte_mkpresent(pte_mkwrite_kernel(pte))); } } diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index 2c70b4d1263d..d4943f2d3f00 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h @@ -1005,7 +1005,7 @@ static inline pte_t pte_wrprotect(pte_t pte) return set_pte_bit(pte, __pgprot(_PAGE_PROTECT)); } -static inline pte_t pte_mkwrite(pte_t pte) +static inline pte_t pte_mkwrite_kernel(pte_t pte) { pte = set_pte_bit(pte, __pgprot(_PAGE_WRITE)); if (pte_val(pte) & _PAGE_DIRTY) @@ -1013,6 +1013,11 @@ static inline pte_t pte_mkwrite(pte_t pte) return pte; } +static inline pte_t pte_mkwrite(pte_t pte) +{ + return pte_mkwrite_kernel(pte); +} + static inline pte_t pte_mkclean(pte_t pte) { pte = clear_pte_bit(pte, __pgprot(_PAGE_DIRTY)); diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c index 85195c18b2e8..4ee5fe5caa23 100644 --- a/arch/s390/mm/pageattr.c +++ b/arch/s390/mm/pageattr.c @@ -96,7 +96,7 @@ static int walk_pte_level(pmd_t *pmdp, unsigned long addr, unsigned long end, if (flags & SET_MEMORY_RO) new = pte_wrprotect(new); else if (flags & SET_MEMORY_RW) - new = pte_mkwrite(pte_mkdirty(new)); + new = pte_mkwrite_kernel(pte_mkdirty(new)); if (flags & SET_MEMORY_NX) new = set_pte_bit(new, __pgprot(_PAGE_NOEXEC)); else if (flags & SET_MEMORY_X) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 56eea96502c6..3607f2572f9e 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -364,11 +364,16 @@ static inline pte_t pte_mkyoung(pte_t pte) return pte_set_flags(pte, _PAGE_ACCESSED); } -static inline pte_t pte_mkwrite(pte_t pte) +static inline pte_t pte_mkwrite_kernel(pte_t pte) { return pte_set_flags(pte, _PAGE_RW); } +static inline pte_t pte_mkwrite(pte_t pte) +{ + return pte_mkwrite_kernel(pte); +} + static inline pte_t pte_mkhuge(pte_t pte) { return pte_set_flags(pte, _PAGE_PSE); diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index ee29fb558f2e..a23f04243c19 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -150,7 +150,7 @@ void make_lowmem_page_readwrite(void *vaddr) if (pte == NULL) return; /* vaddr missing */ - ptev = pte_mkwrite(*pte); + ptev = pte_mkwrite_kernel(*pte); if (HYPERVISOR_update_va_mapping(address, ptev, 0)) BUG(); -- 2.17.1