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 A3EC432C326; Mon, 27 Oct 2025 19:11:39 +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=1761592299; cv=none; b=Kd566ewcw31zfisLXtjIpMUCoUjHQYEkozYixtVNT9adZn/ZF5i3nuACzdQyh8Z8YEURD9HJLPD1L77WvAxR113PiHsxN/NBrNDwpIkco0aWbpCE6nxOZUJYlHa7XLIX2a2ev3vm7JO0ie5u0+nO7qxNvG6Qo/yDOUF8M4eyQIg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761592299; c=relaxed/simple; bh=ywjJnJaQoQ/+ZzEy2mqgSMMXtYKBPQLMzl0JeNrPOHw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HicyP0fB0EwI6vOr9oxQiftHV2F8/dwN3cShGd2rFlZbf8O6ZcjBRjfA9LvW7M2wpni3xgTuUpVEI/Rg4wVgB8zzeQXULTvwS00VCzyeWmljW7huJbeaBW4P0301DwatTVc/NwQNKzO77lvlur3EsIRCthu6s6l806t92AwgjL4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Ri2HxvTB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Ri2HxvTB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10421C4CEFD; Mon, 27 Oct 2025 19:11:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1761592299; bh=ywjJnJaQoQ/+ZzEy2mqgSMMXtYKBPQLMzl0JeNrPOHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ri2HxvTBk7JGnv2Yqi6SuqrLTpfm0YM86nDpOJjrt4FAeCC+519BM/6EkYE/8uulA ULCrQScBGGZ98ds4YoPzvwHlijui43QYPn2LHRz3Yi5WYMU9T2yyTy/NuHeMzLE4GR U/pkeo4HtnjNKuaIwkHTDeJbsM92KjkUxaeXDAbI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Simon Schuster , Andreas Oetken , Dinh Nguyen , Sasha Levin Subject: [PATCH 6.1 068/157] nios2: ensure that memblock.current_limit is set when setting pfn limits Date: Mon, 27 Oct 2025 19:35:29 +0100 Message-ID: <20251027183503.107707391@linuxfoundation.org> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251027183501.227243846@linuxfoundation.org> References: <20251027183501.227243846@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Simon Schuster [ Upstream commit a20b83cf45be2057f3d073506779e52c7fa17f94 ] On nios2, with CONFIG_FLATMEM set, the kernel relies on memblock_get_current_limit() to determine the limits of mem_map, in particular for max_low_pfn. Unfortunately, memblock.current_limit is only default initialized to MEMBLOCK_ALLOC_ANYWHERE at this point of the bootup, potentially leading to situations where max_low_pfn can erroneously exceed the value of max_pfn and, thus, the valid range of available DRAM. This can in turn cause kernel-level paging failures, e.g.: [ 76.900000] Unable to handle kernel paging request at virtual address 20303000 [ 76.900000] ea = c0080890, ra = c000462c, cause = 14 [ 76.900000] Kernel panic - not syncing: Oops [ 76.900000] ---[ end Kernel panic - not syncing: Oops ]--- This patch fixes this by pre-calculating memblock.current_limit based on the upper limits of the available memory ranges via adjust_lowmem_bounds, a simplified version of the equivalent implementation within the arm architecture. Signed-off-by: Simon Schuster Signed-off-by: Andreas Oetken Signed-off-by: Dinh Nguyen Signed-off-by: Sasha Levin --- arch/nios2/kernel/setup.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c index 40bc8fb75e0b5..e2fc4b59d93ea 100644 --- a/arch/nios2/kernel/setup.c +++ b/arch/nios2/kernel/setup.c @@ -147,6 +147,20 @@ static void __init find_limits(unsigned long *min, unsigned long *max_low, *max_high = PFN_DOWN(memblock_end_of_DRAM()); } +static void __init adjust_lowmem_bounds(void) +{ + phys_addr_t block_start, block_end; + u64 i; + phys_addr_t memblock_limit = 0; + + for_each_mem_range(i, &block_start, &block_end) { + if (block_end > memblock_limit) + memblock_limit = block_end; + } + + memblock_set_current_limit(memblock_limit); +} + void __init setup_arch(char **cmdline_p) { console_verbose(); @@ -160,6 +174,7 @@ void __init setup_arch(char **cmdline_p) /* Keep a copy of command line */ *cmdline_p = boot_command_line; + adjust_lowmem_bounds(); find_limits(&min_low_pfn, &max_low_pfn, &max_pfn); max_mapnr = max_low_pfn; -- 2.51.0