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 D18213D6CCC for ; Wed, 18 Mar 2026 13:14:23 +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=1773839663; cv=none; b=mXMYfssuHAtcMwnS8BJ9vXvvUqIY+7uFZM/aKonRHidKbdMvH8+W+W7bzMyhrBPPv7Li0fGytwhc21J6LY/Eqk2FJbmJ7ZqPxp0QyPYSIHsJRv4ogVD1LHjl8nmmMtk3g4fPYM/lTztNoWRoZ3f/dU2SYTtCX/c0wsfeiNA57rw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773839663; c=relaxed/simple; bh=2aiAWhrdMKNyo2Lodq8/s4Sz25takqo6KazoasRPIHQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oDXi15K7jiAy3IFbFXt0GxZdpBB4elB+mwaBmQdoTNNboT0L773BlQx1h8tJJ9FcS4vTqjJI5D1Zwtt87xBVZF0WOp2Njatop0406R4nHInObKIKy7s/L+zE24phU8jjQDfzjAlWfLWIcdOl1m8x2/+W3M/xYnAvkfTiHOqjUhw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OczWvvf0; 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="OczWvvf0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A702DC19421; Wed, 18 Mar 2026 13:14:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773839663; bh=2aiAWhrdMKNyo2Lodq8/s4Sz25takqo6KazoasRPIHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OczWvvf0iEN9r8EFCpPPLUtmv3LUI2rGiByuE8v8ShwolwajAIMyKXAcyNrq9o/QW yw0gpG14O9baaCTkPayv3QD2ZXb/sZX2PCAhOlV6RM5RQ6+CCiZ/s0rO+EzYN9QnGV ufqyxCM4p/kZCPKz+RcGxJ5g4pe2Zvjn+OIkSinr9twkGYsSxBNdXmMcciXytvqLRr DedPUanetb07jzorwVy7NCK1ZesmaTp0qCYisG29lB8bLsjg4US+l2ukWJx4q2XMPi ro00JrhrXxVJapmy3tI+9vQq2EybzVW8t7nnsz4augpbIQcvPN+XP5zTYBETRad1LA EUnAVh/8ihljA== From: Sasha Levin To: stable@vger.kernel.org Cc: Catalin Marinas , Jianpeng Chang , Will Deacon , "Huang, Ying" , Guenter Roeck , Sasha Levin Subject: [PATCH 5.10.y] arm64: mm: Add PTE_DIRTY back to PAGE_KERNEL* to fix kexec/hibernation Date: Wed, 18 Mar 2026 09:14:21 -0400 Message-ID: <20260318131421.723675-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026031756-yoyo-makeover-7754@gregkh> References: <2026031756-yoyo-makeover-7754@gregkh> 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 [ added PTE_DIRTY to PAGE_KERNEL* macros directly instead of _PAGE_KERNEL* ] 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 9a65fb5281100..2c5b9ba13f264 100644 --- a/arch/arm64/include/asm/pgtable-prot.h +++ b/arch/arm64/include/asm/pgtable-prot.h @@ -65,11 +65,11 @@ extern bool arm64_use_ng_mappings; #define _PAGE_DEFAULT (_PROT_DEFAULT | PTE_ATTRINDX(MT_NORMAL)) -#define PAGE_KERNEL __pgprot(PROT_NORMAL) -#define PAGE_KERNEL_RO __pgprot((PROT_NORMAL & ~PTE_WRITE) | PTE_RDONLY) -#define PAGE_KERNEL_ROX __pgprot((PROT_NORMAL & ~(PTE_WRITE | PTE_PXN)) | PTE_RDONLY) -#define PAGE_KERNEL_EXEC __pgprot(PROT_NORMAL & ~PTE_PXN) -#define PAGE_KERNEL_EXEC_CONT __pgprot((PROT_NORMAL & ~PTE_PXN) | PTE_CONT) +#define PAGE_KERNEL __pgprot(PROT_NORMAL | PTE_DIRTY) +#define PAGE_KERNEL_RO __pgprot((PROT_NORMAL & ~PTE_WRITE) | PTE_RDONLY | PTE_DIRTY) +#define PAGE_KERNEL_ROX __pgprot((PROT_NORMAL & ~(PTE_WRITE | PTE_PXN)) | PTE_RDONLY | PTE_DIRTY) +#define PAGE_KERNEL_EXEC __pgprot((PROT_NORMAL & ~PTE_PXN) | PTE_DIRTY) +#define PAGE_KERNEL_EXEC_CONT __pgprot((PROT_NORMAL & ~PTE_PXN) | PTE_CONT | PTE_DIRTY) #define PAGE_S2_MEMATTR(attr) \ ({ \ -- 2.51.0