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 99424C7619A for ; Sun, 19 Mar 2023 00:16:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 554BB28000A; Sat, 18 Mar 2023 20:16:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4B91E280001; Sat, 18 Mar 2023 20:16:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2E2E528000A; Sat, 18 Mar 2023 20:16:18 -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 0AF41280001 for ; Sat, 18 Mar 2023 20:16:18 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E1171C0CF8 for ; Sun, 19 Mar 2023 00:16:17 +0000 (UTC) X-FDA: 80583730794.02.AA848F0 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by imf16.hostedemail.com (Postfix) with ESMTP id B24C2180014 for ; Sun, 19 Mar 2023 00:16:15 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=j9EcXTtc; spf=pass (imf16.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=1679184976; a=rsa-sha256; cv=none; b=vi/32Wgx2444G9lbWB0R49QE8tieFUynMlAlD9pGYKeBWJRx07bkG/DFeuv/MtMA5x94BK WyvRvLFojOjN+A2J4uXh00EhN9LKrF1auUp6ObDvqgBseVan0IeRFYtKIPyOOPl3f/1AM7 mlZH6x9T4lxM08966AwrjkWaSoKU4uA= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=j9EcXTtc; spf=pass (imf16.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=1679184976; 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=33oWnhrr3jWrLjHxAwTEeqeEC+bn441diBSfuvAd5ZQ=; b=i+9BHIVqdPkjSYlNFHs7TSYqXEAycResaqkFFn+aDMbSOJ88I/Ct9oHxx/9oJ+OOiSfIIE 7GybakQ4Qab4+5itRxsbNT0eHwO64vqj8mgzMyE6SBE4ThI34HDShmuUwVp072aUvLeY5z pyDsTCMqCQe6lyWme2NqFD/wEzseNZI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679184975; x=1710720975; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=izjgG3aKsLsDvcFVl85obe6QvAjx4LnRxYiOny/YjPI=; b=j9EcXTtcXRuB47kINGnCdrkCJpOjtDD8iQ91XYLlqR4vODNTqSM4z4eE sgBkozvVQhTEvAxAXpyaecv10MFcPLsQbHBv8WE6kmfZW8zas2IiLnNIj cnfa2yqzG9arXXQloY88JD24a1jJwa8KGsl2dZejADIbuTp29Tg+GskAd Pdju9HdsVxdehZqbeC8cgaIGeIEXxpA7uOvHk6bmaGZ4llKVa4xv0f6lp kmfismpDNsbZFwUnUbI/vHLbAn48rPukzGyRxQt6qyZo/qdbkvZE5wE1c z7nIkI07u1H9i8AQbb30SGl+PvCMXJevvxTYzTqCOU2rnFmC2l8DEHheB Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10653"; a="338490992" X-IronPort-AV: E=Sophos;i="5.98,272,1673942400"; d="scan'208";a="338490992" 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:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10653"; a="749672826" X-IronPort-AV: E=Sophos;i="5.98,272,1673942400"; d="scan'208";a="749672826" 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:13 -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 12/40] s390/mm: Introduce pmd_mkwrite_kernel() Date: Sat, 18 Mar 2023 17:15:07 -0700 Message-Id: <20230319001535.23210-13-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-Rspam-User: X-Rspamd-Queue-Id: B24C2180014 X-Rspamd-Server: rspam01 X-Stat-Signature: jcbeogp41jztu5ao46fg3kdjf6a87w3o X-HE-Tag: 1679184975-400138 X-HE-Meta: U2FsdGVkX19X+1Bur5c5F0vfXobTldf/NiBLolJZSsAm5SfDtWYddfEJwZtEVA14MrCwcZTHlHLXCKMzax/oC1eb0HHWVwhykkKpu43k11hrOZXWgdCFT6JlvIpV7nNzPCu9ssBnADubIcNnYzxAkOX8GnURcZxYS0/xXX9WxyXPTw3wRzu2OZBsHBHqTK8fN7OEeviliZyLKHSJkMWABpS98EDme75qavNhtQP2H7FXqzCP5v5xLu+0dsbc1FUoD+qi9bW83zlXHnUqaF52xa23a4eLcm44ZBisiTxfMR0ThdmciYPH2hG6cP1UW+7IYpVU2xH64zjqdOxaodczpbJeunPMpPwp+gyidGtE6aXsavKAGlVkcyrdvjA3IlvQwQNp063EgbNtA55yn7LrFSEULdtdSzuFeuA+xoleDZuA3fZKWyYU49jfwJ/L/iX880HhDIaGZWvS1CXgGyTdITpfcwWLNG3bRIz6IGN9xuHjqUV/q1DhyExSnImmsNQPrYGR7V8d/E4c4LSO1cc56x8yz9S9fSEANAJfwgR4IgD7Q1PKovNkvmw7H/49Q2nle3s7MHRkvrlOpgWfV7j6pg7lNVu7ajcLTopczhjM5j6S/rhW9NTEkgu/5jJZF2XJ7+5GeGsm7D0wjIwFKDZiw7OYSbu9l8ssOnGN5aWOV5R0N8RCvg16HoN1T3tU0Cpel18+WWr1oL9v6QJ1ghShe4wCY31ez/GSYtCd4gsmOyVXi+TBDe8/HUUv978mOv+ut3XgC1Vy7xo3i9JiaE3XFCQl6DgcmCE4iwmQIaaaOiVd9Q6MRpNs0QBhy0WWNWTzDHq/vbiQiEKwAqbTqGuT9MFjLYAxVl3oND4SQ/A5CQE4W1n3oVpd2u3++S3MCu9bT9vaMto6HqDTZD5tas3wD8kAyNFOVl1MpzwKqTwdlyxLtx1aSZCJs02/7NV8PJXrs8HXLij9Tb1q3YcevrR pQuN1JjE Jk9NwIHHeiQxwax1nidOB+fWegOnZR800SOdTFn3a1N/Maaf2itOyXOcRQVzAkKWN1OYc3lTUAMt7SmD7JXTkVvAzx9IpS/dw1QMH4gdA+khY9BQOYbE1asT87KzR8HvAr8kb739kaa7YhYzEU02H8yjjHtqkS6VYfQPkCOc1V+AXclgintcKqGbd2boWnt0p2w+kvNGPN/UrecdpFA96sptBZzzkqOsbk5t8g5aXeGNAS8xXC5mLUQgOrmdiF6/ClY9JXKKMxZKMNJTNUdNofnzo3NQCGKTdIR18noC2LRUsvGknxyJgOm5zcXVIq0ZXr8PIOypgGtKDVLEBA8KQ/V2E5Tcz81mw0Omjme3nDjoqUA4wBa7gDcsu4W4WqLLzihUtqw0asFoKTmNP9HeBAv1j6qX9tgo0+vTns9aJODjjbuKSl1XtMRgD8rwiYV9evb4Bwqm+udLAWoRktTmgUGD0CqeMd6XFvTo41FlBPDi/zC0dtUbBqD2WTg== 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 pmd_mkwrite() to create different types of writable memory (the existing conventionally writable type and also the new shadow stack type). Future patches will convert pmd_mkwrite() to take a VMA in order to facilitate this, however there are places in the kernel where pmd_mkwrite() is called outside of the context of a VMA. These are for kernel memory. So create a new variant called pmd_mkwrite_kernel() and switch the kernel users over to it. Have pmd_mkwrite() and pmd_mkwrite_kernel() be the same for now. Future patches will introduce changes to make pmd_mkwrite() take a VMA. Only do this for architectures that need it because they call pmd_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: Heiko Carstens Acked-by: David Hildenbrand 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/s390/include/asm/pgtable.h | 7 ++++++- arch/s390/mm/pageattr.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index d4943f2d3f00..deeb918cae1d 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h @@ -1491,7 +1491,7 @@ static inline pmd_t pmd_wrprotect(pmd_t pmd) return set_pmd_bit(pmd, __pgprot(_SEGMENT_ENTRY_PROTECT)); } -static inline pmd_t pmd_mkwrite(pmd_t pmd) +static inline pmd_t pmd_mkwrite_kernel(pmd_t pmd) { pmd = set_pmd_bit(pmd, __pgprot(_SEGMENT_ENTRY_WRITE)); if (pmd_val(pmd) & _SEGMENT_ENTRY_DIRTY) @@ -1499,6 +1499,11 @@ static inline pmd_t pmd_mkwrite(pmd_t pmd) return pmd; } +static inline pmd_t pmd_mkwrite(pmd_t pmd) +{ + return pmd_mkwrite_kernel(pmd); +} + static inline pmd_t pmd_mkclean(pmd_t pmd) { pmd = clear_pmd_bit(pmd, __pgprot(_SEGMENT_ENTRY_DIRTY)); diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c index 4ee5fe5caa23..7b6967dfacd0 100644 --- a/arch/s390/mm/pageattr.c +++ b/arch/s390/mm/pageattr.c @@ -146,7 +146,7 @@ static void modify_pmd_page(pmd_t *pmdp, unsigned long addr, if (flags & SET_MEMORY_RO) new = pmd_wrprotect(new); else if (flags & SET_MEMORY_RW) - new = pmd_mkwrite(pmd_mkdirty(new)); + new = pmd_mkwrite_kernel(pmd_mkdirty(new)); if (flags & SET_MEMORY_NX) new = set_pmd_bit(new, __pgprot(_SEGMENT_ENTRY_NOEXEC)); else if (flags & SET_MEMORY_X) -- 2.17.1