From patchwork Tue Feb 18 18:16:51 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: 13980422 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 E4AD6C021AA for ; Tue, 18 Feb 2025 18:18:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A93D128018B; Tue, 18 Feb 2025 13:17:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F411280181; Tue, 18 Feb 2025 13:17:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 70ECF28018B; Tue, 18 Feb 2025 13:17:46 -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 4739D280181 for ; Tue, 18 Feb 2025 13:17:46 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id DB9651403F8 for ; Tue, 18 Feb 2025 18:17:45 +0000 (UTC) X-FDA: 83133873690.05.C827BF9 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf05.hostedemail.com (Postfix) with ESMTP id E81F4100006 for ; Tue, 18 Feb 2025 18:17:43 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=KJkDhc1+; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of 3xs60ZwQKCHseuckfnnfkd.bnlkhmtw-lljuZbj.nqf@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3xs60ZwQKCHseuckfnnfkd.bnlkhmtw-lljuZbj.nqf@flex--fvdl.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902664; a=rsa-sha256; cv=none; b=G6CwEciTgYpd+2toVWgL4Zj3YqIfv2p7iN0hBM2aZve2Eig3Vg1eNy3pTeXva+Kv/e0yEa dd/Jjmp7zH1eGRlUUtet6PU+e+c0nK/58CFbqp17H4Qp5qzzcDJcbb7izCdVZnveRPW/s2 Ifl8qBGkmxPSNfDebiDhiHFULOxLQtQ= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=KJkDhc1+; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of 3xs60ZwQKCHseuckfnnfkd.bnlkhmtw-lljuZbj.nqf@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3xs60ZwQKCHseuckfnnfkd.bnlkhmtw-lljuZbj.nqf@flex--fvdl.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739902664; 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=UoHutzrguVqjpoysXGVpsK7uaSYmPmWovFVvd2hGtrQ=; b=Vb37CPZv3Lil4LG1Qwy7eO8psnABKo5mQ/AOwDjaOb/nJrd5N9aPZaxIBNraF4mS+5VUQO eLTdClVcEQ4d4i8VSp2mgDyJl4aRhbhXxaAWwwBhFnjMGATbaBiPnHK4laGZ2ks7qgaEIJ sQOzCRZV0mnKla2B7s0mfXNTJJq8Hx8= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-220e1593b85so101296655ad.3 for ; Tue, 18 Feb 2025 10:17:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902663; x=1740507463; 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=UoHutzrguVqjpoysXGVpsK7uaSYmPmWovFVvd2hGtrQ=; b=KJkDhc1+gvvo9Md+oIoHDIydGYJ4bAFNR3P1hcg/u1HVyqRW8VO1qsoN8GDTp2c9n1 b2AENYPhnjDV++wML7S1M35xUFboc/pjt8EHxSS0qml0RIbNNe/1dawmLpjZenmYjKA7 XHsnPvOukNw5ax0ENRByvLaGeR0uM55+uwCmwAJHc4SzKPOpAyVRTl/vhTJEeykh/yTQ mR83jTrLnkn5JP3zScM4o6EL8dnoAZXJRlsUG30+ZE8f7NNZpAIWlxpv7RQVdlbxDzr8 gqislb/Tk77jwch7IuHWkwxA/cOvp9SPwENDvS9jkog2Lmiroa3HYXjk/TODPKajOxuI z2oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902663; x=1740507463; 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=UoHutzrguVqjpoysXGVpsK7uaSYmPmWovFVvd2hGtrQ=; b=C8Dmov/aHktF3hcAfG0224oNUuvKR+5Dztisbays3SRjxGv5fgBaZeoT4R3Ikqr41z Ad0FFUp+JnMSAikkkDO4xD0bRwZ395CJvCZSHU71pOIYooq6YHQoFnQtUrLyx3bfdOB6 abq2PbU+rvfu/Cx74f9WsKIsvJL+O4oveiMQ7Sx5HNn8NC+0vkFRvlUIGFT0rfiz/svo xXNJN71+vhlY6HbJ3n7U4hjXNgBXRwCfxcH2ZwfuQA7/xxvwvfdCbipxcp2Xe3hhOOOE rLkAM/d3V5Er2OfnB6PjLzfVNTiYCydSIFAj5LZP/t+NILyFZ674gjQWtYK07oNVGlRJ 3fAw== X-Forwarded-Encrypted: i=1; AJvYcCWBI2Hq/yy4bkSYEiwT7pDT0woD9etvBSPJzEDSt7lysy5LNB/ScfAYAAofePIT9jB6XaUNwyk7ow==@kvack.org X-Gm-Message-State: AOJu0Yy0u263VvaJ+sTUltyrpDdHrX1JnlyNGn5KjbKExhDXJrzOPsW6 Sa+5KC+XvBJIj7iQ+QEaReD0JStD99Ug2zaOEFFZ7XHPx2up4Bnh9FqS8YtAaKGKDgRrpQ== X-Google-Smtp-Source: AGHT+IEaOE8EcrNPRUGgu2rvllVobmwvl4zwWyfKp9HM46Gmo8dFTgiEDNQFWvfPVH70G3Wi9jSEtAiS X-Received: from pffy18.prod.google.com ([2002:aa7:93d2:0:b0:730:9499:1f46]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1903:b0:732:5c88:990 with SMTP id d2e1a72fcca58-732618c2518mr19287789b3a.17.1739902662836; Tue, 18 Feb 2025 10:17:42 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:51 +0000 In-Reply-To: <20250218181656.207178-1-fvdl@google.com> Mime-Version: 1.0 References: <20250218181656.207178-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog Message-ID: <20250218181656.207178-24-fvdl@google.com> Subject: [PATCH v4 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, Frank van der Linden X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: E81F4100006 X-Stat-Signature: fphicwa6kezckg4srzp8f46nzbqdd6h5 X-Rspam-User: X-HE-Tag: 1739902663-775020 X-HE-Meta: U2FsdGVkX1+MioVu/iPdwWOcWY4hzyHWIPQdtyP14bIOBfbwKv3UJtUfNMZTkkEEyYIKcl46IOsU+9A+idgRh8DyiNZZj9U9b4O1h6sWs4vz4YLmPxnouEIKVLGOxygJfYd5Boe+N0HhC91KLB7qbrpvdO8kMUcT7yn+HjKG/1zCMs0WL6nPdo8W7IxKQ8Fz4I4MbHVv9rrSvmGjxB7xWtxKbaLC9JMJwlDpG+KNsU3EY92FcWyBJkR3PPFk4lDjIJJgsR9UHO+8ghg2ctCoP7rgn013jdVV+fsDNdzSNzI01AycG9Vwn3TcrU/xAfnpUulVvceEUYp2aYsB/sXnuqR8XUyxCXMkKHKX4l4YJbZa7H5CEBlCgY2Ii5zCVGdW8QkDnMOnt65vU+GbVreec6+rNTQsqu+UtigUNDic01lllDmpP/NEvxyo43/0l1nnn0cNsA0OEHyUZvlKtkKZPKWB670wQs0l4vTFCkkNQCQn0/e4f4vlC+i7NzksqKXEYi95CLsDZ3Rw2JVQNwYSHpHLMcpTuKiJi2J+5vMAqIW9YurVbf2WYZ1Y0faVCa5MATe8JxNAGlMKPU/kqfVBqNM+kVq+yYxRo1tmt0cvmYE/pKbjh9D2wFT8fqWLSA5JFTJzQJVEU2+UacvgK+xGkIkvB0TckLad7WaG9vRL2864B2tBTX1tA55OXOR1NIwhHjMi8Orx+wEnJwk+gBmZWhHrzZHhq2fkQiCssohY4J+v6JOmY0Dmv7iXE1BY676qq81Gahko28g7u2MNyHJMuJTx3AOGyu7IYjevesMqls9FLWHboEDmEMItMWJElaW2BOarSDlQaHFNbwE6kVPoUeO3wGhmYk09GbCJ2noSFM1LIsRFjmGgCK2TZR3oWrmwufVoK4KZRzuNhCoKQObnErLFmn3ixSoMLP+dVbr7J+mLQAqPBt2EwEGov5nBrHQv1uAXXF/zHYRw5hJ477q LJOXfNoz CbaSZJYrTivwsU3sqdH9uXnB5PzuInQamyt4VTrMfzkA1pjsmjc44UmGhXtnigJnXvr3JKrYF2UUVOWscm5SrZOqXPMzNxAmmYcQ2eXG+DPoXG0qiNHKDsXK2gE1xM6sE7LNU/qw4+Q29vCzJki7zj4SaeJeMtAdCihawClptj+R/ilrOlU8vFFBRe94aZK4Z+Iclz2eCwnxQgAL5cH7nAm9Kk1/Tdy+fmCphKm/XMgc5IpD8yiYd5Ph2iSU6TY2JERcZZtLuPbU8wVUQVXYAJdB3ncUzPzqenwBWaz8u1sHKLSqP/h/9ew6ysWE0X25uDnkd1MohuItuw4SPnk54lyOGH3/FksfeNk/nseDaM0u7Y1no6ITqSCE+AgKIbEqJumSyFjry193Tof1xGG5+5QjBzAG8jHrKgRhush46eb1W7gNXxpAjAIJNDE3nxnPlNu864TKIre2rs3NFJ7xyjT7e3VZ8F1yeMD3W6fi1wTnjs9fGnmRF/I1EUfoy3yNFw82cwi/TI9Jua9e0JeCM0SbU1g== 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 d0227af4bb71..4388d941d381 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;