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 589D4C282EC for ; Thu, 13 Mar 2025 13:52:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 696D128000D; Thu, 13 Mar 2025 09:51:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 62006280008; Thu, 13 Mar 2025 09:51:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 44FB428000D; Thu, 13 Mar 2025 09:51:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id F3A54280008 for ; Thu, 13 Mar 2025 09:51:57 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 98C951CD48C for ; Thu, 13 Mar 2025 13:51:59 +0000 (UTC) X-FDA: 83216666358.01.0C6F52B Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf12.hostedemail.com (Postfix) with ESMTP id E020040018 for ; Thu, 13 Mar 2025 13:51:57 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=lkivtWoT; spf=pass (imf12.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 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=1741873918; 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=c9I7HQ2NavvKSYyx5OHuIDWo643x0RWPfhB92n3oSpI=; b=m8df0F6p1r0QWZv5USSaimTfdmEisBE1zdPacrd/RPMgwDtVbyDzAh6Fs7H6JUEKpD/cjZ Rg2m20P7qaCWdZ2uIQEyvKbbc4Nv6TLMFOASf9FERnggXUEwLZ3VVP0dtEaNV/z/GGD8oe Bdjs7adcfWgfCCIamXwfGIDjG2cC7N8= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=lkivtWoT; spf=pass (imf12.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 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=1741873918; a=rsa-sha256; cv=none; b=NNIVnEDvhUPvZWqLd5RjqxW8XtSXaOY//jgPCKPmlp4VDunHLfLyJF/KkSJMQVLcog6Jmr 8bBI8kUWeA1/ELe/A0Pf6uY8jhk6XDsjxv4iQjj2ZQXddunq+j2kcKbJEc99foYyogiwUf EsD9XvEmfNxJh8ioZnq3esN4dpipr+I= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 468B45C108A; Thu, 13 Mar 2025 13:49:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D278CC4CEE5; Thu, 13 Mar 2025 13:51:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873916; bh=vJ1t8jcOv4IahmAbojjG/hS3bRjZ1yhzZyXAgkQKcCk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lkivtWoTeJzPisCwCmeZ9L2Fz06iBYCw7N7oUdPfSyVbKGHBQSJRQN557ej/tzus0 RT9LYZZKsZEuccc831bWhcS16iFVfInWEJvOyu28bZGwYqulYjyTkus9rBocPVvhz4 m8zeNcqioCGuPo109d5hVWHgDD9f18aJRE/THVHMZkClmOyxFtvaA5ad1Sbfx5UsQa /mN176Bn7itUz9e8h5ICJhb2Pyd0QqADYzYHfdo8hw/y2vYpPI7xdW6pUdF2K5dqLP rpEfF6BvQYYCTc7YKFjKCOY7th9g+KIym2sJYOE6kTLClyLAp0snpD940nJFfAVx96 iFppF0Okn7hYA== 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 07/13] s390: make setup_zero_pages() use memblock Date: Thu, 13 Mar 2025 15:49:57 +0200 Message-ID: <20250313135003.836600-8-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: E020040018 X-Rspamd-Server: rspam03 X-Stat-Signature: 47rodwq7kqu4fqd813tatbb4cgrsksjy X-HE-Tag: 1741873917-707513 X-HE-Meta: U2FsdGVkX1+V3s37B7bNsuBK7D38y1cM0ip2h8fBVTS+2xfjWaxQoBmYhJIVznbPOUYfLtjW1PQdfhBRtueT0CpgcB0reSHkwGh8jd/3Ab1KKlpZexNA1ngd6UjjDvFezcC4rYAxPeGyK91j6AKX5tpoW1Iq61vlD+aa0HB9k+edc87af/BcUbA1H/WVwNoAe+Cu7vioEd7/Kl8qWrXaXLTC9z+EVT7EjeQiOLxkwFCuYA6DGN8+75qFg2YaHjZf68apwK/W6hFAWqltr7VbkSD/NdcQieYFCWEANewQ3R98r7Q+IasSXGY3tagLGe7aWdtUYhwySJEnEnpilCbuz2B9Yr7YEX6bmIqmyCAx3mavwAF20P6yHLeF6XxZU33+SmVqxR/vkLfn1ql6AZaZrS0vTUKq+Q3PKZ496WtfBKzXyHraJGo4Hd47B6r8vghm30CUK57xj3sKX6vpJ93XfLLph2pWaCHU7RVMU9s1jMj8IrMgpSC0Epdvfasm7qsCcjDf/GYXmvZKW1cjyNMT7KGscv/cZ0uGNqmU+X0/DWVDC8O/qiHkplWHL88G6cFDynPaCwMMXKEt/ZXVD9Fj5vtlKe+HJgri7UMcXntblYhjO8u+6BbWrJHiNMS+SaO8R1DsM5XgzWVKObHeHnJcDEtA37Tkz6a5U7SCLgmiKK+Sl3YOIS5GyRBUJYPdyDT0vRE2dq6CPESHp7LIfeod5/GWcK/WMpl0FJx1IaV1Y/nRsvLYAkLLZfHcGMR/YmbXjdep4065mXiMT7pk8nbUfn75Vqsy+o4YOqb9oGGQh8d9qMkFUxLCFpc5WHLLlYST1ns2svxb4sTCleU1ReAGT//Mkao0bQEIrO9aW6A5fWwLq9GrUg83fInM7DNJubkyDHhsx+c56FQ3gW708CVW6vnPkmfjpKvz2KYop+j2ZgCFYlTuNQt/3OBEQip/pKuzWpeT1FCSaAngSawbaUU w/ODFb5G Pm1RxwXV368V9VCFjxBru3jzZlW5c2mqo3SwTGIJakcOSbnJTCX9y3vc8qZMh/VxmGOaq4eKKJ7Ribt/Uy1KV9hZq0qtVM+fm3uaiDOs6lXmQNaQxO8W0yIg3PL7050dxSgs8uNA9Svkc094JzwZYxF6gEW/9vSCeWXeMo4ANLr4FSsgSKoocDaOorBhuz6pbkzoPQhJIvA+OXpW5IvggHnxxKWB6AbrSRzOZ6siQLgkC5tfIehpNqroC19KOzEPFQ9mbzWtPpdvK3X+eSx5sA8zhvFf7t0pv/OrhU85a1M+V3s4BP71cPqMFOA== 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(). Acked-by: Heiko Carstens Signed-off-by: Mike Rapoport (Microsoft) --- arch/s390/mm/init.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index f2298f7a3f21..f8333feb6a7e 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,16 +81,7 @@ 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); - 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++; - } + empty_zero_page = (unsigned long)memblock_alloc_or_panic(PAGE_SIZE << order, PAGE_SIZE); zero_page_mask = ((PAGE_SIZE << order) - 1) & PAGE_MASK; } @@ -176,9 +165,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) -- 2.47.2