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 4977BC83F03 for ; Thu, 3 Jul 2025 17:28:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BDA356B020E; Thu, 3 Jul 2025 13:28:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B8A836B020F; Thu, 3 Jul 2025 13:28:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A79B06B0248; Thu, 3 Jul 2025 13:28:04 -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 9154A6B020E for ; Thu, 3 Jul 2025 13:28:04 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 07D45587DA for ; Thu, 3 Jul 2025 17:28:04 +0000 (UTC) X-FDA: 83623636488.03.D798BB8 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf28.hostedemail.com (Postfix) with ESMTP id 6F060C001D for ; Thu, 3 Jul 2025 17:28:02 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=u4QmyCGY; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf28.hostedemail.com: domain of rppt@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751563682; a=rsa-sha256; cv=none; b=ifLKV9mVmPjdSzolHhMuVOCBmm1LcvR2SsS5iO0K26l3y4/2Wj+BIFc5g+iFrXRFlXxxHw R+LJGFqr7DLu58spX5ShDdfv8eEsY1MvOsEPdwrI84gJxr4eRMoO19Ota81nd+2xzmMGqr g1qK7TLD5+daNidbKvjk3mQ3KqI6OXk= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=u4QmyCGY; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf28.hostedemail.com: domain of rppt@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751563682; 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=+CW99tD8dpisYW6bEFj/22Ig7y7YNo8QzcOroVFYre4=; b=G166XkIwVVmJ7QICFlli1XNBjrOpaS3NDKkjHIb4N1QDTQCpnzuCuYfMLi6uX4bXnW0mNC TWt2rkJDsiJeh9H/qV5w3RS4HLfr1X0/r0Tfdquq3gOM26Fj9Za8eWko2C1YcPDuYrwXlh JpVjPsj4CM1I9l31ozzcYkT5+ilBOBM= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id A995461451; Thu, 3 Jul 2025 17:28:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5AB48C4CEE3; Thu, 3 Jul 2025 17:27:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751563681; bh=IybfEWRjtWPI3vgAe1K+ogML3aRIqiWylmbRMg2TS4Q=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=u4QmyCGYJccppXLi/utWO3Asz33p4If0D/yWQ2Vv8J0qRff2M5vTzpE1iT5Onnhyp k7fmnhyVrcV5s/nrb7amumz4UlQc2Q3pXd7HUmunjuqUpFExA+qgpP4hu0Z3lgY1dR ey79NaAsiwa3FtQxi1R/wYhLCZXZXDb08nXNs7Zr24zQQjvxT1I4aPf2iERYzrwpCe TmRDYPLgsH62puoIVbift8wvH/ME3OtjpsoNeABXafwxj93A8Ja3beYswDETRDa+K0 r2iCeCZDwJt9qXa3HGm0q6xEiZUm1rNupCC2bMzSdAYtXIcqJ3VLyInllF13ETNkTe MyZamdx2xwYEg== Date: Thu, 3 Jul 2025 20:27:55 +0300 From: Mike Rapoport To: Oscar Salvador Cc: Andrew Morton , Alexandre Ghiti , David Hildenbrand , Pratyush Yadav , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH 3/3] cma: move allocation from HIGHMEM to a helper function Message-ID: References: <20250702173605.2198924-1-rppt@kernel.org> <20250702173605.2198924-4-rppt@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 6F060C001D X-Stat-Signature: b7pciffcweigydmjw6xn9nbq6buspwgg X-HE-Tag: 1751563682-244783 X-HE-Meta: U2FsdGVkX19QeF8LQEbi7smn7aEGzznlVTay1yTfnW8CkWYV14Djox7SvutozdMBTEQY1a23+IES4SjQu0fQDSzSzxOVfLCWzaHy0qDx0xOiQ+4EGhaywxIDO3MjOCzlwn7j5RwXIC6G4pX7T9oR1ez3Gq/QsFYbAIXuKGk54g9EYFSjMu6qfmReoGaYjbUyr0FQ2F5xDWx+PM/EIv5DXr9ocZeJC3kpun+GoNuIj9RuwlcEBulScOWIZ7+gZDL8goHKiSCDxI+Q3Wl/65MIPWs5LX62XqGlTnnWshtkZfLcyHvNRA3nD+ToZqYNVC6pSMjCnvSZjnUGvMmld+4CL9v1bdOv+n76XEJ/iy8pu8hO/fNgxCieAwOmQ0D3mncCTxue5jif2FNXELHSU/TE5viYlRQwZVo7xkrPpIpzFYfH4zUKW0SS8CH1jVfEqLrxYYHSB/K74MpHLNwvCoNZPvOveKHaTwZk50IOIqnjW2wxUVqdUZjTAQucd2fAUiuGVVLQ6v4hND+NuchTGi8K92UzNHrHTDBQsvFqhrLUZSla9quBc+7JXpAzxBfrE0r1as+vfaneBzmOxPQdw+6FWznMsKlx6vPCgCQ3Df5cwSP24+B/7ZQOb1BPydw/0i4TjrcMgsZVaSBQMpFFk0dpta3CWWhLlQtAlq4Ann17wQcUEN8dJPMtmFeBosMwHj5nhg1M0NSMkJPnnzfG327mcl0n3hnyG5b94oiYIIZelcGwoB8w7rGUQ8LFDQojkEc6p0WtIm8RaqTkGyWY82EABOccMyn00QbTPFNWs336/cz7kvPX4cGWYoyOTkhUwcoP2iLmDKGs+UoSLQt4OkrjDut+NF+oT8YCogcu81QjAItymYrM1MKjeSbiMIS2k8ckvE8V5zVvtkzqp40yPGxcHTr4VgbzuYKyo7az0E+/w1OKHLkP5O7iC0BAvf9NqkqVdMVyVfQva6T+G3WBMsN rWGOPCt3 d/dkNzPsqjvjw69gTZ8lWKAszZiLTQXFVEnnxe6lGEZ9BNC2gLO/3Xr7KqFJ1F/vBCWtWpR1XcXLymdVKMzvfgUZUuL4ui0dkofvVc8jhZ1QyDIuCod3CGoNp88jhAuq40Yk0tqgyZYovgUNNiPWE9Ka4ddxxKB1EXHHcMgfioN9/Rbf+MiP22Kp8Ze7sqeYeVLylNTsv0zxG+Hqx/1CfnTKKdtvPAB8hHH/cNAw2NJGemdAy/BroSK47++OM0TcfE9QEq8CgpE/v0Gqj6DpobEsmedxJh2z6S+KfnEyfu0MEIaxw1o2OaWkvgg== 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 Thu, Jul 03, 2025 at 11:53:06AM +0200, Oscar Salvador wrote: > On Wed, Jul 02, 2025 at 08:36:05PM +0300, Mike Rapoport wrote: > > From: "Mike Rapoport (Microsoft)" > > > > When CONFIG_HIGMEM is enabled, __cma_declare_contiguous_nid() first > > tries to allocate the area from HIGHMEM and if that fails it falls back > > to allocation from low memory. > > > > Split allocation from HIGMEM into a helper function to further decouple > > logic related to CONFIG_HIGHMEM. > > > > Signed-off-by: Mike Rapoport (Microsoft) > > --- > > mm/cma.c | 52 +++++++++++++++++++++++++++++----------------------- > > 1 file changed, 29 insertions(+), 23 deletions(-) > > > > diff --git a/mm/cma.c b/mm/cma.c > > index 1df8ff312d99..0a24c46f3296 100644 > > --- a/mm/cma.c > > +++ b/mm/cma.c > > @@ -376,6 +376,30 @@ static int __init cma_fixed_reserve(phys_addr_t base, phys_addr_t size) > > return 0; > > } > > > > +static phys_addr_t __init cma_alloc_highmem(phys_addr_t base, phys_addr_t size, > > + phys_addr_t align, phys_addr_t *limit, int nid) > > +{ > > + phys_addr_t addr = 0; > > + > > + if (IS_ENABLED(CONFIG_HIGHMEM)) { > > + phys_addr_t highmem = __pa(high_memory - 1) + 1; > > + > > + /* > > + * All pages in the reserved area must come from the same zone. > > + * If the requested region crosses the low/high memory boundary, > > + * try allocating from high memory first and fall back to low > > + * memory in case of failure. > > + */ > > + if (base < highmem && *limit > highmem) { > > + addr = memblock_alloc_range_nid(size, align, highmem, > > + *limit, nid, true); > > + *limit = highmem; > > + } > > + } > > Not a big deal, but maybe better to do it in one function? Maybe even move > the CONFIG_PHYS_ADDR_T_64BIT block in there as well? So memblock_alloc_range_nid() > calls would be contained in one place and the X86_64/HIGHMEM comments as > well. > Just a thought. Yeah, this will be neater, thanks! Will send v2 shortly. > -- > Oscar Salvador > SUSE Labs -- Sincerely yours, Mike.