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 A4D3938947F for ; Wed, 29 Apr 2026 09:28:14 +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=1777454894; cv=none; b=NMD39aPV16YU1AphpP2846NXhF+I6yT5Q/D4fUmLOXQ9lPqsKCBwjG4Y/dpAV00x8j0sGsFqu2qPXbeKOjqKlkfes/nG1MIYwZF40Xg1sClGscH7geh4DUhhMms2CqGvfDOdqQMg+wb9reiEyu8Ea+Nw27pebPMMd99DeJAzzc0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777454894; c=relaxed/simple; bh=fpOCUVYEWC1NdrTTi027HUseiIi9m9kIiSeG69aOkwY=; h=MIME-Version:Date:From:To:Message-Id:In-Reply-To:References: Subject:Content-Type; b=ZCBC48fnQoMTAIKLA6+g066UNCkucCk83AEm+A7BZuWevvEXaPn2fIa1JE8fOXn/NCQG5aE5O3vRdx3H3Ifl3sW4UKwI24xAJ4S4NZsSqLn90pgRnY9WetoiY3Tfzao5oR5z2kVnTUHhQWIUeHJPUQ9zmDmsdXMTD6RO+XP/p1w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jKLdDuRH; 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="jKLdDuRH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08B6BC19425; Wed, 29 Apr 2026 09:28:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777454894; bh=fpOCUVYEWC1NdrTTi027HUseiIi9m9kIiSeG69aOkwY=; h=Date:From:To:In-Reply-To:References:Subject:From; b=jKLdDuRHDylpCirha4Z+Mzujyl4KZkrVzuNbDuT3KqdsV2JBd7ZSxnOMeckuzVxcg yR0QYdns3kWUHAerdWr1E4EQAaVu9iHb0QioSCGhXzJULBq9pH0d7NIDDFyOmpuIya k/8zcWFEEmrCUCOywbTq/ut8MDuQ8/ZFO9Xkki5pOlnVHuV+Yi1UE1uW6VMGZi8N7W /PtWZJhNWjUOP34R/7no+f6McEZMan1gBhC6LF0eEDmVdDWMyYmyrPbfuY5QSLMCK5 IOBYsnc/Zf/E0HBU4Za8BubQtXdG/4nm3D3LhgPTPs55+yl5DIpfWNVvREIlAADVMN AsOc6VcofnLMg== Received: from phl-compute-01.internal (phl-compute-01.internal [10.202.2.41]) by mailfauth.phl.internal (Postfix) with ESMTP id 1FDD0F40070; Wed, 29 Apr 2026 05:28:13 -0400 (EDT) Received: from phl-imap-02 ([10.202.2.81]) by phl-compute-01.internal (MEProxy); Wed, 29 Apr 2026 05:28:13 -0400 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefhedrtddtgdekgedtkecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefoggffhffvkfgjfhfutgfgsehtjeertdertddtnecuhfhrohhmpedftehrugcuuehi vghshhgvuhhvvghlfdcuoegrrhgusgeskhgvrhhnvghlrdhorhhgqeenucggtffrrghtth gvrhhnpeffieehgfdvfeefieetfeelvdetvdfgfedvjeetheegvdegjeduuefhheeigeei heenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegrrh guodhmvghsmhhtphgruhhthhhpvghrshhonhgrlhhithihqdduieejtdehtddtjeelqdef fedvudeigeduhedqrghruggspeepkhgvrhhnvghlrdhorhhgseifohhrkhhofhgrrhgurd gtohhmpdhnsggprhgtphhtthhopeejpdhmohguvgepshhmthhpohhuthdprhgtphhtthho pegtrghtrghlihhnrdhmrghrihhnrghssegrrhhmrdgtohhmpdhrtghpthhtohephhhurg hnghiihhgrohihrghnghesghhmrghilhdrtghomhdprhgtphhtthhopeifihhllheskhgv rhhnvghlrdhorhhgpdhrtghpthhtoheplhhinhhugidqrghrmhdqkhgvrhhnvghlsehlih hsthhsrdhinhhfrhgruggvrggurdhorhhgpdhrtghpthhtohepshhtvghvvgdrkhgrnhhg sehunhhishhotgdrtghomhdprhgtphhtthhopeiihhgrohihrghnghdrhhhurghnghesuh hnihhsohgtrdgtohhmpdhrtghpthhtoheplhhinhhugidqkhgvrhhnvghlsehvghgvrhdr khgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: ice86485a:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id 00D69700069; Wed, 29 Apr 2026 05:28:12 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Wed, 29 Apr 2026 11:27:01 +0200 From: "Ard Biesheuvel" To: "zhaoyang.huang" , "Catalin Marinas" , "Will Deacon" , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "Zhaoyang Huang" , steve.kang@unisoc.com Message-Id: <8fcde357-aaa1-4bd2-a8b3-d660b94a38c6@app.fastmail.com> In-Reply-To: <20260429061752.2880923-1-zhaoyang.huang@unisoc.com> References: <20260429061752.2880923-1-zhaoyang.huang@unisoc.com> Subject: Re: [PATCH] arch: arm64: fix KERNEL_SEGMENT_COUNT error Content-Type: text/plain Content-Transfer-Encoding: 7bit Hello Zhaoyang, On Wed, 29 Apr 2026, at 08:17, zhaoyang.huang wrote: > From: Zhaoyang Huang > > During debug of a kernel panic, we find that the pte_t of the final > part of [data, end] segment got overflow to the next page of > init_pg_end[1] which is the gap page before early_init_stack[2]. > This should be introduced by the KERNEL_SEGMENT_COUNT's value is 5 > which should be 6 as map_segment are called 6 times for the segments > of (text, stext, rodata, inittext, initdata, data+bss) > > [1] > crash_arm64_v9.0.1> vtop ffffffed00601000 > VIRTUAL PHYSICAL > ffffffed00601000 83401000 > > PAGE DIRECTORY: ffffffecffd62000 > PGD: ffffffecffd62da0 => 10000000833fb003 > PMD: ffffff80033fb018 => 10000000833fe003 > PTE: ffffff80033fe008 => 68000083401f03 > PAGE: 83401000 > > PTE PHYSICAL FLAGS > 68000083401f03 83401000 (VALID|SHARED|AF|NG|PXN|UXN) > > PAGE PHYSICAL MAPPING INDEX CNT FLAGS > fffffffec00d0040 83401000 0 0 1 4000 reserved > > [2] > ffffffed002c8000 (r) __pi__data > ffffffed0054e000 (d) __pi___bss_start > ffffffed005f5000 (b) __pi_init_pg_dir > ffffffed005fe000 (b) __pi_init_pg_end > ffffffed005ff000 (B) early_init_stack > ffffffed00608000 (b) __pi__end > > Signed-off-by: Zhaoyang Huang > --- > arch/arm64/include/asm/kernel-pgtable.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/include/asm/kernel-pgtable.h > b/arch/arm64/include/asm/kernel-pgtable.h > index 74a4f738c5f5..14dd1c52552a 100644 > --- a/arch/arm64/include/asm/kernel-pgtable.h > +++ b/arch/arm64/include/asm/kernel-pgtable.h > @@ -64,8 +64,8 @@ > #define INIT_IDMAP_FDT_PAGES (EARLY_PAGES(INIT_IDMAP_PGTABLE_LEVELS, > 0UL, UL(MAX_FDT_SIZE), 1) - 1) > #define INIT_IDMAP_FDT_SIZE ((INIT_IDMAP_FDT_PAGES + > EARLY_IDMAP_EXTRA_FDT_PAGES) * PAGE_SIZE) > > -/* The number of segments in the kernel image (text, rodata, inittext, > initdata, data+bss) */ > -#define KERNEL_SEGMENT_COUNT 5 > +/* The number of segments in the kernel image (text, stext, rodata, > inittext, initdata, data+bss) */ > +#define KERNEL_SEGMENT_COUNT 6 > > #if SWAPPER_BLOCK_SIZE > SEGMENT_ALIGN > #define EARLY_SEGMENT_EXTRA_PAGES (KERNEL_SEGMENT_COUNT + 1) I think the better fix would be --- a/arch/arm64/include/asm/kernel-pgtable.h +++ b/arch/arm64/include/asm/kernel-pgtable.h @@ -68,7 +68,7 @@ #define KERNEL_SEGMENT_COUNT 5 #if SWAPPER_BLOCK_SIZE > SEGMENT_ALIGN -#define EARLY_SEGMENT_EXTRA_PAGES (KERNEL_SEGMENT_COUNT + 1) +#define EARLY_SEGMENT_EXTRA_PAGES (KERNEL_SEGMENT_COUNT + 2) /* * The initial ID map consists of the kernel image, mapped as two separate * segments, and may appear misaligned wrt the swapper block size. This means and add a line Fixes: 5973a62efa34 ("arm64: map [_text, _stext) virtual address range non-executable+read-only")