From nobody Sun Feb 8 13:39:41 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B619DEB64D8 for ; Fri, 16 Jun 2023 19:18:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346045AbjFPTSa (ORCPT ); Fri, 16 Jun 2023 15:18:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345953AbjFPTRF (ORCPT ); Fri, 16 Jun 2023 15:17:05 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 544F73A8D; Fri, 16 Jun 2023 12:17:01 -0700 (PDT) Date: Fri, 16 Jun 2023 19:16:59 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686943019; h=from:from:sender:sender:reply-to: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; bh=3ToMvz9hdObD8Sor51jCP3QvZh1KeB3m1ZKfHNQFnSA=; b=HFSiaoMOmHZLOSXbBtCLodWK7kai5HjvRANCtZVLSSbd05QKefN6axM1acETqQXG8IZtoP SbJ7OBU4M5UeY4sy9mMDouOexjrFaaVjRUNze5UbCg4jz55Lb7XAlGOtxGWb9rCsuOleo6 okISBnIPaBvYN4ZGwTGBxMaaczt5rhqpnuXrvNOjZXIsz+wTEXgx7Tt3biFY5WjQS6RR7w Lq9WiYKoFJ9Vs5uNEe087v+XfGPaEQXDVQ5EXRChwpyhXPfjXbGDvKfW9aQ9hASPhKN26O dBk3rtIcCYNx1tgW++E48NGNLmC5KYqG9yuSXyhwpVHroB689xaMPdEo/FEX9g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686943019; h=from:from:sender:sender:reply-to: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; bh=3ToMvz9hdObD8Sor51jCP3QvZh1KeB3m1ZKfHNQFnSA=; b=qxfdstSmaVFMkv/KMZNhrwb7jZAfnpSJoZkg+/6+GY5Evo6GnlPzqK+SBMvFElYCW7shAG BZFY5AjmjzIHioDg== From: "tip-bot2 for Rick Edgecombe" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/shstk] x86/mm: Teach pte_mkwrite() about stack memory Cc: Rick Edgecombe , Dave Hansen , "Borislav Petkov (AMD)" , Kees Cook , "Mike Rapoport (IBM)" , Deepak Gupta , Pengfei Xu , John Allen , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <168694301944.404.15753114470061222047.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/shstk branch of tip: Commit-ID: d3ffcb4e9599461daf567a0ac3ecebe7e09142d3 Gitweb: https://git.kernel.org/tip/d3ffcb4e9599461daf567a0ac3ecebe7e= 09142d3 Author: Rick Edgecombe AuthorDate: Mon, 12 Jun 2023 17:10:47 -07:00 Committer: Dave Hansen CommitterDate: Thu, 15 Jun 2023 16:31:33 -07:00 x86/mm: Teach pte_mkwrite() about stack memory 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 Signed-off-by: Dave Hansen Reviewed-by: Borislav Petkov (AMD) 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 Link: https://lore.kernel.org/all/20230613001108.3040476-22-rick.p.edgecomb= e%40intel.com --- arch/x86/mm/pgtable.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 101e721..c4b222d 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -883,6 +883,9 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) =20 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 =3D pte_mkwrite_novma(pte); =20 return pte_clear_saveddirty(pte); @@ -890,6 +893,9 @@ pte_t pte_mkwrite(pte_t pte, struct vm_area_struct *vma) =20 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 =3D pmd_mkwrite_novma(pmd); =20 return pmd_clear_saveddirty(pmd);