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 B3355C77B7C for ; Thu, 3 Jul 2025 09:53:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1AB826B014B; Thu, 3 Jul 2025 05:53:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 15BF06B014C; Thu, 3 Jul 2025 05:53:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 04A566B015E; Thu, 3 Jul 2025 05:53:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E910C6B014B for ; Thu, 3 Jul 2025 05:53:12 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 517E014077D for ; Thu, 3 Jul 2025 09:53:12 +0000 (UTC) X-FDA: 83622490224.16.19FB51D Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf25.hostedemail.com (Postfix) with ESMTP id 10AA4A000E for ; Thu, 3 Jul 2025 09:53:09 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=K4dy94I1; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=irUAu815; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=K4dy94I1; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=irUAu815; spf=pass (imf25.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751536390; 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=ASGLg+R2jtd9A6SKFohBR505MT0D8s64e+2Cx+0rS/M=; b=gJEexeySXwnWMvGz4FS+tNn944NCKO215imM+MXMIG7RZQ198WVSAEF4tdLUN5Y9Z2dIBq Zbi1WlRM8qXx28HN5xie95d3tdVY1qCkrFF+IweaJ+j5riMh3kwAaSfMWAFbr29zyQ9zkQ wKEztZOfYVHrDTu+DF7cB7vdHpu2OXY= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=K4dy94I1; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=irUAu815; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=K4dy94I1; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=irUAu815; spf=pass (imf25.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751536390; a=rsa-sha256; cv=none; b=HexGsG5OJR1U3M6XRub7boeZvDROuSaODcVkFB9lPRH9U8hhiEUq/BkEFCHF9jrFxZZtX5 CLa+KI6aHXelPnfcElspZZ2vKgiLn7vcKuQqyzm5wlpWbSXDYjb3XpclokP5Xd/RuQiI3/ BxaqZQ4CtqKIomP1L2QDWFEOtSE3Tw0= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 5BC3B1F387; Thu, 3 Jul 2025 09:53:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1751536388; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ASGLg+R2jtd9A6SKFohBR505MT0D8s64e+2Cx+0rS/M=; b=K4dy94I1QjSIye0Zp/yef9GHWsU+jIvS48MkYq5jLeguRxsd7EYBiFBUsY7KJE4hOfHuJo YkfP8c8Oho0dqO/80fXI6r4wdV8mYOB4lhDya4SuO09fqPyb+YuVVIIlpU4ed0yTuZoUbd WR6nYYqToGZ6HNbPyQJ7jBDSpHPQHIY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1751536388; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ASGLg+R2jtd9A6SKFohBR505MT0D8s64e+2Cx+0rS/M=; b=irUAu815G4wRehMLcBMN7OjR1KEfji/6qTkoGKDAZJ88hhvP5CzbApsBJquUg3ASCOPFxH FM+fcLP4j/GMWcBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1751536388; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ASGLg+R2jtd9A6SKFohBR505MT0D8s64e+2Cx+0rS/M=; b=K4dy94I1QjSIye0Zp/yef9GHWsU+jIvS48MkYq5jLeguRxsd7EYBiFBUsY7KJE4hOfHuJo YkfP8c8Oho0dqO/80fXI6r4wdV8mYOB4lhDya4SuO09fqPyb+YuVVIIlpU4ed0yTuZoUbd WR6nYYqToGZ6HNbPyQJ7jBDSpHPQHIY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1751536388; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ASGLg+R2jtd9A6SKFohBR505MT0D8s64e+2Cx+0rS/M=; b=irUAu815G4wRehMLcBMN7OjR1KEfji/6qTkoGKDAZJ88hhvP5CzbApsBJquUg3ASCOPFxH FM+fcLP4j/GMWcBg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id E47D213721; Thu, 3 Jul 2025 09:53:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 0nUZNQNTZmh7CQAAD6G6ig (envelope-from ); Thu, 03 Jul 2025 09:53:07 +0000 Date: Thu, 3 Jul 2025 11:53:06 +0200 From: Oscar Salvador To: Mike Rapoport 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: <20250702173605.2198924-4-rppt@kernel.org> X-Rspamd-Action: no action X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 10AA4A000E X-Stat-Signature: qoiowape86bkybte6w681tdwqkpot9wt X-Rspam-User: X-HE-Tag: 1751536389-553356 X-HE-Meta: U2FsdGVkX193WWiBtvt7k2rDKzEDKCL5RhwtgPFasxrsVA2jWCk0dr9aS3zN8BqoDDLD9a+pYrudH/2HaZyS42J6Qldb9mcHJkKVO8iCUEoa+0pwG7qI86lkUQMJUMKAmxzx0C6nRPn3iBj6eZcO4URvAiFC1Ym/KD+JGdKnJ7Q3zbcBwYbYTt7HvgM4OLX+wYcFuU4TXS0cWKe5JHoPohirRR+fD3kGVZJaADurmrEEL6nWYc4n91BAASYrqK4+0Md8HGugLm96lv9fVuXU9tvluvtQj292jIqgksTVswDdnU6mOWPz1ZVpbvEebZ1P4HdBVd+Sg7VFDCEb6vuhQAooiiJZNMoXisu5tJq54iVOXBWERVNATAD7IO4J1nZRA/bB0WdYbH44qejfPbOnz1MerwRjg7/qVhzQ+7XA679yhkQb+G51OCo1Zhf9ZnCEIssWw56/RVo1RSIyVFzNuRsJGn8OUh51R5dO9+sGYmWLBd1PSO7NP83qohOvRQ9YT8O0y8elJj2Z1QfRVZ5+/SNrin3V0NYu4c2PN2TZim+G+Gez9OdjSmOf8mDUkYJPlYOAJSurvEFyfG1iY6VrhGpIMnG8yIkCT4XQYK9YvzjTwt6+10wox/W1MGmHy5d+emdClHzr0Fl2kwJ0XVOhxG6qNSsarV1Rcq/XNPfVZv0YB87iAcvZrpXYx+kmWPwoBGq4XSCGvESt4FNmSCG3W/kYnsEiFiFxMEyv9VpgPA4V1PTKhyAkyK1TvmLyZHPtOCzZcZ3Z2kVwmuWX6bHLhLmlEtIYlzzDPN8rZvgkmYBPRKSCUZTscUOU6Nh5kArKgfcsUUFnKOPutCoKy5H+gPW3f6AN8j08cBXcbaevnVXwJmPQbIgf6K55PRjtlf3qwX85V5wIUDqIOYW6G5IxylYPYiO/l2ZOwXRbtHtBUCrsPZ5TnpJs7xwGbyp/lZKGTL6hKbF6DS/ZYaRKA1X aSQXUnWA x5orbpTVv/R9TuooofR4WDIlLjO6h9NQeHljwT+wZAbrqCCC4SWMHV98s9OPj7dFkXXSgzG4eYe9R4iVjGbKVlmg9MxDle1F4N7Lzpg6rPIbQxEMpc6xkuCkSRTOVEt3rC7vpxUfd/UJ1/W4SYI3wUrENDnJBLpLA9gzE0jph9XrZfG3eQEKkfbxAjwXanF5F6Pl6USNkq8a6TTOTIGWFrr2Nvtuc/JSTKe2utkDcVlkzeKY1hq2kDY28ErsLk3mhMVfhNHD5gVtSUIlKmKAL2FStuaw03y690cvxdFLdm323HYCPf/FDFxx+vWtwJasfipKZ 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, 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. diff --git a/mm/cma.c b/mm/cma.c index dd7643fc01db..532b56e6971a 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -377,11 +377,12 @@ 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) +static phys_addr_t __init cma_alloc_mem(phys_addr_t base, phys_addr_t size, + phys_addr_t align, phys_addr_t limit, int nid) { phys_addr_t addr = 0; + /* On systems with HIGHMEM try allocating from there first */ if (IS_ENABLED(CONFIG_HIGHMEM)) { phys_addr_t highmem = __pa(high_memory - 1) + 1; @@ -393,11 +394,15 @@ static phys_addr_t __init cma_alloc_highmem(phys_addr_t base, phys_addr_t size, */ if (base < highmem && *limit > highmem) { addr = memblock_alloc_range_nid(size, align, highmem, - *limit, nid, true); + limit, nid, true); *limit = highmem; } } + if (!addr) + addr = memblock_alloc_range_nid(size, alignment, base, + limit, nid, true); + return addr; } @@ -487,16 +492,8 @@ static int __init __cma_declare_contiguous_nid(phys_addr_t *basep, } #endif - /* On systems with HIGHMEM try allocating from there first */ if (!addr) - addr = cma_alloc_highmem(base, size, alignment, &limit, - nid); - if (!addr) { - addr = memblock_alloc_range_nid(size, alignment, base, - limit, nid, true); - if (!addr) - return -ENOMEM; - } + addr = cma_alloc_mem(base, size, alignment, limit, nid); /* * kmemleak scans/reads tracked objects for pointers to other -- Oscar Salvador SUSE Labs