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 A8DDBC28B28 for ; Wed, 12 Mar 2025 15:57:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7C758280003; Wed, 12 Mar 2025 11:57:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 77712280002; Wed, 12 Mar 2025 11:57:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 666FE280003; Wed, 12 Mar 2025 11:57:17 -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 3A64E280002 for ; Wed, 12 Mar 2025 11:57:17 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 1E607121172 for ; Wed, 12 Mar 2025 15:57:18 +0000 (UTC) X-FDA: 83213353356.27.BB06240 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf02.hostedemail.com (Postfix) with ESMTP id 00B4C80019 for ; Wed, 12 Mar 2025 15:57:14 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=VMGDPNzr; spf=pass (imf02.hostedemail.com: domain of ardb@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=ardb@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=1741795035; 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=JChFXqPXVY1XHtpbP2WqOfMeQnLS1qQftUfTh17+lXU=; b=yRbhtLbPxB+XJYm6khMCehUYu+Rj5Nyhb9IATScnXRe0SP4iAvHIIYHPacsJ/bLitGUHj3 MNDtYbMWi0WDS5Uuho7xEtQ3AaO40lid1Kp1m3MCQZaN9AyX0jF4g/lWw8CsQR+0Wne+UR LXkS2MC9rPnkkT517Sv81oQJHQ9QfhQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741795035; a=rsa-sha256; cv=none; b=uHdV+9qr6lWtjetjHHlv5evk9mN7861ukUcNrDfgh+fcC/lGLsI0g5bF8Ju1xhzIxRbko/ od++kGAx5gqvufW8gwbjzMC2cR0Jzr3663BtBDPgLLY3ImcDVqE7i2TTCAtLJQjiCHscaX MHA4ui5Fe5wdtu34R/+VsHpsgO/YNN0= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=VMGDPNzr; spf=pass (imf02.hostedemail.com: domain of ardb@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=ardb@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 020DC5C58ED for ; Wed, 12 Mar 2025 15:54:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 445A0C4CEFD for ; Wed, 12 Mar 2025 15:57:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741795033; bh=dgU35NJAC9FuhPfl4fCxI5+qb1wmL7e+GyilvA+NxwE=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=VMGDPNzrQPf5TkD0b7NrkaL9vBedP++HcJIYppS3OacGh+lmMlyllNbJ65T8EUwpe X6mgQAvFxmpr+7NeL+U8J5eO9mUFyF9iC/Bpw3Fnv2dGtL6Hrt/Yx6uH52UPkON/Bd bMd4vd1sat3O7CafhieqmZ6kqMEcz/ppjRlQKe5fcS7fyHE/3Y4vyt7IpKYAo5CVFc NGaHqUjovj3IqQIA6D2VmMJyyRyouA92R+HwQ7lUhQMLRtbPXzmj+6/9l+YNIMzd2o aGu6LYyHU+u7IYNYk6FT81OA0rsZ70e5lk7oXpt1fRBo8+yNkDj8UUhHY3Of+SO/GN Rivwxuyc+GVag== Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-5499b18d704so4557121e87.0 for ; Wed, 12 Mar 2025 08:57:13 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCXgGTFtczO/LciE4Qse+tSuFxy9MJa/tANT6CJ1e3vmmTHNrzzP31mJ9Y06HMyqRpgbZCmuJJLXUQ==@kvack.org X-Gm-Message-State: AOJu0YwG7qKxJKG/o0WkISbBhMAqtXsR59wDEyLRoIh+R/I6+mTdAHen v2y1gqqR64veoaG3eumlsL7XgWaqM+jR3uSx/7XrijBcA00l9GQot1TeKhk2Oyj6BGkGjwyXH/l qnbocaiwXxUCE4wRwKxIP5pXNitM= X-Google-Smtp-Source: AGHT+IHd+FrUHToN8zCIkYvgOINETMZJki/NvRa0TX9T0SvIe4EkJVM+k58lts/E3WmtqFbt0GpXCZ7ftrMtmqZt6y8= X-Received: by 2002:a05:6512:3e1a:b0:549:8e54:da9c with SMTP id 2adb3069b0e04-54990e2becamr8141673e87.4.1741795031214; Wed, 12 Mar 2025 08:57:11 -0700 (PDT) MIME-Version: 1.0 References: <20250306185124.3147510-1-rppt@kernel.org> <20250306185124.3147510-8-rppt@kernel.org> <20250307152815.9880Gbd-hca@linux.ibm.com> In-Reply-To: From: Ard Biesheuvel Date: Wed, 12 Mar 2025 16:56:59 +0100 X-Gmail-Original-Message-ID: X-Gm-Features: AQ5f1Jrq0NRixaZgOe6Zrlj_W8SN3MQrS2p8OQe5yMSfjVPvuZ4c51CBlAcj7NU Message-ID: Subject: Re: [PATCH 07/13] s390: make setup_zero_pages() use memblock To: Mike Rapoport 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 Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 00B4C80019 X-Stat-Signature: 7we4hauunyi5secgibz5x7nqzjhfqo4x X-HE-Tag: 1741795034-970775 X-HE-Meta: U2FsdGVkX1+xhTyO9A7ZiqLljDHrZOAI25obFllIBUAS4kWp+ufc8ef7BPfpyboX5ccyPApyCWDny7qDzlguUJBAMKF44rvMhHHEFQxH7MmHoUGehKayBnP50Y26hPsSpKHOx8rIAV+wAIekkGnOkRpqFV888Nc9HSKupmkoOt4IXg8s+NnB01l+x+7FausPkqd7DkAKRGZh6IWodktI7tD0lse7MbZ06qzveFn5cwbNle8HH2QLlglhqslwH2sLkue2fX56nMWHV/8cpCgmRqqlhbEOzxEd5uPvSllG5LDF52omO8/Crysb21aumIxwBh83OBzknYzx69V1AHfhrbYHP54wIP9rkF52KIKXkFGbJHPTC0jxUbkshmE93S6gOFsdu1NwwD/Xnp/vRC7xVX3G0imJ9CynMQcw9irF8uF6U0j5VJR+mdIXsCrGN1VDkqJF/l2g+ckHYrh4aa26KC0za6dJHYqnv88KEXV+JG3+ACdNKbiTgss3NZIg2troh0TYncn4jjaOXlUhURHM7BReAQA4vewCjJlqUe8qs9iKby3qWuQ1z077iLf7bGb2/87BnBsuf0kDEX4w/xYWUV6SBDNM35wQXQkuunuRtr8w6IUqFamE85m4rzik42EdZ6z7U1mJY5hbZrJGNanTUWVu+3qSJV2vnYsF2e7hNHIi5OynnvBf7//pNU96Cw3GxDOqk4djVuSbaLRd5FECTo1d8H2HefI2Bo0/tNVf0Fw8+D/nGIY02OTKdVu/PWVgqV8f18enBxkX0JdqhOprG0yzzYip+yL4Y9e58L92YgeIkTrB0kniMgmDxiMF6idkziHIu/wN2UPQ+2i1ElQNQdRuK77gj+CLq10IQ+UV8h2nh+5W7G8MwZzEDmwcHl1chDM9wKpWRTJoqzH7EHTsN7wWKLR3bp+JyEuZoa4hz8GoZg+jvOdjRa/y4iXpuZM1Bmw9HXPno3KZuaHS7BZ or5Pn0BT QJ/OrgHurX+MnOqFymPHjCt9gR82s1a0sL1I20uud69msPch3Iq1rUmFymVck0/vH0PKboOieRGKOc/5j1Tgelre9BCf3EifTL2zzS/6FR/PBxSk5XnAKQBiPJAIe6iL1bYqRsMA7ETOiyy+FbYpe0wyDGe2GnFDqH9BbU5J1JB31/6pLq5271MhfTWkJEI16ThWseaqxXp4i80dCxdQKCUZB16V/zlRh4kei1fr6GFzRHqQH4gTgKidWSnB7beBDco3Lx8LibntzU0gcuiRnlSnzr6kf4H/FDExjWxjzBg/u5oGGviWHesAz8Pbsyh72XhviUaEj5zSBVCL6XXu+GdbpO3905rJpCLjzVLzOzRXUWsEZQdLqCKY73w== 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 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)?