From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25F1B34104E for ; Wed, 18 Mar 2026 11:51:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773834710; cv=none; b=BeLhjLQCm/u7mgpUJTPHihkRjrnddT/wDBzOT7FCZSs/rLjbqy0T16yiOWTxGqhXop6HmesgyTNjUeOLTB1y55tRVfoI4F5/si+M4ijKs38ZmVrepDHoKtm9X1JFtEUr/gCzwVgYrNVHHmNNpSN4ok2sFWnzEJhVkonf6vD2dlk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773834710; c=relaxed/simple; bh=q9VX/2IZvE4siduCWj4cS+AazEBTZbIPvFhtlluXPd0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IYN3IVR3+n/JlUizb+GL5QxHLJSGiMLB6n0UjiceM96wgCBMgMUmPeXUDVoIsRPLd/EsorftslMRxm0I5fq0no1QRfqullwyCUa+BMaAc+rgeRoCqyPTcDGDXkWXaDr6i58mducazRS7UeXAMVD0AUaQ6C0PWHyTCOvpNfRPK8s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Nfg5QcRt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Nfg5QcRt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28497C2BCB2; Wed, 18 Mar 2026 11:51:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773834709; bh=q9VX/2IZvE4siduCWj4cS+AazEBTZbIPvFhtlluXPd0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nfg5QcRtqIxKNGjIYjlKgtmhK5MlVdcvx5PjbL6GvqitfZ/FQBCwJqafu5K3nb1Zi XJwoSKMPXINnQJt78MQUrTxgOlfm4I7RtZD0kzDm6PB3hcYP3+HVCQ2V5ePcuGIHL1 bqG0pvqTFJBhDHa/YgRs4SvWPqn0z0zsHCOGTGZBi2x5PM/szShC2u2Zf5laCpRZCH h/T9eSJWd7P7medbtgYDs69XP/TpvcveN+yXYtUnVjWvDBoLGonzXyNxCOQV3Mj2HZ L8c0ztDTbn83qGasxVceXziX/iFDjLVbZc1ZXOEpnweYlaVsvFufEVSlj0l7hpAiKx +/RIn7KzMKBuw== From: Sasha Levin To: stable@vger.kernel.org Cc: Catalin Marinas , Jianpeng Chang , Will Deacon , "Huang, Ying" , Guenter Roeck , Sasha Levin Subject: [PATCH 6.1.y 2/2] arm64: mm: Add PTE_DIRTY back to PAGE_KERNEL* to fix kexec/hibernation Date: Wed, 18 Mar 2026 07:51:46 -0400 Message-ID: <20260318115146.638253-2-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260318115146.638253-1-sashal@kernel.org> References: <2026031755-deed-balancing-9a48@gregkh> <20260318115146.638253-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Catalin Marinas [ Upstream commit c25c4aa3f79a488cc270507935a29c07dc6bddfc ] Commit 143937ca51cc ("arm64, mm: avoid always making PTE dirty in pte_mkwrite()") changed pte_mkwrite_novma() to only clear PTE_RDONLY when PTE_DIRTY is set. This was to allow writable-clean PTEs for swap pages that haven't actually been written. However, this broke kexec and hibernation for some platforms. Both go through trans_pgd_create_copy() -> _copy_pte(), which calls pte_mkwrite_novma() to make the temporary linear-map copy fully writable. With the updated pte_mkwrite_novma(), read-only kernel pages (without PTE_DIRTY) remain read-only in the temporary mapping. While such behaviour is fine for user pages where hardware DBM or trapping will make them writeable, subsequent in-kernel writes by the kexec relocation code will fault. Add PTE_DIRTY back to all _PAGE_KERNEL* protection definitions. This was the case prior to 5.4, commit aa57157be69f ("arm64: Ensure VM_WRITE|VM_SHARED ptes are clean by default"). With the kernel linear-map PTEs always having PTE_DIRTY set, pte_mkwrite_novma() correctly clears PTE_RDONLY. Fixes: 143937ca51cc ("arm64, mm: avoid always making PTE dirty in pte_mkwrite()") Signed-off-by: Catalin Marinas Cc: stable@vger.kernel.org Reported-by: Jianpeng Chang Link: https://lore.kernel.org/r/20251204062722.3367201-1-jianpeng.chang.cn@windriver.com Cc: Will Deacon Cc: Huang, Ying Cc: Guenter Roeck Reviewed-by: Huang Ying Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/include/asm/pgtable-prot.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/pgtable-prot.h b/arch/arm64/include/asm/pgtable-prot.h index 82bfd88a2e4ea..b305deb1deb84 100644 --- a/arch/arm64/include/asm/pgtable-prot.h +++ b/arch/arm64/include/asm/pgtable-prot.h @@ -45,11 +45,11 @@ #define _PAGE_DEFAULT (_PROT_DEFAULT | PTE_ATTRINDX(MT_NORMAL)) -#define _PAGE_KERNEL (PROT_NORMAL) -#define _PAGE_KERNEL_RO ((PROT_NORMAL & ~PTE_WRITE) | PTE_RDONLY) -#define _PAGE_KERNEL_ROX ((PROT_NORMAL & ~(PTE_WRITE | PTE_PXN)) | PTE_RDONLY) -#define _PAGE_KERNEL_EXEC (PROT_NORMAL & ~PTE_PXN) -#define _PAGE_KERNEL_EXEC_CONT ((PROT_NORMAL & ~PTE_PXN) | PTE_CONT) +#define _PAGE_KERNEL (PROT_NORMAL | PTE_DIRTY) +#define _PAGE_KERNEL_RO ((PROT_NORMAL & ~PTE_WRITE) | PTE_RDONLY | PTE_DIRTY) +#define _PAGE_KERNEL_ROX ((PROT_NORMAL & ~(PTE_WRITE | PTE_PXN)) | PTE_RDONLY | PTE_DIRTY) +#define _PAGE_KERNEL_EXEC ((PROT_NORMAL & ~PTE_PXN) | PTE_DIRTY) +#define _PAGE_KERNEL_EXEC_CONT ((PROT_NORMAL & ~PTE_PXN) | PTE_CONT | PTE_DIRTY) #define _PAGE_SHARED (_PAGE_DEFAULT | PTE_USER | PTE_RDONLY | PTE_NG | PTE_PXN | PTE_UXN | PTE_WRITE) #define _PAGE_SHARED_EXEC (_PAGE_DEFAULT | PTE_USER | PTE_RDONLY | PTE_NG | PTE_PXN | PTE_WRITE) -- 2.51.0