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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D12EC28B2E for ; Thu, 13 Mar 2025 13:51:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B869328000B; Thu, 13 Mar 2025 09:51:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B5CF8280008; Thu, 13 Mar 2025 09:51:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A25E828000B; Thu, 13 Mar 2025 09:51:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 835F3280008 for ; Thu, 13 Mar 2025 09:51:33 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9A73F1420D9 for ; Thu, 13 Mar 2025 13:51:35 +0000 (UTC) X-FDA: 83216665350.30.3C7EED5 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf04.hostedemail.com (Postfix) with ESMTP id 9C46D40015 for ; Thu, 13 Mar 2025 13:51:31 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=u3KxN3gI; spf=pass (imf04.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741873891; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=7TYJ6KyIQxESiqIgrQq9aalozrIFDpJ0ZJXqNbTPqlI=; b=2qj9GyLOfyNxRXbrs9nKjvkbY6Wr7fKhXVh894YrJ50KIgpcxjMsGUE1Pd6Yij7/HilDeH aQ/4aCPsNG8gXG5CTLLUe0X5Tmxdrn1CXGdvk8c9TY2Vi71BRa6btzKPnkYvUSKKNSAFZk lgbalDXsq6zI8CdO+zFvGqRoz7CZ/ys= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=u3KxN3gI; spf=pass (imf04.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741873891; a=rsa-sha256; cv=none; b=qXNyoEoE1eE/x7BvT7MlhpBq+qdVj18k7osTi3YATRpAkq5HPA+RV8YZbi0ErD8RO/i5n0 ZrCOS95ZHO0WjKxND985aSwRWA5m0KQhG7rwS1j5Nq8cLG/QzyNLRHF1LlLUk8HLBuUxvc sv2rwTuxdlU16LK3uohLAbQgUkGnizc= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 5E455A474CE; Thu, 13 Mar 2025 13:46:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 015EFC4CEF6; Thu, 13 Mar 2025 13:51:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873889; bh=jdWrizGlyiZZhCc1iHfNv1CsWigRieeHlQFrymlBBDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u3KxN3gI6tZkgmfjdGzHSgAamoBrtMk5mafHWD0jowj5KlnVnY175VGFXMIdiBWWr B0id/FlW6EUwL50nPhHTxSa3ZYicRa5WCcAVJ1jqVKXm0jic0tczSIN1xHSKcWjdiQ D4zIM9VOnf83gFmBpmn6LKIQhS824VfdxG6Q7Sc5wumpzMv1OC7V7+rYxBizu7Teaz KU/I5rcojMcKt4TssZCQ8zpDNAQK4H9oQKTruuXHVBrx+VpKg8pt85mDQsZo+8ivk2 OY1XX/aha854nOI4DZr2fH95T6QTV9et5NHe2RoD4T67D7uTt3ju/gRHLM1ghupdhu a92GRhFxvI5eA== From: Mike Rapoport To: Andrew Morton Cc: Alexander Gordeev , Andreas Larsson , Andy Lutomirski , Ard Biesheuvel , Arnd Bergmann , Borislav Petkov , Brian Cain , Catalin Marinas , Dave Hansen , "David S. Miller" , Dinh Nguyen , Geert Uytterhoeven , Gerald Schaefer , Guo Ren , Heiko Carstens , Helge Deller , Huacai Chen , Ingo Molnar , Jiaxun Yang , Johannes Berg , John Paul Adrian Glaubitz , Madhavan Srinivasan , Mark Brown , Matt Turner , Max Filippov , Michael Ellerman , Michal Simek , Mike Rapoport , Palmer Dabbelt , Peter Zijlstra , Richard Weinberger , Russell King , Stafford Horne , Thomas Bogendoerfer , Thomas Gleixner , Vasily Gorbik , Vineet Gupta , Will Deacon , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org Subject: [PATCH v2 05/13] MIPS: make setup_zero_pages() use memblock Date: Thu, 13 Mar 2025 15:49:55 +0200 Message-ID: <20250313135003.836600-6-rppt@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250313135003.836600-1-rppt@kernel.org> References: <20250313135003.836600-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 9C46D40015 X-Rspamd-Server: rspam08 X-Stat-Signature: fj7smag4bbz4kz495rjnemo3t818khq6 X-HE-Tag: 1741873891-888105 X-HE-Meta: U2FsdGVkX1/f1i000qBc8by6f2kQgvWBkQWnl32zHEj8MjYvFj7LhnyQfvPz5jRhUaKdAWcay2//0xAruhGWU+vfDj5yop/WoMKYNebmqqyWTLCeyMvTCPBRCU2nkqPaUeQ1JhTtv5YgFR2UmdyVNO2tbafsCtlyel7ASGXxnDOPI1YjQmbx+U5Lm/8qcMYt6JDHSaECe22A2EdjVOlZBpdo6474Enl/aTvFR5DI2XyCAEvir/5mZec/D+mcEFyO4161lqu+VrXx2qEFOrNUeS7niK7AMz94j5yBvORgmjHN4PqDec6oba7iUt4LrZ//SulbYnNE9AmyIBWN2xyZ5enWT3MHJNPL8OJ51NSYh+bA5S8rBxrw/u/H/lk7cX62BOnUy1ETS5cUdPpHNLmKH/uq6nLvl+ax51fLNxKvcGL+vDf2EQ52tp0yR3Yfndde4Usu+WcJtSMSN8qjGfnQj9gRBz2ZWidQpiPYa02TKVov+erDrT/leQi8BZFpGVrFK/f6BXcTrOT3m/IcmWEupxfhw9xuZMpxiQsISOkX7+fahD9v2EpJ+32SZiCXbfFV4i0BsUKo4CWc9Qs5X7zKD+ewPPdGzDMGse7psLCX25Gj00XrR2kkEZR2FMr5EY4KFFBrcfoBsGawftRmzYKljGjMl2Db9Fl0N9vCjPhFdCuJlTLfrMiztFTsUP0LjVBnIUxPzGPjNISZVxn3QrwJ69XTO6U4ySxZF/xlaceSjrjtv7ezckNlvIDcWccvvWRLhzUfVLS6L44lejyPUka0ZXeQ2AWxoBEpJALIwGKlhyDGVjuuZ8s8X4SH0Nypw+7VEe9hQrZEWTxifG0KK8PORnlfCu0IEEDzhVi/U9L7Cm2uNBV1dUmYbk48A/GDZQUbqqQB7EiowFG/9C5BWlgpcaNtzn/sSZuSt0Xi/qA6d02E4cKRwbvGLys5fL9DDZhP3QpqAhrFdVgAnH7O6sB 4RG+QwHu /Q829fpvHU7nsFasMcRrN6aH8zd4YeW9BrH5nyVlXWOtxmsPSIU7JlhaRUDwJFbVbDFQgDyUmwg8jnUQpctSnv/FIZWzenCsoxYpaspyljDO2Qs4BkD+UGS7HN+i5qCOk/xhoLxnmD6RhUoqqJt+Cj7vDVhdWJrQSZsJ0Q2Yxn1DtGdKxKzvSCdjV11bpprJqfKNl6AzxmnBmXeQPQ1CLfdbyU+oAe+NOkJAzoN9ikYBkOXEk71mEKJg0OsM7Y9YUsACUnZjxi7UdzcqJNzALHR/OFw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Mike Rapoport (Microsoft)" Allocating the zero pages from memblock is simpler because the memory is already reserved. This will also help with pulling out memblock_free_all() to the generic code and reducing code duplication in arch::mem_init(). Signed-off-by: Mike Rapoport (Microsoft) --- arch/mips/include/asm/mmzone.h | 2 -- arch/mips/mm/init.c | 18 +++++------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/arch/mips/include/asm/mmzone.h b/arch/mips/include/asm/mmzone.h index 14226ea42036..602a21aee9d4 100644 --- a/arch/mips/include/asm/mmzone.h +++ b/arch/mips/include/asm/mmzone.h @@ -20,6 +20,4 @@ #define nid_to_addrbase(nid) 0 #endif -extern void setup_zero_pages(void); - #endif /* _ASM_MMZONE_H_ */ diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 3db6082c611e..820e35a59d4d 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c @@ -59,24 +59,16 @@ EXPORT_SYMBOL(zero_page_mask); /* * Not static inline because used by IP27 special magic initialization code */ -void setup_zero_pages(void) +static void __init setup_zero_pages(void) { - unsigned int order, i; - struct page *page; + unsigned int order; if (cpu_has_vce) order = 3; else order = 0; - empty_zero_page = __get_free_pages(GFP_KERNEL | __GFP_ZERO, order); - if (!empty_zero_page) - panic("Oh boy, that early out of memory?"); - - page = virt_to_page((void *)empty_zero_page); - split_page(page, order); - for (i = 0; i < (1 << order); i++, page++) - mark_page_reserved(page); + empty_zero_page = (unsigned long)memblock_alloc_or_panic(PAGE_SIZE << order, PAGE_SIZE); zero_page_mask = ((PAGE_SIZE << order) - 1) & PAGE_MASK; } @@ -470,9 +462,9 @@ void __init mem_init(void) BUILD_BUG_ON(IS_ENABLED(CONFIG_32BIT) && (PFN_PTE_SHIFT > PAGE_SHIFT)); maar_init(); - memblock_free_all(); setup_zero_pages(); /* Setup zeroed pages. */ mem_init_free_highmem(); + memblock_free_all(); #ifdef CONFIG_64BIT if ((unsigned long) &_text > (unsigned long) CKSEG0) @@ -486,8 +478,8 @@ void __init mem_init(void) void __init mem_init(void) { high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT); - memblock_free_all(); setup_zero_pages(); /* This comes from node 0 */ + memblock_free_all(); } #endif /* !CONFIG_NUMA */ -- 2.47.2