From patchwork Fri Feb 28 18:29:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank van der Linden X-Patchwork-Id: 13996929 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 4C0D3C282D1 for ; Fri, 28 Feb 2025 18:31:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8D07D28001D; Fri, 28 Feb 2025 13:30:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8814A280001; Fri, 28 Feb 2025 13:30:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6AB4728001D; Fri, 28 Feb 2025 13:30:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 4AC24280001 for ; Fri, 28 Feb 2025 13:30:36 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 924B41410A4 for ; Fri, 28 Feb 2025 18:30:35 +0000 (UTC) X-FDA: 83170194030.10.2075B36 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf24.hostedemail.com (Postfix) with ESMTP id 58744180029 for ; Fri, 28 Feb 2025 18:30:27 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="SVy/a3vG"; spf=pass (imf24.hostedemail.com: domain of 3wgDCZwQKCBEwCu2x55x2v.t532z4BE-331Crt1.58x@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3wgDCZwQKCBEwCu2x55x2v.t532z4BE-331Crt1.58x@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740767427; 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=GJJkcZXm0UDGyycKT5zJa6qHUoeoBff/K3o/6oYQz4Q=; b=dWvHQAqaXU+e+myOXYm+L1rtINBeF0mPcnIF5CSs86Gy3z464Np9393Ku6kosxSELrqF9+ 6VJY5lo4Db7Y0DynKsfdoHOObHUeixY6ZjF93Rzve1Dtk9HuTzRWOYnzZ+hLznYZ3vsAp+ T5UhlITfoNohqT7nkh5Qv8aR1ncgWKc= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="SVy/a3vG"; spf=pass (imf24.hostedemail.com: domain of 3wgDCZwQKCBEwCu2x55x2v.t532z4BE-331Crt1.58x@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3wgDCZwQKCBEwCu2x55x2v.t532z4BE-331Crt1.58x@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740767427; a=rsa-sha256; cv=none; b=VYDXIQ8BkgDhAEz0NM2Wc45SBYMlMdpjdNHD9EV2rDNfyWc4kNszewfo9D31KuYVaxvPZv hnnCAEkbojXTI4AdM63SNHILmDLsbDcgwOque1qgk+T1TsyPrcsMqnxIJQUsNc7dMsPak+ 0TUQkt8ghnRnnTUdOrnX2XGFOO8g4WM= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-22107b29ac3so39413065ad.1 for ; Fri, 28 Feb 2025 10:30:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740767426; x=1741372226; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=GJJkcZXm0UDGyycKT5zJa6qHUoeoBff/K3o/6oYQz4Q=; b=SVy/a3vGajJAti01RZ+U5R0vaM/A7Ja29JLOAjj+XSWzp0w7d2lg4v3G79BBXqpt2z q/uxWRIi2GhTqigNGtCnRQAHBxdmaDoFS8V24jyX1STp/DoHIYovvQQYurqi+kHox1WT tkd9lXKWxBuHWeh4XLZy7AJeIwqliyTAqcPfCHmyK5lgpIJaG+SgKf3xWsDsisi6J/9c i9IaRlcxfuHEXmEparc2vLlxxcZhKUEonI3e93omeAFZAnONoqpAfWY2RBPDO6TsonWF cWRNooWaIJPtN7/VLwdlscppLbXdt5PdoMvxBIqhGrumyS9Ex04T5hdKnxaE++du7hHO lQKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740767426; x=1741372226; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GJJkcZXm0UDGyycKT5zJa6qHUoeoBff/K3o/6oYQz4Q=; b=Wtpmx6Rc0PH9HOsWVg2fch4FLH30Y7YV7WX8zGUduxZIF04NoiSJMADkOzM41dwrfT paD0ip2LT7ulU7v7+/PfyMknzxANq7nAKpR0DPLamFtD64P6shyG7r9D6yAaYFseVZFi Qngut2caE1DrO7IVNtqgvYzk5x6ZaCwm27YP3woNyqkUAUlhjoBqRi2HZ0uu6BhPWHQP 8MV60IWAkFrg4flv4D5fj9RIgk5yirxBOkqBahfSnfzyg2dn5AkFyHDbY6aXKDQWm4Si 8b3QN7mpgwUeGAZM5G1p1Fjss3znIZ/UNXuFhAYwwGI+cNSgIzn+wF4ODMgZHzLYA3lW HZGA== X-Forwarded-Encrypted: i=1; AJvYcCWuPK6xVxxOd7NC8DfsXmQyr9swYn2kTzf3qmswDKTpMJapyk1ajE7Ytie53+8TSjRIv/sBuxhsHA==@kvack.org X-Gm-Message-State: AOJu0Yx5H5JRJtvvriqFJrphUJJkF79GtEDcGwxKq2HzfUdJy+SsD6Ad ZJn+Yfe/huXxoEcWGgUkZLP9gO82K5a5PvBmTj4WoJOvXCTL2ZdX1Kq6TWUK995CdhXlYg== X-Google-Smtp-Source: AGHT+IFaQfecV0+g8772luhiih5Wz27ZxuM2qewDmjx0CupIM+riybkEMnFN2lTpHGDtl7PIHg8dgK4Y X-Received: from pjbpw4.prod.google.com ([2002:a17:90b:2784:b0:2ef:82c0:cb8d]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ef47:b0:221:2d4b:b4c6 with SMTP id d9443c01a7336-2234b05eb87mr134741995ad.17.1740767426169; Fri, 28 Feb 2025 10:30:26 -0800 (PST) Date: Fri, 28 Feb 2025 18:29:24 +0000 In-Reply-To: <20250228182928.2645936-1-fvdl@google.com> Mime-Version: 1.0 References: <20250228182928.2645936-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250228182928.2645936-24-fvdl@google.com> Subject: [PATCH v5 23/27] mm/cma: introduce a cma validate function From: Frank van der Linden To: akpm@linux-foundation.org, muchun.song@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: yuzhao@google.com, usamaarif642@gmail.com, joao.m.martins@oracle.com, roman.gushchin@linux.dev, ziy@nvidia.com, david@redhat.com, Frank van der Linden X-Rspam-User: X-Stat-Signature: zewjmo9amqgb4nbesu54xdru8unczqxb X-Rspamd-Queue-Id: 58744180029 X-Rspamd-Server: rspam07 X-HE-Tag: 1740767427-604587 X-HE-Meta: U2FsdGVkX1+gEcoVrR5Rq1ni+7oJFCRVX4Uboih3mJqdgDBvKEXxYgGIrLYZta2cnUlL9B0hAKeah8Hq/XQTVrYSyZ/bBf/h2+OBULBFBqFke8GvsNKFYNSKM32YeoshKZzX1TvrT5HlcFm/S4Vs4ToGdY05ER+tSqZN3gXWFWC0SKF64jMAfoPszpJPr8Qn894Io296Z1VEr5ZXrcMec93no8oQYwxABeCDafOXxEcOGxqneAK1Gis4TrEn6fSyQnwet47KBxpc+xunvx27opRwbaIrR/9us59ydQm/kFZKUd22RmEKxqotru05AoFoMDPagm22AtLyUdAaObrratTRqWT+QANmbF3pdC3KDnIyPopSe3gkpVE8/ZP2wbr8onr73678PJQyoOPdGiswsOVceNZV7dsP1pwa079Toubjsz/VXEvEpOQtHhfnhNzUWigo0tjaTaizS9EkdT6aQIq6I+2OKp/RPkZZujNmfkop1d/xJNbrvGdtjpJ4ChsxFe5Pj1yj3ga8xUcCuxL3nNJN4bWfaIhKGHQYctz/BLsEAFsREb+Zj3qIUL2WdgIJf/0z6vCaC5pvtgN+oQODTJ9jyYLJCybmVOzGNSZfB1sWy4X3js/3W1u36KpCCT0TEI6e6tZ9QLKOtQLhtyth0A4t3r69vVYsIbfcggBBZGpOrv4X1p3cVGk1B0RUeWxhoZECWwjtkFANmhWcJAe6vCxrPQTiGOLot8SxWt/NInaSkzc+M0bSiK7HFiYY35TLq3ca5B8SO4YZXO9gsHPJyltkqQFrYsFwupC/5jon2th0aHUhm92wDtnyQgbcgEtdzBGLGYKE1Ind8YprgJVPZ48Z7NUppkx3qmhhK5UCkEaXHfcrb/Tx+l2aQVXQ5ImLPNzcssHZaS0ryeqPTN4oTEYp1VUfwA9ZEWFhi2M3u5dHVMFnCegZtimEerLfbuHcVHzM0fVr1j3N2tD2i2g diI4IRhV odaesEgBHb92v1nS9QLiiPvJBfU52hScKFwhZyMIp6M3R9Ku6vmi8yz620cYYiBdtvSVY/9IsqGAP3D2bdykboG6X9hacIbAubBWphP8AZ8JX4SG1/ReGz0ZONdiYTrr7w847KKyp3Egvjtnu7rqFDhTsPCUjDuT+heNYjqK+sLEiRjuDqAYAAdPJunYbkYZPWR4vNyYkfee+/p2PHbL5VBDA94dcaPG3AS7sm8k8m/ZXurhjTtuMdeUpu+W/pUcF8MijG/knsyDhOPy5sKxZjF2FohH6oXqr8Mb/ip2FAmk2JorpB03aP9w3jKcxraGGqXy+A4aqtuU2PJ+ajP6cUz344EcPa4HQ0KwJD/9QXVwSX2RqgQMKVERC4cVzexE4Vm420yIaFOBgmBnCeI6iR8+wR+7mHiFwCqEfT+DGgJHW5HbD7vMs9Ly/u0yAnSBPQAJuPjWvFqcXz4oZ+eTrAEXjTTQ8RGOKrPp9m8np7AbClrThZbMbc5I/ssAzisJGdR0PsL9JOUCpKyNjFS+FjUNleA== 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: Define a function to check if a CMA area is valid, which means: do its ranges not cross any zone boundaries. Store the result in the newly created flags for each CMA area, so that multiple calls are dealt with. This allows for checking the validity of a CMA area early, which is needed later in order to be able to allocate hugetlb bootmem pages from it with pre-HVO. Signed-off-by: Frank van der Linden --- include/linux/cma.h | 5 ++++ mm/cma.c | 60 ++++++++++++++++++++++++++++++++++++--------- mm/cma.h | 8 +++++- 3 files changed, 60 insertions(+), 13 deletions(-) diff --git a/include/linux/cma.h b/include/linux/cma.h index 03d85c100dcc..62d9c1cf6326 100644 --- a/include/linux/cma.h +++ b/include/linux/cma.h @@ -60,6 +60,7 @@ extern void cma_reserve_pages_on_error(struct cma *cma); #ifdef CONFIG_CMA struct folio *cma_alloc_folio(struct cma *cma, int order, gfp_t gfp); bool cma_free_folio(struct cma *cma, const struct folio *folio); +bool cma_validate_zones(struct cma *cma); #else static inline struct folio *cma_alloc_folio(struct cma *cma, int order, gfp_t gfp) { @@ -70,6 +71,10 @@ static inline bool cma_free_folio(struct cma *cma, const struct folio *folio) { return false; } +static inline bool cma_validate_zones(struct cma *cma) +{ + return false; +} #endif #endif diff --git a/mm/cma.c b/mm/cma.c index 61ad4fd2f62d..5e1d169e24fa 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -99,6 +99,49 @@ static void cma_clear_bitmap(struct cma *cma, const struct cma_memrange *cmr, spin_unlock_irqrestore(&cma->lock, flags); } +/* + * Check if a CMA area contains no ranges that intersect with + * multiple zones. Store the result in the flags in case + * this gets called more than once. + */ +bool cma_validate_zones(struct cma *cma) +{ + int r; + unsigned long base_pfn; + struct cma_memrange *cmr; + bool valid_bit_set; + + /* + * If already validated, return result of previous check. + * Either the valid or invalid bit will be set if this + * check has already been done. If neither is set, the + * check has not been performed yet. + */ + valid_bit_set = test_bit(CMA_ZONES_VALID, &cma->flags); + if (valid_bit_set || test_bit(CMA_ZONES_INVALID, &cma->flags)) + return valid_bit_set; + + for (r = 0; r < cma->nranges; r++) { + cmr = &cma->ranges[r]; + base_pfn = cmr->base_pfn; + + /* + * alloc_contig_range() requires the pfn range specified + * to be in the same zone. Simplify by forcing the entire + * CMA resv range to be in the same zone. + */ + WARN_ON_ONCE(!pfn_valid(base_pfn)); + if (pfn_range_intersects_zones(cma->nid, base_pfn, cmr->count)) { + set_bit(CMA_ZONES_INVALID, &cma->flags); + return false; + } + } + + set_bit(CMA_ZONES_VALID, &cma->flags); + + return true; +} + static void __init cma_activate_area(struct cma *cma) { unsigned long pfn, base_pfn; @@ -113,19 +156,12 @@ static void __init cma_activate_area(struct cma *cma) goto cleanup; } + if (!cma_validate_zones(cma)) + goto cleanup; + for (r = 0; r < cma->nranges; r++) { cmr = &cma->ranges[r]; base_pfn = cmr->base_pfn; - - /* - * alloc_contig_range() requires the pfn range specified - * to be in the same zone. Simplify by forcing the entire - * CMA resv range to be in the same zone. - */ - WARN_ON_ONCE(!pfn_valid(base_pfn)); - if (pfn_range_intersects_zones(cma->nid, base_pfn, cmr->count)) - goto cleanup; - for (pfn = base_pfn; pfn < base_pfn + cmr->count; pfn += pageblock_nr_pages) init_cma_reserved_pageblock(pfn_to_page(pfn)); @@ -145,7 +181,7 @@ static void __init cma_activate_area(struct cma *cma) bitmap_free(cma->ranges[r].bitmap); /* Expose all pages to the buddy, they are useless for CMA. */ - if (!cma->reserve_pages_on_error) { + if (!test_bit(CMA_RESERVE_PAGES_ON_ERROR, &cma->flags)) { for (r = 0; r < allocrange; r++) { cmr = &cma->ranges[r]; for (pfn = cmr->base_pfn; @@ -172,7 +208,7 @@ core_initcall(cma_init_reserved_areas); void __init cma_reserve_pages_on_error(struct cma *cma) { - cma->reserve_pages_on_error = true; + set_bit(CMA_RESERVE_PAGES_ON_ERROR, &cma->flags); } static int __init cma_new_area(const char *name, phys_addr_t size, diff --git a/mm/cma.h b/mm/cma.h index ff79dba5508c..bddc84b3cd96 100644 --- a/mm/cma.h +++ b/mm/cma.h @@ -49,11 +49,17 @@ struct cma { /* kobject requires dynamic object */ struct cma_kobject *cma_kobj; #endif - bool reserve_pages_on_error; + unsigned long flags; /* NUMA node (NUMA_NO_NODE if unspecified) */ int nid; }; +enum cma_flags { + CMA_RESERVE_PAGES_ON_ERROR, + CMA_ZONES_VALID, + CMA_ZONES_INVALID, +}; + extern struct cma cma_areas[MAX_CMA_AREAS]; extern unsigned int cma_area_count;