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 1F136C2BA1B for ; Wed, 12 Mar 2025 16:09:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 839C6280002; Wed, 12 Mar 2025 12:09:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7E8F6280001; Wed, 12 Mar 2025 12:09:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6B1E3280002; Wed, 12 Mar 2025 12:09:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 4E961280001 for ; Wed, 12 Mar 2025 12:09:32 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 157D71611C9 for ; Wed, 12 Mar 2025 16:09:33 +0000 (UTC) X-FDA: 83213384226.24.B28935F Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf09.hostedemail.com (Postfix) with ESMTP id 6E4F014001B for ; Wed, 12 Mar 2025 16:09:31 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=o1nXbH0l; spf=pass (imf09.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=1741795771; 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=wsMJykXiAVRnUAnbnGJL1+xUj8omt8ZvzvgCgKuGHWo=; b=QNG1/cOTxHiHQQuM2Fxm3yFed2x+TazDZT3+MtwBcHBufancwJsRibtRMRfkgLQCWPCSir f/2Jo9eRWkFMUBHd5kAbyLIWE686vzNyY8M5EohOdgdf8nRC85sIXxd7MjJ6eggPwI/WYj 0WIu7VzWCW4aY99y4hCW0uIses5L0jA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741795771; a=rsa-sha256; cv=none; b=SopnEeyU39ro1/PqZdf0/yq+1i4FDejS5YPSiXfXawFV0fKqNYvaoi2Wvoz8BDpa0qao6x 2UTd7Du95SggZFRSvD5KoYsBeiz7a5alCOJWNHcct9XvNDDqMrWhvF0KpZQRRpyMI9c59q 8AISPKLD/weyKpzkxG9rmV+Ze5xKw/k= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=o1nXbH0l; spf=pass (imf09.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 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id AE4BCA41156; Wed, 12 Mar 2025 16:04:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBA43C4CEDD; Wed, 12 Mar 2025 16:09:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741795770; bh=U+kn0eqCA1vTkLcceUerHMcbUlG4P1T7ky+SM+cNeZ0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=o1nXbH0lAp/Eqh29Z9apDenWiT7PjuKxKiO2JQvLOJVWK5GP4OmPvFpXi6asrnzZT nu94zZUymz0UiYH5e2oHwUKtTI1fSzIDWOtzi+i34Gkz1xkL6x5U9bzNGRhUtzuTKS DXX5HBMSnM0KQHz9TeDEZUAKZi2/XgNg8n+fKtj+coTJt3gRJNcK3xsnp4c0Rfm92c yO1JQdFiH5w2Gbb11wg1ZkFYIseNAErd8Fb7JJ7KzSSF/QC6tMXJP/39miA0uSvCwy IrlqFK1R0v32Dh9qsAKLmrl9vNb/vAYRou4oKyLZKKWsSVO2mj5QR0FroBYJHAdDo/ ffW5IRilofYyA== Date: Wed, 12 Mar 2025 18:09:07 +0200 From: Mike Rapoport To: Ard Biesheuvel Cc: Heiko Carstens , 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: X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 6E4F014001B X-Stat-Signature: tf7tiuxsx539rxadib6aq7p1tq17q5u1 X-HE-Tag: 1741795771-986840 X-HE-Meta: U2FsdGVkX18my0O5CEco3rZnEtRFNJMmTpiiaX9MZhAq5M7DUuwkYQ9lPx0iOFfI5vSjYTfFiLCEU8g+pwwyr/NKf3S/J1ACyIGbwmZdjhb6rXnKLoUrN1c+SYPgt6di4jNu7DBL530zx1iP28YQtkapP0ij7C0s5hjeVQBOkNhUqG9XLjtnRWJwGEZCDn9lN5yAV08MpebFpvFsQkqZeFvHwpx2CVLVHlaedAawjCuMmr1Yz68kXqk3OtW3x+AfqSXztDIpz5hWV6QHDFMR6gnJz99hEMaehq4BhdzGCSvHMaofwQWgyhh9BLJJQi9B5DRLgJnKw8YIClLCCLPW4v5rRP88dRnjIDAnnM/jO0/yUFzSUTDSeGFBBzFMMVq3I2enjTxS03L8jtY3/BnfSGby4IE9iR1UeNJQ2bBeD/WOXBYj1axnohd1ynjYYRkRGwuWdqSme7SXzkon0RI5+40bYrRzeTg8WaRYgnFmOlXCmKBEIhKLXfLfy1usqM76W8ssbLEd3Uvy5fQ3oVCXSYmwzBz/6qdh98KcqZG6A7xPNhlfxZz2UlKb8gBaiyvq4x76ialT/Xpk7LmKl7wQunUzE/LFadfWpoDWi1DuYXQnOr65ibsonRh1uOQZquKNqFVNYbbanUNbh5RzXwmhgR7oakImUG1uUfkFQHrsdKFXuYJegP4Ns54Ve27I28hDjPQm1eIq5cLshKmgGop125R/cOqGN9SjrEtknnDx8pwwJMMhu75M9S7Da6U4S+9FPz5C9DRMBk4ZBjp6eVQVbnHULOeO4tIvDD4udLA+Qd6cnOY/p3ISTJ61YngBYD5tWUs4H80SO3e36E8jI7GqJweDpZnmqtVOn/est5dJgP2judqUdXy51vM0AOfRjLMC9UHJpbWtB8JroWWq+tvodrilC/o8EhQrT67My6VBY23s18/2itYjeLMIrUdD3kTRMIRhe0DiI7/EZ+/3VNP 1Elw5sbs CYfHqN9aWBHTAyKdg6KA9kTkiwCozQkvKpOzxi9eX++IcgTX6xnhKemmVb1++3Y9N2W/O44GiPD1quhzmehXFJT5bpfpcl3PKRU4f70iwDmMhXTPhLxmcb4c0fpxGAHPWH/JWXhpUXQFqMYRjC2yDC8JqYogCdxJPXdDIalsFXO8k0PBTpRhbeu2kN7sS2mb+fntP5cDdV0+rinHNuuzKZBHkOtwEG1v7KuoFIhptWEKeC5RvlffLialLtHH8pCYea0o632VwMjFEFwfE7paJzU4v4QpElXyW+czMQ6tJkCEZEnAsMqmj5jebA9bJJT9ccuhJFKB6bEP1UufWMOM1MlWSHgvrrCpG4qmz 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 Wed, Mar 12, 2025 at 04:56:59PM +0100, Ard Biesheuvel wrote: > On Tue, 11 Mar 2025 at 06:56, Mike Rapoport wrote: > > > > 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); > > > > memblock_alloc_or_panic() takes the alignment is in bytes, no? So > shouldn't the second argument be BIT(order)? The second argument should be PAGE_SIZE. Thanks for catching that! -- Sincerely yours, Mike.