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 40641C28B2F for ; Tue, 11 Mar 2025 05:56:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E074C280002; Tue, 11 Mar 2025 01:56:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D8E0E280001; Tue, 11 Mar 2025 01:56:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C0762280002; Tue, 11 Mar 2025 01:56:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id A19CF280001 for ; Tue, 11 Mar 2025 01:56:23 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C1A541419DD for ; Tue, 11 Mar 2025 05:56:25 +0000 (UTC) X-FDA: 83208210330.04.07EA367 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf12.hostedemail.com (Postfix) with ESMTP id 1DE0640008 for ; Tue, 11 Mar 2025 05:56:23 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=f48a7jPd; 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=1741672584; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=qfQ8fQV+HqU0Qyc/Dri7YXItrVPHcO+rnRFfjqJQ+Js=; b=TWP6QTbIdWZRtp3Qsfn7xnzIT+A+zff79yvLaXkAXmFSvsVgEk8Cb3wUmqSS3OI8cshgTA ep/lbuS75xzdsY1GYwkDEo2WcwrAOUbZXfiB77Z1J1RdOmGMYcAi0GNMM0Xy45Vt490I3k LYb4flxOXZ59oG9yoX1QSCZuv3HlZFg= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=f48a7jPd; 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=1741672584; a=rsa-sha256; cv=none; b=Y2H+fn3i2cI5p6DQdsPd8QDDlVBhDe/IjPOcp9U9EkZnIKsOpLqNxqiGz5UOm4dgtALy97 yGZr/oxrLDAjO0xsq6gWvJ5ehJn1z9D3CbPiOa+Ba1rVhig+iJcV7zLAR/3Tlk54ZxHnv2 o5+mc0rqKg0pB66htlx/wYezlpxyGpk= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id D3DBF5C4D94; Tue, 11 Mar 2025 05:54:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D93EC4CEED; Tue, 11 Mar 2025 05:56:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741672582; bh=JR5aE1/6W9bEsH29C5z708XdvBh3y3whu03ldRN1cT0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=f48a7jPdRs+4CFxnOQTPCHsm75344xXl4kGcXGjsNF7CXHD6rakA6cXBClsJrVEtn WMcp4MDOS6ujAbPjNce+g3L+xfZC5vi4RqizMWw2e621BlT1F9Ay/Loxsxa26BilyR V3RuJvI1gFKwfV3U+Q95PUC/u4Gy4+xVTdXkrb9dHTeavvebfTfgzz2yhmQ89ydU2G kiwkfL2BapKmKWzCToyXgMHRmDr7W8auvyr26g/1+MWMbdjrYYGY9Pgy3JpC8H5B/G ocFRu6iz+c47Alu4XK27RyF2DFlSe0JprTDW9yyHuXhbUMDy3L4Bzl+ZBGVJfIovu1 qQCLqsddFmhPA== Date: Tue, 11 Mar 2025 07:55:55 +0200 From: Mike Rapoport To: Heiko Carstens Cc: Andrew Morton , 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 , Helge Deller , Huacai Chen , Ingo Molnar , Jiaxun Yang , Johannes Berg , John Paul Adrian Glaubitz , Madhavan Srinivasan , Matt Turner , Max Filippov , Michael Ellerman , Michal Simek , 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: Re: [PATCH 07/13] s390: make setup_zero_pages() use memblock Message-ID: References: <20250306185124.3147510-1-rppt@kernel.org> <20250306185124.3147510-8-rppt@kernel.org> <20250307152815.9880Gbd-hca@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250307152815.9880Gbd-hca@linux.ibm.com> X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 1DE0640008 X-Stat-Signature: h4grrf1uj5hir91ytjgsb4xy9n16ey6b X-Rspam-User: X-HE-Tag: 1741672583-744011 X-HE-Meta: U2FsdGVkX18x+TOAip7HTaZZggfS11zIqk2vKvaiJs4iWb+SnithqCIupYO2FG/bBEvP/j8G5JNVnFwVreX90peuIvjsYioJXlOdW0exWYDHiUrIyrzWriSySqQsRO1EoTpz7MbzgfsT79DIcDw8+7FIIkmnnSvyy2Ke3Fpp7hoqan0+ziyKSVKW3QbqA74MgfeMawKxpKftTuwWH9xfbSLxScko9cirWwuSLknUPfzHCB48yIF2fqfaGmuyqY3PssGzF7IJACi2mIGj7XW4l3JsapVxQwkxOkA/yhE34X7yZoZXwiN1g+pQITo5VUoFTCefvLhoc0YqALkvXvNDV9A1mEHLBplL6kgQpR8aXITw93HuWLXv9689C5dl9JM/7q6P9TnkOOF8pY7wW0pLdrbaaQRnO9KkjtM29lOSZ+HY/LMVuBANzMXPZl9LIMMtWMJBSe9a5WpCMi8OLEjqLJmuDmgkDw+c5WgADIEowsx5nKSBdH4BjHBi1UIGXwOdTS0QqnZT77xSJfOZuK7FWrMB2lcPAHZJZw7wC7HXIzGiRMZHDz2n4ef2rympeNeFoKHlAInySLP/1JPbJO8xtnvwstxaydmKAzduT8chuHHwQ82CFc1diZx+t8JDFnoD4d+YJhWUb+ySqEuXcwm++Ll7DU/A+mTkv/Fsj5uY9iNUVfjVGhQs5Z2EEdiVIPzZKqeEfqGUvD5z1IVGvnhuR6OQgQkONs99fQddha2EYjLO6HwlCvf/X0OVMdzSAgTf+LrNcb3oT+nLE4emsY865u063aNrZ+EgNhoY/pX3ANQe87XvOYTe+MgWYWxogNupFyvId59gB6wBCRlNJHN0rs8wUc9dNrRMq3XwxaJRkDCCDvtK5f+xIB7q5DM+NRdgyr+egrDWzxSuWkj5xIGNC13af5IfxMxJp4SIjGknLuHHBRBkyHA+j9mx69tg9pfea41syi5SMfXkfmnr5Rr vGfKZMQX F6XhTVyg0213ZHSNNf9f/BgIFlcRoMUKdROT9spjkNKSPPz/aREJuw5B99HXCyAbmT12VyRr4jZsBygsuP6nfQYI21sKH8aJI9liAd9XoFauaXw/xk1aRrkbXs+OTzDH8YjguGr3xJMLrZlWzWY1k+ti1OzzijRRx3gy+GTGV00PipuZMW+UL87IhEfaAJPbt+QScUHsRQZCDlUISLacBUKp5ohW310jciINIOKUWMnNKx0DiL/+qk/OZMWYAACXp+hxpvNfeQ/I06SI4h+2TV0pUc5kYyf1faLIvCJO/Ho22eV3UXcFa3Q1zYfHj16Nw6PwEzuv+kEU+rXbNK2Oc+Bfd/kVD5xTASsRG 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: On Fri, Mar 07, 2025 at 04:28:15PM +0100, Heiko Carstens wrote: > On Thu, Mar 06, 2025 at 08:51:17PM +0200, Mike Rapoport wrote: > > 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/s390/mm/init.c | 14 +++----------- > > 1 file changed, 3 insertions(+), 11 deletions(-) > > Acked-by: Heiko Carstens > > > - 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"); > > This could have been converted to memblock_alloc_or_panic(), but I > guess this can also be done at a later point in time. Duh, I should have remembered about memblock_alloc_or_panic() :) @Andrew, can you please pick this as a fixup? >From 344fec8519e5152c25809c9277b54a68f9cde0e9 Mon Sep 17 00:00:00 2001 From: "Mike Rapoport (Microsoft)" Date: Tue, 11 Mar 2025 07:51:27 +0200 Subject: [PATCH] s390: use memblock_alloc_or_panic() in setup_zero_page() Signed-off-by: Mike Rapoport (Microsoft) --- arch/s390/mm/init.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index ab8ece3c41f1..c6a97329d7e7 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -81,9 +81,7 @@ static void __init setup_zero_pages(void) while (order > 2 && (total_pages >> 10) < (1UL << order)) order--; - empty_zero_page = (unsigned long)memblock_alloc(PAGE_SIZE << order, order); - if (!empty_zero_page) - panic("Out of memory in setup_zero_pages"); + empty_zero_page = (unsigned long)memblock_alloc_or_panic(PAGE_SIZE << order, order); zero_page_mask = ((PAGE_SIZE << order) - 1) & PAGE_MASK; } -- 2.47.2 -- Sincerely yours, Mike.