From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out30-98.freemail.mail.aliyun.com (out30-98.freemail.mail.aliyun.com [115.124.30.98]) (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 136E02F0C64 for ; Mon, 1 Dec 2025 08:43:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.98 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764578594; cv=none; b=PHYq9mDv51Hi8U7jR+N8oDvL4VMxA3CErqo1MTXDKZ24/dNekUFywZ6Yt3fGcMRJjljEikZHzcBNp8gXgI45mzk9vuV3XHST15Vw++QS4RO6GhG1dUq1lNPRe/Cc69P1A7wmyuoIKqd7R/Kf0ode8xgj7pZoVzPP3r7TjQkUJo8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764578594; c=relaxed/simple; bh=SLT9M1RACIreRtpVeo8ysisSCzgOMYp5sd3TG0bMAbw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=pP3Sck6kHV77nHCXd5/9kCV1kWPwqiOlaczyOFbDyDmqpAX7l8lx8Mr44cJVBm9rBHahEt8xiS9949To3b++yCyWjOZAVEwIyeYm4hxDl7z/tYBgUe2zq65R5t9HYsPsKSmTPVEwuLYyA2TgWx93qwNpPmpfb60hcDsTbrUz7rw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=lLZl/sZA; arc=none smtp.client-ip=115.124.30.98 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="lLZl/sZA" DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1764578587; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; bh=Er0ga7cjSZ0JKeVRoO5GUwHS5fC5Y/9LAo9V07HY5YE=; b=lLZl/sZAT8tOvLbefzIYRZ7o1W0ajsX5mS2RIi5E1BlV0gU8pxebur4YOSwNMWcPl3rNwa1C2UFZIteY6B/i7w05+hVrGAApg2liAHknG4vjkG9JNKmJcRuVqtQMxXCay1QmpTharV550FGRKxwgKxBUsFi6c19stYIawiukHqY= Received: from DESKTOP-5N7EMDA(mailfrom:ying.huang@linux.alibaba.com fp:SMTPD_---0Wtol.eq_1764578571 cluster:ay36) by smtp.aliyun-inc.com; Mon, 01 Dec 2025 16:43:07 +0800 From: "Huang, Ying" To: Jianpeng Chang Cc: catalin.marinas@arm.com, will@kernel.org, ardb@kernel.org, anshuman.khandual@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "Shenhar, Talel" Subject: Re: [PATCH] arm64: mm: Fix kexec failure after pte_mkwrite_novma() change In-Reply-To: (Jianpeng Chang's message of "Mon, 1 Dec 2025 15:54:37 +0800") References: <20251127034350.3600454-1-jianpeng.chang.cn@windriver.com> <87qztiec4e.fsf@DESKTOP-5N7EMDA> Date: Mon, 01 Dec 2025 16:42:50 +0800 Message-ID: <87v7iqh9th.fsf@DESKTOP-5N7EMDA> User-Agent: Gnus/5.13 (Gnus v5.13) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ascii Jianpeng Chang writes: > On 11/28/25 5:32 PM, Huang, Ying wrote: >> CAUTION: This email comes from a non Wind River email account! >> Do not click links or open attachments unless you recognize the sender and know the content is safe. >> >> Hi, Jianpeng, >> >> Jianpeng Chang writes: >> >>> Commit 143937ca51cc ("arm64, mm: avoid always making PTE dirty in >>> pte_mkwrite()") modified pte_mkwrite_novma() to only clear PTE_RDONLY >>> when the page is already dirty (PTE_DIRTY is set). While this optimization >>> prevents unnecessary dirty page marking in normal memory management paths, >>> it breaks kexec on some platforms like NXP LS1043. >>> >>> The issue occurs in the kexec code path: >>> 1. machine_kexec_post_load() calls trans_pgd_create_copy() to create a >>> writable copy of the linear mapping >>> 2. _copy_pte() calls pte_mkwrite_novma() to ensure all pages in the copy >>> are writable for the new kernel image copying >>> 3. With the new logic, clean pages (without PTE_DIRTY) remain read-only >>> 4. When kexec tries to copy the new kernel image through the linear >>> mapping, it fails on read-only pages, causing the system to hang >>> after "Bye!" >>> >>> The same issue affects hibernation which uses the same trans_pgd code path. >>> >>> Fix this by explicitly clearing PTE_RDONLY in _copy_pte() for both >>> kexec and hibernation, ensuring all pages in the temporary mapping are >>> writable regardless of their dirty state. This preserves the original >>> commit's optimization for normal memory management while fixing the >>> kexec/hibernation regression. >>> >>> Fixes: 143937ca51cc ("arm64, mm: avoid always making PTE dirty in pte_mkwrite()") >> IMHO, this isn't the right "Fixes" tag. The original _copy_pte() code >> should be the fixing target. > > Hi Ying, > > According to my understanding, the Fixes tag should point to the > commit that directly > > introduced the issue. While _copy_pte() was introduced with > pte_mkwrite_novma() in > > commit 6ecc21bb432d, at that time pte_mkwrite_novma() always cleared > the PTE_RDONLY Per my understanding, that is not correct to clearing PTE_RDONLY in pte_mkwrite_novma() in the first place. However, "Fixes" flag is used for patch backporting too. For that, the original tag is better. So, It's OK for me now. > bit unconditionally, and kexec worked correctly. Should we blame a > change that was > > working properly at the time, or am I missing something here? > >> >>> Signed-off-by: Jianpeng Chang >>> --- >>> arch/arm64/mm/trans_pgd.c | 12 ++++++++++-- >>> 1 file changed, 10 insertions(+), 2 deletions(-) >>> >>> diff --git a/arch/arm64/mm/trans_pgd.c b/arch/arm64/mm/trans_pgd.c >>> index 18543b603c77..ad4e5e4fcc91 100644 >>> --- a/arch/arm64/mm/trans_pgd.c >>> +++ b/arch/arm64/mm/trans_pgd.c >>> @@ -40,8 +40,13 @@ static void _copy_pte(pte_t *dst_ptep, pte_t *src_ptep, unsigned long addr) >>> * Resume will overwrite areas that may be marked >>> * read only (code, rodata). Clear the RDONLY bit from >>> * the temporary mappings we use during restore. >>> + * >>> + * For kexec/hibernation, we need writable access regardless >>> + * of the page's dirty state, so force clear PTE_RDONLY. >>> */ >>> - __set_pte(dst_ptep, pte_mkwrite_novma(pte)); >>> + pte = set_pte_bit(pte, __pgprot(PTE_WRITE)); >>> + pte = clear_pte_bit(pte, __pgprot(PTE_RDONLY)); >>> + __set_pte(dst_ptep, pte); >> Why not >> >> __set_pte(dst_ptep, pte_mkwrite_novma(pte_mkdirty(pte)); > I agree that using pte_mkdirty() is indeed better, makes the > modification clearer and avoids the helper function. I will change it. Thanks! >> ? >> >>> } else if (!pte_none(pte)) { >>> /* >>> * debug_pagealloc will removed the PTE_VALID bit if >>> @@ -57,7 +62,10 @@ 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_mkvalid(pte_mkwrite_novma(pte))); >>> + pte = pte_mkvalid(pte); >>> + pte = set_pte_bit(pte, __pgprot(PTE_WRITE)); >>> + pte = clear_pte_bit(pte, __pgprot(PTE_RDONLY)); >>> + __set_pte(dst_ptep, pte); >>> } >>> } --- Best Regards, Huang, Ying