From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C31CC433DB for ; Wed, 3 Mar 2021 00:48:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3748864F9A for ; Wed, 3 Mar 2021 00:48:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236104AbhCCAaD (ORCPT ); Tue, 2 Mar 2021 19:30:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:55106 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350768AbhCBMub (ORCPT ); Tue, 2 Mar 2021 07:50:31 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id ADD2664F8D; Tue, 2 Mar 2021 11:58:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614686290; bh=NxFW8b7YGDL/oGlVS9C/cc2aGHnorVmtyoIzDeJp/Xk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dhOLSQEzJMSbXK22v7J3IgIBP+L2xO9ru+VSCWr8D7YxTRaMlRYwW6LIop2ga6RM5 vMe+KxD4t5Q6jMGiay/YfGgcvem1Bqy4voIzLBlKHFuTdNJqxREMr7Kbp3KBkXJ5EO CqGNliKSK/x65gHenAD2171BALEhl4+G6Ptyii3JwCBQEbuJe/kfqgyspm2YPatMd0 Yr9FMVzbAU6GqIcD5lCQpUZcboorM7mpbxMiV6DgWR6vN4F7iDjPlzLB75L4zOJEJq gIO+uzCYe4vE0piBuKAROR/XLPiytI/Qj4a3Syum+kAdwI/RXE9hf6TjfE94SPG3Bi eFHfqc3Y+8MVQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andreas Larsson , Mike Rapoport , "David S . Miller" , Sasha Levin , sparclinux@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 16/33] sparc32: Limit memblock allocation to low memory Date: Tue, 2 Mar 2021 06:57:32 -0500 Message-Id: <20210302115749.62653-16-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210302115749.62653-1-sashal@kernel.org> References: <20210302115749.62653-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andreas Larsson [ Upstream commit bda166930c37604ffa93f2425426af6921ec575a ] Commit cca079ef8ac29a7c02192d2bad2ffe4c0c5ffdd0 changed sparc32 to use memblocks instead of bootmem, but also made high memory available via memblock allocation which does not work together with e.g. phys_to_virt and can lead to kernel panic. This changes back to only low memory being allocatable in the early stages, now using memblock allocation. Signed-off-by: Andreas Larsson Acked-by: Mike Rapoport Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- arch/sparc/mm/init_32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c index 906eda1158b4..40dd6cb4a413 100644 --- a/arch/sparc/mm/init_32.c +++ b/arch/sparc/mm/init_32.c @@ -197,6 +197,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) size = memblock_phys_mem_size() - memblock_reserved_size(); *pages_avail = (size >> PAGE_SHIFT) - high_pages; + /* Only allow low memory to be allocated via memblock allocation */ + memblock_set_current_limit(max_low_pfn << PAGE_SHIFT); + return max_pfn; } -- 2.30.1