From patchwork Thu Mar 6 18:51:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 14005196 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 C2358C282D1 for ; Thu, 6 Mar 2025 18:53:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DA1B4280013; Thu, 6 Mar 2025 13:53:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D5163280011; Thu, 6 Mar 2025 13:53:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C1A16280013; Thu, 6 Mar 2025 13:53:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A12E4280011 for ; Thu, 6 Mar 2025 13:53:19 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id C285482606 for ; Thu, 6 Mar 2025 18:53:19 +0000 (UTC) X-FDA: 83192024118.29.768A19D Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf17.hostedemail.com (Postfix) with ESMTP id 320E040012 for ; Thu, 6 Mar 2025 18:53:18 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=H78DLSl+; spf=pass (imf17.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=1741287198; 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=cjjeOY4XBjuFiJaanm3Vhggpqwt0qk0uWA9+wvm49V8=; b=7jYuISXu+6ohsB8PFU3oGPPK+XPNL4cPQgUNtRgFEF28hwg4lVUkV7Hl2+PAnyTKeT701V 1mmVDWw0Ez6EfN2i/WaFXFQZJuYm93SM4zAVrVnbFZZQL174LhXWgwALC9nZGA+EWyuRwC FDjpq8VjN8yUbo7Lv4/tCeMvQhwUGok= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=H78DLSl+; spf=pass (imf17.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=1741287198; a=rsa-sha256; cv=none; b=zWEZWJ+xXOZMe/Szqs23X9sPWnm1wsZOAri4CrkgIQb4DLDsObrEZII4f3pJuwrPEZts1G 0f6i6I0usctjwJF+/ObOd1JAPJToFKausPVe32yV75gCfy5Bh3wTkFV0BNXIKDbgB7X+ze LVl1IHuLp1pryKUD1uvghP53bidn6IU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id D0F5CA44F0F; Thu, 6 Mar 2025 18:47:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8163DC4CEE8; Thu, 6 Mar 2025 18:53:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741287197; bh=BkE0IFJXSKU77+xC0N2TBlUULdAjqoteouUfp8/gZ9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H78DLSl+IjdnXrOdxgT+/xt6JTBU4euW24C/yDa5I+IadYyC+HEIKf8v9/STSql0w 8Ci9p73t1w+Xz+YHbbWW0NqRvPAsTTGgkup9RJxFt3IWYCiwU8KzktKs78WPfgstEp r3TBxtlGs5W73C+QSyCEERn1fqDTHnrNMca8jScShJM1AOJsNrVThziirlU9DWuCQI NxI/6QapAZIvA0iPZvBo0oljP9L1r5qcoH4ZPCXNbth214GQA4i6M5RW8Tday7NHzb PgoPccIN87hXyD3eA9w781HCQ9lk9kdOFTozIS7Gy/SywY4wv8FVfsBzQ613ahQ7F+ 9OZnlgrDMKwRQ== From: Mike Rapoport To: Andrew Morton Cc: Alexander Gordeev , Andreas Larsson , Andy Lutomirski , 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 , 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 07/13] s390: make setup_zero_pages() use memblock Date: Thu, 6 Mar 2025 20:51:17 +0200 Message-ID: <20250306185124.3147510-8-rppt@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250306185124.3147510-1-rppt@kernel.org> References: <20250306185124.3147510-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 320E040012 X-Stat-Signature: g4in5fimbs44oe6mf5wbcupg43pfjmm4 X-HE-Tag: 1741287198-171383 X-HE-Meta: U2FsdGVkX18jaeLHNJt7EeVGSRgs00wUENRuDrB9jBudHUCHI4+JtMr9Hq8cCTKnODSua56SWTGKj8zEY3zfiABD5JypeIkvXHn/+wCCUcc6VB+ZbFXhh8ly2ocXZARYvHyEcVDqP/E0oDfn5vKmwTRnvmmDrkDdMYI8idHkpYO8UAN5Pb0Wx8e3j784LskBGsu+oJeHu/zdRSv+tW4aSwvlNcO5ETg3DKDoDk/J9wQJJeyZn6nDHsVYetLrGzgcoyImFOcUleOLG8mwop+XA9yJJv5fkltC7WQRqQMwV9x0hXR0k8aoAPWP4GU1/6KJZXOJ5QbJ9P7hucTUwc4+EcwPbnYwiShqhv3YDCZX7ym6hgDceSegAySuBBXmU6E1D3+rXQb4XVGQEhm6bfAcP/fWJcbcmDzjfiC+AedSig4EohJX71gU0OQ2qi0EAwJchPBL/FEecNW6XNuzK6fh2aJFwx9tb+v4GrKR+2iUgTkyo/2qxBJZQvReyW/QPHn1ezJ0josZlqi6NDjXr8Ks/8ja0XCpwK2QReBaxCGshGJGPW7UPv6s/uKGssCgdweVrpO07Ew2gUwtO2WvRD05l0RLsPDeiAhxCJHGbgU1YgjKfP+laUyiwRRL6FDqZIXpSEkzaRm9MowRwY/+j4PsghFDtSWiGoZ/qVPXdYrDQh3bj+1Sct1iXBGjZgHsB8z0oFUUV2kBuOoJO4tZ5FRQiAklNLvCfPL6irxE0fuAm8MjCtHP07clN27+nVgy82vtZF2JhFHyjMYfJcUrJ2Blnyd1CMECGHXHcqD2CphCXFf4WkZKOP0nalTMqtKaZUI4NfvmZUPJaHZdcWMYOzILxB5oe/xmVDWgzGkoU1fw879iGVe5JFIeLpoe4/krwjoFRJC7ytnEff62tCchxbMxqYJx1Q4Vt+FvwDu0AJ3dZz/MS9g0YrS2+Z4jVqr/KPisZ5Grey9rq5D26rkNVOg KdGo9YIa Jsu2EBsg7sllyY5/EZ/HOpVJfXs96TH9ZbUAV8tIpUzRXCAxs8qVf1w9zZ9zmhNzAVjsik41a4n9vOFebMgc8QHvC0oVqziymEe4qfeuTVwRWvfvOS9L2JJvKabnZrgXYGdbLKYFKwmYas2k2Ej64qnPZ2ihNvQVdj22AilNI+/3LOHYyX04WZf7N9U1wxX0HBdFahu0HpdCfYIppm2dRE7GUf5zSXg0+zFD3nsUzXsRg9GJYPP2PUYDIw5wagax9lBFM8IKahi+yX37O6e/4W8Vk5w== 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) Acked-by: Heiko Carstens Signed-off-by: Mike Rapoport (Microsoft) --- arch/s390/mm/init.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index f2298f7a3f21..020aa2f78d01 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -73,8 +73,6 @@ static void __init setup_zero_pages(void) { unsigned long total_pages = memblock_estimated_nr_free_pages(); unsigned int order; - struct page *page; - int i; /* Latest machines require a mapping granularity of 512KB */ order = 7; @@ -83,17 +81,10 @@ static void __init setup_zero_pages(void) while (order > 2 && (total_pages >> 10) < (1UL << order)) order--; - empty_zero_page = __get_free_pages(GFP_KERNEL | __GFP_ZERO, order); + empty_zero_page = (unsigned long)memblock_alloc(PAGE_SIZE << order, order); if (!empty_zero_page) panic("Out of memory in setup_zero_pages"); - page = virt_to_page((void *) empty_zero_page); - split_page(page, order); - for (i = 1 << order; i > 0; i--) { - mark_page_reserved(page); - page++; - } - zero_page_mask = ((PAGE_SIZE << order) - 1) & PAGE_MASK; } @@ -176,9 +167,10 @@ void __init mem_init(void) pv_init(); kfence_split_mapping(); + setup_zero_pages(); /* Setup zeroed pages. */ + /* this will put all low memory onto the freelists */ memblock_free_all(); - setup_zero_pages(); /* Setup zeroed pages. */ } unsigned long memory_block_size_bytes(void)