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 74514C83030 for ; Thu, 3 Jul 2025 18:47:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D7B8B6B027E; Thu, 3 Jul 2025 14:47:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CDE576B0280; Thu, 3 Jul 2025 14:47:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF60F6B0281; Thu, 3 Jul 2025 14:47:26 -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 AD1256B027E for ; Thu, 3 Jul 2025 14:47:26 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 2CF418059A for ; Thu, 3 Jul 2025 18:47:26 +0000 (UTC) X-FDA: 83623836492.05.FF87059 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf03.hostedemail.com (Postfix) with ESMTP id 70EC32000F for ; Thu, 3 Jul 2025 18:47:24 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=BL7X8Y9z; spf=pass (imf03.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=1751568444; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+eZtcGo/9ZUH/kGMfGhj51/2g5THmdDYXZNHuVyoBLM=; b=L5A6+PI6Dv+XoJ0hRbnSoUbq5OBEGk0T1ektasBbcb3Tc3GFuJTBnQZLadENutu79ofH+u 4rZGcTDOvHzY4oyP/PTFEoyHFrQPWYty73jO2Gg9Qs4qOwpvcgwh7g//XNeWiiC4YTriJd 2kIhR44ohKrsiMCPcROzbMkJpy1CfnQ= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=BL7X8Y9z; spf=pass (imf03.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=1751568444; a=rsa-sha256; cv=none; b=QulhjWVggUfMS2apRwU8VfduG1VyFmP9GQgSb6KVIAzLKXBQap0dhs505WSMi2pC/sM72j DvTwXHrzaDbXgAZoKoPnrJJViDrRG8B9GVht1kRxCmCQIeXOFQaYt7hcxqa+iz6ziHKxI/ GgAGmF7AhNre9eCDXHcqxtu7U6rR5eU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 5475C5C6790; Thu, 3 Jul 2025 18:47:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD96FC4CEE3; Thu, 3 Jul 2025 18:47:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751568443; bh=fDYGSp0mhPleTZCOwqNaMFjGYXswrc476BaeDuKTLlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BL7X8Y9zuboU6b75TO6pEI89umaqtfAw0Fvdg7scetSgKDDqeKT+83YXNi1vmr/Rk vUhKs7AuKX+6I6vMVc37yZ4pFz4TJ8+6/wEo2jePBl5I/wJPYnSOLiame9qlsoVG+7 B+51ZeUdIF2j4bDYbBkDiWazpXwPj9BspVIbNHip+hvMiKqXJbCT6qBhAvKljZ+IZU +XbDBSMDPlSWd90wBbL6Bto7eHljFXfQAz1jPt+o7QIW/zLj1NArOTUdWnqucpc0aN P8Gix12xky2S6OqLhFKjPWnwayL3lxSzIIKCqODV+wS02aS33tg1R0T2ufI8XFSgOE 1QDvCuxOI6Dug== From: Mike Rapoport To: Andrew Morton Cc: Alexandre Ghiti , David Hildenbrand , Mike Rapoport , Oscar Salvador , Pratyush Yadav , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 2/3] cma: split resrvation of fixed area into a helper function Date: Thu, 3 Jul 2025 21:47:10 +0300 Message-ID: <20250703184711.3485940-3-rppt@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250703184711.3485940-1-rppt@kernel.org> References: <20250703184711.3485940-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 70EC32000F X-Stat-Signature: aam4q9wfzzj9pon8kpq8gaqo4m43ppew X-Rspam-User: X-HE-Tag: 1751568444-344773 X-HE-Meta: U2FsdGVkX184Fbx/shohQ6u+hrc+g0k300/afrkEE0SqGKZ/nkAjQcGn2FFa3KMb64NpoeJoZgSzGNACQArzLoVk6NFoIVHyvz1+ApRMKaC3Ask9kzRXJ2mEWt0fx6LftyVeSKmVxzHqJjGwKf8S5Cr6d1cPeenT2kviyOQY89hLjCp6yJ5gvTWC4vm50brIlGl5Ai/HqHzi8UUMcH3+aN8AaJO+2ikxt7CFsxba1qkdge3Ytsnmfki594Kk7g0bLIHdFaoLCnBVXYHv6pF9Qp6d+j8qi/9JHZeR2ekame6zs5d7OHJ3Di896H9LZv5jOzMiyuNrl8p/M+9Dym0ElO4BFJVJdTmCnWxvsgR9OCW6qIYWcEb0iKjHci1Z/VJmwoiJ+SbvJ6rXBUoPrcHt9sKKM0COc3rV16w3mb4f8GmsUMnEsL4ne7yRWRCfCjgfnrCJm4hZlPIsj2jryHuUbr8TcKE2TiUftoypx/UdHU7JKfMKIBXTxOepm4N54J5CnWPAwSxtzCPAJh4DNUVEOf1hmelG+Hd7BLhH8OShxbONZqo0hGmoIaA9iyCGOEGLGR3NoJbY7XjqpZseGH0jMYutCUxuOUAvQktXklGHSuZlpXBT9gTqo8d6gTTLRBIPMAwOnvGFJFalxO20BeqWTi4/8rVtU9sQO/jddD6XvHEQh5QiIpHLBnDGT3Tr8ZUlNhxbOVXIyZDMfVnJcA9BgBoe+AWUyxVzYp0ZhpPXS7RGSezAMCKhjkzng/OtqcgB9mwmA2LtOa7KZkNEhWIbEbO24pmq2MZ5q8K84/JB6oLwlLy+K72gJjb4BCELt9TPrAsaJ73i7Grtf1Jn1we0RdnF94Oq8vSx+hS78LxbKCTm6QreSIivlWfvGlcQYulGXMlCI24ic2etaYurpWCBItkFckkYAdfNHOXbdZU7aYsP1pwv662z11b3x9rm5pBEWPTZGYCOECuSJx8wLzD OcosPcbZ Z7u9G/q2V8NyBohHUSHftwUvJn7j6ibhu5pQEbgd9Lgf0i4dHlKTSaDAACeIMQvKeC3YDT9S5bwv0ho9CAzrLlk4b1Dtotawa6ASQn+TJIWyQZ0kEyzcYDvkgyiMR40tLZGlYbmJwxuGhyGzjGCtmn4I3GMDfR4tDftSc7NYqxUATOItlLH4Xrav65GaTN7Z12ZIzvnC95q7UmiCoO0i5yVg90M8NXe80/dYoSIWdX27f6YvleGw2MWqECESyjDoIu1P2 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: From: "Mike Rapoport (Microsoft)" Move the check that verifies that reservation of fixed area does not cross HIGHMEM boundary and the actual memblock_resrve() call into a helper function. This makes code more readable and decouples logic related to CONFIG_HIGHMEM from the core functionality of __cma_declare_contiguous_nid(). Signed-off-by: Mike Rapoport (Microsoft) Acked-by: Oscar Salvador Acked-by: David Hildenbrand --- mm/cma.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/mm/cma.c b/mm/cma.c index 9bf95f8f0f33..40986722f2e2 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -352,6 +352,30 @@ static void __init list_insert_sorted( } } +static int __init cma_fixed_reserve(phys_addr_t base, phys_addr_t size) +{ + if (IS_ENABLED(CONFIG_HIGHMEM)) { + phys_addr_t highmem_start = __pa(high_memory - 1) + 1; + + /* + * If allocating at a fixed base the request region must not + * cross the low/high memory boundary. + */ + if (base < highmem_start && base + size > highmem_start) { + pr_err("Region at %pa defined on low/high memory boundary (%pa)\n", + &base, &highmem_start); + return -EINVAL; + } + } + + if (memblock_is_region_reserved(base, size) || + memblock_reserve(base, size) < 0) { + return -EBUSY; + } + + return 0; +} + static int __init __cma_declare_contiguous_nid(phys_addr_t *basep, phys_addr_t size, phys_addr_t limit, phys_addr_t alignment, unsigned int order_per_bit, @@ -407,15 +431,6 @@ static int __init __cma_declare_contiguous_nid(phys_addr_t *basep, if (!IS_ALIGNED(size >> PAGE_SHIFT, 1 << order_per_bit)) return -EINVAL; - /* - * If allocating at a fixed base the request region must not cross the - * low/high memory boundary. - */ - if (fixed && base < highmem_start && base + size > highmem_start) { - pr_err("Region at %pa defined on low/high memory boundary (%pa)\n", - &base, &highmem_start); - return -EINVAL; - } /* * If the limit is unspecified or above the memblock end, its effective @@ -433,10 +448,9 @@ static int __init __cma_declare_contiguous_nid(phys_addr_t *basep, /* Reserve memory */ if (fixed) { - if (memblock_is_region_reserved(base, size) || - memblock_reserve(base, size) < 0) { - return -EBUSY; - } + ret = cma_fixed_reserve(base, size); + if (ret) + return ret; } else { phys_addr_t addr = 0; -- 2.47.2