From patchwork Tue Feb 18 18:16:29 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: 13980400 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 E0A6DC021AF for ; Tue, 18 Feb 2025 18:17:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 58C24280177; Tue, 18 Feb 2025 13:17:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C56D280176; Tue, 18 Feb 2025 13:17:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22BC8280177; Tue, 18 Feb 2025 13:17:13 -0500 (EST) 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 F0823280176 for ; Tue, 18 Feb 2025 13:17:12 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A29D01C6FF7 for ; Tue, 18 Feb 2025 18:17:12 +0000 (UTC) X-FDA: 83133872304.15.D0EC6A8 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by imf21.hostedemail.com (Postfix) with ESMTP id E336A1C0011 for ; Tue, 18 Feb 2025 18:17:09 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=1+N0SRaJ; spf=pass (imf21.hostedemail.com: domain of 3pM60ZwQKCFk6M4C7FF7C5.3FDC9ELO-DDBM13B.FI7@flex--fvdl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3pM60ZwQKCFk6M4C7FF7C5.3FDC9ELO-DDBM13B.FI7@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=1739902630; 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=YFMDP9y7jE/B7rMGFu3HCD39n6UMlP9JUwWE0fLegnI=; b=awU833F2rtgQYvCyUm8kOrfxPgjahMC4ywDoElKLGNdpHl8+e47BlGpT8Bc0GWfwPW0j2A KrEVGVJyuQpRq6Dx3fQxfpIvSMUva3h1A1VvBZDM0qsTIPqUV0FDaSL3hKiS+5XS8qssYG SXOUMt3xOIpnQAfrvMQDzEVAGubhjEk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902630; a=rsa-sha256; cv=none; b=oF7FSDXVxg3X8HZli3WIjjmic58HMEV3HWNLaXEzKOUNbvpzNZsn0U1Gut+9uqXQdd/aiH cBMEjs4kFlxqZQSqDDTFhCYJM+vjP5qdFvFsDao6HSLlXlhEiLzDG6H22OlyDOnUx814DH rh05fdoURYnwiFU3f7wtHj20EdpSta8= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=1+N0SRaJ; spf=pass (imf21.hostedemail.com: domain of 3pM60ZwQKCFk6M4C7FF7C5.3FDC9ELO-DDBM13B.FI7@flex--fvdl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3pM60ZwQKCFk6M4C7FF7C5.3FDC9ELO-DDBM13B.FI7@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2fc1eadf5a8so11121064a91.3 for ; Tue, 18 Feb 2025 10:17:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902628; x=1740507428; 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=YFMDP9y7jE/B7rMGFu3HCD39n6UMlP9JUwWE0fLegnI=; b=1+N0SRaJhbo6b+IWDWiKnMCrhREcAgwP3Xme4yO73R8B56Uxp6zM7u5Iy5JE6Uxa8S DiB2CntKKeqZvkyiCiCmjHR2Lwc2d7teck8dFzQzsxsojDVg7PwP3J4XsTBePkYpbk9V FRxsI+4iJT+aHmjMxJz4nQahDwhlNeu7YA8VF/j0pSmP1lgm4a8Y1THmp4OuhjZFfN3f K4lvAA91uaTr5oz7UsoXCkKV8g0USE9GCTgz/+8/bhm3yl5KxLARsC8waZXpYzwOl44s 7qjmNMlXHXnrEGRZBfeObXyBZs766de5LY8fQ97lC2zGqpq3FBB8hxQ6FHSnfSVxFBNw jZyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902628; x=1740507428; 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=YFMDP9y7jE/B7rMGFu3HCD39n6UMlP9JUwWE0fLegnI=; b=PDJHefiIenQ/pjV1fYqu+W7P0bcunsqUNBvuJJoPfvSwEO+kDqNUeJ8gbUiLRLeQpp +JLeWCwYVJ6dXPgn+rj5VDjRW/7oLwUgcVYCyqMz+3nUIvaIjvqkWxpgka70dLB/3w1a ck+Mz0worU2OxYcqxGHvdjDUaGlcExyZpJFDzBY8vwxkRUtNqtokGRszpgVSp/AOFTm7 q9ZWPy3mg7fNG2c0Kgjf7bEz5bYWTgZlSqwkzobSwhh7nw39+DDvSsvAlkFWEDlPEyA3 wNpRA4R5O+9aTWUmrPZCinqDZ7V2mMfEsQuo+Ltgw9D/aOco0V/PwAW/0wQvbveWXNzM Yiuw== X-Forwarded-Encrypted: i=1; AJvYcCV1J8RnFPq41n5doPkf/heweB8aLJuRxFR1gm2QJ7SLHMXev8/eDQy/lREQr9NBTjrQ5o5Uhr6idw==@kvack.org X-Gm-Message-State: AOJu0YytBviL9Rfk5m/R4bKtJkRiMPkbW/ooW4CZ9MAxjVo/0AUTpZlz lxs6jm2Uwsn7DQNRzvTyg9ztnFqyrf6pO6tguANsde8iui4PP8EIFqytBUDUrFF8btCCEA== X-Google-Smtp-Source: AGHT+IFKNXDQlFw3p4kB+WyHMQa70HsCZ8AgEKV5M11liys6mRWRTzYQbQMsUg+5jC7sM7FrCTb3toTw X-Received: from pfbji12.prod.google.com ([2002:a05:6a00:8f0c:b0:730:50c0:136d]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1301:b0:730:8a0a:9f06 with SMTP id d2e1a72fcca58-7329df4e95dmr405449b3a.16.1739902628294; Tue, 18 Feb 2025 10:17:08 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:29 +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-2-fvdl@google.com> Subject: [PATCH v4 01/27] mm/cma: export total and free number of pages for CMA areas 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 , Oscar Salvador X-Rspam-User: X-Rspamd-Queue-Id: E336A1C0011 X-Rspamd-Server: rspam07 X-Stat-Signature: oume3jm67ccsm6kf1zt49rym5gnuq8i6 X-HE-Tag: 1739902629-361875 X-HE-Meta: U2FsdGVkX19YrgB9v20WG0snjGfRQZmCqd0WyZmACYtySG8z2rAWX6EkLjPiaWfg+6ElDy83vT03CRr7zNVzwYYCAuYomen9kvOyJ/RZxGyJDUUktfImL/CbCCaOphKU9rfaLno+srfSoxjiGdy2eGjkIrbKkbvsxkgCw++WWQ9P8AneWRCFvbbUWby5wj+zR6+/IiWa0zTG/3S6z/r81wCZZECeKLStLJfuReoRcrmLYArDzttM8oea0NpRPEk8S3hlFitGNy8jyMk3ZUYOJwaZgYkRGe0KoGQHBaj7yGmp57XMw2W1bWIOBYBZmvIeVNEqQpJtZLMPpUlnSz5WhsWwt+5qwdfMsT1JaLqPVX4j+r3q67ArRdM+qHFSyk9OqwOuTxQFVVQ8cPeGaFBEHBNofPz3/0ogtAeFAIZ4QzFcRF/cDkvevtkqdmkFOAnj0FCvR+iIvTwuW3nUy9Y3IvjXxRpaN+noBNvsgb6vnEEMBzm9CyMY5FVkMpciWlLsCpmVVznZx59ly9S6uRcxNZ/ymmoU9b4ofJVLmHgyx0glRo1kWGHPLcf/E8yqcShjlMauePKa0gVPuIYyM1XsPtHns0q2eOUvZRnT8zTGTEJLpaM1/G7VqIIP95d8MYAvOa/dls6Mz5qC11kTwlYQFVVsT9miCbumHjUJoBf/VxHeEDca6sERt/Wqf0xM1SoqswUVrSsX7AZfXPeighc08xHAQ+14Qw4s4kTGRDeJ0NRv0j3mqk2DcWAuRnyQAI/p7HiQszaDbMnUCUNfzfAi6tvyjruOGaVYfzOW1UvVmVjSPXQqv52mdJsRxzmhdd5y+zmOX+hjm1FtmelrFvGJlcFb56Pc1x/iUia7G/GWP87w+4+yw9B8cAiRlTAEsDp8bf33lHgXouHeuJKJ9UmxbdhwCqryIkZjgO9Frn/qpUCSKt+wa5GbqLYXH4CYbP+CGnxWDy3no8Uqf5tQvUx oBiXzT8y 1+8hk85j84fFOBQ9R6i1Jsx/J2DOXKMfgP66v8GS1buwj/yc7hDmmDJG/piU0UovmmHWlOfkOF/rXKa2/eib2Jix6Clmm4I/78ozmjHOd3oT7lQN6TNZrzVWdxsxBSL9wNU2w+aLyZNAETz8NbqXcmj5koUZVPxeDDpkm8nmuf35Ypf/oC4wIj8jgfirI1qdpKuBtWOtfCpxeWnL/x7uWqgJRs4lOI5OCgDm5tcZ11V5y/npQL5YMBKu/EDhL0k121pPne3xE+3xiNoxYL/PR4gmIpwBDMhnO2uEvIzT415KUNEklfeXtTmUN/pN7EbeYV82E5LxGhwVMA7/ZvJBf5QMOasZdGXeaox6+z+rf0T7R1V0BgHBzuwyCaWIu1rNGhh1RoOhPo27jq11z8HgNLeAq4VQqRD38E9EcujX/rMuhhCNUxO31TCtbA/keOK1f0xarmMMG5ep5mOLYJEajS4RWMTCE+ANH6fw5hlDKp5Zz3OFGAlX8g/dB0+ef9YZmNvo0AvWlrFBJdtUaE4jwRBPafE9rptLI9kUBcb5wB1YixAkYQn9uBCQ9SFFOLbeGL7sStIFCLlGjCCQW95yNOkfdmMVu6nFt6s5du/+e1c18jPg= 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: In addition to the number of allocations and releases, system management software may like to be aware of the size of CMA areas, and how many pages are available in it. This information is currently not available, so export it in total_page and available_pages, respectively. The name 'available_pages' was picked over 'free_pages' because 'free' implies that the pages are unused. But they might not be, they just haven't been used by cma_alloc The number of available pages is tracked regardless of CONFIG_CMA_SYSFS, allowing for a few minor shortcuts in the code, avoiding bitmap operations. Reviewed-by: Oscar Salvador Signed-off-by: Frank van der Linden --- Documentation/ABI/testing/sysfs-kernel-mm-cma | 13 +++++++++++ mm/cma.c | 22 ++++++++++++++----- mm/cma.h | 1 + mm/cma_debug.c | 5 +---- mm/cma_sysfs.c | 20 +++++++++++++++++ 5 files changed, 51 insertions(+), 10 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-kernel-mm-cma b/Documentation/ABI/testing/sysfs-kernel-mm-cma index dfd755201142..aaf2a5d8b13b 100644 --- a/Documentation/ABI/testing/sysfs-kernel-mm-cma +++ b/Documentation/ABI/testing/sysfs-kernel-mm-cma @@ -29,3 +29,16 @@ Date: Feb 2024 Contact: Anshuman Khandual Description: the number of pages CMA API succeeded to release + +What: /sys/kernel/mm/cma//total_pages +Date: Jun 2024 +Contact: Frank van der Linden +Description: + The size of the CMA area in pages. + +What: /sys/kernel/mm/cma//available_pages +Date: Jun 2024 +Contact: Frank van der Linden +Description: + The number of pages in the CMA area that are still + available for CMA allocation. diff --git a/mm/cma.c b/mm/cma.c index de5bc0c81fc2..95a8788e54d3 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -86,6 +86,7 @@ static void cma_clear_bitmap(struct cma *cma, unsigned long pfn, spin_lock_irqsave(&cma->lock, flags); bitmap_clear(cma->bitmap, bitmap_no, bitmap_count); + cma->available_count += count; spin_unlock_irqrestore(&cma->lock, flags); } @@ -133,7 +134,7 @@ static void __init cma_activate_area(struct cma *cma) free_reserved_page(pfn_to_page(pfn)); } totalcma_pages -= cma->count; - cma->count = 0; + cma->available_count = cma->count = 0; pr_err("CMA area %s could not be activated\n", cma->name); } @@ -206,7 +207,7 @@ int __init cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, snprintf(cma->name, CMA_MAX_NAME, "cma%d\n", cma_area_count); cma->base_pfn = PFN_DOWN(base); - cma->count = size >> PAGE_SHIFT; + cma->available_count = cma->count = size >> PAGE_SHIFT; cma->order_per_bit = order_per_bit; *res_cma = cma; cma_area_count++; @@ -390,7 +391,7 @@ static void cma_debug_show_areas(struct cma *cma) { unsigned long next_zero_bit, next_set_bit, nr_zero; unsigned long start = 0; - unsigned long nr_part, nr_total = 0; + unsigned long nr_part; unsigned long nbits = cma_bitmap_maxno(cma); spin_lock_irq(&cma->lock); @@ -402,12 +403,12 @@ static void cma_debug_show_areas(struct cma *cma) next_set_bit = find_next_bit(cma->bitmap, nbits, next_zero_bit); nr_zero = next_set_bit - next_zero_bit; nr_part = nr_zero << cma->order_per_bit; - pr_cont("%s%lu@%lu", nr_total ? "+" : "", nr_part, + pr_cont("%s%lu@%lu", start ? "+" : "", nr_part, next_zero_bit); - nr_total += nr_part; start = next_zero_bit + nr_zero; } - pr_cont("=> %lu free of %lu total pages\n", nr_total, cma->count); + pr_cont("=> %lu free of %lu total pages\n", cma->available_count, + cma->count); spin_unlock_irq(&cma->lock); } @@ -444,6 +445,14 @@ static struct page *__cma_alloc(struct cma *cma, unsigned long count, for (;;) { spin_lock_irq(&cma->lock); + /* + * If the request is larger than the available number + * of pages, stop right away. + */ + if (count > cma->available_count) { + spin_unlock_irq(&cma->lock); + break; + } bitmap_no = bitmap_find_next_zero_area_off(cma->bitmap, bitmap_maxno, start, bitmap_count, mask, offset); @@ -452,6 +461,7 @@ static struct page *__cma_alloc(struct cma *cma, unsigned long count, break; } bitmap_set(cma->bitmap, bitmap_no, bitmap_count); + cma->available_count -= count; /* * It's safe to drop the lock here. We've marked this region for * our exclusive use. If the migration fails we will take the diff --git a/mm/cma.h b/mm/cma.h index 8485ef893e99..3dd3376ae980 100644 --- a/mm/cma.h +++ b/mm/cma.h @@ -13,6 +13,7 @@ struct cma_kobject { struct cma { unsigned long base_pfn; unsigned long count; + unsigned long available_count; unsigned long *bitmap; unsigned int order_per_bit; /* Order of pages represented by one bit */ spinlock_t lock; diff --git a/mm/cma_debug.c b/mm/cma_debug.c index 602fff89b15f..89236f22230a 100644 --- a/mm/cma_debug.c +++ b/mm/cma_debug.c @@ -34,13 +34,10 @@ DEFINE_DEBUGFS_ATTRIBUTE(cma_debugfs_fops, cma_debugfs_get, NULL, "%llu\n"); static int cma_used_get(void *data, u64 *val) { struct cma *cma = data; - unsigned long used; spin_lock_irq(&cma->lock); - /* pages counter is smaller than sizeof(int) */ - used = bitmap_weight(cma->bitmap, (int)cma_bitmap_maxno(cma)); + *val = cma->count - cma->available_count; spin_unlock_irq(&cma->lock); - *val = (u64)used << cma->order_per_bit; return 0; } diff --git a/mm/cma_sysfs.c b/mm/cma_sysfs.c index f50db3973171..97acd3e5a6a5 100644 --- a/mm/cma_sysfs.c +++ b/mm/cma_sysfs.c @@ -62,6 +62,24 @@ static ssize_t release_pages_success_show(struct kobject *kobj, } CMA_ATTR_RO(release_pages_success); +static ssize_t total_pages_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + struct cma *cma = cma_from_kobj(kobj); + + return sysfs_emit(buf, "%lu\n", cma->count); +} +CMA_ATTR_RO(total_pages); + +static ssize_t available_pages_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + struct cma *cma = cma_from_kobj(kobj); + + return sysfs_emit(buf, "%lu\n", cma->available_count); +} +CMA_ATTR_RO(available_pages); + static void cma_kobj_release(struct kobject *kobj) { struct cma *cma = cma_from_kobj(kobj); @@ -75,6 +93,8 @@ static struct attribute *cma_attrs[] = { &alloc_pages_success_attr.attr, &alloc_pages_fail_attr.attr, &release_pages_success_attr.attr, + &total_pages_attr.attr, + &available_pages_attr.attr, NULL, }; ATTRIBUTE_GROUPS(cma); From patchwork Tue Feb 18 18:16:30 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: 13980401 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 DC400C021AA for ; Tue, 18 Feb 2025 18:17:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ED82D280178; Tue, 18 Feb 2025 13:17:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E610F280176; Tue, 18 Feb 2025 13:17:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C3D64280178; Tue, 18 Feb 2025 13:17:13 -0500 (EST) 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 85B81280176 for ; Tue, 18 Feb 2025 13:17:13 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F2CC5B031B for ; Tue, 18 Feb 2025 18:17:12 +0000 (UTC) X-FDA: 83133872304.22.21EE80E Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by imf19.hostedemail.com (Postfix) with ESMTP id 078151A0011 for ; Tue, 18 Feb 2025 18:17:10 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=MMwQr72M; spf=pass (imf19.hostedemail.com: domain of 3pc60ZwQKCFo7N5D8GG8D6.4GEDAFMP-EECN24C.GJ8@flex--fvdl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3pc60ZwQKCFo7N5D8GG8D6.4GEDAFMP-EECN24C.GJ8@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=1739902631; 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=4zNW6laAXeBJ4XvKs0ISVQpTV4GK6Euoa4r/dFwlt3c=; b=tt5WKY3uN4Aulv/U8JJCGVTUO6SKCFAb/gCxb/6LIe2TMfRbzdrE54rBn4X9aZQl6e5Zut aEQ0IY+R6slDPc/qGhfrAuipOPcgahVIZhhZVtwl1nXVm6AFw4vgLqwNxXdrRUHIiquIIU O9mKse6cqb0U2y2jRp9JniE9DLO5i8Y= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=MMwQr72M; spf=pass (imf19.hostedemail.com: domain of 3pc60ZwQKCFo7N5D8GG8D6.4GEDAFMP-EECN24C.GJ8@flex--fvdl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3pc60ZwQKCFo7N5D8GG8D6.4GEDAFMP-EECN24C.GJ8@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902631; a=rsa-sha256; cv=none; b=pssWxaLAHw0FjWQSXndTKrtN6ELptC3c/YI5xmf2NvQsJ5NCiL5nEAFHMZBRadGjuyZq60 qxdUjxrX4sqi2mtfhCHOPenhnogDESpkbROEepNrRtWiM0r1CEEKeRmfhO1ZA7rmo74Ej/ Q8rHi5U5V9jEMoaNliTFEwB5mLdDxkw= Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2fc2fee4425so13708396a91.0 for ; Tue, 18 Feb 2025 10:17:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902630; x=1740507430; 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=4zNW6laAXeBJ4XvKs0ISVQpTV4GK6Euoa4r/dFwlt3c=; b=MMwQr72MH3OuG+gEuoufdeBsTid8dKWpMriW3fkzTN8FMf3FaZtgS+SQ3aF+TkbbRP RSXZgT4l/s6QXMoRcRKKE7Ypif2jAZKEtYdJ4+pUIFJdftMhsBEX9iicBgX3gkdu/35h /5LSdBhp7I7TL3Pm8cldLJ6vz96qOiU2qoSc3IMTgHjLhz2X4SlmOig2Ow7lcjRM1HDL jqJY9VZeKPi2HIsJrz5+hO1TBoOb0l4Pp6WcwGp9wNqT4Ep7t9qFefzc2CgGx3sAyMie HsptcSSGxW6nSq4mh6m3YKg5S4r8Wc47ZPWKdOSB8EaTSf3qkcHfUs0+nnniDkacgbv+ C3Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902630; x=1740507430; 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=4zNW6laAXeBJ4XvKs0ISVQpTV4GK6Euoa4r/dFwlt3c=; b=pAlwqr0jFXaSY6ZJ/DVEvbZEVpG57ZzOtVsNEYmMi4hSvAuxwXIlDHSGWjFoBRgaPs zZ9MuPear5RdX+pf5sN9Cy8p0xvuW++Ps8GxeJ4+b6mD3/nagwmxG6s0BRqcItIyfvt3 H71+tfqa8Wll6AC0C7J0O+yfmwDYBzRVIC4LCLOV7PKnn8mpUk5cqOUtlfgXOXp9WJZr qIJ6u28YL9aHJd+z8JKfhQcqmAZUJob4v4F0whpg2dqhUaBJaaGAH7loUajqTwFz0Wnz WsJSVU1lz3ebnYkAHj4+fQoTDjy3z0vFbNiDwYhI9+hfZyqb7R297J5ocXx9JP+n6z0Q p1/Q== X-Forwarded-Encrypted: i=1; AJvYcCWf1lD/cC80Xz0PAdrTr7cWdwsAnPDwS8WJ8XrVyAXnis1Ri7GY0FFtXc62z9iPEll7ga+SiY72iw==@kvack.org X-Gm-Message-State: AOJu0YwloaY3jDf5TKDGavZpzGo9QxbXS0LwG0WuLYrvvrY+FYh5ZF74 8fvKr4QKlyt3yqRY4dsFLukBdI6Zz4zj/H8GuGJ1FL9HKPb4L584HfWIlTpY4id2qRwMWA== X-Google-Smtp-Source: AGHT+IFDz0E+0MOsaQwNMhq4mrumn6NDDTkI3VcULN43g1FJxnYlC5s+Qw3+dqWyOooQw8QQrK9M1/01 X-Received: from pfbf10.prod.google.com ([2002:a05:6a00:ad8a:b0:730:8970:1f9c]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:2343:b0:732:623d:beee with SMTP id d2e1a72fcca58-7329de48488mr477117b3a.2.1739902629974; Tue, 18 Feb 2025 10:17:09 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:30 +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-3-fvdl@google.com> Subject: [PATCH v4 02/27] mm, cma: support multiple contiguous ranges, if requested 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-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 078151A0011 X-Stat-Signature: yrp56ot6uoc38ab3h15wqm75w4kbbpcy X-HE-Tag: 1739902630-673311 X-HE-Meta: U2FsdGVkX18Ghq0I96pDf7Cj+4RQBKTjTNy4tItN2XJShpzoBF4A+OPug1FUJPA+qtMwe1jiNDMyNFNPI919nSZYs0ZA3sDY936j0uBfiWq1YtucTDTY2j+56KTfeTK8653/54qdWN25c6N3f47/DFYxSP5rOu9dwfKGN+3MTZRxRSGBirziE/jv3lTTDRkN9EhA5h4b67s3IsBPX7SmyuUEC49qac++HnyRxTYqt8nqRG9XbVI7X3U0N4dkFYilCSMsmU11oqP/KUGQSzqu7Lux4R+ED8ff9aHKaiFRcoUgVr7PaWFqiSOTTXFb8PTxj3y3apmMKL+mInrfy5WQ3iDOLuQqKesaVeinpeSAI1O24oYp60lF0C0+uKAd8S1caYE6K/A3JwwaUyMMJ6YcKlq9MNw2BZPsIDGEBNwddGhN3JETViLfKwaJ+drlW/riJ9wbVRIA/9EU5krYND6KAV0N6Sq17IQrD37HIVbo7dMCm3WDB12FVmQaJCwHubfi3GTSYvWgt+n8jBplCrAoSYgsSQJcmBQz2XyXRlrvWy56+kgHLORb2dFysUmKSJwRelOMDU60mQNtYTW82tQKF94Apt0wWkZ4+mfENWJaozZIzLTz99ipTG/gk6gNr5EqT+33DLQakw6P/S+Qj0JK8WcBsrG+vJQpyzPtzXf6q4lfaB+rroFq61I0JB6anTGzUHlPLO7u/WxKXrOS5oYdBlmemsu4oSrOx4VBq9+/MfUXVfD7DEakIdW0vPTBouBRyrbT8t/z+SukA7fSQ4dChK728EcrkvIhkkyvMmQv0SZL3yBu0fVkLc/MHx7uWDqEWdr9x3WHqlM6wLFfZS9HbmrrI+SPPxmi/ijhfRUWzpF+5ZG1OUeKQH3Y+cEPwoeasrlptafPWkoQ/ZUvsxBV7EvtEcPSRtVFM+Ue7FpSJuNq/DghaMzFx6mavTgiWtf33/1T5w7A4bPT4/mEugo O/rRb4z2 sJ2/isLZ96pzsBTGu0ILiwGyOG63bsgrm/olGV43XcR//9p9cHS0WxsX5MXVm1w0l833IYlKPfb3FjKelYzQz4+JoBt1KS/WQnFU42lscHU20v16j6Iem1mt6L3QjLqfr/QBxI7BSopKWfrhh5Jf//OAgQZ0ek7DxHpttyaYuo+zfnyjNWsG80mn2wM8S/TikBiZdRSfaAENUIqV/bGrMeyc6EQm5nJLxo/7iLmsSfkAu7PIthNDJVWxpOkL7iJmOwThJHG9upVFVn2Tc3UaoCPIon5+5ubrDCeAvx51/fxybuwT3lxz73EQUdLiCYZf1Oe+cWp8byQo6iJ//JSfaI/aW55yk5u4r/Fnhc4+90WhVlzM1aSsVY297D6iNikmlG4eKJx0vk1yzMmawYzCw3KgvFwnt9uDVCm/ezFsHz5bcZK4BxWxaWy98TGjPVOelbJTwKRw1yf7abjGJMUO0C3By105mTiy/ezoiWco4HS/WYjgyC0wYFO2LcF37Qc3GPb0bXq5YzrQUDRPtg4lRIU/eVuArncmial/dEjm6ACh0qEdNK13Mji7jtQ== 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: Currently, CMA manages one range of physically contiguous memory. Creation of larger CMA areas with hugetlb_cma may run in to gaps in physical memory, so that they are not able to allocate that contiguous physical range from memblock when creating the CMA area. This can happen, for example, on an AMD system with > 1TB of memory, where there will be a gap just below the 1TB (40bit DMA) line. If you have set aside most of memory for potential hugetlb CMA allocation, cma_declare_contiguous_nid will fail. hugetlb_cma doesn't need the entire area to be one physically contiguous range. It just cares about being able to get physically contiguous chunks of a certain size (e.g. 1G), and it is fine to have the CMA area backed by multiple physical ranges, as long as it gets 1G contiguous allocations. Multi-range support is implemented by introducing an array of ranges, instead of just one big one. Each range has its own bitmap. Effectively, the allocate and release operations work as before, just per-range. So, instead of going through one large bitmap, they now go through a number of smaller ones. The maximum number of supported ranges is 8, as defined in CMA_MAX_RANGES. Since some current users of CMA expect a CMA area to just use one physically contiguous range, only allow for multiple ranges if a new interface, cma_declare_contiguous_nid_multi, is used. The other interfaces will work like before, creating only CMA areas with 1 range. cma_declare_contiguous_nid_multi works as follows, mimicking the default "bottom-up, above 4G" reservation approach: 0) Try cma_declare_contiguous_nid, which will use only one region. If this succeeds, return. This makes sure that for all the cases that currently work, the behavior remains unchanged even if the caller switches from cma_declare_contiguous_nid to cma_declare_contiguous_nid_multi. 1) Select the largest free memblock ranges above 4G, with a maximum number of CMA_MAX_RANGES. 2) If we did not find at most CMA_MAX_RANGES that add up to the total size requested, return -ENOMEM. 3) Sort the selected ranges by base address. 4) Reserve them bottom-up until we get what we wanted. Signed-off-by: Frank van der Linden --- Documentation/admin-guide/mm/cma_debugfs.rst | 10 +- include/linux/cma.h | 3 + mm/cma.c | 594 +++++++++++++++---- mm/cma.h | 27 +- mm/cma_debug.c | 56 +- 5 files changed, 550 insertions(+), 140 deletions(-) diff --git a/Documentation/admin-guide/mm/cma_debugfs.rst b/Documentation/admin-guide/mm/cma_debugfs.rst index 7367e6294ef6..4120e9cb0cd5 100644 --- a/Documentation/admin-guide/mm/cma_debugfs.rst +++ b/Documentation/admin-guide/mm/cma_debugfs.rst @@ -12,10 +12,16 @@ its CMA name like below: The structure of the files created under that directory is as follows: - - [RO] base_pfn: The base PFN (Page Frame Number) of the zone. + - [RO] base_pfn: The base PFN (Page Frame Number) of the CMA area. + This is the same as ranges/0/base_pfn. - [RO] count: Amount of memory in the CMA area. - [RO] order_per_bit: Order of pages represented by one bit. - - [RO] bitmap: The bitmap of page states in the zone. + - [RO] bitmap: The bitmap of allocated pages in the area. + This is the same as ranges/0/base_pfn. + - [RO] ranges/N/base_pfn: The base PFN of contiguous range N + in the CMA area. + - [RO] ranges/N/bitmap: The bit map of allocated pages in + range N in the CMA area. - [WO] alloc: Allocate N pages from that CMA area. For example:: echo 5 > /cma//alloc diff --git a/include/linux/cma.h b/include/linux/cma.h index d15b64f51336..863427c27dc2 100644 --- a/include/linux/cma.h +++ b/include/linux/cma.h @@ -40,6 +40,9 @@ static inline int __init cma_declare_contiguous(phys_addr_t base, return cma_declare_contiguous_nid(base, size, limit, alignment, order_per_bit, fixed, name, res_cma, NUMA_NO_NODE); } +extern int __init cma_declare_contiguous_multi(phys_addr_t size, + phys_addr_t align, unsigned int order_per_bit, + const char *name, struct cma **res_cma, int nid); extern int cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, unsigned int order_per_bit, const char *name, diff --git a/mm/cma.c b/mm/cma.c index 95a8788e54d3..6ac9173d3a7d 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -35,9 +36,16 @@ struct cma cma_areas[MAX_CMA_AREAS]; unsigned int cma_area_count; static DEFINE_MUTEX(cma_mutex); +static int __init __cma_declare_contiguous_nid(phys_addr_t base, + phys_addr_t size, phys_addr_t limit, + phys_addr_t alignment, unsigned int order_per_bit, + bool fixed, const char *name, struct cma **res_cma, + int nid); + phys_addr_t cma_get_base(const struct cma *cma) { - return PFN_PHYS(cma->base_pfn); + WARN_ON_ONCE(cma->nranges != 1); + return PFN_PHYS(cma->ranges[0].base_pfn); } unsigned long cma_get_size(const struct cma *cma) @@ -63,9 +71,10 @@ static unsigned long cma_bitmap_aligned_mask(const struct cma *cma, * The value returned is represented in order_per_bits. */ static unsigned long cma_bitmap_aligned_offset(const struct cma *cma, + const struct cma_memrange *cmr, unsigned int align_order) { - return (cma->base_pfn & ((1UL << align_order) - 1)) + return (cmr->base_pfn & ((1UL << align_order) - 1)) >> cma->order_per_bit; } @@ -75,46 +84,57 @@ static unsigned long cma_bitmap_pages_to_bits(const struct cma *cma, return ALIGN(pages, 1UL << cma->order_per_bit) >> cma->order_per_bit; } -static void cma_clear_bitmap(struct cma *cma, unsigned long pfn, - unsigned long count) +static void cma_clear_bitmap(struct cma *cma, const struct cma_memrange *cmr, + unsigned long pfn, unsigned long count) { unsigned long bitmap_no, bitmap_count; unsigned long flags; - bitmap_no = (pfn - cma->base_pfn) >> cma->order_per_bit; + bitmap_no = (pfn - cmr->base_pfn) >> cma->order_per_bit; bitmap_count = cma_bitmap_pages_to_bits(cma, count); spin_lock_irqsave(&cma->lock, flags); - bitmap_clear(cma->bitmap, bitmap_no, bitmap_count); + bitmap_clear(cmr->bitmap, bitmap_no, bitmap_count); cma->available_count += count; spin_unlock_irqrestore(&cma->lock, flags); } static void __init cma_activate_area(struct cma *cma) { - unsigned long base_pfn = cma->base_pfn, pfn; + unsigned long pfn, base_pfn; + int allocrange, r; struct zone *zone; + struct cma_memrange *cmr; + + for (allocrange = 0; allocrange < cma->nranges; allocrange++) { + cmr = &cma->ranges[allocrange]; + cmr->bitmap = bitmap_zalloc(cma_bitmap_maxno(cma, cmr), + GFP_KERNEL); + if (!cmr->bitmap) + goto cleanup; + } - cma->bitmap = bitmap_zalloc(cma_bitmap_maxno(cma), GFP_KERNEL); - if (!cma->bitmap) - goto out_error; + 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)); - zone = page_zone(pfn_to_page(base_pfn)); - for (pfn = base_pfn + 1; pfn < base_pfn + cma->count; pfn++) { - WARN_ON_ONCE(!pfn_valid(pfn)); - if (page_zone(pfn_to_page(pfn)) != zone) - goto not_in_zone; - } + /* + * 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)); + zone = page_zone(pfn_to_page(base_pfn)); + for (pfn = base_pfn + 1; pfn < base_pfn + cmr->count; pfn++) { + WARN_ON_ONCE(!pfn_valid(pfn)); + if (page_zone(pfn_to_page(pfn)) != zone) + goto cleanup; + } - for (pfn = base_pfn; pfn < base_pfn + cma->count; - pfn += pageblock_nr_pages) - init_cma_reserved_pageblock(pfn_to_page(pfn)); + for (pfn = base_pfn; pfn < base_pfn + cmr->count; + pfn += pageblock_nr_pages) + init_cma_reserved_pageblock(pfn_to_page(pfn)); + } spin_lock_init(&cma->lock); @@ -125,13 +145,19 @@ static void __init cma_activate_area(struct cma *cma) return; -not_in_zone: - bitmap_free(cma->bitmap); -out_error: +cleanup: + for (r = 0; r < allocrange; r++) + bitmap_free(cma->ranges[r].bitmap); + /* Expose all pages to the buddy, they are useless for CMA. */ if (!cma->reserve_pages_on_error) { - for (pfn = base_pfn; pfn < base_pfn + cma->count; pfn++) - free_reserved_page(pfn_to_page(pfn)); + for (r = 0; r < allocrange; r++) { + cmr = &cma->ranges[r]; + for (pfn = cmr->base_pfn; + pfn < cmr->base_pfn + cmr->count; + pfn++) + free_reserved_page(pfn_to_page(pfn)); + } } totalcma_pages -= cma->count; cma->available_count = cma->count = 0; @@ -154,6 +180,43 @@ void __init cma_reserve_pages_on_error(struct cma *cma) cma->reserve_pages_on_error = true; } +static int __init cma_new_area(const char *name, phys_addr_t size, + unsigned int order_per_bit, + struct cma **res_cma) +{ + struct cma *cma; + + if (cma_area_count == ARRAY_SIZE(cma_areas)) { + pr_err("Not enough slots for CMA reserved regions!\n"); + return -ENOSPC; + } + + /* + * Each reserved area must be initialised later, when more kernel + * subsystems (like slab allocator) are available. + */ + cma = &cma_areas[cma_area_count]; + cma_area_count++; + + if (name) + snprintf(cma->name, CMA_MAX_NAME, name); + else + snprintf(cma->name, CMA_MAX_NAME, "cma%d\n", cma_area_count); + + cma->available_count = cma->count = size >> PAGE_SHIFT; + cma->order_per_bit = order_per_bit; + *res_cma = cma; + totalcma_pages += cma->count; + + return 0; +} + +static void __init cma_drop_area(struct cma *cma) +{ + totalcma_pages -= cma->count; + cma_area_count--; +} + /** * cma_init_reserved_mem() - create custom contiguous area from reserved memory * @base: Base address of the reserved area @@ -172,13 +235,9 @@ int __init cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, struct cma **res_cma) { struct cma *cma; + int ret; /* Sanity checks */ - if (cma_area_count == ARRAY_SIZE(cma_areas)) { - pr_err("Not enough slots for CMA reserved regions!\n"); - return -ENOSPC; - } - if (!size || !memblock_is_region_reserved(base, size)) return -EINVAL; @@ -195,25 +254,261 @@ int __init cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, if (!IS_ALIGNED(base | size, CMA_MIN_ALIGNMENT_BYTES)) return -EINVAL; + ret = cma_new_area(name, size, order_per_bit, &cma); + if (ret != 0) + return ret; + + cma->ranges[0].base_pfn = PFN_DOWN(base); + cma->ranges[0].count = cma->count; + cma->nranges = 1; + + *res_cma = cma; + + return 0; +} + +/* + * Structure used while walking physical memory ranges and finding out + * which one(s) to use for a CMA area. + */ +struct cma_init_memrange { + phys_addr_t base; + phys_addr_t size; + struct list_head list; +}; + +/* + * Work array used during CMA initialization. + */ +static struct cma_init_memrange memranges[CMA_MAX_RANGES] __initdata; + +static bool __init revsizecmp(struct cma_init_memrange *mlp, + struct cma_init_memrange *mrp) +{ + return mlp->size > mrp->size; +} + +static bool __init basecmp(struct cma_init_memrange *mlp, + struct cma_init_memrange *mrp) +{ + return mlp->base < mrp->base; +} + +/* + * Helper function to create sorted lists. + */ +static void __init list_insert_sorted( + struct list_head *ranges, + struct cma_init_memrange *mrp, + bool (*cmp)(struct cma_init_memrange *lh, struct cma_init_memrange *rh)) +{ + struct list_head *mp; + struct cma_init_memrange *mlp; + + if (list_empty(ranges)) + list_add(&mrp->list, ranges); + else { + list_for_each(mp, ranges) { + mlp = list_entry(mp, struct cma_init_memrange, list); + if (cmp(mlp, mrp)) + break; + } + __list_add(&mrp->list, mlp->list.prev, &mlp->list); + } +} + +/* + * Create CMA areas with a total size of @total_size. A normal allocation + * for one area is tried first. If that fails, the biggest memblock + * ranges above 4G are selected, and allocated bottom up. + * + * The complexity here is not great, but this function will only be + * called during boot, and the lists operated on have fewer than + * CMA_MAX_RANGES elements (default value: 8). + */ +int __init cma_declare_contiguous_multi(phys_addr_t total_size, + phys_addr_t align, unsigned int order_per_bit, + const char *name, struct cma **res_cma, int nid) +{ + phys_addr_t start, end; + phys_addr_t size, sizesum, sizeleft; + struct cma_init_memrange *mrp, *mlp, *failed; + struct cma_memrange *cmrp; + LIST_HEAD(ranges); + LIST_HEAD(final_ranges); + struct list_head *mp, *next; + int ret, nr = 1; + u64 i; + struct cma *cma; + /* - * Each reserved area must be initialised later, when more kernel - * subsystems (like slab allocator) are available. + * First, try it the normal way, producing just one range. */ - cma = &cma_areas[cma_area_count]; + ret = __cma_declare_contiguous_nid(0, total_size, 0, align, + order_per_bit, false, name, res_cma, nid); + if (ret != -ENOMEM) + goto out; - if (name) - snprintf(cma->name, CMA_MAX_NAME, name); - else - snprintf(cma->name, CMA_MAX_NAME, "cma%d\n", cma_area_count); + /* + * Couldn't find one range that fits our needs, so try multiple + * ranges. + * + * No need to do the alignment checks here, the call to + * cma_declare_contiguous_nid above would have caught + * any issues. With the checks, we know that: + * + * - @align is a power of 2 + * - @align is >= pageblock alignment + * - @size is aligned to @align and to @order_per_bit + * + * So, as long as we create ranges that have a base + * aligned to @align, and a size that is aligned to + * both @align and @order_to_bit, things will work out. + */ + nr = 0; + sizesum = 0; + failed = NULL; - cma->base_pfn = PFN_DOWN(base); - cma->available_count = cma->count = size >> PAGE_SHIFT; - cma->order_per_bit = order_per_bit; + ret = cma_new_area(name, total_size, order_per_bit, &cma); + if (ret != 0) + goto out; + + align = max_t(phys_addr_t, align, CMA_MIN_ALIGNMENT_BYTES); + /* + * Create a list of ranges above 4G, largest range first. + */ + for_each_free_mem_range(i, nid, MEMBLOCK_NONE, &start, &end, NULL) { + if (start < SZ_4G) + continue; + + start = ALIGN(start, align); + if (start >= end) + continue; + + end = ALIGN_DOWN(end, align); + if (end <= start) + continue; + + size = end - start; + size = ALIGN_DOWN(size, (PAGE_SIZE << order_per_bit)); + if (!size) + continue; + sizesum += size; + + pr_debug("consider %016llx - %016llx\n", (u64)start, (u64)end); + + /* + * If we don't yet have used the maximum number of + * areas, grab a new one. + * + * If we can't use anymore, see if this range is not + * smaller than the smallest one already recorded. If + * not, re-use the smallest element. + */ + if (nr < CMA_MAX_RANGES) + mrp = &memranges[nr++]; + else { + mrp = list_last_entry(&ranges, + struct cma_init_memrange, list); + if (size < mrp->size) + continue; + list_del(&mrp->list); + sizesum -= mrp->size; + pr_debug("deleted %016llx - %016llx from the list\n", + (u64)mrp->base, (u64)mrp->base + size); + } + mrp->base = start; + mrp->size = size; + + /* + * Now do a sorted insert. + */ + list_insert_sorted(&ranges, mrp, revsizecmp); + pr_debug("added %016llx - %016llx to the list\n", + (u64)mrp->base, (u64)mrp->base + size); + pr_debug("total size now %llu\n", (u64)sizesum); + } + + /* + * There is not enough room in the CMA_MAX_RANGES largest + * ranges, so bail out. + */ + if (sizesum < total_size) { + cma_drop_area(cma); + ret = -ENOMEM; + goto out; + } + + /* + * Found ranges that provide enough combined space. + * Now, sorted them by address, smallest first, because we + * want to mimic a bottom-up memblock allocation. + */ + sizesum = 0; + list_for_each_safe(mp, next, &ranges) { + mlp = list_entry(mp, struct cma_init_memrange, list); + list_del(mp); + list_insert_sorted(&final_ranges, mlp, basecmp); + sizesum += mlp->size; + if (sizesum >= total_size) + break; + } + + /* + * Walk the final list, and add a CMA range for + * each range, possibly not using the last one fully. + */ + nr = 0; + sizeleft = total_size; + list_for_each(mp, &final_ranges) { + mlp = list_entry(mp, struct cma_init_memrange, list); + size = min(sizeleft, mlp->size); + if (memblock_reserve(mlp->base, size)) { + /* + * Unexpected error. Could go on to + * the next one, but just abort to + * be safe. + */ + failed = mlp; + break; + } + + pr_debug("created region %d: %016llx - %016llx\n", + nr, (u64)mlp->base, (u64)mlp->base + size); + cmrp = &cma->ranges[nr++]; + cmrp->base_pfn = PHYS_PFN(mlp->base); + cmrp->count = size >> PAGE_SHIFT; + + sizeleft -= size; + if (sizeleft == 0) + break; + } + + if (failed) { + list_for_each(mp, &final_ranges) { + mlp = list_entry(mp, struct cma_init_memrange, list); + if (mlp == failed) + break; + memblock_phys_free(mlp->base, mlp->size); + } + cma_drop_area(cma); + ret = -ENOMEM; + goto out; + } + + cma->nranges = nr; *res_cma = cma; - cma_area_count++; - totalcma_pages += cma->count; - return 0; +out: + if (ret != 0) + pr_err("Failed to reserve %lu MiB\n", + (unsigned long)total_size / SZ_1M); + else + pr_info("Reserved %lu MiB in %d range%s\n", + (unsigned long)total_size / SZ_1M, nr, + nr > 1 ? "s" : ""); + + return ret; } /** @@ -241,6 +536,26 @@ int __init cma_declare_contiguous_nid(phys_addr_t base, phys_addr_t alignment, unsigned int order_per_bit, bool fixed, const char *name, struct cma **res_cma, int nid) +{ + int ret; + + ret = __cma_declare_contiguous_nid(base, size, limit, alignment, + order_per_bit, fixed, name, res_cma, nid); + if (ret != 0) + pr_err("Failed to reserve %ld MiB\n", + (unsigned long)size / SZ_1M); + else + pr_info("Reserved %ld MiB at %pa\n", + (unsigned long)size / SZ_1M, &base); + + return ret; +} + +static int __init __cma_declare_contiguous_nid(phys_addr_t base, + phys_addr_t size, phys_addr_t limit, + phys_addr_t alignment, unsigned int order_per_bit, + bool fixed, const char *name, struct cma **res_cma, + int nid) { phys_addr_t memblock_end = memblock_end_of_DRAM(); phys_addr_t highmem_start; @@ -273,10 +588,9 @@ int __init cma_declare_contiguous_nid(phys_addr_t base, /* Sanitise input arguments. */ alignment = max_t(phys_addr_t, alignment, CMA_MIN_ALIGNMENT_BYTES); if (fixed && base & (alignment - 1)) { - ret = -EINVAL; pr_err("Region at %pa must be aligned to %pa bytes\n", &base, &alignment); - goto err; + return -EINVAL; } base = ALIGN(base, alignment); size = ALIGN(size, alignment); @@ -294,10 +608,9 @@ int __init cma_declare_contiguous_nid(phys_addr_t base, * low/high memory boundary. */ if (fixed && base < highmem_start && base + size > highmem_start) { - ret = -EINVAL; pr_err("Region at %pa defined on low/high memory boundary (%pa)\n", &base, &highmem_start); - goto err; + return -EINVAL; } /* @@ -309,18 +622,16 @@ int __init cma_declare_contiguous_nid(phys_addr_t base, limit = memblock_end; if (base + size > limit) { - ret = -EINVAL; pr_err("Size (%pa) of region at %pa exceeds limit (%pa)\n", &size, &base, &limit); - goto err; + return -EINVAL; } /* Reserve memory */ if (fixed) { if (memblock_is_region_reserved(base, size) || memblock_reserve(base, size) < 0) { - ret = -EBUSY; - goto err; + return -EBUSY; } } else { phys_addr_t addr = 0; @@ -357,10 +668,8 @@ int __init cma_declare_contiguous_nid(phys_addr_t base, if (!addr) { addr = memblock_alloc_range_nid(size, alignment, base, limit, nid, true); - if (!addr) { - ret = -ENOMEM; - goto err; - } + if (!addr) + return -ENOMEM; } /* @@ -373,75 +682,67 @@ int __init cma_declare_contiguous_nid(phys_addr_t base, ret = cma_init_reserved_mem(base, size, order_per_bit, name, res_cma); if (ret) - goto free_mem; - - pr_info("Reserved %ld MiB at %pa on node %d\n", (unsigned long)size / SZ_1M, - &base, nid); - return 0; + memblock_phys_free(base, size); -free_mem: - memblock_phys_free(base, size); -err: - pr_err("Failed to reserve %ld MiB on node %d\n", (unsigned long)size / SZ_1M, - nid); return ret; } static void cma_debug_show_areas(struct cma *cma) { unsigned long next_zero_bit, next_set_bit, nr_zero; - unsigned long start = 0; + unsigned long start; unsigned long nr_part; - unsigned long nbits = cma_bitmap_maxno(cma); + unsigned long nbits; + int r; + struct cma_memrange *cmr; spin_lock_irq(&cma->lock); pr_info("number of available pages: "); - for (;;) { - next_zero_bit = find_next_zero_bit(cma->bitmap, nbits, start); - if (next_zero_bit >= nbits) - break; - next_set_bit = find_next_bit(cma->bitmap, nbits, next_zero_bit); - nr_zero = next_set_bit - next_zero_bit; - nr_part = nr_zero << cma->order_per_bit; - pr_cont("%s%lu@%lu", start ? "+" : "", nr_part, - next_zero_bit); - start = next_zero_bit + nr_zero; + for (r = 0; r < cma->nranges; r++) { + cmr = &cma->ranges[r]; + + start = 0; + nbits = cma_bitmap_maxno(cma, cmr); + + pr_info("range %d: ", r); + for (;;) { + next_zero_bit = find_next_zero_bit(cmr->bitmap, + nbits, start); + if (next_zero_bit >= nbits) + break; + next_set_bit = find_next_bit(cmr->bitmap, nbits, + next_zero_bit); + nr_zero = next_set_bit - next_zero_bit; + nr_part = nr_zero << cma->order_per_bit; + pr_cont("%s%lu@%lu", start ? "+" : "", nr_part, + next_zero_bit); + start = next_zero_bit + nr_zero; + } + pr_info("\n"); } pr_cont("=> %lu free of %lu total pages\n", cma->available_count, cma->count); spin_unlock_irq(&cma->lock); } -static struct page *__cma_alloc(struct cma *cma, unsigned long count, - unsigned int align, gfp_t gfp) +static int cma_range_alloc(struct cma *cma, struct cma_memrange *cmr, + unsigned long count, unsigned int align, + struct page **pagep, gfp_t gfp) { unsigned long mask, offset; unsigned long pfn = -1; unsigned long start = 0; unsigned long bitmap_maxno, bitmap_no, bitmap_count; - unsigned long i; + int ret = -EBUSY; struct page *page = NULL; - int ret = -ENOMEM; - const char *name = cma ? cma->name : NULL; - - trace_cma_alloc_start(name, count, align); - - if (!cma || !cma->count || !cma->bitmap) - return page; - - pr_debug("%s(cma %p, name: %s, count %lu, align %d)\n", __func__, - (void *)cma, cma->name, count, align); - - if (!count) - return page; mask = cma_bitmap_aligned_mask(cma, align); - offset = cma_bitmap_aligned_offset(cma, align); - bitmap_maxno = cma_bitmap_maxno(cma); + offset = cma_bitmap_aligned_offset(cma, cmr, align); + bitmap_maxno = cma_bitmap_maxno(cma, cmr); bitmap_count = cma_bitmap_pages_to_bits(cma, count); if (bitmap_count > bitmap_maxno) - return page; + goto out; for (;;) { spin_lock_irq(&cma->lock); @@ -453,14 +754,14 @@ static struct page *__cma_alloc(struct cma *cma, unsigned long count, spin_unlock_irq(&cma->lock); break; } - bitmap_no = bitmap_find_next_zero_area_off(cma->bitmap, + bitmap_no = bitmap_find_next_zero_area_off(cmr->bitmap, bitmap_maxno, start, bitmap_count, mask, offset); if (bitmap_no >= bitmap_maxno) { spin_unlock_irq(&cma->lock); break; } - bitmap_set(cma->bitmap, bitmap_no, bitmap_count); + bitmap_set(cmr->bitmap, bitmap_no, bitmap_count); cma->available_count -= count; /* * It's safe to drop the lock here. We've marked this region for @@ -469,7 +770,7 @@ static struct page *__cma_alloc(struct cma *cma, unsigned long count, */ spin_unlock_irq(&cma->lock); - pfn = cma->base_pfn + (bitmap_no << cma->order_per_bit); + pfn = cmr->base_pfn + (bitmap_no << cma->order_per_bit); mutex_lock(&cma_mutex); ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA, gfp); mutex_unlock(&cma_mutex); @@ -478,7 +779,7 @@ static struct page *__cma_alloc(struct cma *cma, unsigned long count, break; } - cma_clear_bitmap(cma, pfn, count); + cma_clear_bitmap(cma, cmr, pfn, count); if (ret != -EBUSY) break; @@ -490,6 +791,38 @@ static struct page *__cma_alloc(struct cma *cma, unsigned long count, /* try again with a bit different memory target */ start = bitmap_no + mask + 1; } +out: + *pagep = page; + return ret; +} + +static struct page *__cma_alloc(struct cma *cma, unsigned long count, + unsigned int align, gfp_t gfp) +{ + struct page *page = NULL; + int ret = -ENOMEM, r; + unsigned long i; + const char *name = cma ? cma->name : NULL; + + trace_cma_alloc_start(name, count, align); + + if (!cma || !cma->count) + return page; + + pr_debug("%s(cma %p, name: %s, count %lu, align %d)\n", __func__, + (void *)cma, cma->name, count, align); + + if (!count) + return page; + + for (r = 0; r < cma->nranges; r++) { + page = NULL; + + ret = cma_range_alloc(cma, &cma->ranges[r], count, align, + &page, gfp); + if (ret != -EBUSY || page) + break; + } /* * CMA can allocate multiple page blocks, which results in different @@ -508,7 +841,8 @@ static struct page *__cma_alloc(struct cma *cma, unsigned long count, } pr_debug("%s(): returned %p\n", __func__, page); - trace_cma_alloc_finish(name, pfn, page, count, align, ret); + trace_cma_alloc_finish(name, page ? page_to_pfn(page) : 0, + page, count, align, ret); if (page) { count_vm_event(CMA_ALLOC_SUCCESS); cma_sysfs_account_success_pages(cma, count); @@ -551,20 +885,31 @@ struct folio *cma_alloc_folio(struct cma *cma, int order, gfp_t gfp) bool cma_pages_valid(struct cma *cma, const struct page *pages, unsigned long count) { - unsigned long pfn; + unsigned long pfn, end; + int r; + struct cma_memrange *cmr; + bool ret; - if (!cma || !pages) + if (!cma || !pages || count > cma->count) return false; pfn = page_to_pfn(pages); + ret = false; - if (pfn < cma->base_pfn || pfn >= cma->base_pfn + cma->count) { - pr_debug("%s(page %p, count %lu)\n", __func__, - (void *)pages, count); - return false; + for (r = 0; r < cma->nranges; r++) { + cmr = &cma->ranges[r]; + end = cmr->base_pfn + cmr->count; + if (pfn >= cmr->base_pfn && pfn < end) { + ret = pfn + count <= end; + break; + } } - return true; + if (!ret) + pr_debug("%s(page %p, count %lu)\n", + __func__, (void *)pages, count); + + return ret; } /** @@ -580,19 +925,32 @@ bool cma_pages_valid(struct cma *cma, const struct page *pages, bool cma_release(struct cma *cma, const struct page *pages, unsigned long count) { - unsigned long pfn; + struct cma_memrange *cmr; + unsigned long pfn, end_pfn; + int r; + + pr_debug("%s(page %p, count %lu)\n", __func__, (void *)pages, count); if (!cma_pages_valid(cma, pages, count)) return false; - pr_debug("%s(page %p, count %lu)\n", __func__, (void *)pages, count); - pfn = page_to_pfn(pages); + end_pfn = pfn + count; + + for (r = 0; r < cma->nranges; r++) { + cmr = &cma->ranges[r]; + if (pfn >= cmr->base_pfn && + pfn < (cmr->base_pfn + cmr->count)) { + VM_BUG_ON(end_pfn > cmr->base_pfn + cmr->count); + break; + } + } - VM_BUG_ON(pfn + count > cma->base_pfn + cma->count); + if (r == cma->nranges) + return false; free_contig_range(pfn, count); - cma_clear_bitmap(cma, pfn, count); + cma_clear_bitmap(cma, cmr, pfn, count); cma_sysfs_account_release_pages(cma, count); trace_cma_release(cma->name, pfn, pages, count); diff --git a/mm/cma.h b/mm/cma.h index 3dd3376ae980..5f39dd1aac91 100644 --- a/mm/cma.h +++ b/mm/cma.h @@ -10,19 +10,35 @@ struct cma_kobject { struct cma *cma; }; +/* + * Multi-range support. This can be useful if the size of the allocation + * is not expected to be larger than the alignment (like with hugetlb_cma), + * and the total amount of memory requested, while smaller than the total + * amount of memory available, is large enough that it doesn't fit in a + * single physical memory range because of memory holes. + */ +struct cma_memrange { + unsigned long base_pfn; + unsigned long count; + unsigned long *bitmap; +#ifdef CONFIG_CMA_DEBUGFS + struct debugfs_u32_array dfs_bitmap; +#endif +}; +#define CMA_MAX_RANGES 8 + struct cma { - unsigned long base_pfn; unsigned long count; unsigned long available_count; - unsigned long *bitmap; unsigned int order_per_bit; /* Order of pages represented by one bit */ spinlock_t lock; #ifdef CONFIG_CMA_DEBUGFS struct hlist_head mem_head; spinlock_t mem_head_lock; - struct debugfs_u32_array dfs_bitmap; #endif char name[CMA_MAX_NAME]; + int nranges; + struct cma_memrange ranges[CMA_MAX_RANGES]; #ifdef CONFIG_CMA_SYSFS /* the number of CMA page successful allocations */ atomic64_t nr_pages_succeeded; @@ -39,9 +55,10 @@ struct cma { extern struct cma cma_areas[MAX_CMA_AREAS]; extern unsigned int cma_area_count; -static inline unsigned long cma_bitmap_maxno(struct cma *cma) +static inline unsigned long cma_bitmap_maxno(struct cma *cma, + struct cma_memrange *cmr) { - return cma->count >> cma->order_per_bit; + return cmr->count >> cma->order_per_bit; } #ifdef CONFIG_CMA_SYSFS diff --git a/mm/cma_debug.c b/mm/cma_debug.c index 89236f22230a..fdf899532ca0 100644 --- a/mm/cma_debug.c +++ b/mm/cma_debug.c @@ -46,17 +46,26 @@ DEFINE_DEBUGFS_ATTRIBUTE(cma_used_fops, cma_used_get, NULL, "%llu\n"); static int cma_maxchunk_get(void *data, u64 *val) { struct cma *cma = data; + struct cma_memrange *cmr; unsigned long maxchunk = 0; - unsigned long start, end = 0; - unsigned long bitmap_maxno = cma_bitmap_maxno(cma); + unsigned long start, end; + unsigned long bitmap_maxno; + int r; spin_lock_irq(&cma->lock); - for (;;) { - start = find_next_zero_bit(cma->bitmap, bitmap_maxno, end); - if (start >= bitmap_maxno) - break; - end = find_next_bit(cma->bitmap, bitmap_maxno, start); - maxchunk = max(end - start, maxchunk); + for (r = 0; r < cma->nranges; r++) { + cmr = &cma->ranges[r]; + bitmap_maxno = cma_bitmap_maxno(cma, cmr); + end = 0; + for (;;) { + start = find_next_zero_bit(cmr->bitmap, + bitmap_maxno, end); + if (start >= bitmap_maxno) + break; + end = find_next_bit(cmr->bitmap, bitmap_maxno, + start); + maxchunk = max(end - start, maxchunk); + } } spin_unlock_irq(&cma->lock); *val = (u64)maxchunk << cma->order_per_bit; @@ -159,24 +168,41 @@ DEFINE_DEBUGFS_ATTRIBUTE(cma_alloc_fops, NULL, cma_alloc_write, "%llu\n"); static void cma_debugfs_add_one(struct cma *cma, struct dentry *root_dentry) { - struct dentry *tmp; + struct dentry *tmp, *dir, *rangedir; + int r; + char rdirname[12]; + struct cma_memrange *cmr; tmp = debugfs_create_dir(cma->name, root_dentry); debugfs_create_file("alloc", 0200, tmp, cma, &cma_alloc_fops); debugfs_create_file("free", 0200, tmp, cma, &cma_free_fops); - debugfs_create_file("base_pfn", 0444, tmp, - &cma->base_pfn, &cma_debugfs_fops); debugfs_create_file("count", 0444, tmp, &cma->count, &cma_debugfs_fops); debugfs_create_file("order_per_bit", 0444, tmp, &cma->order_per_bit, &cma_debugfs_fops); debugfs_create_file("used", 0444, tmp, cma, &cma_used_fops); debugfs_create_file("maxchunk", 0444, tmp, cma, &cma_maxchunk_fops); - cma->dfs_bitmap.array = (u32 *)cma->bitmap; - cma->dfs_bitmap.n_elements = DIV_ROUND_UP(cma_bitmap_maxno(cma), - BITS_PER_BYTE * sizeof(u32)); - debugfs_create_u32_array("bitmap", 0444, tmp, &cma->dfs_bitmap); + rangedir = debugfs_create_dir("ranges", tmp); + for (r = 0; r < cma->nranges; r++) { + cmr = &cma->ranges[r]; + snprintf(rdirname, sizeof(rdirname), "%d", r); + dir = debugfs_create_dir(rdirname, rangedir); + debugfs_create_file("base_pfn", 0444, dir, + &cmr->base_pfn, &cma_debugfs_fops); + cmr->dfs_bitmap.array = (u32 *)cmr->bitmap; + cmr->dfs_bitmap.n_elements = + DIV_ROUND_UP(cma_bitmap_maxno(cma, cmr), + BITS_PER_BYTE * sizeof(u32)); + debugfs_create_u32_array("bitmap", 0444, dir, + &cmr->dfs_bitmap); + } + + /* + * Backward compatible symlinks to range 0 for base_pfn and bitmap. + */ + debugfs_create_symlink("base_pfn", tmp, "ranges/0/base_pfn"); + debugfs_create_symlink("bitmap", tmp, "ranges/0/bitmap"); } static int __init cma_debugfs_init(void) From patchwork Tue Feb 18 18:16:31 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: 13980402 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 5FD58C021AD for ; Tue, 18 Feb 2025 18:17:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1E1AA280179; Tue, 18 Feb 2025 13:17:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 16CF3280176; Tue, 18 Feb 2025 13:17:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E8947280179; Tue, 18 Feb 2025 13:17:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id C7068280176 for ; Tue, 18 Feb 2025 13:17:14 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 79C8E120405 for ; Tue, 18 Feb 2025 18:17:14 +0000 (UTC) X-FDA: 83133872388.09.246892D Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf06.hostedemail.com (Postfix) with ESMTP id A705C180014 for ; Tue, 18 Feb 2025 18:17:12 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=3c8Z6knh; spf=pass (imf06.hostedemail.com: domain of 3p860ZwQKCFw9P7FAIIAF8.6IGFCHOR-GGEP46E.ILA@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3p860ZwQKCFw9P7FAIIAF8.6IGFCHOR-GGEP46E.ILA@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=1739902632; 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=tllVc7X/acXyb+IoDErelML7G/kmBDOgXbXRXqPobDE=; b=RhX5atzYBT3SOi7eGSONj/PPPStgO8xVKurhtTMdXXfC3cYwGvXomQpirXFvE6Kws+qz3B tYIweqcquJFbR3ooDk0lnFr6aY40Mb8/to12ggBIBXjb7youO7VBGkqSZkcJU7VB+7Mzrn ZGErF2Z4jQOKm6F293ua13fV3F0DhDw= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=3c8Z6knh; spf=pass (imf06.hostedemail.com: domain of 3p860ZwQKCFw9P7FAIIAF8.6IGFCHOR-GGEP46E.ILA@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3p860ZwQKCFw9P7FAIIAF8.6IGFCHOR-GGEP46E.ILA@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902632; a=rsa-sha256; cv=none; b=onKhimcz0u052kTTI1DL8wbhHFdZYr+ganAlgrkv8A7Bdl6sZVFAUTeKQYjZquwGZs4eVG uQPNxEgypIF0NynnIcypmhw15k7SijlmW5nnTtMeA4KfWBXb3MwaSb99joP0BwdwUZhUS9 HqD83jzqfq9OZQ2yjpN/IwCL+vddQbw= Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2fc45101191so6029428a91.1 for ; Tue, 18 Feb 2025 10:17:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902631; x=1740507431; 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=tllVc7X/acXyb+IoDErelML7G/kmBDOgXbXRXqPobDE=; b=3c8Z6knhgVjhlul645qFr1C9Y/PSrqgrjJmRcEoTeSBv41K6K4ZFYFc2HbFYIvc3U+ ViCMyxMXK7FvpOpZV+SDIBENxkLnPrEmsmUSKGS9amVO/Wr4Z76zKmGyC238ifyeZ3XI orokzUh7qQHvogmCGuh74Oe+0HAldDdxzfPlRItIRlsbhtNNhj0/5X6LAvPP0hrD5S9P nbaHtAlRMREPy5jEA+sNV2TlD/Go7ZgIM9ywDUStkffbsPQxfznWEypGr/b8DIiewDKm VvlKsiz7ts2o7zuOIxqU3UzPfcFbVgGLZDHsjFQCbPnRpOTybWMvsiv87jacYrtINknN ypYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902631; x=1740507431; 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=tllVc7X/acXyb+IoDErelML7G/kmBDOgXbXRXqPobDE=; b=Z9G4HiLl2CYfEXJfEX3ruC07PzQ0GODzmAdrc6dNIy3AdTpY6NbHvEuUlkj1SjkGT6 ASMKSxMACuZw2Abi7BDNllAOm8yTSBieT3dKHTfjgCI3dVYuowvqvGYFUBm/KQbW+Rhn 64Piqumzo+ER8w9HRlI9cIegvwtvqq4f/Wn1NV6fzXX4KQWnC/uMtjBDCoK7w2TDxcAU iKl4YnMrdMBrHZAZ7udToWTutIwPb1MNGR+aQOdo9Rj10IxPvHZlgMsfUnMgjLggHWMW sRJQYdEswYFvAFgPUYh7esPAfRFFqqQF7vs5qPP2+ZlMsfpnTsFkuCopkMG+grrYqK6N Xqmw== X-Forwarded-Encrypted: i=1; AJvYcCWUFWFeac8MNewuTmFJCD3CwZ5iOjRSxHdXCinsyOTsok+kaR9HFtZJjE8RDxae/hS4y/JCeHwqaA==@kvack.org X-Gm-Message-State: AOJu0YxjpOa+om1EL71KvDU5VrKxaks4D2phQ3EtVmKutgqlJ3XsefB4 iR8+Yf2ExJAxzgBpVZAE2YT7w9IYsZraXUWSwtfQGzqLRL6HvreqZT5lWdk04VHVxOL+SQ== X-Google-Smtp-Source: AGHT+IEImgj/kN4IDC2d0OdCVCT/P6/c0Qlb8Kol3LFJI2Z9hlrSwi6kxHopJVJc8L3J73IZc+vlmUAx X-Received: from pjbli10.prod.google.com ([2002:a17:90b:48ca:b0:2ea:448a:8cd1]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:d0c6:b0:2fc:a3b7:108a with SMTP id 98e67ed59e1d1-2fca3b711a8mr4781829a91.2.1739902631607; Tue, 18 Feb 2025 10:17:11 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:31 +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-4-fvdl@google.com> Subject: [PATCH v4 03/27] mm/cma: introduce cma_intersects 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 , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , linux-s390@vger.kernel.org X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: A705C180014 X-Stat-Signature: mf9f4at867b8ye7ye9a5tnzi1fm3ap5h X-HE-Tag: 1739902632-139366 X-HE-Meta: U2FsdGVkX1/5Dog50DzZzawal1woCR0cOcT85GdZ7bebcfbWCwDP3H1OQ+0qn9cA9vro6YWM9WutWUKpJ+Vd5zIczm27GTbtfmvcMrV4Av9guDlBXXM2AYlS2/TXPvTwEMci9J3CVJS7Hmk7dIoyf0aG+xwlpHc166p3rJaHkdwZm3i/zD1WEOMMYltwxfWvLxPDS+cBfWNSKdalOvx9TmvUebUDhzB10NEKDLn8HNmYNuArKrJ8GS3/Z2lch9XF8oz+icF58JK/WXWJpVGS+wM/zK9R6cDEGbqSf8LGPDjJ/OqObcVNiYbKNAxzxOjpUDcfg/N+M+LH0AxrIdGI3R/jYX7f0M5SsAmmRersHZoR/iBkdCCabc7UEMoJX1cqgUYnBgbbjwamql/YcVpABh+Lfl+9R6KBKIjIzaCC83/lbjRWV+S9VljCNW+OERyJv072/vwQqUrYUQnhQ5ONJteykDq93hsdaIGjFlYmqwadegUS3ZN0zHsFBk4xy4XV7W9TsrGkMSiXjc2vKzj7BZ86Pb2w60YuQ2f4iMIqvjntaKp6NVgG4WiS4QGx0uM+bd9/sbtxblKjMX2npld/X64BDjZlNsKzogzEAk4O3k3RHnsoL+C2KIT9qY+A2ouUHq/PQR+Y1AI6JEYgwpw7Eu5cc2JrVfdDf/86vjbo9lQUtL24Xb5TLyE4oBljIdcRpm2SWaWdvakQ2gof7/SJdJbVUvUst01JNYzz+gq9ywe8gJzL8jnBzsRK1ff88acCinphXE6HIDwxXdyu0aRqiuBLF8RRrpZeeFKCg/ji3rjkrd75fDLYe89PMtluXZg5tSeGIpjN7WE/9yybBtLqwuVyls6D1tC2WnUpVtS5nfDxsCsWnqMbmusInpqM8Xk9yKaDCalEKTcI6bIGpE4UGQ9a6q2aPCvI73z5Z3IqY743dSZj56MQfdDYK6PbikFrFLqGw+v9CJY+NLTUIpC ehuQDavt 0H8DfsbhsRs+F/Qe8YAbcOjbD3StkbLZrLD6SKK+oA1ieR637VryqOu2XRGCIwV03Gr4j8VD1n16k7lMMEA88VqsY91qAKXAATudfAdBIH3dntsh8NQWdF2kG8rtF585igukyJdaj6UFrTp9n16CiSYyyxxB+cSggZvaLtyYRWgDA2fyGEb4KOTU1XaV/Fpr7Cvn61epHDYcB2W5juGuNZraizhpytGlnskPU0BCBUGyOpCuExNeu5c24ujpzSmpPEopdVEX0XoSmaxaFhOKmt9gou6CNx0q//rAJjX9ml+QzWZYlDllCyymYaZdcvFfQwxi4SFBspPTGo6H/gE+gFlMLmXg5ngstldsi/EwY2d6qaM+lnmi5Va4rrI6Cf1Et23twpmX6E+2DnUnw2z7T0s9UJHiKoVMakOqWq6P6OPl0ISTUG+RWQv7z0eDmjJWFP7E+EbpsS9VOUzKn40FTE4Kx+RW4RRNo7rP7gx75R7lCTkQAMGmIC3awB1ty00EwnnYHoIFCIpEln3mg//7NRKaW2q/ZkqSYeMcjPu6yR9raBjBnfj9X0MxTYtYmvzPGCK62SxXK05FBNxoRy7Q2VZxqLE+vi7AYnj19Xyj+i34edmFB7gEjNSjjZA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000026, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Now that CMA areas can have multiple physical ranges, code can't assume a CMA struct represents a base_pfn plus a size, as returned from cma_get_base. Most cases are ok though, since they all explicitly refer to CMA areas that were created using existing interfaces (cma_declare_contiguous_nid or cma_init_reserved_mem), which guarantees they have just one physical range. An exception is the s390 code, which walks all CMA ranges to see if they intersect with a range of memory that is about to be hotremoved. So, in the future, it might run in to multi-range areas. To keep this check working, define a cma_intersects function. This just checks if a physaddr range intersects any of the ranges. Use it in the s390 check. Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Alexander Gordeev Cc: linux-s390@vger.kernel.org Acked-by: Alexander Gordeev Signed-off-by: Frank van der Linden --- arch/s390/mm/init.c | 13 +++++-------- include/linux/cma.h | 1 + mm/cma.c | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index f2298f7a3f21..d88cb1c13f7d 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c @@ -239,16 +239,13 @@ struct s390_cma_mem_data { static int s390_cma_check_range(struct cma *cma, void *data) { struct s390_cma_mem_data *mem_data; - unsigned long start, end; mem_data = data; - start = cma_get_base(cma); - end = start + cma_get_size(cma); - if (end < mem_data->start) - return 0; - if (start >= mem_data->end) - return 0; - return -EBUSY; + + if (cma_intersects(cma, mem_data->start, mem_data->end)) + return -EBUSY; + + return 0; } static int s390_cma_mem_notifier(struct notifier_block *nb, diff --git a/include/linux/cma.h b/include/linux/cma.h index 863427c27dc2..03d85c100dcc 100644 --- a/include/linux/cma.h +++ b/include/linux/cma.h @@ -53,6 +53,7 @@ extern bool cma_pages_valid(struct cma *cma, const struct page *pages, unsigned extern bool cma_release(struct cma *cma, const struct page *pages, unsigned long count); extern int cma_for_each_area(int (*it)(struct cma *cma, void *data), void *data); +extern bool cma_intersects(struct cma *cma, unsigned long start, unsigned long end); extern void cma_reserve_pages_on_error(struct cma *cma); diff --git a/mm/cma.c b/mm/cma.c index 6ac9173d3a7d..c7116a5819c5 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -978,3 +978,24 @@ int cma_for_each_area(int (*it)(struct cma *cma, void *data), void *data) return 0; } + +bool cma_intersects(struct cma *cma, unsigned long start, unsigned long end) +{ + int r; + struct cma_memrange *cmr; + unsigned long rstart, rend; + + for (r = 0; r < cma->nranges; r++) { + cmr = &cma->ranges[r]; + + rstart = PFN_PHYS(cmr->base_pfn); + rend = PFN_PHYS(cmr->base_pfn + cmr->count); + if (end < rstart) + continue; + if (start >= rend) + continue; + return true; + } + + return false; +} From patchwork Tue Feb 18 18:16:32 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: 13980403 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 DD0BEC021AF for ; Tue, 18 Feb 2025 18:17:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BCD3428017A; Tue, 18 Feb 2025 13:17:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A6A69280176; Tue, 18 Feb 2025 13:17:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 894B328017A; Tue, 18 Feb 2025 13:17:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 52C77280176 for ; Tue, 18 Feb 2025 13:17:16 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1760D4A046 for ; Tue, 18 Feb 2025 18:17:16 +0000 (UTC) X-FDA: 83133872472.23.D9C0F0B Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf14.hostedemail.com (Postfix) with ESMTP id 35C7210000E for ; Tue, 18 Feb 2025 18:17:14 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=I8DiZRx4; spf=pass (imf14.hostedemail.com: domain of 3qc60ZwQKCF4BR9HCKKCHA.8KIHEJQT-IIGR68G.KNC@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3qc60ZwQKCF4BR9HCKKCHA.8KIHEJQT-IIGR68G.KNC@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=1739902634; 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=28M4Y7I4U26ijj95STzi27Y4mVBVbqYB7mo45pFLbos=; b=zA7ngLqcTMKrcUpO2T576DSM5JSCXyfRpwwCoVftKp3ojE1t46DNpgyklNi5VMHkncwt8A DrYQLDRot7K9JRkIsZ82KZrmUy3AOpJCm+tVNDZ+/2NRSjA0/RZw4Cuo5a29P97KsiffdQ iuFcgimCybqgoOUS99sU7Ihc9qsppn8= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=I8DiZRx4; spf=pass (imf14.hostedemail.com: domain of 3qc60ZwQKCF4BR9HCKKCHA.8KIHEJQT-IIGR68G.KNC@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3qc60ZwQKCF4BR9HCKKCHA.8KIHEJQT-IIGR68G.KNC@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902634; a=rsa-sha256; cv=none; b=hP3I32kHpDpU/KY7wBrcX1WzF1eGTfneO6mtnzW43we4IGpRJF78eDRwpo/U/YOD+WJOVl SrsICooK0xo+OzMhhkuTBGYqBOPIrrtuKOJeSI1FkG7hh2QYGKNrsshZGnLEYHLzr1VLUy 4/r3q8w9EnamzRtzzW+3pzPt1UJi66M= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-220e1593b85so101287055ad.3 for ; Tue, 18 Feb 2025 10:17:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902633; x=1740507433; 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=28M4Y7I4U26ijj95STzi27Y4mVBVbqYB7mo45pFLbos=; b=I8DiZRx4Al2lbsgF0bZGAkH3VRFzf9fMqkB9jBfC3v35zMDhCMnRPK6f2zjkUyy/in pYh85Bh2Y7Cg0l1Ev8Ibgq9Tj3HOUartOigXmAf9N83QzLMZHCvw1gI+OVqJ/IhrCWHK b2q+qq2EC6WTbsE+ugyR3ujvHsvG+IConzabOeq9zHaNr0s6zBllWKdMoFCuTczo9rpY ylByoRELkYSReglYI/KnN0xXwg9OTlDCPwMtVCC6en8CFYN34FdZqe5xeXRxcRO4n/52 v18+Hr3NtdtgXFaJqResG4oS6w7yZy+gvDdYeUx2o7xN9FKhGV1gMd9DT/SklfT7JDkb zA8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902633; x=1740507433; 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=28M4Y7I4U26ijj95STzi27Y4mVBVbqYB7mo45pFLbos=; b=Z3x6ELaYUauScux+e20NIb3XZRpla/FgWHXZXzWP5NJzTPD33p7c01fVzT+EOWHal0 WshVEZCoU7tm38Zz+brgextlMp77U3mYvht32M1zyORRzkrHY7B9m8A3b3e9Ig1O120N Dg6ugDTIc+p7eOQDZXGc7dFeQbsEjSRs7leBZZa+k8K1oseAsVHcvKeRwVFOfKdI087h DfxxILXU/L8l8LZUwNwayEJtEzFSqupdJqPBDYYF6sgRA55llA8Q2MRQ+p1BJ1pN7cXo Bl9JzGsQtcmDZNvL5U+H5QKk8b8HHMC6wZeM3kDGxfuw13Ie8l3ymBvKVH2OGxPTQW7z tgVA== X-Forwarded-Encrypted: i=1; AJvYcCW39OVrH3J95GHL8cdWL0Gz/pHanvV3rOCIsj3Tn0nuUe0OU2GWsRViORhLda59i8LbaQM76klbVg==@kvack.org X-Gm-Message-State: AOJu0Yze1BMgryGej0eu+4xOB/TdIeSZpcLLruIBOK6X3RpzURttjn70 hMXMatKi3Ciu1pr843Bt5F5u0UrrpspNyG41y0YpXISGpDuFJEcHijDcQl0gW6ruV0BfjA== X-Google-Smtp-Source: AGHT+IEYbMUCFmzET0WrgCEwTCh1KWF3YPlhwmyjrDvgvzwF7FS0w2ZdMSG5zEuVscgIA6n3HgmNbmdc X-Received: from pfjx15.prod.google.com ([2002:aa7:9a4f:0:b0:732:20df:303c]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6300:6307:b0:1ee:a410:4a99 with SMTP id adf61e73a8af0-1eea4104e77mr13684604637.24.1739902633140; Tue, 18 Feb 2025 10:17:13 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:32 +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-5-fvdl@google.com> Subject: [PATCH v4 04/27] mm, hugetlb: use cma_declare_contiguous_multi 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-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 35C7210000E X-Stat-Signature: xyk4ydupwmktewu5enjogruos9eyw651 X-HE-Tag: 1739902634-196783 X-HE-Meta: U2FsdGVkX1+h5hA3P1EClBVyeORMXTXfZB2GpGO3t7EfmbShH87juk7hS2he77Qk2bhJUKcVJLmPbGxTv5cx1x/oCcr6deVlfYSRDj/2L4C+1EAt6oN0wkWbdt5a0Uclb/UUhH3WL0eO49Q8hZvEyrNycTqnVQj2WJx4OtkXDafoYkxjGNloVMlDqmICdY+p2YAlMKYpbczKQQPAWo2hq2P9KTkQENcnNdBdu6khky9Mg3/XzqtoHuSeutjktXpEi0cl1vkkh3uNZVQJgvDEgT+9uRF+t2PDgPZvTw2vWCYfjT+MNQN1qh4S3t8LvoLfJqOZHWIDUiUIOBsrnam3XlFU56D3mxQmrd6PEPdjvruR2HlgDg460aLnCeRXk7EeVaVA8CaTm1sD6kYtRSOPTJAMwcHnthv6RqWjTQj4PS0QSzam4VINSuuN6tOpp20RLcBGITctV41E3ldQWimXhc/NPHKkKoJD+mYaAz1BAVhiKhh5T7xDc9UVdrzKEe03jmGJka7CA0o5kxoJGi7M1Rt3ekPX1lujufY1l+9rsC3kJkITnQ/p9bM8ryRHr+f9nXG8gHVGJ9T9HYU+EyqBkfDbSEbH4who1gn9ptfznzq47jFBIBaA3tQTpPdAsMVz4amXknM4l0i8H1+sKQq10vSlz1c503Rp/dmBSzLWsXKe9LmgHuykoHgIvdmoXIzamsTFDCw4VXjGmw5JaGdjJKcwv2dZthFGzvehJDAUDZTmAQfKpWvs13Zc1n2qk6IRoyvE8Xv9jHPPW/hhGNc6he22S3tTgIAZx6LbRteFR8Jiimvlv4W7sg8RVDON8m6LtGBtzdrFSxR+QPu2H6dCUyzt0uFl7bKvOeDHv953GxaEWzFMgfSLlF4gYuPU7c0gN+tmM51ewa5uIZDa0Ce+ZYHXe4G6sorKclZ6XHrZF3qNMjNw/fl1ohh94eHpM7Qqge2zi7qqqEzTKNxa3tt PGTA5/Zd 1A+0ypeUhvfhHG4yfO1kuWleXNavUFOze8J+l0OJ1tnkqfr5HEZmYRjuqTedjkSH9hP4V0pC2RtbuS0MG+oUefy9DpCEt7NlitUbVNUGfmIiGhbf15tbBB41HO29FWII9E3LUEWK/Mcz/dU4U14lyoGF2qzPZiGG67nxSzZYkHjmo+E3ya9kFB0slBXKmeoK4zJGff8TkybommQEHXGvK2NQfe7oUmKopGPZrnNTzmk3NLGeA3Ok5w/7iPwlDvBjZhfdBqDa2yvyE6kfcZxvH8XVhUt7wNXmPsxPnnpwmMd0ZBP5O6xU8BAnbxey3CoMTmqpdRRT0Kq8NZvspPcSzBn++rW/CytKknXwldLrehl4UTov4mdkU6yny1B0nCbJSyNFYCPoEhLdFEa2pi20C5hsEvPpt+AIq/JhoxfAB/ALEcqStFkioL8peEgsZFwaQ2pTbJ1/mH1w3qlcOfbC/XhVSOLti1w6E3nacSmHZ1HzvD7EyhZKprqlFlupM699LM8ki/SUKNhOW8NsOAxt4YY7hvHXYTVEYV4GcHtb/f2alyrI/1yFFM1azyTJ1pC5HkOfnK1/Z8C+qd80= 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: hugetlb_cma is fine with using multiple CMA ranges, as long as it can get its gigantic pages allocated from them. So, use cma_declare_contiguous_multi to allow for multiple ranges, increasing the chances of getting what we want on systems with gaps in physical memory. Signed-off-by: Frank van der Linden --- mm/hugetlb.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 163190e89ea1..fadfacf56066 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -7738,9 +7738,8 @@ void __init hugetlb_cma_reserve(int order) * may be returned to CMA allocator in the case of * huge page demotion. */ - res = cma_declare_contiguous_nid(0, size, 0, - PAGE_SIZE << order, - HUGETLB_PAGE_ORDER, false, name, + res = cma_declare_contiguous_multi(size, PAGE_SIZE << order, + HUGETLB_PAGE_ORDER, name, &hugetlb_cma[nid], nid); if (res) { pr_warn("hugetlb_cma: reservation failed: err %d, node %d", From patchwork Tue Feb 18 18:16:33 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: 13980404 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 321E0C021AD for ; Tue, 18 Feb 2025 18:17:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9AA8D28017B; Tue, 18 Feb 2025 13:17:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 93294280176; Tue, 18 Feb 2025 13:17:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6271B28017B; Tue, 18 Feb 2025 13:17:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 3EDCD280176 for ; Tue, 18 Feb 2025 13:17:18 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id B90F5A06E6 for ; Tue, 18 Feb 2025 18:17:17 +0000 (UTC) X-FDA: 83133872514.18.32CFB94 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf19.hostedemail.com (Postfix) with ESMTP id B93C71A000F for ; Tue, 18 Feb 2025 18:17:15 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=yMKiRv+B; spf=pass (imf19.hostedemail.com: domain of 3qs60ZwQKCF8CSAIDLLDIB.9LJIFKRU-JJHS79H.LOD@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3qs60ZwQKCF8CSAIDLLDIB.9LJIFKRU-JJHS79H.LOD@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=1739902635; 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=u/xuszDLPFK7URQqd9Wqbe7y8mvvdnw5mOni6+3Gut4=; b=ADjXXmYRK1IyIqmkh0BrZtT9mO2E9qrt5Bl9oDyMW0a/phgdKWGRCqXNuPh0GVv/mufPKc MVo/nXbxUbJIfbc0rp5Hxn6ZBkgL3NG6miEWDt4E1sH8gBjI6fKTXRIft5PAGRXOofiziy 2SpKuvnrtG+YX4XNgrIOpKKC1KCNyxs= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=yMKiRv+B; spf=pass (imf19.hostedemail.com: domain of 3qs60ZwQKCF8CSAIDLLDIB.9LJIFKRU-JJHS79H.LOD@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3qs60ZwQKCF8CSAIDLLDIB.9LJIFKRU-JJHS79H.LOD@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902635; a=rsa-sha256; cv=none; b=ltL9nAMU5A7gH9+lFHasMpm5q41XhgfFDEyzSrTLp1II1AuN3le1kiP0n2rtWu1TC0fRDO wVYVpRJXxAsR6aKW/MJYsFEHZqFx/ycQ8T1apSWLueZ4CVXwX6wPnnlpTWEHnkUCQEv6+2 ogYv4Kk4NzLDgtm5nrdGmb3fYer8YLo= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2210305535bso121026225ad.1 for ; Tue, 18 Feb 2025 10:17:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902634; x=1740507434; 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=u/xuszDLPFK7URQqd9Wqbe7y8mvvdnw5mOni6+3Gut4=; b=yMKiRv+BG7DIqLoGFCwL4Qqxid2E0fO2CJVYSXFOeDtyu33VwDOJ/eSjoOEnNMwnvn qT2ITGvvukonR4UZa4YyeDf7OQc4kTy9vEwvTP6WvaFSWeSNgZ3LG9OcDo1k3LiEMvXy rkThd7VD/Z6q8yWtzNjErkb7DN37Yr/5+4521+/fYryaybAax9mvOMS9J5fVsO8Sj0qq jmfYteuZ9iPhSrobbIajdFyK2wQUYgP7veYf1QxzGQgl7RJzycNapA5pDUMSex2TxZFJ Gf1qkv24BdKH2OfGBGIx1TdQYdq2Y5Xuird1dyFw26gMNIKhZyyrbo2S7k/ult4f+jw3 fq8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902634; x=1740507434; 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=u/xuszDLPFK7URQqd9Wqbe7y8mvvdnw5mOni6+3Gut4=; b=rJ+WbZyaKX5OstvB/024t8zO1bP9/yaKPEvCyzFialYQK6TOmXxKpJjtQVQkFCKDSX etM1RRuydfZ7Z7OiTM2mnAs1UIFBh4+jvf2/0kXaPCSWXyNkMV4KhLCyl55wdiB5Hghc k+8+DZ4F1DTt3hnBh7fX2pH+QZkiBVEzCdAE3iCMQkfmFR7Yd0TbnG432kzQWhs4eX66 puZXIX384gFMYCONag7qeHKlTEIL4S88AjavisgVTCecZ/VzS50o6rr05T64//KmQ6rP 44Legenlvg5OzpDlxibgCOfvKG0lsMToYWzy+Bz2sd/WdQwc1J6J10U9gYxSwhezJ6R8 8XFg== X-Forwarded-Encrypted: i=1; AJvYcCXNJc4AxEljpOmHPGJULSLNzXwh8e+riz2TghGeKl2icHjz9LJrSkkslQTuAMbUMEdN2Qzav8SkjQ==@kvack.org X-Gm-Message-State: AOJu0YzbGQS9YHhJjF1ymVNJjjP/nDXwFzQv4+KE4fUFUNWZWyC0JJWR 0iI1rDjpHC/NyboWvZmwCt33fhZwDMrL/W/SRfpR/eWATyMtVtOX2zDRWKnouag88XhYpw== X-Google-Smtp-Source: AGHT+IG+/GahjgZk9wH9MMpH5rIkZMWL8OoiRoUarubQVIw+Za1lYfVaSifBByt4Dpo+odnYODGrih6V X-Received: from pfbce6.prod.google.com ([2002:a05:6a00:2a06:b0:730:8e17:ed06]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:7898:b0:1ee:7c7d:d699 with SMTP id adf61e73a8af0-1ee8cc08368mr27621857637.35.1739902634501; Tue, 18 Feb 2025 10:17:14 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:33 +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-6-fvdl@google.com> Subject: [PATCH v4 05/27] mm/hugetlb: remove redundant __ClearPageReserved 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 , Oscar Salvador X-Rspam-User: X-Rspamd-Queue-Id: B93C71A000F X-Stat-Signature: zg7pgpfi39c73imx1g838wt417ah6h4b X-Rspamd-Server: rspam03 X-HE-Tag: 1739902635-964046 X-HE-Meta: U2FsdGVkX19Q/HvA8b0foyBwqgS1PlDqxWaQxvQ9S07KCh0sJVB5kA3Kx7LVD6ID1l+gXUoaVRvoep/vdbKrZcPyE+6kwsgxfZw3FizWj/31L43alhGoyKnOx79Us729yXESU/J5DZ/NB1PIQiwpBisp6E/faObS9wu7PzcOdWF+D9r5jP0si0r229JXlAQmS9MCEsuEOejnu1YkvyPI/VJ9d3gJzkaeeSB7seKS7VnaGH0uLCpYTpMRq58dSb7z2Iom12exhdcy8HKBT3nqf1xamWojhXRaCOP8X2tAiUf9rocJwicRs9GhBQFRaUmCd+ZdTLhh74HcvW5/L9WH49j5XTtV1t4et4X5jRuwn/6zmpprNRezyg6tmBotevIzZbs6z1T8uyzLT/aWTkC+Io0hwei0PZecBL6TyGSq0RDOBFng11oyxIBS2mPJdWnocVYGR0jUnJvXJC77sZpW+cnc6q+2pxBDmJukRpU7nEOzzNXcMAgLjP+Yh3DhA8Tsfvfv3cU8Xlce41G+2EtlCBerdnLUDZMv6bV/vrvT4LKAGq3S3KGvWgIFzmMe/0LmHTnZRinppnMis81MKLhGCZuDfTIFJVZpFHVxrX/DYWHnDuydo0Wfy/BMqfS98vbYa61XixJtd26Oe34zy+r19XJoTxQGXpU5T1Znx6EpigPhdYtD3bbYOGaZDA1vypMH3fP/6r03ws8f97T4U10HCt9L8BIIjvYzRhR9NWRndcGYgIbnoO7T9XvGPQBnZx+ThW5EMA08Wm2J0Oxn5UzSYqMc88Po1A+yhF7FQqcME4CFmDLGvO/OEcphLeFfCUpcDFGAfJYf9fllhyfWf2tpyEZuQHTYDuh05Jf0ueDg0+GjG9Jqide2F3P3uWqx8MngdE/eHEeXSFZV5ja4Uu5GiJvDwJpR5ayppugu8/FpW6u1NwmLgc5Mk+H6aA1mwk/6jhJqhIbwB8JuJVETmhx lYhBzN7D rsfxZ/u5eighAJnAS/pwEXpvYEP7lTaqj6aFUS5TRO90ESaIQmN1JE6JXRbSDlapc2CB4p9XmBanpiCsCRJEZBMWNToGKmLGtRjIydAyMUG9VOPdTwihKt4jpU1sUxJ/nSnA8MNRiN63AE9gRECYIGqLLQL51/O6o/Lsrk/+LL59m7DEnW3LIXB89vPmJwvP165z0/FUnvXx9evfKZHhYjisQPdSADBdjgsV/9Kzgf5XolOV9qfGsONvX130xGtPnwyjZ8gkb2toudmdQ8SxhoM66V6CD3tu+eFlFNyz5DtJcdZxvEzkON9FBxK8D1ZH/b1FtGECjw2WtBPvWfdmYyBmyyNIH+4bqxLjjxk8oOV3FCFhP/hUb9uzWbS+4CIQufRZRKEVb+ce3FzK3Z2opTnyI/CRoNT0YpgNqf8UgB3yqJCQmMa7aj/ksqoaxqASL7qvN1n1PxcMXd43n3DRwiddXMxvwrkqplscopgG23WIXNllZE7bRl70eN7wu2U+TdGpjLUZWiKqNSTMCZgOlUeZoqaBfLglAoj9T2oN0DxtFDuZj6ur38zcYu4GR+QrrA+iuictcsfzzRQBJUk9zcrq5tcO8L88cgRhAXzp3aTcG5Hc49gftf9GX24r0LJJfPEqU+rVle81kh9c= X-Bogosity: Ham, tests=bogofilter, spamicity=0.015027, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: In hugetlb_folio_init_tail_vmemmap, the reserved flag is cleared for the tail page just before it is zeroed out, which is redundant. Remove the __ClearPageReserved call. Reviewed-by: Oscar Salvador Signed-off-by: Frank van der Linden --- mm/hugetlb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index fadfacf56066..d6d7ebc75b86 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3198,7 +3198,6 @@ static void __init hugetlb_folio_init_tail_vmemmap(struct folio *folio, for (pfn = head_pfn + start_page_number; pfn < end_pfn; pfn++) { struct page *page = pfn_to_page(pfn); - __ClearPageReserved(folio_page(folio, pfn - head_pfn)); __init_single_page(page, pfn, zone, nid); prep_compound_tail((struct page *)folio, pfn - head_pfn); ret = page_ref_freeze(page, 1); From patchwork Tue Feb 18 18:16:34 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: 13980405 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 BDED0C021AD for ; Tue, 18 Feb 2025 18:17:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B54C728017C; Tue, 18 Feb 2025 13:17:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B06FC280176; Tue, 18 Feb 2025 13:17:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 980F228017C; Tue, 18 Feb 2025 13:17:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 6C092280176 for ; Tue, 18 Feb 2025 13:17:19 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 263FA12042F for ; Tue, 18 Feb 2025 18:17:19 +0000 (UTC) X-FDA: 83133872598.11.5CD5A74 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf22.hostedemail.com (Postfix) with ESMTP id 3497DC000A for ; Tue, 18 Feb 2025 18:17:16 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=EA5EwGu8; spf=pass (imf22.hostedemail.com: domain of 3rM60ZwQKCGEEUCKFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3rM60ZwQKCGEEUCKFNNFKD.BNLKHMTW-LLJU9BJ.NQF@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=1739902637; 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=3u+CTmqwrQrYV/K3zHrRFLHLK3NiyuJYp7ufpVwRU0E=; b=OdFPwhkPovPS/9IZAoelhW3uq6oTpt5g9Pkmd+1KkuA43rRBdo/64vOm51FDWH0jchAhb2 YbPExSf/LgA27ZLaYDIpqurPLxcJgkGdLEHEP99ANp7YHALkn1jwUEhg9DGUEOfDb8B6RN 37sz/UFOhMs4jUZPHaFn1q294wliR0o= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=EA5EwGu8; spf=pass (imf22.hostedemail.com: domain of 3rM60ZwQKCGEEUCKFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3rM60ZwQKCGEEUCKFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902637; a=rsa-sha256; cv=none; b=x/pNKbKmIXtf3P7Ia6MHAPeA0JkQ2cGwgAbbj9+32ofU1Xbg4NzxGHjLyFguZ0eSjZ2dUU 0p0Gvt/YBwXPQcHkBGqnCUuDKbhdGFbQEpG/UyOj49tlbBXpwwMGXTKXRcIrEgyH5JRmQl +W3OZnMV07cDhowFYFGXjDu1Suud4So= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-221063a808dso62883895ad.1 for ; Tue, 18 Feb 2025 10:17:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902636; x=1740507436; 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=3u+CTmqwrQrYV/K3zHrRFLHLK3NiyuJYp7ufpVwRU0E=; b=EA5EwGu85HDu3vhPA5C49lHEHI8uqIXdUlJkoJw1HDm9ofhShEV42DbiTxHBs27tn0 KSnEOwVoT0+L4hyg33/4KBb3OPNC9F91JKpueuEAgl2DPkY1Cj9iJCb2jxf0ztF7hGbU RjjAZP7g0DEd30KfnQQsNmph/ODo7274tjVKs2Nylw6lqPpBiyjNvfWKVc9Kq6+fU005 3MiGKMGBLd2KnZisTJhUYMfCpYe/PNKyeXvIUj+GR6Rjv8wD5ngh8B3tBMHvf/thg39R h9i3qWaiUcjYOv84+SBHUloc3IWNsLGH/wadiVgtF2dsD/VClzyuBaUgh2YtAyrB2wnx vIxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902636; x=1740507436; 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=3u+CTmqwrQrYV/K3zHrRFLHLK3NiyuJYp7ufpVwRU0E=; b=wJKu9s2cwOPs9RxPOmzT07eP7Zm/gSX1MhRMK3uE/FhmWoegXr4odUW9CMDgDsIbsx prEnKKpQRouGI6dLlk7T5G74uVClP6y3MeFxtHfyp0ewir/JKL5xAw5Vy6KjZM6zY2xI +Qx8qf1PMrlUh3dg4Rar9nCa1svEUgFmFtqJ8ZqpMML6k+dkb1MkuIfgLZgr2S16si1C nPrUunQQxzN3mbwuqr3Azu4nHUIdq3jazM+vF4Ne6u53dMj9K4sXGiPA2qltj3OACIs6 Tf+Q+6A992j9oggwACMKf7tIGe1woKKN0Nl2dDByrXFzogGpDkzu4/tlWq2htQ74r2C8 DX9w== X-Forwarded-Encrypted: i=1; AJvYcCW/H3SWjcKqIl/boHMSeo8pRV8BiG/Bvwdl7OM96Tw+Oh+LfMci0coXV5pL0FI5o64aBmmvadeFdg==@kvack.org X-Gm-Message-State: AOJu0YyiOxK7sMDFkHzuaKAvFNMV2h7KX2ppRQVhrqhpqdM0cE/sdeAc zfNNfLZ+QmG/WZ2ww6lx5O1G4qmL8MTLu9kqg2e7bnwco6YynLMb7v9xPvxYKUch1HHo0w== X-Google-Smtp-Source: AGHT+IEVyVGfhy0mXXOBmh74w/Y/vdmVPddLDcQdO/svtyI1/ROIig9nA5bmpgS18LLbayg6zPhWAxMS X-Received: from pfbfu14.prod.google.com ([2002:a05:6a00:610e:b0:730:9654:30f]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:6b05:b0:1ed:e7cc:ee89 with SMTP id adf61e73a8af0-1ee8cc0335fmr25038306637.26.1739902636141; Tue, 18 Feb 2025 10:17:16 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:34 +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-7-fvdl@google.com> Subject: [PATCH v4 06/27] mm/hugetlb: use online nodes for bootmem allocation 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: rspam04 X-Rspamd-Queue-Id: 3497DC000A X-Stat-Signature: rxz3cqhtfhkgnjttrqtgei1ddypsc8jk X-Rspam-User: X-HE-Tag: 1739902636-351205 X-HE-Meta: U2FsdGVkX19vO57tSEuWA+bajSeA6l8LYvuMFocvxtxWwP/SkK8cYXOpnFt04N8DmYx07DcBRPsdrjUvaGQ60OKb3Wy9YlsaRV2a7emSomRPQ54Qcu4Y0jdOHrO5Pk047jmztGX2hZ/GjKff6GAdqZQo1xIwLJG72FKKDYBWpWTAvrTc9c/i9e0adxViEhZ07SRm6aeykApr45LeOY0Xxc/d2F/ufAwLsZVUZTT8obOJ8ntc3pGl+z0qUjkvg+fIEpYJOwwFLoEe5jgsNeCPbWDnFbVhK9u0zdepzDIS4WCx4da6lUPJ+f0Ww7A11iA3+FNCWY78x0ZczoLjFxex2BXf+xdtEI2CZcmpukXiJQ1yhRqXqQsAkz6Kb4NLSIY7yzY5ZKHVVNYUnWVjwp029C5ce5xjlvVOF4Wqt01qYVVTDE8I7Rkhx3aaOURLxp6OlcAswBKfa0OCjMFjay96GAo/0ypia1PT+JtyRdlMxZwk6xx4S6EvS5R0JbxsJf3WIDYCinjuQ7fDLACrVB0DvxTo6KV6oK3+RAhAxJYk+D+nd4njzYUfky0sm4z1SPcAR+00f5lIVPFDgJcRcbl81esXOWUro2exemXyVLrSxTklMaRT3GLM8u5txj6MY8/sEVxV9nsPJFEbrct1he9LxFfouKWg7koOA/dom8evyf4bEwf78CXMA9eao8zZqDvb34ufS5AhLjxVLatYlVRcCCFcxECqpeqSJhMo2gP44lClr76P3pOa9HjPs0nEBYQ87BlFWH6m1VOmc+jUTKR6qnx79QK9c74P3H7T3fqPM4L+B52MuiVdkRWjEhj9pWfqp56yNvN3SvqbDoem+2jYaiZW9dQrfr732qTSAIDv20z90q2S+zsqShs0ZJVrzTDtMFFnbel8khzpVtmleNZkua6rKQXFvpdgTk6CvPuaUT73qPU/8R2j6Hf64RSte0jo5/GxiffKcLeOr5PsaAa kKxdwA6U vEQDUTRIjQ6/oYxbyfotQ8UHkPMrGStS/IoBxwBH/G/kVxFbsmiRjuF86QfUVLo2z32DOMaZ3nRrtMJSgepMJaCaGQAcgkZVSwMTHS7qDUp8q+xZwxS1MzODClNZ3DxrrMhI8bmiJECp8/TyrBUpzkeAFnTMapJuPszMeqCRRZFA6w9QddqONpIOvMNC3pr+vJ2R+joG0lk03pAGEjYNcSDC3HssDy/FHRc/JA0r5ny4cfYJQRi7lG/VXlirDlJeMlPWOsMwFkneu+AmG4xQuUOzy0CYrc+9Ldryi+apxtrWwZ20BkphF4Of0/VfeXrMsQw8lb232iTZ1/ZqWihXN7bAJKsjnaDcI6X4ybQg4FygjmPR33AlFIPVctijnYSI+CdyaUXpWUFS9kOQA4ob/Ji3d47rK0IbzKNVSIMbmUkw1GEidiiekPtpZy0sTbtaLJDt31iql/bbgIrkHf+Bnjx29L+9PWZRMuzfFko9I+i1Uu1MHBP1cf3xpvhVKDZ5ZSNpEKqzh+q1BxgyhHlllKFXQnw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000228, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Later commits will move hugetlb bootmem allocation to earlier in init, when N_MEMORY has not yet been set on nodes. Use online nodes instead. At most, this wastes just a few cycles once during boot (and most likely none). Signed-off-by: Frank van der Linden --- mm/hugetlb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index d6d7ebc75b86..0592c076cd36 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3152,7 +3152,7 @@ int __alloc_bootmem_huge_page(struct hstate *h, int nid) goto found; } /* allocate from next node when distributing huge pages */ - for_each_node_mask_to_alloc(&h->next_nid_to_alloc, nr_nodes, node, &node_states[N_MEMORY]) { + for_each_node_mask_to_alloc(&h->next_nid_to_alloc, nr_nodes, node, &node_states[N_ONLINE]) { m = memblock_alloc_try_nid_raw( huge_page_size(h), huge_page_size(h), 0, MEMBLOCK_ALLOC_ACCESSIBLE, node); @@ -4546,8 +4546,8 @@ void __init hugetlb_add_hstate(unsigned int order) for (i = 0; i < MAX_NUMNODES; ++i) INIT_LIST_HEAD(&h->hugepage_freelists[i]); INIT_LIST_HEAD(&h->hugepage_activelist); - h->next_nid_to_alloc = first_memory_node; - h->next_nid_to_free = first_memory_node; + h->next_nid_to_alloc = first_online_node; + h->next_nid_to_free = first_online_node; snprintf(h->name, HSTATE_NAME_LEN, "hugepages-%lukB", huge_page_size(h)/SZ_1K); From patchwork Tue Feb 18 18:16:35 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: 13980406 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 EC3CCC021AA for ; Tue, 18 Feb 2025 18:17:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 58A0028017D; Tue, 18 Feb 2025 13:17:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 51225280176; Tue, 18 Feb 2025 13:17:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 38CBF28017D; Tue, 18 Feb 2025 13:17:21 -0500 (EST) 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 0601A280176 for ; Tue, 18 Feb 2025 13:17:21 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id BBF52B0444 for ; Tue, 18 Feb 2025 18:17:20 +0000 (UTC) X-FDA: 83133872640.16.E7D28C3 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by imf18.hostedemail.com (Postfix) with ESMTP id D1C6E1C0004 for ; Tue, 18 Feb 2025 18:17:18 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=PzRApZi8; spf=pass (imf18.hostedemail.com: domain of 3rc60ZwQKCGIFVDLGOOGLE.COMLINUX-MMKVACK.ORG@flex--fvdl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3rc60ZwQKCGIFVDLGOOGLE.COMLINUX-MMKVACK.ORG@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902638; a=rsa-sha256; cv=none; b=OWTmjTsK/J1wEcJQt/SmH4tVhi4Wl1FJ6OAd13/dZk+OHFji8n7JmujtO9m8AH9RO8THbw Xp9t9u/6Orfo2A+jcMKYnjAhISJOYYTIjcJ4pYrwVdkdloaqkd02RL6Nd9htjzBd91Biaq eTCAzvD+cnN94zuZDNKDIfiyGo5p3/Y= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=PzRApZi8; spf=pass (imf18.hostedemail.com: domain of 3rc60ZwQKCGIFVDLGOOGLE.COMLINUX-MMKVACK.ORG@flex--fvdl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3rc60ZwQKCGIFVDLGOOGLE.COMLINUX-MMKVACK.ORG@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=1739902638; 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=UzfWv9BqKfCaTLcusLA/6ZlD1dELHDMIUuMG+2mtrpE=; b=HLXm2VSXB1nV5gBrNryjvHNlV+iZh5nLnROeJU5sP4gnqmCRwUcZoY8xHBQZTEyvHy35Bg fvlvxGnJS1YmmggIMS74bdz6LdR2dw76FXhPuLTx9vAG4iv87H/DwwzWo0r5H5shPGzehq Fh9D/ZEDfFrnh/DSPb1i7MZrw7SHKtQ= Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2fc5888c192so5628731a91.0 for ; Tue, 18 Feb 2025 10:17:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902638; x=1740507438; 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=UzfWv9BqKfCaTLcusLA/6ZlD1dELHDMIUuMG+2mtrpE=; b=PzRApZi8fi6lL2IQoRguyApY/U86E+VDJGGkvmXvWCT9+yyZG06IUfGt60l65QxQBi Z6+ecTocB2k9Q/7GZS8UgW52bfIgcRgzBff491e3da9imiOV136neathf3R95iqmxNjx n8w1k3P/MbZWtriMjMElS/hoQLr/xOOtR9b5/bHOfO7gXjZj1EHHEQFL0/tZfdWI5Khp 6sZggDlKpe1aiuMU5tPRnrQZlnyiy4YEIcDAi3kViaU4XhAUjkpM5kppTdLz1zy8K1jm J3sQRvsUMmSsgYAnrpbNlUT9q4sqRVZ1VbVsTzrQAiYis5DH+YJfN2PkWIWKFy6qRhcj FvOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902638; x=1740507438; 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=UzfWv9BqKfCaTLcusLA/6ZlD1dELHDMIUuMG+2mtrpE=; b=FQBOtKHIOTm8dJTrUN6T+vsEENaubQ9elQGEUJkHu7H87GXuVU5ZETAnhd6GjY4tgM Y6Yd6f9I0OiA2/jIbSW4sttH4bKApk9YHVHXRVEQ3Hy+5iJ9Ts1CV0aT5HE+D9Mxrvmf R+e9jvG/q914Q7RUXXwvmqQXa+6sPuGgVDkL5wNuPJrGjyAO/NXqM8Y3dUtlHql2Cdaa OLVwf4Cj+v/hK5EYdT3D8Z7ZiLc7j8QzPMXZLySNdtzT8KplU4A9R4WWxfPwvvS6ycLh CXf6qAa2hdhQt3qSeMeAC+jDb0VE9dP+0UKXakMB6y7Bvy1LKh6GcLJGw3kjz20ZVkS/ L4pA== X-Forwarded-Encrypted: i=1; AJvYcCWeM+lOBkYNDMKzuwiGnw8Kc7xZkNxd4VtQU3qehz2LlAUkhMFAyvvs+JY+4IBTP9TkK920wls/Xg==@kvack.org X-Gm-Message-State: AOJu0Yw5X5WsU3cxQ/3SmWcG1whBoJV2wX+FBfpV4mofJQ+T0VjpxkH9 k13AJun/KgyAFGQKkK9TQLZV7cFSaEKriq4u7l85e0eFmRVC7JpjfjDmLlzReP8s6FOoPA== X-Google-Smtp-Source: AGHT+IHa8Y+sJQ8IwQWCMO2RNbH8G/VryDlpbdJULvNEszvFgqi1s498qDm7c8r07sVjg2DWswKH4xZf X-Received: from pfbga22.prod.google.com ([2002:a05:6a00:6216:b0:730:8ca0:1f9b]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:2e97:b0:730:87cf:a7cd with SMTP id d2e1a72fcca58-7329de6ecbdmr585107b3a.8.1739902637790; Tue, 18 Feb 2025 10:17:17 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:35 +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-8-fvdl@google.com> Subject: [PATCH v4 07/27] mm/hugetlb: convert cmdline parameters from setup to early 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-Stat-Signature: c33c73sy37m4og73bur3j3j9srrasmq6 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: D1C6E1C0004 X-Rspam-User: X-HE-Tag: 1739902638-89410 X-HE-Meta: U2FsdGVkX1945vCbBxI6dQXOwuKv3LN00HgYaeTIOpMq0gMVkg/OVeSuLKFNvJ30vOlYneK3B35v8VFUgZsQAiqJYLnI/B1KaprK14XfTIL/cT3pLjRICoKTXzaaKh7e/ixUtXrU8yWbDZOKfEIepVmRa71kP2HUJXkUKz3IP+dUoF6PApXbr67Q4swBRNO4pOXfGpnEeQpCoH93DO6m7J+T7Bgfs8mtxUKnCoRsgjDaGWUVL0maVd8T1ZyygPp8maHfsytYCuhkbO1NZB2vf6R3/pW8EXfa+QwEvndnDaSVt2/kGza8Rl6tBwX7BaSWoKwacfE5gV2yFL13w2nB4XeA+QUO7P/z0UrFXxYZ2yYBZDRTIHN7666ksSFtIBew9bWM4yDpFYWaliikx1BNVU6pCtruD9iGhygas5g/Y0EvnHCNzPjdf7iKjeHkz4W9metp0ZsKPAXVsiW2sBBRLYDw8KBVSYLyaOAmHJsMfOTkBiXe8DAyLy16vGdonCLt4apuFTGh5RPKkr1k0RNas8e0MoDIiP5/BEtJ3ZeQFsIrn2pR/tt6zfQFgoa250dV23xHp9kBTRBsNkhg50dKNF2hqRw04V6DzQQx4dHmQoGqNiFIbtVAVH0sgoA435GO6L34+wD/xNxKi0dVKJ5wYxb6Q9bvFINO6C+CefD1k+7nnrH294WTpoHuj2WQ5c9dUe8pkbJL0W/9M+GpEhKIQfOdSBW3zIrrV7xOgDbypJy+8Jp6CxJI1IgzQGVW5YQTOv9zbleh7XA0Ni+WhGpIs+CDuJbY/9JT9URzD4b9k+u7skft8ik54ojUeLgtcFmEhTmtS1iUlzxkSGkt7Xoq2xLDYgOcGnWOv28/Et4dsa6vpz/L9XK/Z9QLKP75YR1Pwmi/Mn4TTxu/lrAQToQZFDMTAbsOESY0ZPJb0L2EXD+BOmSHiNr2/9YFNGLO5AxKtXaEmICAWxomuYv13B8 BS9jVYN4 6HKTzV02zxSYZIY7G5mscF03VL7Q6QV9ic5C6L2udOasfZSxMVpvRnoiCeJJw67SKGoB3L9nCFYAmKtqLDoB8d/xVWsDftqlUNV9Sj5z7olsi82b6GIyZZE5rJH6aJVsMzN3KqVV+A3IyUW+l1mCNXU/0zdekY05MsQ1+837lKw71sNx6Gg2f7FVO8Gwwe97HT5bji/lCWVMlso2rqck8UllX9W9/iEYCzRs1ZqZsRyI0Npea5Y/3ttJ0P2J17adoaTnwcAjxg8R8wj1kijGcFeUFEBVbgqcIt+GGjMjxPPFoAeJV9HSBvWybhnd/p2WJc82f/kotAfn7v7CD1EvDzkrwj/zjpohvVblvxfS9hIxNQz+k5m85+lRhXdpaqMaN6cGExLW+3EEkpWYnmXbdkRkxLL3kvo7rWxkDATn6v7u1Jpn4w5GlNwPRv6bFKHxwzvcwa+XK22pXZOHkJgb9YoCk05c8SpVkPVeijXEpNkEZulctnfxdiyEUR77un/7WkyTPygAZ95iZglW+zeMYYf42Zj6/g6iKtt0tLX9ItMsCefms5ITKTdmwj13m6/07oG+ei6jXqWPDWY4QHcuR+72iRg== 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: Convert the cmdline parameters (hugepagesz, hugepages, default_hugepagesz and hugetlb_free_vmemmap) to early parameters. Since parse_early_param might run before MMU setups on some platforms (powerpc), validation of huge page sizes as specified in command line parameters would fail. So instead, for the hstate-related values, just record the them and parse them on demand, from hugetlb_bootmem_alloc. The allocation of hugetlb bootmem pages is now done in hugetlb_bootmem_alloc, which is called explicitly at the start of mm_core_init(). core_initcall would be too late, as that happens with memblock already torn down. This change will allow earlier allocation and initialization of bootmem hugetlb pages later on. No functional change intended. Signed-off-by: Frank van der Linden --- .../admin-guide/kernel-parameters.txt | 14 +- include/linux/hugetlb.h | 6 + mm/hugetlb.c | 133 ++++++++++++++---- mm/hugetlb_vmemmap.c | 6 +- mm/mm_init.c | 3 + 5 files changed, 126 insertions(+), 36 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index fb8752b42ec8..ae21d911d1c7 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -1861,7 +1861,7 @@ hpet_mmap= [X86, HPET_MMAP] Allow userspace to mmap HPET registers. Default set by CONFIG_HPET_MMAP_DEFAULT. - hugepages= [HW] Number of HugeTLB pages to allocate at boot. + hugepages= [HW,EARLY] Number of HugeTLB pages to allocate at boot. If this follows hugepagesz (below), it specifies the number of pages of hugepagesz to be allocated. If this is the first HugeTLB parameter on the command @@ -1873,12 +1873,12 @@ :[,:] hugepagesz= - [HW] The size of the HugeTLB pages. This is used in - conjunction with hugepages (above) to allocate huge - pages of a specific size at boot. The pair - hugepagesz=X hugepages=Y can be specified once for - each supported huge page size. Huge page sizes are - architecture dependent. See also + [HW,EARLY] The size of the HugeTLB pages. This is + used in conjunction with hugepages (above) to + allocate huge pages of a specific size at boot. The + pair hugepagesz=X hugepages=Y can be specified once + for each supported huge page size. Huge page sizes + are architecture dependent. See also Documentation/admin-guide/mm/hugetlbpage.rst. Format: size[KMG] diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index ec8c0ccc8f95..9cd7c9dacb88 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -174,6 +174,8 @@ struct address_space *hugetlb_folio_mapping_lock_write(struct folio *folio); extern int sysctl_hugetlb_shm_group; extern struct list_head huge_boot_pages[MAX_NUMNODES]; +void hugetlb_bootmem_alloc(void); + /* arch callbacks */ #ifndef CONFIG_HIGHPTE @@ -1250,6 +1252,10 @@ static inline bool hugetlbfs_pagecache_present( { return false; } + +static inline void hugetlb_bootmem_alloc(void) +{ +} #endif /* CONFIG_HUGETLB_PAGE */ static inline spinlock_t *huge_pte_lock(struct hstate *h, diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 0592c076cd36..1a200f89e21a 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -62,6 +63,24 @@ static unsigned long hugetlb_cma_size __initdata; __initdata struct list_head huge_boot_pages[MAX_NUMNODES]; +/* + * Due to ordering constraints across the init code for various + * architectures, hugetlb hstate cmdline parameters can't simply + * be early_param. early_param might call the setup function + * before valid hugetlb page sizes are determined, leading to + * incorrect rejection of valid hugepagesz= options. + * + * So, record the parameters early and consume them whenever the + * init code is ready for them, by calling hugetlb_parse_params(). + */ + +/* one (hugepagesz=,hugepages=) pair per hstate, one default_hugepagesz */ +#define HUGE_MAX_CMDLINE_ARGS (2 * HUGE_MAX_HSTATE + 1) +struct hugetlb_cmdline { + char *val; + int (*setup)(char *val); +}; + /* for command line parsing */ static struct hstate * __initdata parsed_hstate; static unsigned long __initdata default_hstate_max_huge_pages; @@ -69,6 +88,20 @@ static bool __initdata parsed_valid_hugepagesz = true; static bool __initdata parsed_default_hugepagesz; static unsigned int default_hugepages_in_node[MAX_NUMNODES] __initdata; +static char hstate_cmdline_buf[COMMAND_LINE_SIZE] __initdata; +static int hstate_cmdline_index __initdata; +static struct hugetlb_cmdline hugetlb_params[HUGE_MAX_CMDLINE_ARGS] __initdata; +static int hugetlb_param_index __initdata; +static __init int hugetlb_add_param(char *s, int (*setup)(char *val)); +static __init void hugetlb_parse_params(void); + +#define hugetlb_early_param(str, func) \ +static __init int func##args(char *s) \ +{ \ + return hugetlb_add_param(s, func); \ +} \ +early_param(str, func##args) + /* * Protects updates to hugepage_freelists, hugepage_activelist, nr_huge_pages, * free_huge_pages, and surplus_huge_pages. @@ -3484,6 +3517,8 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) for (i = 0; i < MAX_NUMNODES; i++) INIT_LIST_HEAD(&huge_boot_pages[i]); + h->next_nid_to_alloc = first_online_node; + h->next_nid_to_free = first_online_node; initialized = true; } @@ -4546,8 +4581,6 @@ void __init hugetlb_add_hstate(unsigned int order) for (i = 0; i < MAX_NUMNODES; ++i) INIT_LIST_HEAD(&h->hugepage_freelists[i]); INIT_LIST_HEAD(&h->hugepage_activelist); - h->next_nid_to_alloc = first_online_node; - h->next_nid_to_free = first_online_node; snprintf(h->name, HSTATE_NAME_LEN, "hugepages-%lukB", huge_page_size(h)/SZ_1K); @@ -4572,6 +4605,42 @@ static void __init hugepages_clear_pages_in_node(void) } } +static __init int hugetlb_add_param(char *s, int (*setup)(char *)) +{ + size_t len; + char *p; + + if (hugetlb_param_index >= HUGE_MAX_CMDLINE_ARGS) + return -EINVAL; + + len = strlen(s) + 1; + if (len + hstate_cmdline_index > sizeof(hstate_cmdline_buf)) + return -EINVAL; + + p = &hstate_cmdline_buf[hstate_cmdline_index]; + memcpy(p, s, len); + hstate_cmdline_index += len; + + hugetlb_params[hugetlb_param_index].val = p; + hugetlb_params[hugetlb_param_index].setup = setup; + + hugetlb_param_index++; + + return 0; +} + +static __init void hugetlb_parse_params(void) +{ + int i; + struct hugetlb_cmdline *hcp; + + for (i = 0; i < hugetlb_param_index; i++) { + hcp = &hugetlb_params[i]; + + hcp->setup(hcp->val); + } +} + /* * hugepages command line processing * hugepages normally follows a valid hugepagsz or default_hugepagsz @@ -4591,7 +4660,7 @@ static int __init hugepages_setup(char *s) if (!parsed_valid_hugepagesz) { pr_warn("HugeTLB: hugepages=%s does not follow a valid hugepagesz, ignoring\n", s); parsed_valid_hugepagesz = true; - return 1; + return -EINVAL; } /* @@ -4645,24 +4714,16 @@ static int __init hugepages_setup(char *s) } } - /* - * Global state is always initialized later in hugetlb_init. - * But we need to allocate gigantic hstates here early to still - * use the bootmem allocator. - */ - if (hugetlb_max_hstate && hstate_is_gigantic(parsed_hstate)) - hugetlb_hstate_alloc_pages(parsed_hstate); - last_mhp = mhp; - return 1; + return 0; invalid: pr_warn("HugeTLB: Invalid hugepages parameter %s\n", p); hugepages_clear_pages_in_node(); - return 1; + return -EINVAL; } -__setup("hugepages=", hugepages_setup); +hugetlb_early_param("hugepages", hugepages_setup); /* * hugepagesz command line processing @@ -4681,7 +4742,7 @@ static int __init hugepagesz_setup(char *s) if (!arch_hugetlb_valid_size(size)) { pr_err("HugeTLB: unsupported hugepagesz=%s\n", s); - return 1; + return -EINVAL; } h = size_to_hstate(size); @@ -4696,7 +4757,7 @@ static int __init hugepagesz_setup(char *s) if (!parsed_default_hugepagesz || h != &default_hstate || default_hstate.max_huge_pages) { pr_warn("HugeTLB: hugepagesz=%s specified twice, ignoring\n", s); - return 1; + return -EINVAL; } /* @@ -4706,14 +4767,14 @@ static int __init hugepagesz_setup(char *s) */ parsed_hstate = h; parsed_valid_hugepagesz = true; - return 1; + return 0; } hugetlb_add_hstate(ilog2(size) - PAGE_SHIFT); parsed_valid_hugepagesz = true; - return 1; + return 0; } -__setup("hugepagesz=", hugepagesz_setup); +hugetlb_early_param("hugepagesz", hugepagesz_setup); /* * default_hugepagesz command line input @@ -4727,14 +4788,14 @@ static int __init default_hugepagesz_setup(char *s) parsed_valid_hugepagesz = false; if (parsed_default_hugepagesz) { pr_err("HugeTLB: default_hugepagesz previously specified, ignoring %s\n", s); - return 1; + return -EINVAL; } size = (unsigned long)memparse(s, NULL); if (!arch_hugetlb_valid_size(size)) { pr_err("HugeTLB: unsupported default_hugepagesz=%s\n", s); - return 1; + return -EINVAL; } hugetlb_add_hstate(ilog2(size) - PAGE_SHIFT); @@ -4751,17 +4812,33 @@ static int __init default_hugepagesz_setup(char *s) */ if (default_hstate_max_huge_pages) { default_hstate.max_huge_pages = default_hstate_max_huge_pages; - for_each_online_node(i) - default_hstate.max_huge_pages_node[i] = - default_hugepages_in_node[i]; - if (hstate_is_gigantic(&default_hstate)) - hugetlb_hstate_alloc_pages(&default_hstate); + /* + * Since this is an early parameter, we can't check + * NUMA node state yet, so loop through MAX_NUMNODES. + */ + for (i = 0; i < MAX_NUMNODES; i++) { + if (default_hugepages_in_node[i] != 0) + default_hstate.max_huge_pages_node[i] = + default_hugepages_in_node[i]; + } default_hstate_max_huge_pages = 0; } - return 1; + return 0; +} +hugetlb_early_param("default_hugepagesz", default_hugepagesz_setup); + +void __init hugetlb_bootmem_alloc(void) +{ + struct hstate *h; + + hugetlb_parse_params(); + + for_each_hstate(h) { + if (hstate_is_gigantic(h)) + hugetlb_hstate_alloc_pages(h); + } } -__setup("default_hugepagesz=", default_hugepagesz_setup); static unsigned int allowed_mems_nr(struct hstate *h) { diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 7735972add01..5b484758f813 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -444,7 +444,11 @@ DEFINE_STATIC_KEY_FALSE(hugetlb_optimize_vmemmap_key); EXPORT_SYMBOL(hugetlb_optimize_vmemmap_key); static bool vmemmap_optimize_enabled = IS_ENABLED(CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON); -core_param(hugetlb_free_vmemmap, vmemmap_optimize_enabled, bool, 0); +static int __init hugetlb_vmemmap_optimize_param(char *buf) +{ + return kstrtobool(buf, &vmemmap_optimize_enabled); +} +early_param("hugetlb_free_vmemmap", hugetlb_vmemmap_optimize_param); static int __hugetlb_vmemmap_restore_folio(const struct hstate *h, struct folio *folio, unsigned long flags) diff --git a/mm/mm_init.c b/mm/mm_init.c index 2630cc30147e..d2dee53e95dd 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "internal.h" #include "slab.h" #include "shuffle.h" @@ -2641,6 +2642,8 @@ static void __init mem_init_print_info(void) */ void __init mm_core_init(void) { + hugetlb_bootmem_alloc(); + /* Initializations relying on SMP setup */ BUILD_BUG_ON(MAX_ZONELISTS > 2); build_all_zonelists(NULL); From patchwork Tue Feb 18 18:16:36 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: 13980407 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 D8DB3C021AF for ; Tue, 18 Feb 2025 18:17:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 191C6280176; Tue, 18 Feb 2025 13:17:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F4566B009D; Tue, 18 Feb 2025 13:17:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DEBDA28017E; Tue, 18 Feb 2025 13:17:22 -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 B8F3E280176 for ; Tue, 18 Feb 2025 13:17:22 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 3969A1203A4 for ; Tue, 18 Feb 2025 18:17:22 +0000 (UTC) X-FDA: 83133872724.04.531D708 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf10.hostedemail.com (Postfix) with ESMTP id 5BB73C0010 for ; Tue, 18 Feb 2025 18:17:20 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=EVofUuP2; spf=pass (imf10.hostedemail.com: domain of 3r860ZwQKCGQHXFNIQQING.EQONKPWZ-OOMXCEM.QTI@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3r860ZwQKCGQHXFNIQQING.EQONKPWZ-OOMXCEM.QTI@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=1739902640; 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=LI59bwMf14K7zqmv7lidvyJaJYBmHXGc9XaKmUDK00o=; b=QtgD0aeRsFH9Ih0AGRfoqvJzOUMvPVZZ1XhYd5gP+7QLGkHI2slisxoVWCl38qKa6LkLSy nT9k1ZjhJPKu8X9u1cE8mZaFjDRwq9W0qQt1Mwf86HEbBdNtGTCqebcb0WnXGoUZcwUXCK Hum8rWqk5+ZNEBQmJ2C2yNKF2cWlo1M= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902640; a=rsa-sha256; cv=none; b=ZHvID+hOb+zOISkMzrNrxNQenqnL+0xt7BDgRUyBkFzfbsSHXJc/8Ermn4yGrYdUwfNH/u T1BS6+LV7pubmYdcCRQrt1QznAsy4edwcBso9w19V0YSFEIihDz1ezHs7MOr1vW0bTAq7U KgStnioX/V7d0N939aWTtmz2qM2p/2Y= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=EVofUuP2; spf=pass (imf10.hostedemail.com: domain of 3r860ZwQKCGQHXFNIQQING.EQONKPWZ-OOMXCEM.QTI@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3r860ZwQKCGQHXFNIQQING.EQONKPWZ-OOMXCEM.QTI@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-220ec5c16e9so93241505ad.1 for ; Tue, 18 Feb 2025 10:17:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902639; x=1740507439; 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=LI59bwMf14K7zqmv7lidvyJaJYBmHXGc9XaKmUDK00o=; b=EVofUuP2ZzBtzZDy+LNWY7gYrr4/hCT8qN8QWBRVO1BhVoPr46/J6aZqNItCNrjZKE lyESeh+EK5QjV5UNOEs4m91EsyVrtOEaa74I3d6FBKcS9Lbbnxyt6qk4m0VcWKcBkKO1 BWK/8CTsdisjJ61APb6l3djX72wNvcvbnBKcVAmZhzsnEabrVD+aJX84CGBTXVhQWG7B cjoZAdlRUeXyT9o4Maod8Q3m12g0PCQEp26EjAvR9GlrRqowwj5kZ9TFf/qu61n8qYwQ O9P1rNwtqrsOXCEo8970ivT7P8jHEvLz5tKL7Dab0NKDxCuJGQ0jQMkARx04b9q5Bdwm T1vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902639; x=1740507439; 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=LI59bwMf14K7zqmv7lidvyJaJYBmHXGc9XaKmUDK00o=; b=VxfCwyX4X8mDIUW41m1HH8cXumeyUOEkFt5vw4NviWOHI5d9pHs6EMC07TyUgXbBBD BDtEySSqAhWcLE4Hs+lJLFSD9OBmNoLGrqo/7FWoxa1q0Z001xwrgQY+mDanLl0iZyRm K/TLg/fYxLqKC15qyavIBVrM//b3mXzxoT0xi52gly8+HXnZDaMtgDw76Oc5wxtqcbEm fkU+ET9crSqnYeG0g1RpeB2E1ftOwZ9grDApCCjhqs7r2hbibgwixAiznKHzIxJReScy tO9IZUy35VSL01yo6EkK62hvhy7Wd0cPq6cxlGLUjM6+RrRSsia7PwiMignxoRbH1lqa KNCg== X-Forwarded-Encrypted: i=1; AJvYcCUR6bb6qLfceMQdIF/eN4GWVFoeyJDlOv3h+SH6rAhR5XqK5Cnbal65K8c9xSwD9Kv8f6Lnt01gKA==@kvack.org X-Gm-Message-State: AOJu0YzjGokMSK0vwMboKTRwGXYuEqqd5t6lkAefg2DL7A/kMC3LsgLt MUuaFMXVeZ2wyPFFDG7jJIaiGvoXNihhYy+KKe3n0Xl4WUmy3Bd3H0PahqPI532r2O/QZQ== X-Google-Smtp-Source: AGHT+IG9foWIdjzRTrMdjif1U8LT9wkYyvNc0HI0vWqalqwP0zFxC1Vsnt6pOAwRi/AdmSVzfgrNzojU X-Received: from pfbcb13.prod.google.com ([2002:a05:6a00:430d:b0:730:8636:67d7]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1a89:b0:725:cfa3:bc6b with SMTP id d2e1a72fcca58-732617757c7mr27894680b3a.3.1739902639374; Tue, 18 Feb 2025 10:17:19 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:36 +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-9-fvdl@google.com> Subject: [PATCH v4 08/27] x86/mm: make register_page_bootmem_memmap handle PTE mappings 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 , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Dan Carpenter X-Rspam-User: X-Rspamd-Queue-Id: 5BB73C0010 X-Rspamd-Server: rspam07 X-Stat-Signature: xbmiiab8txoejcqq1txi4ydswpm46hgn X-HE-Tag: 1739902640-690013 X-HE-Meta: U2FsdGVkX18+kGCOrKAF85+6aKOZsN69MIPPU5VOjDO5cmodqFYtCZlNavIhAUs4dUcYc6u/QlP8TGWHvPtYJL81BaqOUQH7uJucns5BsoRCljUixZH4Ibho7hrYgSfet+P9qfj7YJSrxA3DiBhsVdqfWWKXfbJ5l5YXpDPBD/PpeDHReMHjjRBTrC3TnQOCz/A4UkE659h7buLuPMPY/NwNK6EkmducZYJItCPilbmrMZZMUtSgy5IJIvUUC8f6ohwEly5Wm3Xuy7zysj21e7W7AqkUrSOKk4h5/oLg7/tNOVJWbAsQrHkM8qq3rSNCc+VIMJGhCJ4KgzX4RPF6j+7Vu7KGuvUQV+Gk2gXMfSaQu8opK9olFHndzJkj3XYbtj/wm2x8bXmRJ/H6dWT/ccSCAjMmvfXiFpp8F9ZrlXBHz8dcN9Sa3Df38EbbKG0eQ3f+MZ2MWL0YmorlU1DOuu7m32vAfsg4UyhGE8Ue1GPBAVMuVzN7lR2/jRdnuMai5jHsiNPaz4lxqHlWu3MucziDlierY0H5p/fOAPWC41tH+CVGfHz2tpLBMF8sQDWBtBtIRaxuO4Sxjo45pfJjcxYbZ9ZPAXqH29jQu4Vkwougd+LTDb03hy7m5LJsX+MHgoWLsiSF+opzvxHABagQUHgjPMr1WhKG43Kuv5AV2XjdUkSv7Rz0ElmIhkAeRfqVjaZhbcJFLAd6U2VH6uyrvZ/Nnf8ASQf7rNCbrgA6mcIOQcxSCWle9JeZdoemL/aflcnbG90/YcW99TRZL/CyBPrSV0LZ5a0zlkrc2zSQEBD9wDXag+ufWjtY0oJ4W0EAFH8Jjx+rU4+Yf6bevprMCNNxMGgAXmWIT0Y7pLJs97ewNi8fKleXWX7twfO05zD5t7Bzk63SsU1j05XMpHwnV1JIzN5KkRZ30Kv6Lel51xhqNckFgI3wLUyD13kWqIOVtjJrB95BPNalIoGZdZy w08XNoDX YyXZlqqqWeuDU2PQXo6Fp/ATPWg7xgp/SjgghmT8kXC7+A5A993uF6prlW/mT0afrW8H8BrU9mi+Qg+MoEKpYn/Zo6evrtA5gAB4HsP4fue4G7655kRJoXOUqSB2bNJKxdMk5tsP7CZvC9GyVD3UMeuMyBil34GhGBSKrYoAEjzshp5uMdhTqydROsZbPxadeRFtV+UozrXsKZbV+n3/dZoVg2du5Wx/Xp90cujPGhgQcgnrZzA6YHUAAM9ebFsz76v1LIJE9WU51kYb3zCfKqel9TJmLmuBRdMIVOoNaqTkSbu1gjkTObXglcmhRD603Q3EACRorpUdTmKcdysSByRaJP9ONBQegUBobumQ0lGJ4cQ7xFy90ZbZOT9mXzKEeBZXZGeaZjA0SUgw4n2Z7ATFbsL2OjjRrGZQ2NJRm6cPVoIQTl6tuqETPZAug53DkxGsDdGbaue0PzznfcPMc6/2c5yAYVCy1NE2BlacRgsR93dEqkIYqpGVvfN/kF9BAcUf9bgm0FsVEctNAsfibIi+u/42SS3exIWIceH4ZJgcqK6jdgJLKnrQ2r2U+LtgSFBxDhOl/cdsH2Z2bDm0l39D4f0r8Pc/RbGwMewGc2cMvMaMjc2XyOusYh6j0Tt6T2tdNuptljDtDjTLZadMXDjD9Dlf6fzWEfVvokjcS0a9YS3pzso0h7pBcckOlRGeLYEuw0lVvz2LwGyJDM5Vc3CP1CDo84JEBlwAZhxMwc9qHX/A= 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: register_page_bootmem_memmap expects that vmemmap pages handed to it are PMD-mapped, and that the number of pages to call get_page_bootmem on is PMD-aligned. This is currently a correct assumption, but will no longer be true once pre-HVO of hugetlb pages is implemented. Make it handle PTE-mapped vmemmap pages and a nr_pages argument that is not necessarily PAGES_PER_SECTION. Cc: Dave Hansen Cc: Andy Lutomirski Cc: Peter Zijlstra Cc: Dan Carpenter Signed-off-by: Frank van der Linden --- arch/x86/mm/init_64.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 01ea7c6df303..6e8e4ef5312a 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1599,11 +1599,14 @@ void register_page_bootmem_memmap(unsigned long section_nr, } get_page_bootmem(section_nr, pud_page(*pud), MIX_SECTION_INFO); - if (!boot_cpu_has(X86_FEATURE_PSE)) { + pmd = pmd_offset(pud, addr); + if (pmd_none(*pmd)) { + next = (addr + PAGE_SIZE) & PAGE_MASK; + continue; + } + + if (!boot_cpu_has(X86_FEATURE_PSE) || !pmd_leaf(*pmd)) { next = (addr + PAGE_SIZE) & PAGE_MASK; - pmd = pmd_offset(pud, addr); - if (pmd_none(*pmd)) - continue; get_page_bootmem(section_nr, pmd_page(*pmd), MIX_SECTION_INFO); @@ -1614,12 +1617,7 @@ void register_page_bootmem_memmap(unsigned long section_nr, SECTION_INFO); } else { next = pmd_addr_end(addr, end); - - pmd = pmd_offset(pud, addr); - if (pmd_none(*pmd)) - continue; - - nr_pmd_pages = 1 << get_order(PMD_SIZE); + nr_pmd_pages = (next - addr) >> PAGE_SHIFT; page = pmd_page(*pmd); while (nr_pmd_pages--) get_page_bootmem(section_nr, page++, From patchwork Tue Feb 18 18:16:37 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: 13980408 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 7BB68C021AD for ; Tue, 18 Feb 2025 18:17:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C6A766B00B0; Tue, 18 Feb 2025 13:17:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BA98628017F; Tue, 18 Feb 2025 13:17:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9CDAE28017E; Tue, 18 Feb 2025 13:17:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 714026B00AD for ; Tue, 18 Feb 2025 13:17:24 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 273BD1A0450 for ; Tue, 18 Feb 2025 18:17:24 +0000 (UTC) X-FDA: 83133872808.02.943A867 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by imf18.hostedemail.com (Postfix) with ESMTP id 3B9B11C0010 for ; Tue, 18 Feb 2025 18:17:21 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=hmviwMEJ; spf=pass (imf18.hostedemail.com: domain of 3sM60ZwQKCGUIYGOJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--fvdl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3sM60ZwQKCGUIYGOJRRJOH.FRPOLQXa-PPNYDFN.RUJ@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=1739902642; 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=Q0IhpG73Mu/sy6kJxwk08UujlGc0BKXNAJxBD1Va+9I=; b=IK9+kc+iInCMqiP9wSV6/r2yEgp0NRKnQoxRQUKSNwtWej+SQ06vq0ozePr96LfRKv9Bir Ulbp+ZmZsZqg5By4yC7lfqKTFKoSL//cKzb/TvKPUNN0ipnZu1NGJ30i7UZx2/OUTYnDX1 lst9CH9Daqg0RoYa96iQCYauGW5DXMs= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=hmviwMEJ; spf=pass (imf18.hostedemail.com: domain of 3sM60ZwQKCGUIYGOJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--fvdl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3sM60ZwQKCGUIYGOJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902642; a=rsa-sha256; cv=none; b=4NtNmP046XHEsBt4fkvVA/lqhX5+yHuOhrx4rX361cWtAIQbMm5grzwvp+/JXXUV4z+tQ3 oHS6JnlzB8aXClhhHF/X30Q3sVvnWr+tqv1V9XSqZsRYwFZOrHHvl8WTnP9ufMGWlF6iVZ 7TLtrM0Kclph9QW3jD7SB6U9aRhg+eI= Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2fc2e648da3so8582897a91.3 for ; Tue, 18 Feb 2025 10:17:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902641; x=1740507441; 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=Q0IhpG73Mu/sy6kJxwk08UujlGc0BKXNAJxBD1Va+9I=; b=hmviwMEJaNjx2+fhERtQgQNyCN5JvOSBlNt/sYgeShXDLxQhguLwuk74F6WGYIafcw EcrnwCWQucIrpIIXSiNvUyAcvWrPlHITRSsoeuBlzi3COEY3keYc0sljWYfYlpAPKRnu 6DzlwgkuyVhUkxqaMPhViIN7+NavhknYR9rJ0dHHLmF7A0D/a69FyjgNFFuMUs4bfuRB UqkNbvxp0zDmZ2GxZeqmsPscCdvbk5uA3bhEFwKN98mSW1Hrr+6Xm39df3c7pOLfQJQo gKo4sf75T5pi2OJErtXhG7QJmtQB9JI0Z/g3wj3bk38DNd21k1pfDIgHWkN8vzqfxAfl 446w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902641; x=1740507441; 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=Q0IhpG73Mu/sy6kJxwk08UujlGc0BKXNAJxBD1Va+9I=; b=HlIIpDkbQn1njP8XFxn1yM3FjwDlYlQYD9bEEW+VQ8Kw7Ru89pxgznva8vOkRTiHth PFSsIcME1w9+H7pTIiw150uGozGVqm6O4TBF7F8K6Me2GFSSIYqzj5JZdYw0b8+uEnLT LCwZJuBplL05ExIx8e13DCyGU+OnoLP9eJRbENPpMGKPBM/JBoTC5vzPyxTSTvMkXef8 z2xdIjf9rtHRM92Qcqo5jfjhjMHMiTHLEoYsDv9ebVSH8P0vd85qaHB8Yycrr5GchHT2 +8nxdMFvBa9sSD/qwPMtG5T+WLWsFVkaPmn2W4x448e35ZDqVREBI3+mSw6MLdn2aExl 7a2A== X-Forwarded-Encrypted: i=1; AJvYcCU+4UJQKMwwqzev3MWvR6tXa7osaUjdVuwM9gbuk5p+MH3zcBIsWUn6DVwbmz/G4PleNvfx/h8Wvw==@kvack.org X-Gm-Message-State: AOJu0YxvU775Cl3LdTiAZaw9pxQCMhFNfHPrVdoKqAS0tOf6r5neN97Y r2cSonWJuX2n/hUQDo9FpMiNv4g8FaGSx8OKMcTpAlAGfLDv5UzpvYu26Py8f5TK+QNEDw== X-Google-Smtp-Source: AGHT+IHIdBPoxWjU9UROtCoNBXFA8FwC/QXY/IFjY0j7H4jQuSn/Y/LKSiDgq3UeDUo+hwamke9lbkTW X-Received: from pfan14.prod.google.com ([2002:aa7:8a4e:0:b0:730:7648:7a74]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:138b:b0:728:e2cc:bfd6 with SMTP id d2e1a72fcca58-7329df01493mr426974b3a.18.1739902640911; Tue, 18 Feb 2025 10:17:20 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:37 +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-10-fvdl@google.com> Subject: [PATCH v4 09/27] mm/bootmem_info: export register_page_bootmem_memmap 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-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 3B9B11C0010 X-Stat-Signature: 7smd3dobdyqasbtp3hwj1nns93n1y6ui X-HE-Tag: 1739902641-486452 X-HE-Meta: U2FsdGVkX18ISxvacAdB469WdEndNa/oETE7QB19dgsJ/pu3sZ1fwrSQh69GqMS8Ir1kchtc6LoVh/sGDQ6VuGXTi9TS0jubOudBNNnPSMoKI/WhL4ezwHMr3kepUFZkzRHc9s5DTPmNR9TB0D2bHjq8nW0EupCsN6H7/sF/kElzIU68eNVJgA2TcmxmWCuxowZc9v3RmXUVS7vJfKrgxEvk04xV5F7uDfa+G+UldXiss1NlsnzEtRCyu9m7SSkrqRinAR2iaFMPO7h+xX1O4hn4l9mLLPHDLzOfZJRwL9oGdeRPRwk0Kf3s2pRXA2mkzaqBonHMn7oRRPB9QO1nVGe8uyLqCFLN03POqBkXwc5HF9tYbznNg8xuPn7T05Dk/dHtEd00HzFWg2ReE5vvIi1XdXmtD4Z45qoLZZ5TvxT1cOMlhzGBKaegEytwB6j0i7S911Y5wE1opyMFg+j4bVE9NTFDRHQ4oSuuNkQd7nyivVj4caNK5PpgcpMVmnKFUCilNkoHQ+ZQkNejl29FZnbsZmkdfViSn6F/4YlKooAfvc/kf+uXJnQDWoi0FckOIFrFrg1fqHst1WFFwvXWucOu//YiAG45DKU5JqHwg6TB5EAho1GR/21iQk8m+U/QGfrtRTnyJug8ACxZachARVPPsmBAn7/jrOs7NERhImKnN7Dz5FQeZ0QJWgkgH48g2YalrEpinTsMmaNX+rNUtoak/YN/uo89h57KfvbvhTzzwreCGnwwDjh1hw3Fy4Rw6cJzMRCCnSrDVL5LIDygqrE8WHGnYBGFj71ftb2G35KFv0z6N2R7bVliIyO6E+6ps0k6libfkYM8fZgF7VrjH/7+L1O0ZZcovuRGGXV1yQeXPFTXDZ0dNw9HcGbwVqe3rVg4rDIdRwrdQW6wm2E1087LsXtFo7jYvI9qW9BUeqD2ec7ad9TsrTa7MlV+yKaaX9XzUmBxzsbHuMYSvZ/ 0cVD6o6Y 1hX60rNc6wM0pt0Tds4SLnM+RXvnWyc72rf5M1HsYhR3Xuxb3JmdlwdRt6STQrmAjXXsoPeVFPQDnaEg1t86QdKCuFhCm855CS3VAiY7lRH/SgO2WXYqpT8PwOX/QfzpR1Lym48bNhLursbSGrD1JWGGYP3aBTgSs6Bipoowm/hp8VzN9vXLH0EktSLw2otMYRXBwwekXFKgDrEoGw/12sXIN5IGeCDtbU/tmjQEGrNLumGQ+RwyT8SLGKLjqbgRpAPWnahx4e0Lz4Ru+FTomL4jnxTta5D7ZndLAFE91mYRgcgriRRkLPCZK/O92RbbFTwBn2zCVm+ATkHCCGhk8kaFBjBijm8Dk3osPmpVkWL+KP8hS23CVoc8FeLx5FWT5HtM6jOLv0R4+ArjUY6I5kojDfxYdp+qG2544LDsdGDWZXGL2qySTfkl2rmSnU5Xn/xtvANge1OUvCPfPebiPPMsv31GjmTI77VIeuJhjIxVNWoTVfZQW9tEaaD+GTcRvf8QbyKNlMPvcz9wIdTgih+auTFFZd56NBlfWXITzu3uNh+03s+yBWzT+76yunxZxW016 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000226, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: If other mm code wants to use this function for early memmap inialization (on the platforms that have it), it should be made available properly, not just unconditionally in mm.h Make this function available for such cases. Signed-off-by: Frank van der Linden --- arch/powerpc/mm/init_64.c | 4 ++++ include/linux/bootmem_info.h | 7 +++++++ include/linux/mm.h | 3 --- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index d96bbc001e73..b6f3ae03ca9e 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -386,10 +387,13 @@ void __ref vmemmap_free(unsigned long start, unsigned long end, } #endif + +#ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE void register_page_bootmem_memmap(unsigned long section_nr, struct page *start_page, unsigned long size) { } +#endif /* CONFIG_HAVE_BOOTMEM_INFO_NODE */ #endif /* CONFIG_SPARSEMEM_VMEMMAP */ diff --git a/include/linux/bootmem_info.h b/include/linux/bootmem_info.h index d8a8d245824a..4c506e76a808 100644 --- a/include/linux/bootmem_info.h +++ b/include/linux/bootmem_info.h @@ -18,6 +18,8 @@ enum bootmem_type { #ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE void __init register_page_bootmem_info_node(struct pglist_data *pgdat); +void register_page_bootmem_memmap(unsigned long section_nr, struct page *map, + unsigned long nr_pages); void get_page_bootmem(unsigned long info, struct page *page, enum bootmem_type type); @@ -58,6 +60,11 @@ static inline void register_page_bootmem_info_node(struct pglist_data *pgdat) { } +static inline void register_page_bootmem_memmap(unsigned long section_nr, + struct page *map, unsigned long nr_pages) +{ +} + static inline void put_page_bootmem(struct page *page) { } diff --git a/include/linux/mm.h b/include/linux/mm.h index 7b1068ddcbb7..6dfc41b461af 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3918,9 +3918,6 @@ static inline bool vmemmap_can_optimize(struct vmem_altmap *altmap, } #endif -void register_page_bootmem_memmap(unsigned long section_nr, struct page *map, - unsigned long nr_pages); - enum mf_flags { MF_COUNT_INCREASED = 1 << 0, MF_ACTION_REQUIRED = 1 << 1, From patchwork Tue Feb 18 18:16:38 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: 13980409 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 14264C021AA for ; Tue, 18 Feb 2025 18:17:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 34BF928017E; Tue, 18 Feb 2025 13:17:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0CC8D6B00CB; Tue, 18 Feb 2025 13:17:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E3B5128017E; Tue, 18 Feb 2025 13:17:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id BFDA06B00C9 for ; Tue, 18 Feb 2025 13:17:25 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 76E691201B7 for ; Tue, 18 Feb 2025 18:17:25 +0000 (UTC) X-FDA: 83133872850.07.1B552EA Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf04.hostedemail.com (Postfix) with ESMTP id 98F8E4000C for ; Tue, 18 Feb 2025 18:17:23 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=JXAF3nYg; spf=pass (imf04.hostedemail.com: domain of 3ss60ZwQKCGcKaIQLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3ss60ZwQKCGcKaIQLTTLQJ.HTRQNSZc-RRPaFHP.TWL@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=1739902643; 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=QHuPJqfQqZyD3xPuHYnDsZ7VFtOe3jnvWOipytOApzk=; b=FOgctML0Znt01b1X3iKqjRZRPxiCDRq3pKqALEKJ7O2CmKQfUTcGVdbP8sJ79ePCF8IfNB 0YjCyxbVUhhnGiZQzpFpZSHAz3jQVHVa/t/QnHx9hvAm2j6rAp0I67i1HGD/OlxA4ndaZ9 mBJOLmzDExuhmJKhBgE8GXfRnetFftc= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=JXAF3nYg; spf=pass (imf04.hostedemail.com: domain of 3ss60ZwQKCGcKaIQLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3ss60ZwQKCGcKaIQLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902643; a=rsa-sha256; cv=none; b=L5ZQkU4lpl9C5neLGYkDQLl5mOqxtzjthRyA8dX3/GG+lzp2HEF2+b8/TbbCnfgl9UOH9N HE4G6cVylbQix1qCgnVjLp9Vqz1v24903b1UfcKN6z78EgXZ+dYLhNXRWPHYBiQypy6jJb 5ih6u+VxHEnV1/OwFWmp6Lp60a96OaM= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-221063a808dso62884705ad.1 for ; Tue, 18 Feb 2025 10:17:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902642; x=1740507442; 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=QHuPJqfQqZyD3xPuHYnDsZ7VFtOe3jnvWOipytOApzk=; b=JXAF3nYgMp/0e9rV5dFDLoMxT4DOscfW4RRowdITzS64wFgIx684H9qnQH9czbHTJB Q0/n321soXGW2EkhALduPmD0YJ8/HXzlFMkHmIDWdMm0XspMRBqrz1yI3RN8yTPqwTa2 GlbbwEFt9BZQP4OO9g8YW2yKyysMxOZKB4lUwGkRbi3ikUKycyKJk+nuGWfE6+4h2aDj rMV9e3a2E0SLMoPlo66s5Hl/eR0heuI095spYh2wVDTez7Ml6AMV4QH/zjG0q0UDbv0E tPNG9Foj9z8uijh3TjsGXnGGZNznUV+4EINoytrekm9OJLKLrSsEeR4IBy7TwGRlwnfA KDyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902642; x=1740507442; 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=QHuPJqfQqZyD3xPuHYnDsZ7VFtOe3jnvWOipytOApzk=; b=sQNr9WvE1vXGqckOOAr8AFkRy8GS8/OzjydaDME9jWaHhdDO4SARdAVMiZpv/3q5Fb kGy+MP52SNyMp0t0GIFkA+8yP33pWtCzC7gw1swD8PC/Y8erWGLAYwFC4YSqQSNktVVm pIlQ16vSzt0UgCJOjvAk/du64wadaqoW9uI/ja6Bg7V9UGbhcunwGcIRT78YkISDxj3S X33NfvOjWNbQO9hWMT/OnYWr8Ht5YOcxOSk3JxWe7ifPLT6haxGfQWtM5qw0ZgwkU5Pf d8EmpYfy88/n2GgwFr9E9D+/9HykwVWchzTPxVGFf3VAaUkXcGw+iDlazq+QsyTVaY1+ c7RA== X-Forwarded-Encrypted: i=1; AJvYcCXr8YpyGH6SLFSHuOBm5AUPlHz5T/Yx7RfyP81Z1awJER+1fFMbGvGG3lwI6ZcgGp29VsH8BiEGFw==@kvack.org X-Gm-Message-State: AOJu0Yy+0G1UxzJZEKlYJVzGOYm1lSH8VebDlyjd7vwTr/fM+a+Rnu18 SjaPi8ihzjIUHSE5Z90twqwZlsKlIjoaSrLFUJ5cuWnrwO3mvDWvAuyr8KP7SkCBa4Eh9w== X-Google-Smtp-Source: AGHT+IF/tqrjIncWta5fdpCjLPTmY2z8K3edM8w7NT9CYkwW5Spjl+Yw51aD9LiAbauV0zFCuvILnlVC X-Received: from pfaq11.prod.google.com ([2002:a05:6a00:a88b:b0:730:9a11:69a3]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:880c:b0:1ee:b583:1b44 with SMTP id adf61e73a8af0-1eeb5831c62mr11114718637.4.1739902642566; Tue, 18 Feb 2025 10:17:22 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:38 +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-11-fvdl@google.com> Subject: [PATCH v4 10/27] mm/sparse: allow for alternate vmemmap section init at boot 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: rspam04 X-Rspamd-Queue-Id: 98F8E4000C X-Stat-Signature: 8jdzkpcz4aayf3coaayz9qk4mgekxycp X-Rspam-User: X-HE-Tag: 1739902643-877371 X-HE-Meta: U2FsdGVkX1/QdZ369u05j+Ec3xxYlUQp5/1M5TfOekivT7wMMdnQERoidmFKIwtODJjFnkgnEAP/WaDXF0tDo66OgZm751z/hEwQ562Q85kPimDNt23VNujhcuHbkMh/q74FZEhAehakLcWEju8XhY3HUXUTmcwVXubQTOe0rCi7UplhkdtaMdF2dIQX8CxQ08hAvm4wj6t3IaJf8dVdfqboxkaE3dO9yOHCGiw+ciAjJpBlwJMrqAoJkoorYJ45aoA2gtQebqnWUe7KgaA+TUzjhcMb/ZNWBE5dlkauqDQtVT9VrGeCuES9a/ScObeC8lz1S5JV+amqjwo5DkHa7tyvP7pwjNU/pzl59/JsuqaoXF7EfCg7nh9bGmLP3r16uZiTT3WMW0azecVbHhkVPhXGVXlRtNcxeV/Nw4UmNMIL4Bjw5aRKu1NE2M/zUxix4SnUX9JqyarCGE9soP81dpld2FWLoJ4tPd/zP9QGvU8REeFTLeEbKnctUcCuxyCKJNtcnnlNopOZOen7kN+y7NyjMdsbiuZ3yHhwdaP3b2yAcPnPJUkb2LTIsyB5tTYGa7zYUW0XKy8X+7zTfyZB5cHTbb1Foh1f9I4vwkafro8XZd4mdA4EqOMZLwRJYbiHf+pAHyt4BWEZeX4tJelgRUdOve1pVIL6hC4TMd3d4nRVD93FD/mGjB7KxaU+ua5H4ygyGHSO7yoGhdNkDSVyXUkwX79rEMY9xiQPyoq2/YCq5yXo4CrjaCUAgeDZCMruJHHWePBlJMWGEQo9ZqZzMQUahoz52H3gaJTawfgA054G/weMn7ng/A1jsvFPhFTzUOPCxoFV8ToK72jIL0w+coIZAxd1BGvNJKBfI03fi9oudzaFNQdNWOjYmYVa2vp1qSLZxLiqJWx6DIfhhPXo8YfWab5Jz6fONnjnPdTBT85o2a3Rs0TgX/YbsUW6wGqAGlu/JDlGYTznBehxl7b XdL3CMdb JAhtl+BPGNwY0RcEcISpKtGF80KULRhPWCOQAe05U7kj8z4RSamXfMhtqK3fm7guR/3EYopnwDj2DmDovCis2PNzD2Uyy1ajN6nGhGHFqneXo7zNw8HWLqCp+lb5MssJJzVoGZ4x/X5RaDYsAd85n2DpabagS3YVpLsUCU1xGYvm+fUcmtG81jrCa4iZf4mGxEGieFXbm3npGyNZXQuuiorfnG6bH1Ehbp3XQhyMCQom0FqyCtYfZ9Nn3vAmZ2476EoP5H4x4Q7kBRiLndZmOVFe/QO/ucc/3sCRRIjeVUPOo27XA2wEyDB80vWBNlxu4+pKiibuMU7xOOO4mQ1R2RJ8g/EntEJEm9GWrGZiXL/FNPfG/ds46GD2Z+Ntf8PomIolKZrGbMJsXWjirTHBy/OMua9yZaiZNRVLOegY2hAtmr5n9+LZPR28hHSbUoHTN9TKDqvb1pqMl3ExsLSpyElI1LFj8nFr3gfDHs/ULMXUETzimnwIul31joelI//BHIsc6jpB+1HHdnNiDYU76fwS+8w== 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: Add functions that are called just before the per-section memmap is initialized and just before the memmap page structures are initialized. They are called sparse_vmemmap_init_nid_early and sparse_vmemmap_init_nid_late, respectively. This allows for mm subsystems to add calls to initialize memmap and page structures in a specific way, if using SPARSEMEM_VMEMMAP. Specifically, hugetlb can pre-HVO bootmem allocated pages that way, so that no time and resources are wasted on allocating vmemmap pages, only to free them later (and possibly unnecessarily running the system out of memory in the process). Refactor some code and export a few convenience functions for external use. In sparse_init_nid, skip any sections that are already initialized, e.g. they have been initialized by sparse_vmemmap_init_nid_early already. The hugetlb code to use these functions will be added in a later commit. Export section_map_size, as any alternate memmap init code will want to use it. THe config option to enable this is SPARSEMEM_VMEMMAP_PREINIT, which is dependent on and architecture-specific option, ARCH_WANT_SPARSEMEM_VMEMMAP_PREINIT. This is done because a section flag is used, and the number of flags available is architecture-dependent (see mmzone.h). Architecures can decide if there is room for the flag and enable the option. Fortunately, as of right now, all sparse vmemmap using architectures do have room. Signed-off-by: Frank van der Linden --- include/linux/mm.h | 1 + include/linux/mmzone.h | 35 +++++++++++++++++ mm/Kconfig | 8 ++++ mm/bootmem_info.c | 4 +- mm/mm_init.c | 3 ++ mm/sparse-vmemmap.c | 23 +++++++++++ mm/sparse.c | 87 ++++++++++++++++++++++++++++++++---------- 7 files changed, 139 insertions(+), 22 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 6dfc41b461af..df83653ed6e3 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3828,6 +3828,7 @@ static inline void print_vma_addr(char *prefix, unsigned long rip) #endif void *sparse_buffer_alloc(unsigned long size); +unsigned long section_map_size(void); struct page * __populate_section_memmap(unsigned long pfn, unsigned long nr_pages, int nid, struct vmem_altmap *altmap, struct dev_pagemap *pgmap); diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 9540b41894da..44ecb2f90db4 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1933,6 +1933,9 @@ enum { SECTION_IS_EARLY_BIT, #ifdef CONFIG_ZONE_DEVICE SECTION_TAINT_ZONE_DEVICE_BIT, +#endif +#ifdef CONFIG_SPARSEMEM_VMEMMAP_PREINIT + SECTION_IS_VMEMMAP_PREINIT_BIT, #endif SECTION_MAP_LAST_BIT, }; @@ -1944,6 +1947,9 @@ enum { #ifdef CONFIG_ZONE_DEVICE #define SECTION_TAINT_ZONE_DEVICE BIT(SECTION_TAINT_ZONE_DEVICE_BIT) #endif +#ifdef CONFIG_SPARSEMEM_VMEMMAP_PREINIT +#define SECTION_IS_VMEMMAP_PREINIT BIT(SECTION_IS_VMEMMAP_PREINIT_BIT) +#endif #define SECTION_MAP_MASK (~(BIT(SECTION_MAP_LAST_BIT) - 1)) #define SECTION_NID_SHIFT SECTION_MAP_LAST_BIT @@ -1998,6 +2004,30 @@ static inline int online_device_section(struct mem_section *section) } #endif +#ifdef CONFIG_SPARSEMEM_VMEMMAP_PREINIT +static inline int preinited_vmemmap_section(struct mem_section *section) +{ + return (section && + (section->section_mem_map & SECTION_IS_VMEMMAP_PREINIT)); +} + +void sparse_vmemmap_init_nid_early(int nid); +void sparse_vmemmap_init_nid_late(int nid); + +#else +static inline int preinited_vmemmap_section(struct mem_section *section) +{ + return 0; +} +static inline void sparse_vmemmap_init_nid_early(int nid) +{ +} + +static inline void sparse_vmemmap_init_nid_late(int nid) +{ +} +#endif + static inline int online_section_nr(unsigned long nr) { return online_section(__nr_to_section(nr)); @@ -2035,6 +2065,9 @@ static inline int pfn_section_valid(struct mem_section *ms, unsigned long pfn) } #endif +void sparse_init_early_section(int nid, struct page *map, unsigned long pnum, + unsigned long flags); + #ifndef CONFIG_HAVE_ARCH_PFN_VALID /** * pfn_valid - check if there is a valid memory map entry for a PFN @@ -2116,6 +2149,8 @@ void sparse_init(void); #else #define sparse_init() do {} while (0) #define sparse_index_init(_sec, _nid) do {} while (0) +#define sparse_vmemmap_init_nid_early(_nid, _use) do {} while (0) +#define sparse_vmemmap_init_nid_late(_nid) do {} while (0) #define pfn_in_present_section pfn_valid #define subsection_map_init(_pfn, _nr_pages) do {} while (0) #endif /* CONFIG_SPARSEMEM */ diff --git a/mm/Kconfig b/mm/Kconfig index 1b501db06417..f984dd928ce7 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -489,6 +489,14 @@ config SPARSEMEM_VMEMMAP SPARSEMEM_VMEMMAP uses a virtually mapped memmap to optimise pfn_to_page and page_to_pfn operations. This is the most efficient option when sufficient kernel resources are available. + +config ARCH_WANT_SPARSEMEM_VMEMMAP_PREINIT + bool + +config SPARSEMEM_VMEMMAP_PREINIT + bool "Early init of sparse memory virtual memmap" + depends on SPARSEMEM_VMEMMAP && ARCH_WANT_SPARSEMEM_VMEMMAP_PREINIT + default y # # Select this config option from the architecture Kconfig, if it is preferred # to enable the feature of HugeTLB/dev_dax vmemmap optimization. diff --git a/mm/bootmem_info.c b/mm/bootmem_info.c index 95f288169a38..b0e2a9fa641f 100644 --- a/mm/bootmem_info.c +++ b/mm/bootmem_info.c @@ -88,7 +88,9 @@ static void __init register_page_bootmem_info_section(unsigned long start_pfn) memmap = sparse_decode_mem_map(ms->section_mem_map, section_nr); - register_page_bootmem_memmap(section_nr, memmap, PAGES_PER_SECTION); + if (!preinited_vmemmap_section(ms)) + register_page_bootmem_memmap(section_nr, memmap, + PAGES_PER_SECTION); usage = ms->usage; page = virt_to_page(usage); diff --git a/mm/mm_init.c b/mm/mm_init.c index d2dee53e95dd..9f1e41c3dde6 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1862,6 +1862,9 @@ void __init free_area_init(unsigned long *max_zone_pfn) } } + for_each_node_state(nid, N_MEMORY) + sparse_vmemmap_init_nid_late(nid); + calc_nr_kernel_pages(); memmap_init(); diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 3287ebadd167..8751c46c35e4 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -470,3 +470,26 @@ struct page * __meminit __populate_section_memmap(unsigned long pfn, return pfn_to_page(pfn); } + +#ifdef CONFIG_SPARSEMEM_VMEMMAP_PREINIT +/* + * This is called just before initializing sections for a NUMA node. + * Any special initialization that needs to be done before the + * generic initialization can be done from here. Sections that + * are initialized in hooks called from here will be skipped by + * the generic initialization. + */ +void __init sparse_vmemmap_init_nid_early(int nid) +{ +} + +/* + * This is called just before the initialization of page structures + * through memmap_init. Zones are now initialized, so any work that + * needs to be done that needs zone information can be done from + * here. + */ +void __init sparse_vmemmap_init_nid_late(int nid) +{ +} +#endif diff --git a/mm/sparse.c b/mm/sparse.c index 133b033d0cba..ee0234a77c7f 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -408,13 +408,13 @@ static void __init check_usemap_section_nr(int nid, #endif /* CONFIG_MEMORY_HOTREMOVE */ #ifdef CONFIG_SPARSEMEM_VMEMMAP -static unsigned long __init section_map_size(void) +unsigned long __init section_map_size(void) { return ALIGN(sizeof(struct page) * PAGES_PER_SECTION, PMD_SIZE); } #else -static unsigned long __init section_map_size(void) +unsigned long __init section_map_size(void) { return PAGE_ALIGN(sizeof(struct page) * PAGES_PER_SECTION); } @@ -495,6 +495,44 @@ void __weak __meminit vmemmap_populate_print_last(void) { } +static void *sparse_usagebuf __meminitdata; +static void *sparse_usagebuf_end __meminitdata; + +/* + * Helper function that is used for generic section initialization, and + * can also be used by any hooks added above. + */ +void __init sparse_init_early_section(int nid, struct page *map, + unsigned long pnum, unsigned long flags) +{ + BUG_ON(!sparse_usagebuf || sparse_usagebuf >= sparse_usagebuf_end); + check_usemap_section_nr(nid, sparse_usagebuf); + sparse_init_one_section(__nr_to_section(pnum), pnum, map, + sparse_usagebuf, SECTION_IS_EARLY | flags); + sparse_usagebuf = (void *)sparse_usagebuf + mem_section_usage_size(); +} + +static int __init sparse_usage_init(int nid, unsigned long map_count) +{ + unsigned long size; + + size = mem_section_usage_size() * map_count; + sparse_usagebuf = sparse_early_usemaps_alloc_pgdat_section( + NODE_DATA(nid), size); + if (!sparse_usagebuf) { + sparse_usagebuf_end = NULL; + return -ENOMEM; + } + + sparse_usagebuf_end = sparse_usagebuf + size; + return 0; +} + +static void __init sparse_usage_fini(void) +{ + sparse_usagebuf = sparse_usagebuf_end = NULL; +} + /* * Initialize sparse on a specific node. The node spans [pnum_begin, pnum_end) * And number of present sections in this node is map_count. @@ -503,47 +541,54 @@ static void __init sparse_init_nid(int nid, unsigned long pnum_begin, unsigned long pnum_end, unsigned long map_count) { - struct mem_section_usage *usage; unsigned long pnum; struct page *map; + struct mem_section *ms; - usage = sparse_early_usemaps_alloc_pgdat_section(NODE_DATA(nid), - mem_section_usage_size() * map_count); - if (!usage) { + if (sparse_usage_init(nid, map_count)) { pr_err("%s: node[%d] usemap allocation failed", __func__, nid); goto failed; } + sparse_buffer_init(map_count * section_map_size(), nid); + + sparse_vmemmap_init_nid_early(nid); + for_each_present_section_nr(pnum_begin, pnum) { unsigned long pfn = section_nr_to_pfn(pnum); if (pnum >= pnum_end) break; - map = __populate_section_memmap(pfn, PAGES_PER_SECTION, - nid, NULL, NULL); - if (!map) { - pr_err("%s: node[%d] memory map backing failed. Some memory will not be available.", - __func__, nid); - pnum_begin = pnum; - sparse_buffer_fini(); - goto failed; + ms = __nr_to_section(pnum); + if (!preinited_vmemmap_section(ms)) { + map = __populate_section_memmap(pfn, PAGES_PER_SECTION, + nid, NULL, NULL); + if (!map) { + pr_err("%s: node[%d] memory map backing failed. Some memory will not be available.", + __func__, nid); + pnum_begin = pnum; + sparse_usage_fini(); + sparse_buffer_fini(); + goto failed; + } + sparse_init_early_section(nid, map, pnum, 0); } - check_usemap_section_nr(nid, usage); - sparse_init_one_section(__nr_to_section(pnum), pnum, map, usage, - SECTION_IS_EARLY); - usage = (void *) usage + mem_section_usage_size(); } + sparse_usage_fini(); sparse_buffer_fini(); return; failed: - /* We failed to allocate, mark all the following pnums as not present */ + /* + * We failed to allocate, mark all the following pnums as not present, + * except the ones already initialized earlier. + */ for_each_present_section_nr(pnum_begin, pnum) { - struct mem_section *ms; - if (pnum >= pnum_end) break; ms = __nr_to_section(pnum); + if (!preinited_vmemmap_section(ms)) + ms->section_mem_map = 0; ms->section_mem_map = 0; } } From patchwork Tue Feb 18 18:16:39 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: 13980410 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 A7E87C021AD for ; Tue, 18 Feb 2025 18:17:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ABB1028017F; Tue, 18 Feb 2025 13:17:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A695C6B00CC; Tue, 18 Feb 2025 13:17:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 84B4728017F; Tue, 18 Feb 2025 13:17:27 -0500 (EST) 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 573BE6B00CB for ; Tue, 18 Feb 2025 13:17:27 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 021F7A06CE for ; Tue, 18 Feb 2025 18:17:26 +0000 (UTC) X-FDA: 83133872934.23.C0F2DD8 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf23.hostedemail.com (Postfix) with ESMTP id 2060C140009 for ; Tue, 18 Feb 2025 18:17:24 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=bTVELaKr; spf=pass (imf23.hostedemail.com: domain of 3tM60ZwQKCGkMcKSNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3tM60ZwQKCGkMcKSNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902645; a=rsa-sha256; cv=none; b=IAQvnphNeYWFC6QQFJbJA4f0keYJVrfpd6uEde6W49WW4A6EcYMQEu1pouBUSrLOK0WZzo TuzzzhMmifB+ByWr+lfr7vp39CdvVoECeU65RlBmHF6jTabnNp70hg+4P18e8C/3/H+ash 8qR9FsGIH5ha+/MTP9FfzL2gHhhEoJA= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=bTVELaKr; spf=pass (imf23.hostedemail.com: domain of 3tM60ZwQKCGkMcKSNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3tM60ZwQKCGkMcKSNVVNSL.JVTSPUbe-TTRcHJR.VYN@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=1739902645; 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=Ai+2PcLhfWXOAXIqdyoXE98yT4B7cK2/aFq2Flf4tfI=; b=RguCBOsYCF3/s3wxFyR43XvCrgxn7cHNZBwGaKz8bEqOXO/CykPbi5uEeB77ulBQZiC5cI 1N/pXoqcurtNfMUQPEvYx48BMnUrNx74IlG5Rp0+RaY5fczenk/LHDGhgP0E9KH2zBtrdW r1Cc7YJ7FVGAiComd8mbq63oBIXNoGw= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-22103ae73f9so72604835ad.2 for ; Tue, 18 Feb 2025 10:17:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902644; x=1740507444; 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=Ai+2PcLhfWXOAXIqdyoXE98yT4B7cK2/aFq2Flf4tfI=; b=bTVELaKrp65MEQ2FfjBUEIyqo7MTReqnLWjf0LcrgDdxLTOlCX1CYCfsOku7CZJ6DI qkUmH8RJNX7yxwasRC4U0giZ+Q/ZMWZLRNvaz9GRN+C4mK9QlTnfFVB5V7bPr9iIEmrF WRUNVEIe47gvQZUJuYxwMvXc7uYryGyh3Z0jhPFB1S74whhAWK7qPkiq0pCb+4jS9aWG ESbbWejm4ad4SycHT2FS7s//Kn/tBQMVThkVZQmdOI5jTcoaV3naB9nNcPP6q7BEhngg PJTn6iq2SuxghDu4lTt8YEpg+sVgxXsKxWpBqTOvq/R4UkCg80FCbR3SCFfmewfY/Al+ UmKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902644; x=1740507444; 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=Ai+2PcLhfWXOAXIqdyoXE98yT4B7cK2/aFq2Flf4tfI=; b=g5RdD2/C//WBx3SasTzYLeu3wyATG+92q5nJwuqIrjgjlci6nzoOnn2fZHPCB3vTdB h+k6UwVA23tDk7cLbplQJ3fqQgpmvmrKthHBBwFp2rnV7b5BS1CIqcehHdFv4Q4ryTII NBMkZK+q1eMhUePTSsPCO5AXozfUe0kFHROAB+VDNOnGU1i1QL/GG3DFHSvw98noqVeh C9aFFgEHRSeX5cgWz0Oc+JrF4KKHkwBXpdP/VkXgzF5kqDiDC0EXUpJN/nJNYEj0M01N P9uAE4vti6bc41yVUKsuTa6nAqlJBYBaTPqUTbEWi0dk/mSXe7pIP8urBjHOtWaxoAcq HHYA== X-Forwarded-Encrypted: i=1; AJvYcCVx5u84/0XJhOFGID9agGlc+bEoSDm0hEvkcYUIJMNmcLLxURqVIltUqtfa8i6inB3Vo56srgK8xA==@kvack.org X-Gm-Message-State: AOJu0YwfLMXrCkj9LHPgiPpYbYMWTGhsifoZzqXmWBUSh/nBuNYXx9wE +P4ODEL5FWXhZyjryknzp8gQJYPhqtcY+gYEo2xpa33u44rd9sPifZCEglWGTbfu7auQDQ== X-Google-Smtp-Source: AGHT+IF2lNuKdgyZ+cnrzIuVV9ax0N34a1mxx5ftlrEwON3P4oKuHyNrXFqevuyZxYmpfAFSTaHfDRgc X-Received: from plblb8.prod.google.com ([2002:a17:902:fa48:b0:220:e952:af68]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e5d0:b0:220:d601:a6dc with SMTP id d9443c01a7336-2210405ccbamr231723465ad.22.1739902644058; Tue, 18 Feb 2025 10:17:24 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:39 +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-12-fvdl@google.com> Subject: [PATCH v4 11/27] mm/hugetlb: set migratetype for bootmem folios 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-Stat-Signature: 9318n4mm1rk73hjw3wmrf8t3q7aj5nu7 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 2060C140009 X-Rspam-User: X-HE-Tag: 1739902644-463532 X-HE-Meta: U2FsdGVkX1+HbQLAgG4E32KL7/Yx2U1Nur+m9Dt07gML0p90wakPHWY16SwUUuXlYgtCkdXItfO1Ov+JpQljqvkxmNhka4kZBdA+y6g1K8PD3ljucKHQafZGfiSjf2LqEamOLovNYucoJwH47S3IoU1w3jVqSsIH8zwa/D1c6jnLUBTymCemYbuJfnO1UlWsqx6t+zsLEru5eVZyfovQdIJUao4Q0vj6tRbY1mjKU+uqEP+3627d2hOD2pY+YgIMYM5YH7Vudlu1/8vZeSv17fH1w6XVLutxa8+1pxFlQOM9VeBVmc3SFD7Oa2/vz4Ymh3pARMg4Qz2yZ7O8uOG9RsaI7svYNS+4wc3hCZFO4G566+T8wiuJZxNoT/gFIEaVWl1CZ6ZBZifoHvqFWM4p3kid+VBAhR7Eg97XgvDW8FwJ3F9jljGoaFgCkDGwkBzXcWiYs1TSLtOQrys7Uuq1IlLbQqKx9QXNkhHRcrHOy8skF2BuFSCo+pXZLYa4Qo4Lvjy4Z8OKAmYCNbkds0Q7TEbIY7XRhfKPqXrelJ5gXl3qp/W8NEaTGZjUhVUFY7DW3rwAKxXgQKUjlmI1x0u5Zh1T/9fVGx9MdnTinbmv7DQClC+w3HU2+1M+qruzLIPprGBmmRiMJdUvrFgCun0HDL2xQ7BN9moaCclDE5rNGrCwzkAk/YCXeus7G1yfJ/pxPzPjqu6nghJUE3VYrDdsI4tvGHRMWlPrGzQc603o36FLaY7FS4KarXn9srmQfIOQRKoak+2e02rVhnBgNZDmyPZ5uV6yzvXCQUu5Kskvp4N5MBKdS+eygN6DDn8mTH+RRyXmCoBiYD068Z7Jo/vAJV+lighK5xEoa3oGnrYWZ9yjNaM02+CbKFWl2oE2UuTdfQ8c9l+UWIgSPTLB/F7MeW6T/xwsxr7Df1PYalrQvGo/iJIbwCHPaYgEjF/EUnEz/ME/MLfGnldswvnuVwz vGYqtiV2 TOz0WIOqqDhqbzUlj/BMEAKTyag47XhtSq8sLFmsI2OCaHnQ68GAx/ZY9u0UR5YshlLgUwMDk/egkt1WuA4kKyxCfoQnVX7TG3Fye6ThD3xNuLsQT3NF+Rsjzpavjd3djVq5blA+p3F6dCu/v8kCRNCZUmKnj7lRDV5q9QgnUgrf7M32UzG1LJ8lEdEqxICvplmZSqWb6h6oVDoXdwbCwQpzvJcSUpsmhZd09YNDh0PJs/Vb73+Rp/5IdGWdmw7AJiqXv2RYXbD7WIbhg5w6rlb1+sMv5vurXyEPC4npjT3/xquYqpidUZbaGKq7By4YvwCG2XDzSCM9nZjSvD2fporqiFBe26qmmP92spsqjmtCDFwhWCncfXzR6F3+gEzPAXACOvQkJj89g3GKIZkDq1ovgxeZvQc7aWOvSVg2i7PJT/BP0YFw2Cw4aZT0oJViaOQfQdzi1zAbmrukqFwYQfnbJ28E/v2SN5JibsPk5+TQoZgB8aZdmlAjounULVZP2iE/1I7oE4PUxpSzIFAbKa9Tusg== 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: The pageblocks that back memblock allocated hugetlb folios might not have the migrate type set, in the CONFIG_DEFERRED_STRUCT_PAGE_INIT case. memblock allocated hugetlb folios might be given to the buddy allocator eventually (if nr_hugepages is lowered), so make sure that the migrate type for the pageblocks contained in them is set when initializing them. Set it to the default that memmap init also uses (MIGRATE_MOVABLE). Signed-off-by: Frank van der Linden --- mm/hugetlb.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 1a200f89e21a..19a7a795a388 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3254,6 +3254,26 @@ static void __init hugetlb_folio_init_vmemmap(struct folio *folio, prep_compound_head((struct page *)folio, huge_page_order(h)); } +/* + * memblock-allocated pageblocks might not have the migrate type set + * if marked with the 'noinit' flag. Set it to the default (MIGRATE_MOVABLE) + * here. + * + * Note that this will not write the page struct, it is ok (and necessary) + * to do this on vmemmap optimized folios. + */ +static void __init hugetlb_bootmem_init_migratetype(struct folio *folio, + struct hstate *h) +{ + unsigned long nr_pages = pages_per_huge_page(h), i; + + WARN_ON_ONCE(!pageblock_aligned(folio_pfn(folio))); + + for (i = 0; i < nr_pages; i += pageblock_nr_pages) + set_pageblock_migratetype(folio_page(folio, i), + MIGRATE_MOVABLE); +} + static void __init prep_and_add_bootmem_folios(struct hstate *h, struct list_head *folio_list) { @@ -3275,6 +3295,7 @@ static void __init prep_and_add_bootmem_folios(struct hstate *h, HUGETLB_VMEMMAP_RESERVE_PAGES, pages_per_huge_page(h)); } + hugetlb_bootmem_init_migratetype(folio, h); /* Subdivide locks to achieve better parallel performance */ spin_lock_irqsave(&hugetlb_lock, flags); __prep_account_new_huge_page(h, folio_nid(folio)); From patchwork Tue Feb 18 18:16:40 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: 13980411 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 2F2EBC021AF for ; Tue, 18 Feb 2025 18:17:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 19275280180; Tue, 18 Feb 2025 13:17:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 11A186B00CC; Tue, 18 Feb 2025 13:17:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6523280180; Tue, 18 Feb 2025 13:17:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id BFEA26B00CB for ; Tue, 18 Feb 2025 13:17:28 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7F31D1403F1 for ; Tue, 18 Feb 2025 18:17:28 +0000 (UTC) X-FDA: 83133872976.27.A874A6D Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf02.hostedemail.com (Postfix) with ESMTP id B372F80004 for ; Tue, 18 Feb 2025 18:17:26 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=KecNygcE; spf=pass (imf02.hostedemail.com: domain of 3tc60ZwQKCGoNdLTOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3tc60ZwQKCGoNdLTOWWOTM.KWUTQVcf-UUSdIKS.WZO@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=1739902646; 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=OvfAfabT3FOQzTKFA/T5HKTcXvHT3pHZFdKCEk/uJyk=; b=m+bEnmjPKM2LR+F4knm59MI5kARgbyIlYFpe7sPbreNrny9VU3MDOpJl9WqCJUIHX7r93G VE67H8rkFGNWWfHmnHKEOa0OL/xMMzsy5zarwtoGWYMoq8T4/TnGO6XJ88RMZ4j8d0yuXk OlOaJQ0pkZdHmrQO5dlsI6W0XEb3cwU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902646; a=rsa-sha256; cv=none; b=NcqC5C3HuMa0rvGsB4kok9nLe6C4Jh1wecvVZbm1u6kWrVhGjzs3xTXB9Icex+WedA3UGv 5I2vZYLvKOk0pPU/5alrFB6ZoESBKnu4Mn665Oon9U9+CBMQLxeBTAq20xvr9zD1eZdP0U KkcHwvbmt0t3hOxH/lEhJSu3Mnsx+yk= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=KecNygcE; spf=pass (imf02.hostedemail.com: domain of 3tc60ZwQKCGoNdLTOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3tc60ZwQKCGoNdLTOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-220f0382404so88270405ad.1 for ; Tue, 18 Feb 2025 10:17:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902646; x=1740507446; 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=OvfAfabT3FOQzTKFA/T5HKTcXvHT3pHZFdKCEk/uJyk=; b=KecNygcEwhh406WuK/ZBFaGhZy8FMWjVvWsBh03LQN1q3ftMldluA6NEHnGQPAbiR3 f2EmmCUq3ogf1kY8pdb4x4Hj9nSCcI2mFWJO0c7fYa094X/k0zX3lClF0ZpGJqEnB/Ei am3917BKjYzD2oGIqg99eqiiiNBOvMpqVyUwjMfrMqQ8RGGANNoUdnCrxuQN74Ffb+kt 3eZXDEp5Aw3tJLnoAPvZA8vBZ/2h7ZpqKjPWTlC/aprm6g2Zeg3EfxDu60qBa880Oq3F zr3nMkzPUaJo6TqfdcdmoDCwZvESxno11aD2HvXTcWVGYhCg2qDyfBMAf0qFhgtKISpk 1Tvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902646; x=1740507446; 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=OvfAfabT3FOQzTKFA/T5HKTcXvHT3pHZFdKCEk/uJyk=; b=NpLcWbxU2gnexB+jvXORdqkfIDQFSae2Yzl3++NZ/q+O/mbK/u/rR+zjl+Ai5p6AWy MMGGyEa3orTNpUNY4bzngnvbPb4wQnSUOjFAG28PjKyZLaQbfQRYUTrtF3GcbjoruibB tpMTxCUQa+A5AvmV7mD0sUy9GExfDInz2geZEzj5wSfPC9n3FEBJrNfdOBbPcjzSnANg nEwmdcBHh6o7wgNY0VSLKtIuzb9e46IywO3EF5yEzDef9tn2lFYsfTNiqpMR/JEIagop Skn0c27Hczqwt8Rz8zjcUFDK/FxYbCFnDIA/K3/Xdws0wlcbThd8kfBoXXqyT/pVCOAS Oxrw== X-Forwarded-Encrypted: i=1; AJvYcCUFgMuDKyQYOl8LsysfVg2AGGiX/xY2YWB8wHGZLF/TkHntoHV7Y8GHbUpiH0n/nLXvY+TSJTLLGQ==@kvack.org X-Gm-Message-State: AOJu0YzrlzMKVPchf0Uq906z0MzW66Vu/dhupRuSAj4md3CfAjP48izy p+dWaXelP4ZXnrV2oBqgIsgMhL20kYH8ByAwCqtLFXlBxG5VUjabFpS2ZVi8nOYELYkHZQ== X-Google-Smtp-Source: AGHT+IFvSNPdBbepKEoVoWi1qQOaCYkORgQpakxpUeNt43f5okQM/hLmZPRepQHlQe973YIHv4a3xcRy X-Received: from pgbda5.prod.google.com ([2002:a05:6a02:2385:b0:ad7:38bc:1096]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:999e:b0:1ee:764b:ae2b with SMTP id adf61e73a8af0-1eed4ff48b2mr424330637.27.1739902645700; Tue, 18 Feb 2025 10:17:25 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:40 +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-13-fvdl@google.com> Subject: [PATCH v4 12/27] mm: define __init_reserved_page_zone 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-Rspam-User: X-Rspamd-Queue-Id: B372F80004 X-Rspamd-Server: rspam07 X-Stat-Signature: 65j3su5b74t1nnkp4cju6w3ck883o9h7 X-HE-Tag: 1739902646-708003 X-HE-Meta: U2FsdGVkX19YOeQkUb9ve9ytjigXZ4qCysMUPje5e3a6kjTAaJ1fycDGBy2PXeM/hI3q3CIVj3yw33oia8HFf5qmaw7a6CrAjdBghWxpLur5iueCMU8d6x64wdBYeWaDJxLNFQia3cuVNBOMxDJ6Yff6LUvbhkuNSSbvB3tS6+VcZEPRSQLJlJ2UcOa0O2z3ycSN8eaAleHDZyylYiLxqqS43dMALzH1Pd56YKX3y0spgAsqObSq06R4lszZ3oXWrjMFGDeEtIlOsgkqTVCk9ktiPKFTc+PBrdOUEsEKmXAxlnGX3t417HuACctkym4k13lCXcf5iQP/9Xp7gDobND15vFpHsVx5Ec0S/u+9EISJjD+p5fr17sE10EANQL9UdKg+nXnmnB6eHqHz2pEP1RdjVl6zzNatHR0Jivyi+PCpL2cCAbFisZWOAF+/tEs57Pc7ml8MfBPo2fZjkYVvZUS+XR+ZZ7TfUxqgzX0+8eAYGZ8Lq0fE5+Yih+40Q2TF0HLbXGTYPpxV0nTaA93PatzyxwHU08mUNIDgMaOV1eTKKZWXo42Co/eJW/v6ifsOUtIJGZNJ2h6eP/fCUidpcGjMHLVVBaAgSGf9eZTEvKVvNj+Auc+B6F7pF/0ObdOwfJM1HV8+UiPkRdi1DPY8ZOiVopiqHYpjOrxFSexP1of0C/3etc+ovSI+H6O5YPGLJr/PBnRMWy/99cZ7xMCJRzobXk2la+V4HRffZpjGc8RirvyaYC1WP2dhzCpaX2txOJTZutlTxDkijybhzKBLj4jDvUE0GPWk5N4qYgzilUhmswXdUgfaZe2lhT0pTOiPPdx8MzFRYDd0UwONgKpRrl4u/TEPbwnBGwh4P8qxprNc842FWlgHkHbXSF5q5e+CGMBPfdtMCgGX7f+AUG9LlDoKUBWXy+54damxk8Olkgr93ECgDbeF5FZRHD9I4ltmbY6rNfGsQ0T8unNuhO8 TyAV4aNX LgWgH59ad4KRq5i0bcsDHPqjGcEr+TYmrweO7bCUcIW86yZU94ge9aPf1MDlHBOpWYqerTrpJa7hAGjYI7qomfrJbMq1KstYL2fQ3ZomY75D18gcrux0cOGGnQtZaGhDwVA+PEkfvTgV7dqrtzhpDcsQLntWP921J60BayR1oOLI3DcUQDcaYEBj6FpcDhE4rrSHhe7DsKj1G8nJGgFIWAUs+TXuc4zf7gybnFKSbkE4JwIKwxpROjUYRmMKotMW3lJvrJkwXj1usmFGG53pWCnHYgUOnEmcf2Xc13SCMoRj6Gs8W/vnxvw3By26mQ9L6faDqeQK7SFKu1axFyeHYHO3BsdK6CSSWt4jkFt71FzDIPgZ8vWF3cj0dUsnE5NFaurYqsMQp3jHPSbtsvuyoQGrO79OnXpdcQXZ4+H+zJnXA2F39uIeehctfzT7RNxGOcidiZ3t/+02h4Vl0Mu2Yu26rnuL3r/BeuHCYdZlmnFgRBRRfqHj/yVBG2v+gZtSQcQp7aB0MHUcgLn0zZBJjGLkAxYQF2hUWKp6D/cLLthU+rBiczMmgvpQg0Z+ihtPznpYTLs2Yul+mdWpGfqB5Q8wKOKBOdGmJyvS/Mn9zLFSwK2w= 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: Sometimes page structs must be unconditionally initialized as reserved, regardless of DEFERRED_STRUCT_PAGE_INIT. Define a function, __init_reserved_page_zone, containing code that already did all of the work in init_reserved_page, and make it available for use. Signed-off-by: Frank van der Linden --- mm/internal.h | 1 + mm/mm_init.c | 38 +++++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 109ef30fee11..57662141930e 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1448,6 +1448,7 @@ static inline bool pte_needs_soft_dirty_wp(struct vm_area_struct *vma, pte_t pte void __meminit __init_single_page(struct page *page, unsigned long pfn, unsigned long zone, int nid); +void __meminit __init_reserved_page_zone(unsigned long pfn, int nid); /* shrinker related functions */ unsigned long shrink_slab(gfp_t gfp_mask, int nid, struct mem_cgroup *memcg, diff --git a/mm/mm_init.c b/mm/mm_init.c index 9f1e41c3dde6..925ed6564572 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -650,6 +650,28 @@ static inline void fixup_hashdist(void) static inline void fixup_hashdist(void) {} #endif /* CONFIG_NUMA */ +/* + * Initialize a reserved page unconditionally, finding its zone first. + */ +void __meminit __init_reserved_page_zone(unsigned long pfn, int nid) +{ + pg_data_t *pgdat; + int zid; + + pgdat = NODE_DATA(nid); + + for (zid = 0; zid < MAX_NR_ZONES; zid++) { + struct zone *zone = &pgdat->node_zones[zid]; + + if (zone_spans_pfn(zone, pfn)) + break; + } + __init_single_page(pfn_to_page(pfn), pfn, zid, nid); + + if (pageblock_aligned(pfn)) + set_pageblock_migratetype(pfn_to_page(pfn), MIGRATE_MOVABLE); +} + #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT static inline void pgdat_set_deferred_range(pg_data_t *pgdat) { @@ -708,24 +730,10 @@ defer_init(int nid, unsigned long pfn, unsigned long end_pfn) static void __meminit init_reserved_page(unsigned long pfn, int nid) { - pg_data_t *pgdat; - int zid; - if (early_page_initialised(pfn, nid)) return; - pgdat = NODE_DATA(nid); - - for (zid = 0; zid < MAX_NR_ZONES; zid++) { - struct zone *zone = &pgdat->node_zones[zid]; - - if (zone_spans_pfn(zone, pfn)) - break; - } - __init_single_page(pfn_to_page(pfn), pfn, zid, nid); - - if (pageblock_aligned(pfn)) - set_pageblock_migratetype(pfn_to_page(pfn), MIGRATE_MOVABLE); + __init_reserved_page_zone(pfn, nid); } #else static inline void pgdat_set_deferred_range(pg_data_t *pgdat) {} From patchwork Tue Feb 18 18:16:41 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: 13980412 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 8F5E9C021AD for ; Tue, 18 Feb 2025 18:17:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D78796B00CE; Tue, 18 Feb 2025 13:17:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D26D6280182; Tue, 18 Feb 2025 13:17:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B7E69280181; Tue, 18 Feb 2025 13:17:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 908CA6B00CE for ; Tue, 18 Feb 2025 13:17:30 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 3B51F120420 for ; Tue, 18 Feb 2025 18:17:30 +0000 (UTC) X-FDA: 83133873060.21.0AF46D2 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf19.hostedemail.com (Postfix) with ESMTP id 5EC2C1A001A for ; Tue, 18 Feb 2025 18:17:28 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=jHoRLUtX; spf=pass (imf19.hostedemail.com: domain of 3t860ZwQKCGwPfNVQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3t860ZwQKCGwPfNVQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902648; a=rsa-sha256; cv=none; b=6f5uQMPdbJgJIEEQ4IsL8qFBYUdOepg9uaeAMFnydu49ESAx2HIbQ0kV3FvTGw/CHwjTLe 0UVvbkz6WF+/9rqGp6CAjP6oH3P6oVL39khmQV59uqFVkdQyqknLkYP0JcnEmF1GNpue/n gtcWA7+Q+eGK4K5VTUWSSvNOzH2iPTE= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=jHoRLUtX; spf=pass (imf19.hostedemail.com: domain of 3t860ZwQKCGwPfNVQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3t860ZwQKCGwPfNVQYYQVO.MYWVSXeh-WWUfKMU.YbQ@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=1739902648; 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=165gS3goRLf8zZj6pEhjQb5PxE79JM+3p+KuzMFcveU=; b=xsd3zWqSsscGDfJJXBBEoFktp771f5tqsC2XalKfAMi3DExEck/VmJ2IOYpn9zPII35Yqx Kke5fH2rYxyxv+zhFfEZEmlUGiivd/61MdjXN/HsTRy6iHpbobLHU19HCQKanAwPHyUiHm +Qlql9qiv3kjBuB51QlpFfLb03C/ZTs= Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2fc1eadf5a8so11121573a91.3 for ; Tue, 18 Feb 2025 10:17:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902647; x=1740507447; 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=165gS3goRLf8zZj6pEhjQb5PxE79JM+3p+KuzMFcveU=; b=jHoRLUtXzIshEmBTlWMT0Sf/BND+3ECm63dedZNBh9+F+HgSJrxW4e0ntUErvqtWxg QKxuGd/6VrgKmh69/Hms0N/VWKHcEC6aXGxm+SgXXEpSbdZZk+ofFCHVfCgZs+SQ4bIe ppwbNme5CRzmPuzkKboUV+9VQgK13oXuRugsQ8yFllVCqH/XB5PdEH+SYHXq7SfTB5Lf WMfSoHtwsqnZaen2eHVTZVodRRubApqVqwbJIh984vPBbbHCQTpsxbCOY/uuVa/zTDV1 loTrEgjD7VdiKRRq5pAv10vdbzIu5Zb0GvEsF2ta/63AuDw5tbvhJuM4ScSO/rb61Q4C 9/tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902647; x=1740507447; 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=165gS3goRLf8zZj6pEhjQb5PxE79JM+3p+KuzMFcveU=; b=EnbiP88xBRM4ahfww4KEcfM3ehksXAEangJ22wQXfCgJZKWxFjoxbwLXdLToZ4nd9D o8zhRvcjSZD6N6uBEj14QPvocON1IV3Oc4u4ot060Z71YkvB68bsAHKldX21/ECAecyc rTtsT27fB9WhdQ+DYREPCV01eNtt3XI/C4r8gCGHiGmICqLYbBlI8oz/ZiDSXHfg7nNp n1Vf2a/X7Df7B841n2+9w031QE1Q3eJVfRbGBqI1Q9EfXPb4hnt2sohDte/n4xXlAG+h Lsrs0QEh2K03kBq8R0nBCQ8sE82tUBKcVQNlE1TClum15aAEtZuevS7a/+/24ojP01n1 iQpQ== X-Forwarded-Encrypted: i=1; AJvYcCVhwLPM2GymbM6Hk+tEOVZKUbPHi8onFxTsNjQMiIcwz1SCNF9C+Hbe9XUhUpgjZdbZGchnRI8lIw==@kvack.org X-Gm-Message-State: AOJu0YxjJ79xZE3iyKJVhd7G92FuhkZif/NKARdoYxMHhuTEeMwzjBCF OfbcuObhq3wLnrKeuIcYoEob4BA1v5aqp/wh7Pc8RJNF3KfJX4e1WVCVSseKS3iJpyCBoQ== X-Google-Smtp-Source: AGHT+IEoqMlrNITX7gZxzMB0Y+rjQKU0M6SIkqPiK42wAClKKAVtpeQMhJt67RX0BgBBDoe6CJK14pHN X-Received: from pjf4.prod.google.com ([2002:a17:90b:3f04:b0:2fc:13d6:b4cb]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:134e:b0:2ee:acb4:fecd with SMTP id 98e67ed59e1d1-2fcb5a10379mr642511a91.9.1739902647343; Tue, 18 Feb 2025 10:17:27 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:41 +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-14-fvdl@google.com> Subject: [PATCH v4 13/27] mm/hugetlb: check bootmem pages for zone intersections 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-Queue-Id: 5EC2C1A001A X-Stat-Signature: zbt43pmmb63rznc6ymtzigxepg9ouagj X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1739902648-958242 X-HE-Meta: U2FsdGVkX19Bj6erLJNc0scPGxYf7LIwqztCxOB9yEYaiYxTsCEBLbvD1sqvpiEfvQ0BqASgwiq/QWCc7e4ZGG0CYybgAJLVLOgMteZ7hixlAEc6+MV1bWRFIyHKB/BqUvPOPBbBOUDOAzHhiEzU9cxb+Y5Vhy//t6MCterwG2cOJ/BTfOXI7Wyew5IQKZeX7JJn56bfF6jCuwHebo8637h9VFfDp23r8OswrH+SeQcclGwCKMOMG8vaDahmQWcVQYDazglO3JFpJr769JOLzShFAVpKo/e9d1tUvbilaxwDJa0VMqn7tNR4By/DmbQYA5lYibVATRsGt6ws0meX54fIts9s3ThDEv5910rsc7vvGb365dAooEh0eOTD06d7Mqb9bkmy+AdZbRJF+9u9WOOTx1MLBFwKvadxiFzBhgSeqittou/yS8ck9ytrbHWGfkzui74ZvjoIGculxtS9SFAlCiKCIS49mKU6hWnRwRMouG2cl212q09n2SMDe2C/6y0PgGxm3TF3qxUz1wOMPT9JlWoT3rszFbGpamAV0I/4GiPr+a270pKpHUF5PyLv0B6aEQXDQNnXSi6F0jg0cJHK1RnyoDVsT8xTGFu3GPPJkq96gl1t9l657/YoHbTdNFqjJpyXTpLxy+zXTilkOaJ3PsrEceNZCxGw57wSpikAX5T7RZ9a7WVUi82EoS1k7vnHKmUQy+BK71zM7zxtj37SumuQYSmMzJsDqNbe72V0CuiR9nLLWHLhu23G859L4+Bu2ybhZT1mPb9AuRMzhUyLBrZFy1whKR2qAr+xVwDuaCWhtVPd9Q7PfTvpENOqku6iA/8DxlWAmO2EgUmqU4wH3UAugqfH7Y/sybeazth0Utyu+TufHKeQW9C7RVJEjx9quRAaqRZNDyBr9szqO1Jh3mYzFpEmApklmaruAWyI1383fFQ3DheA/+opzNtj9+MrrtBj4MJz/vIW67m apPuu9Lf b5XjPWdeOWs6mQ2NzhV5QbFyD2CJz/gA8H/2nbjrw5FlRUOF0BRyj6p1LoWFbgrYiqz0INk2i02Pg/IAO2xkn7/Nij5nRrw8ERRekJRqir8zdJJlhhM+d0UAmbAG2DnC7T5qEUGFgd0yD5b7d1KNO4TxU/e1KxGpLfHv7IDudtHLgMkgM/gtaa1+0nhdFYI/aK+AqDQRxAtrPpCg1OnTdZpHPm4jhmlNSJh3Ef6iMRSDLjTbA2Ry4a+ScHD6WwDS8s5SCy5Brx42CPS6ZD9Jt4MjjqpGfX80HxG0o0E0WSbgnUxkZHVG3L0YEue3oFiCkc9pvhZ50e6gc1XBGye/5PLcXGsQhky0MfO6q/HuuABSAEEV2tl2BK8P1h03B1nx0ZmHCruat+eNMNfkp1zpXGQDEw/1A25QhZUDzHp+s2FBUZfKu6bvu7+ooam52x0HAizPQGdLAvZljIzKITniRCR1XIIj+ni58MpANtUwGzaOVKPZcKSvRCgUCIPNyalkJ/9UM/S4rHv3sAOd7bvKPw1Ul9Q== 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: Bootmem hugetlb pages are allocated using memblock, which isn't (and mostly can't be) aware of zones. So, they may end up crossing zone boundaries. This would create confusion, a hugetlb page that is part of multiple zones is bad. Worse, HVO might then end up stealthily re-assigning pages to a different zone when a hugetlb page is freed, since the tail page structures beyond the first vmemmap page would inherit the zone of the first page structures. While the chance of this happening is low, you can definitely create a configuration where this happens (especially using ZONE_MOVABLE). To avoid this issue, check if bootmem hugetlb pages intersect with multiple zones during the gather phase, and discard them, handing them to the page allocator, if they do. Record the number of invalid bootmem pages per node and subtract them from the number of available pages at the end, making it easier to do these checks in multiple places later on. Signed-off-by: Frank van der Linden --- mm/hugetlb.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++-- mm/internal.h | 2 ++ mm/mm_init.c | 25 +++++++++++++++++++++ 3 files changed, 86 insertions(+), 2 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 19a7a795a388..f9704a0e62de 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -62,6 +62,7 @@ static unsigned long hugetlb_cma_size_in_node[MAX_NUMNODES] __initdata; static unsigned long hugetlb_cma_size __initdata; __initdata struct list_head huge_boot_pages[MAX_NUMNODES]; +static unsigned long hstate_boot_nrinvalid[HUGE_MAX_HSTATE] __initdata; /* * Due to ordering constraints across the init code for various @@ -3304,6 +3305,44 @@ static void __init prep_and_add_bootmem_folios(struct hstate *h, } } +static bool __init hugetlb_bootmem_page_zones_valid(int nid, + struct huge_bootmem_page *m) +{ + unsigned long start_pfn; + bool valid; + + start_pfn = virt_to_phys(m) >> PAGE_SHIFT; + + valid = !pfn_range_intersects_zones(nid, start_pfn, + pages_per_huge_page(m->hstate)); + if (!valid) + hstate_boot_nrinvalid[hstate_index(m->hstate)]++; + + return valid; +} + +/* + * Free a bootmem page that was found to be invalid (intersecting with + * multiple zones). + * + * Since it intersects with multiple zones, we can't just do a free + * operation on all pages at once, but instead have to walk all + * pages, freeing them one by one. + */ +static void __init hugetlb_bootmem_free_invalid_page(int nid, struct page *page, + struct hstate *h) +{ + unsigned long npages = pages_per_huge_page(h); + unsigned long pfn; + + while (npages--) { + pfn = page_to_pfn(page); + __init_reserved_page_zone(pfn, nid); + free_reserved_page(page); + page++; + } +} + /* * Put bootmem huge pages into the standard lists after mem_map is up. * Note: This only applies to gigantic (order > MAX_PAGE_ORDER) pages. @@ -3311,14 +3350,25 @@ static void __init prep_and_add_bootmem_folios(struct hstate *h, static void __init gather_bootmem_prealloc_node(unsigned long nid) { LIST_HEAD(folio_list); - struct huge_bootmem_page *m; + struct huge_bootmem_page *m, *tm; struct hstate *h = NULL, *prev_h = NULL; - list_for_each_entry(m, &huge_boot_pages[nid], list) { + list_for_each_entry_safe(m, tm, &huge_boot_pages[nid], list) { struct page *page = virt_to_page(m); struct folio *folio = (void *)page; h = m->hstate; + if (!hugetlb_bootmem_page_zones_valid(nid, m)) { + /* + * Can't use this page. Initialize the + * page structures if that hasn't already + * been done, and give them to the page + * allocator. + */ + hugetlb_bootmem_free_invalid_page(nid, page, h); + continue; + } + /* * It is possible to have multiple huge page sizes (hstates) * in this list. If so, process each size separately. @@ -3590,13 +3640,20 @@ static void __init hugetlb_init_hstates(void) static void __init report_hugepages(void) { struct hstate *h; + unsigned long nrinvalid; for_each_hstate(h) { char buf[32]; + nrinvalid = hstate_boot_nrinvalid[hstate_index(h)]; + h->max_huge_pages -= nrinvalid; + string_get_size(huge_page_size(h), 1, STRING_UNITS_2, buf, 32); pr_info("HugeTLB: registered %s page size, pre-allocated %ld pages\n", buf, h->free_huge_pages); + if (nrinvalid) + pr_info("HugeTLB: %s page size: %lu invalid page%s discarded\n", + buf, nrinvalid, nrinvalid > 1 ? "s" : ""); pr_info("HugeTLB: %d KiB vmemmap can be freed for a %s page\n", hugetlb_vmemmap_optimizable_size(h) / SZ_1K, buf); } diff --git a/mm/internal.h b/mm/internal.h index 57662141930e..63fda9bb9426 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -658,6 +658,8 @@ static inline struct page *pageblock_pfn_to_page(unsigned long start_pfn, } void set_zone_contiguous(struct zone *zone); +bool pfn_range_intersects_zones(int nid, unsigned long start_pfn, + unsigned long nr_pages); static inline void clear_zone_contiguous(struct zone *zone) { diff --git a/mm/mm_init.c b/mm/mm_init.c index 925ed6564572..f7d5b4fe1ae9 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -2287,6 +2287,31 @@ void set_zone_contiguous(struct zone *zone) zone->contiguous = true; } +/* + * Check if a PFN range intersects multiple zones on one or more + * NUMA nodes. Specify the @nid argument if it is known that this + * PFN range is on one node, NUMA_NO_NODE otherwise. + */ +bool pfn_range_intersects_zones(int nid, unsigned long start_pfn, + unsigned long nr_pages) +{ + struct zone *zone, *izone = NULL; + + for_each_zone(zone) { + if (nid != NUMA_NO_NODE && zone_to_nid(zone) != nid) + continue; + + if (zone_intersects(zone, start_pfn, nr_pages)) { + if (izone != NULL) + return true; + izone = zone; + } + + } + + return false; +} + static void __init mem_init_print_info(void); void __init page_alloc_init_late(void) { From patchwork Tue Feb 18 18:16:42 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: 13980413 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 221C0C021AA for ; Tue, 18 Feb 2025 18:17:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 93277280182; Tue, 18 Feb 2025 13:17:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8BC93280181; Tue, 18 Feb 2025 13:17:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7116E280182; Tue, 18 Feb 2025 13:17:32 -0500 (EST) 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 4A236280181 for ; Tue, 18 Feb 2025 13:17:32 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id ED5041203D8 for ; Tue, 18 Feb 2025 18:17:31 +0000 (UTC) X-FDA: 83133873102.05.2F5041B Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf10.hostedemail.com (Postfix) with ESMTP id 169BAC0014 for ; Tue, 18 Feb 2025 18:17:29 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=nSd5XLrZ; spf=pass (imf10.hostedemail.com: domain of 3uM60ZwQKCG0QgOWRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3uM60ZwQKCG0QgOWRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902650; a=rsa-sha256; cv=none; b=kEgw2OQDEU04IZ43zXGRUAiergLoDQAgBfhOZiYemTKUsaCQU5lNlXO6aIAf952g/+E2qK pIeGuJoL2mh7C0O6scFaReyFuPdKt1tUYSD2EbYtSv2iXcNTueeHRb6b4fYijej2G3d9tw hWmi6ZHZB7tlHQJaxw5Y68b63N/v3KY= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=nSd5XLrZ; spf=pass (imf10.hostedemail.com: domain of 3uM60ZwQKCG0QgOWRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3uM60ZwQKCG0QgOWRZZRWP.NZXWTYfi-XXVgLNV.ZcR@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=1739902650; 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=ndjpqFzmue1FVYKX2ILaxRtTculNzXNDNbdJe9j9peI=; b=QsgPETZP7raIjZeUfQNBvCFC/7AhQnAhyKJbAfgs75KQaLOuNTGm1Vw9biwfMISY80crI7 HLo6VR6CksHwAbpadHBqo2WQCpyTTQRYMINn3MaB/ePHCOeThqGiYp2l92rgykVKPUqIsU fQvYrd1/nrjboNMzzBXlaIydK+sDp+8= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-22109f29c99so66174135ad.1 for ; Tue, 18 Feb 2025 10:17:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902649; x=1740507449; 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=ndjpqFzmue1FVYKX2ILaxRtTculNzXNDNbdJe9j9peI=; b=nSd5XLrZR7Um1Malph7h1YsVLsPJYt3JmHI9X7D4zacJmTqgMyKkEwFxrgVtnO04M9 lWZhW9N821ZLx2EvK0p6WmKFQGCqi4/kSN5FnNXU48D06h2f0G4UKieuot5qK6jU4ne5 C8oGnn6tcIRl234N7xR+MYFT87oFPB9rYim8OoL4LkF9PT1n/CkAaaTObro/NXw0y+iB XxVVj08PDYVuL7UoPUha/4vbhI+7VwHf8/QJfdMjlLRby2fAf8ADkWQeoQQJ5ghgnmx+ VDZV9fRgabcQ/sq3nNFQxtg0QBwKzK1KV+vEK9t6jc93+Q/sZ3GosxLiDdF/X/N2i1W6 hcpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902649; x=1740507449; 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=ndjpqFzmue1FVYKX2ILaxRtTculNzXNDNbdJe9j9peI=; b=d4KslCpYyM/YS8mFq6vi7B0v88pA9DD+2KZs48FsWOKZBP69g5FYhH5emHvGVSczsP bwsY8CecRhfbB1pM6Y1D5VGtTaTowowLmIee/g3nm704WYjd8wPwHAHJBtdHj/7GlINx JSR9aJBeWlVbM5JMk/F6/+BZRRXpH0lKyFH714ez95m0FGTWCmhOrsOPtvv0Lxw2J8jW TxODBuWj25Cph3g0s3ej1Hq6FCuf0zAnKApT0s0GZyItOXGPDBdAdemtZvHmdWcxVa0I +z6EGhYigU5hUIl/cmbYJ7W2SlCgJLT3smABgxz+S09EHREyDHtFRRmfgAhyeEnx4BRC ECKA== X-Forwarded-Encrypted: i=1; AJvYcCW/5dWE9QwPdOAqQZJbya/EvZc6iR1vncNP221i3ZxlYS7JmxP9ikLcGKoH5zAd17F0YhAi3isi9g==@kvack.org X-Gm-Message-State: AOJu0YzbXtTYh1zr05wmjLcGX/So5IPt/0YzyLqgezGLS0uEvjAdDYsx VGZiqmpX/fgaG8MF3KUJCX0KrTXJPB77q9qSyZ0a8aHjGaiQ8tr8ec5ruK31DLPDkSQb5A== X-Google-Smtp-Source: AGHT+IFy/y4SdHiSsCJxJvo+FEGoVCcMZnIS41yIyMZQQV2TA0dYBg625jQNShPtSAzKdBaABpM16dqb X-Received: from pfbcv8.prod.google.com ([2002:a05:6a00:44c8:b0:730:796b:a54a]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:7289:b0:1ee:c598:7a90 with SMTP id adf61e73a8af0-1eec5987d29mr6917388637.39.1739902648950; Tue, 18 Feb 2025 10:17:28 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:42 +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-15-fvdl@google.com> Subject: [PATCH v4 14/27] mm/sparse: add vmemmap_*_hvo functions 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-Queue-Id: 169BAC0014 X-Stat-Signature: aw6fkfshdazy9gxcafwi5uyyizrwdrgm X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1739902649-657795 X-HE-Meta: U2FsdGVkX18oLbfZZ4y9XBbK+OSXgGW+9DZWtm61OLAWxl4z4wzZk3JUlRIKElNFW2hgvhXJf6cgJp0Ivuel089pSQjwaCwWZucxoKw7TALl9SiRxgklcR6I3gYagsbBEJ2+PKaZIniFdjipYe9FxsarXXh5wpvFMqdu41ZmexJYRXIy8lIQZx0QZAMTGX1JEoFM0KPfJPSHukTNKTs8yjOQTLV+aK0lCmaDVJnrIXUK5Ru0mS5P305/0CpYUKz2U8Aga9h4GxlxOVA0j3bL+znJB/K1RXjWUkgWXDYuoHub1pKkXWzfJSfHJ8o7hbwk+YipdnjUh/yt59SNfORMKm+2TQaAbU6i4ACnWzToH8NETMHbcFAybWECzneiiLDxOdeDkpnDO+9IkA6EcvobKL/L60FTOHyDWsqhBC32pHSGzpmO/g9cNuFWF7WZ7Ks7MMR14ZsFeRjgiILvx+BNp/lDHiImEuoKri4SgViu0vwlM21OxjKAFZXQl+/D3zi0xBLJdvkjMcgNea+ZJOW80k+w14PDPirUgxURH5IDANx1DSgU1/0xgKKTW3VJr704p9Z4yOspuBVyHiHVyN2iJoiB5A0Uo04JyV8AcXLiD9XgVAvVlREZ6ZNNptywQ9cJWPm8lwrtwPG14QG4jllHePuQtbJss1W+XDI5oH2zccGXN9ZDesmjh8Bv9+MCPwbmyEAidm2iMkkz4FzidwMlQHrvvG+a98O/u/nZuGviV6WZ2HyzGloZBMFQFgV+gs4/5vh/a4KgG6ZtJCCWIQcfN0Rhwc6O/M2b846cxgzIywKeY5spzeXsP6e23wq7rCVvsT235SpmYVnN0KR6r8YqGDNRJDW78e32/cxM4fgcY9ejxF/wIGuR7cw4icnGDJ3hda+6YLvYGX6uYoEQ061r4e2WCz1RxAwTaLOz8FqZ1gmRS6DszJUqjVZyMIUGCRrSGwidm+yTl06bOdNYJTW e+mAFGd5 gNuW3UuvNH4iHXunTDLKcc5xgZ1IuODTtwbOoBTba9hbBnlrObfbJDieMzYxpg6YqvisVy00vARodl8SlHQtkjxwuMC8XrwrcrOMDHqFIG5lgfLRCfqfG+Y/PPTayvnpDSdS0SddbFg47QJLU1f4+tSehQvy4/BHhmR2Sz9MTwnonheAwkQUE0u2sMvWhGpPpPgrhwE8HTdLp146XrlYA2z5BM40QGAK/OC6hrBdH88INI6UkGRrVRqKL0vMjMmBpJB7pn4PfJhk0GswraQbD4V4TY9Jk5IgQoll0DNlBgJVY06W+YY1dEStyWHksscDxZ1y0AbFlzSB3hl+c6y6L+unacfcy0RDmcb9yjegctCNau7e/T0/KPQISQcn8yGiGi3N9VpZXFIyNXjMdgKp/+pLG3DWRkyWP8XVVufhkhYWT2j2RId06mci6DChnuACbMWrLziEKA6Weulr7XxMOQcjs3RsloatWk3qlXp2T+Mg8qLBTYwqZVBpbuqX8dX3tJ0LnLPYQ7t4Nl2YykSWW2Cz98P7WZ9+4rbO3idovLf7CMg2iXPxvhQgr4RVt6C6oev6D10yRuA8SNcI= 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: Add a few functions to enable early HVO: vmemmap_populate_hvo vmemmap_undo_hvo vmemmap_wrprotect_hvo The populate and undo functions are expected to be used in early init, from the sparse_init_nid_early() function. The wrprotect function is to be used, potentially, later. To implement these functions, mostly re-use the existing compound pages vmemmap logic used by DAX. vmemmap_populate_address has its argument changed a bit in this commit: the page structure passed in to be reused in the mapping is replaced by a PFN and a flag. The flag indicates whether an extra ref should be taken on the vmemmap page containing the head page structure. Taking the ref is appropriate to for DAX / ZONE_DEVICE, but not for HugeTLB HVO. The HugeTLB vmemmap optimization maps tail page structure pages read-only. The vmemmap_wrprotect_hvo function that does this is implemented separately, because it cannot be guaranteed that reserved page structures will not be write accessed during memory initialization. Even with CONFIG_DEFERRED_STRUCT_PAGE_INIT, they might still be written to (if they are at the bottom of a zone). So, vmemmap_populate_hvo leaves the tail page structure pages RW initially, and then later during initialization, after memmap init is fully done, vmemmap_wrprotect_hvo must be called to finish the job. Subsequent commits will use these functions for early HugeTLB HVO. Signed-off-by: Frank van der Linden --- include/linux/mm.h | 9 ++- mm/sparse-vmemmap.c | 141 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 135 insertions(+), 15 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index df83653ed6e3..0463c062fd7a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3837,7 +3837,8 @@ p4d_t *vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node); pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node); pmd_t *vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node); pte_t *vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node, - struct vmem_altmap *altmap, struct page *reuse); + struct vmem_altmap *altmap, unsigned long ptpfn, + unsigned long flags); void *vmemmap_alloc_block(unsigned long size, int node); struct vmem_altmap; void *vmemmap_alloc_block_buf(unsigned long size, int node, @@ -3853,6 +3854,12 @@ int vmemmap_populate_hugepages(unsigned long start, unsigned long end, int node, struct vmem_altmap *altmap); int vmemmap_populate(unsigned long start, unsigned long end, int node, struct vmem_altmap *altmap); +int vmemmap_populate_hvo(unsigned long start, unsigned long end, int node, + unsigned long headsize); +int vmemmap_undo_hvo(unsigned long start, unsigned long end, int node, + unsigned long headsize); +void vmemmap_wrprotect_hvo(unsigned long start, unsigned long end, int node, + unsigned long headsize); void vmemmap_populate_print_last(void); #ifdef CONFIG_MEMORY_HOTPLUG void vmemmap_free(unsigned long start, unsigned long end, diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 8751c46c35e4..8cc848c4b17c 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -30,6 +30,13 @@ #include #include +#include + +/* + * Flags for vmemmap_populate_range and friends. + */ +/* Get a ref on the head page struct page, for ZONE_DEVICE compound pages */ +#define VMEMMAP_POPULATE_PAGEREF 0x0001 #include "internal.h" @@ -144,17 +151,18 @@ void __meminit vmemmap_verify(pte_t *pte, int node, pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node, struct vmem_altmap *altmap, - struct page *reuse) + unsigned long ptpfn, unsigned long flags) { pte_t *pte = pte_offset_kernel(pmd, addr); if (pte_none(ptep_get(pte))) { pte_t entry; void *p; - if (!reuse) { + if (ptpfn == (unsigned long)-1) { p = vmemmap_alloc_block_buf(PAGE_SIZE, node, altmap); if (!p) return NULL; + ptpfn = PHYS_PFN(__pa(p)); } else { /* * When a PTE/PMD entry is freed from the init_mm @@ -165,10 +173,10 @@ pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node, * and through vmemmap_populate_compound_pages() when * slab is available. */ - get_page(reuse); - p = page_to_virt(reuse); + if (flags & VMEMMAP_POPULATE_PAGEREF) + get_page(pfn_to_page(ptpfn)); } - entry = pfn_pte(__pa(p) >> PAGE_SHIFT, PAGE_KERNEL); + entry = pfn_pte(ptpfn, PAGE_KERNEL); set_pte_at(&init_mm, addr, pte, entry); } return pte; @@ -238,7 +246,8 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node) static pte_t * __meminit vmemmap_populate_address(unsigned long addr, int node, struct vmem_altmap *altmap, - struct page *reuse) + unsigned long ptpfn, + unsigned long flags) { pgd_t *pgd; p4d_t *p4d; @@ -258,7 +267,7 @@ static pte_t * __meminit vmemmap_populate_address(unsigned long addr, int node, pmd = vmemmap_pmd_populate(pud, addr, node); if (!pmd) return NULL; - pte = vmemmap_pte_populate(pmd, addr, node, altmap, reuse); + pte = vmemmap_pte_populate(pmd, addr, node, altmap, ptpfn, flags); if (!pte) return NULL; vmemmap_verify(pte, node, addr, addr + PAGE_SIZE); @@ -269,13 +278,15 @@ static pte_t * __meminit vmemmap_populate_address(unsigned long addr, int node, static int __meminit vmemmap_populate_range(unsigned long start, unsigned long end, int node, struct vmem_altmap *altmap, - struct page *reuse) + unsigned long ptpfn, + unsigned long flags) { unsigned long addr = start; pte_t *pte; for (; addr < end; addr += PAGE_SIZE) { - pte = vmemmap_populate_address(addr, node, altmap, reuse); + pte = vmemmap_populate_address(addr, node, altmap, + ptpfn, flags); if (!pte) return -ENOMEM; } @@ -286,7 +297,107 @@ static int __meminit vmemmap_populate_range(unsigned long start, int __meminit vmemmap_populate_basepages(unsigned long start, unsigned long end, int node, struct vmem_altmap *altmap) { - return vmemmap_populate_range(start, end, node, altmap, NULL); + return vmemmap_populate_range(start, end, node, altmap, -1, 0); +} + +/* + * Undo populate_hvo, and replace it with a normal base page mapping. + * Used in memory init in case a HVO mapping needs to be undone. + * + * This can happen when it is discovered that a memblock allocated + * hugetlb page spans multiple zones, which can only be verified + * after zones have been initialized. + * + * We know that: + * 1) The first @headsize / PAGE_SIZE vmemmap pages were individually + * allocated through memblock, and mapped. + * + * 2) The rest of the vmemmap pages are mirrors of the last head page. + */ +int __meminit vmemmap_undo_hvo(unsigned long addr, unsigned long end, + int node, unsigned long headsize) +{ + unsigned long maddr, pfn; + pte_t *pte; + int headpages; + + /* + * Should only be called early in boot, so nothing will + * be accessing these page structures. + */ + WARN_ON(!early_boot_irqs_disabled); + + headpages = headsize >> PAGE_SHIFT; + + /* + * Clear mirrored mappings for tail page structs. + */ + for (maddr = addr + headsize; maddr < end; maddr += PAGE_SIZE) { + pte = virt_to_kpte(maddr); + pte_clear(&init_mm, maddr, pte); + } + + /* + * Clear and free mappings for head page and first tail page + * structs. + */ + for (maddr = addr; headpages-- > 0; maddr += PAGE_SIZE) { + pte = virt_to_kpte(maddr); + pfn = pte_pfn(ptep_get(pte)); + pte_clear(&init_mm, maddr, pte); + memblock_phys_free(PFN_PHYS(pfn), PAGE_SIZE); + } + + flush_tlb_kernel_range(addr, end); + + return vmemmap_populate(addr, end, node, NULL); +} + +/* + * Write protect the mirrored tail page structs for HVO. This will be + * called from the hugetlb code when gathering and initializing the + * memblock allocated gigantic pages. The write protect can't be + * done earlier, since it can't be guaranteed that the reserved + * page structures will not be written to during initialization, + * even if CONFIG_DEFERRED_STRUCT_PAGE_INIT is enabled. + * + * The PTEs are known to exist, and nothing else should be touching + * these pages. The caller is responsible for any TLB flushing. + */ +void vmemmap_wrprotect_hvo(unsigned long addr, unsigned long end, + int node, unsigned long headsize) +{ + unsigned long maddr; + pte_t *pte; + + for (maddr = addr + headsize; maddr < end; maddr += PAGE_SIZE) { + pte = virt_to_kpte(maddr); + ptep_set_wrprotect(&init_mm, maddr, pte); + } +} + +/* + * Populate vmemmap pages HVO-style. The first page contains the head + * page and needed tail pages, the other ones are mirrors of the first + * page. + */ +int __meminit vmemmap_populate_hvo(unsigned long addr, unsigned long end, + int node, unsigned long headsize) +{ + pte_t *pte; + unsigned long maddr; + + for (maddr = addr; maddr < addr + headsize; maddr += PAGE_SIZE) { + pte = vmemmap_populate_address(maddr, node, NULL, -1, 0); + if (!pte) + return -ENOMEM; + } + + /* + * Reuse the last page struct page mapped above for the rest. + */ + return vmemmap_populate_range(maddr, end, node, NULL, + pte_pfn(ptep_get(pte)), 0); } void __weak __meminit vmemmap_set_pmd(pmd_t *pmd, void *p, int node, @@ -409,7 +520,8 @@ static int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, * with just tail struct pages. */ return vmemmap_populate_range(start, end, node, NULL, - pte_page(ptep_get(pte))); + pte_pfn(ptep_get(pte)), + VMEMMAP_POPULATE_PAGEREF); } size = min(end - start, pgmap_vmemmap_nr(pgmap) * sizeof(struct page)); @@ -417,13 +529,13 @@ static int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, unsigned long next, last = addr + size; /* Populate the head page vmemmap page */ - pte = vmemmap_populate_address(addr, node, NULL, NULL); + pte = vmemmap_populate_address(addr, node, NULL, -1, 0); if (!pte) return -ENOMEM; /* Populate the tail pages vmemmap page */ next = addr + PAGE_SIZE; - pte = vmemmap_populate_address(next, node, NULL, NULL); + pte = vmemmap_populate_address(next, node, NULL, -1, 0); if (!pte) return -ENOMEM; @@ -433,7 +545,8 @@ static int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn, */ next += PAGE_SIZE; rc = vmemmap_populate_range(next, last, node, NULL, - pte_page(ptep_get(pte))); + pte_pfn(ptep_get(pte)), + VMEMMAP_POPULATE_PAGEREF); if (rc) return -ENOMEM; } From patchwork Tue Feb 18 18:16:43 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: 13980414 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 93E81C021AF for ; Tue, 18 Feb 2025 18:17:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EB18F280183; Tue, 18 Feb 2025 13:17:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E13CD280181; Tue, 18 Feb 2025 13:17:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C8BF7280183; Tue, 18 Feb 2025 13:17:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 9C84B280181 for ; Tue, 18 Feb 2025 13:17:33 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 49EDD1403FD for ; Tue, 18 Feb 2025 18:17:33 +0000 (UTC) X-FDA: 83133873186.12.7FAEB93 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf09.hostedemail.com (Postfix) with ESMTP id 78C2C140021 for ; Tue, 18 Feb 2025 18:17:31 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Rz7kpm+R; spf=pass (imf09.hostedemail.com: domain of 3us60ZwQKCG8SiQYTbbTYR.PbZYVahk-ZZXiNPX.beT@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3us60ZwQKCG8SiQYTbbTYR.PbZYVahk-ZZXiNPX.beT@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=1739902651; 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=Cqd9IxTofwawmp1dYCujhov0pMRv31D5VOrM7Wa0ZrI=; b=FtH+oOlD6FLk0bvt3bXw1EcS4MwR7W+PnFieG9EuLTdJpWG0y0QdflzV/bTjc1TNEgP3Qz Uo58TO00JYKZJybtwb8RESi1EZ8xi5GKn1j1EJg9XQlA/m+oz52l8HMg039WSiYxSR3Kn0 vAJneXES9NAB/+naKi/WgqSYEmLFADg= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Rz7kpm+R; spf=pass (imf09.hostedemail.com: domain of 3us60ZwQKCG8SiQYTbbTYR.PbZYVahk-ZZXiNPX.beT@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3us60ZwQKCG8SiQYTbbTYR.PbZYVahk-ZZXiNPX.beT@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902651; a=rsa-sha256; cv=none; b=6cn3PwTAVkJXQrh3YKcFzlYqX7ZrvQuSrCdcQGU8gnRqpCwCNzhCg15jUmCaGaQzvIEn2C AWMmjc8kP76n/xwlb4zoRw5icjGgJ6tOFU2Vd+mZ4qChaSsPuRrw9bVUQR+cj9BDhO8nG2 6XOHziSl5WNdN0lH48Wqb6tGONd3r5g= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-22114b800f0so89332525ad.1 for ; Tue, 18 Feb 2025 10:17:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902650; x=1740507450; 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=Cqd9IxTofwawmp1dYCujhov0pMRv31D5VOrM7Wa0ZrI=; b=Rz7kpm+RxnsLrhttxWRoFKQDs7zS16egkzfU17mLxVLmWrH+0ZQi2/7/l6kQkHrdpj tnTlxqBhSaSLuKBfEoc/Rm4GHY83qoYA1d7FOmsW3jR1TfiAGU0W5HgG8fvVltT5kob7 nJDRjlix7nYkw3mFRX9l52c9dsu2qE26/SfL5FIxuoc5XHC4cF4E3aCMmWS5452m+U2a zGlQ0spGVd+p2jhURS8A0pKE7EAYNL1iX1PcmyEGvuf6gDLe8BDIBTerzApPqjMRfi5G SLWWukAbdyAV6a8yHY4BePofUspj+2vUkKqfp960uuaXIrl6wntLoyWwgSXsZrBqVxXS VILw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902650; x=1740507450; 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=Cqd9IxTofwawmp1dYCujhov0pMRv31D5VOrM7Wa0ZrI=; b=Kbmh1kafkwp+tEs9Xg8nDyEpXyy2COpbEy51VVt/k2h+N4TA+nin6L7DiTrAmSQUR8 whOaLBFswg4/vfLgyp0P3w3QyPIFgB7VH5Vlh+IHoeiY1OMguRz3Zi2/nQTLFk0oITNP 9Z2139JdC6HFljGE24FXJUbAl9FxihMif2x6nGtR7/40T5twlQQ9HHtYi/q4Ucr0K+2+ DXEhvQdj73ExzH2YUfu76BBJwMPji8cOxU2n4Lo9WOwS5LTlleu/ogMmBaAhP+1LKhYG 7tFy7Z7a5JOur2XraPG6fyNPe/7+qNoTDtZt8+gv6dDkwTMrOPvAv7LcNGZ+RQc/Bhou 3BQw== X-Forwarded-Encrypted: i=1; AJvYcCWYKD77BGyODlUn0MwYkfVyD4vCELT6gMcYSHTWA3XWtIEeEFvKiHurES48Z4DZ2TlKlHz1tRvo8Q==@kvack.org X-Gm-Message-State: AOJu0YzMcpcv3WjbwZy11Pmiu3z+DEtQFxNWCZkGXl01GtHUOXlHIU13 n20KAt33V/zOD1DJaFAd/F6W4cuz7/RH+lOHS0BorhZsOoPcJn5cUDhu0FzeFC588fsPRQ== X-Google-Smtp-Source: AGHT+IFjTD0B6vnesK387z7IZw++9KQQ8VuMcl6CQdkIwwGo2IRYNL3TOstEEppR/SOlo9oZvDErqS3A X-Received: from pfva19.prod.google.com ([2002:a05:6a00:c93:b0:730:94db:d304]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:72a6:b0:1e1:9ba5:80d8 with SMTP id adf61e73a8af0-1ee8cc162e9mr23545819637.33.1739902650491; Tue, 18 Feb 2025 10:17:30 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:43 +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-16-fvdl@google.com> Subject: [PATCH v4 15/27] mm/hugetlb: deal with multiple calls to hugetlb_bootmem_alloc 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: rspam04 X-Rspamd-Queue-Id: 78C2C140021 X-Stat-Signature: 9p84mhtmgx4zztnwsyycy4uuigc65xhq X-Rspam-User: X-HE-Tag: 1739902651-645888 X-HE-Meta: U2FsdGVkX18k7+WSzhzg2tVDIuNL7Qcu0htfblVkCh/1RuxPSMAnSTmx8IdMrmai3ZpciOTyDVBMD7uGCl7KOZDVvJwpArPrMYSHYZsUHt6bGQZ+2ieTUKROjm7KPAhHR5f2JylXiBPqaELRNSyGKrb+wXdMIw4OSRMyJoJseLbTQyzROEQmSTrYwCOU8/KxOac6VkZD1eYw1tBmBqcFhNAlNf4VpEVj1OIO0BWxAxPq0G9jcfRjlO1rC4+MJDHygF3jALyw6rONwqo973zMhMcOcIxdy+mAN9oaxkeKRXL/w0S5d5eSOjW8OPxUoMpahGJqMCWTVAuXMcoWFfitam4hTfR3b+5X0nccvgSjcjjxxPp01vTGZ05R0JQwDY+kUSRlI3oP1H21sE2uBnPov0EO89P1s02tktbCKy57GUcnebDmG+sl8W/nnUBlMf54VWSmcBab8eB2kHwUklQbBKjRcKe6Y6SwubQKznoJPWDm9OKibFapXxpETFwEmCHb5kpYNL7xoSTkeDYAjKDIQCuos8hz2wyLK6FWHxOxyitcouveHWcAbHcVoaN/Pu1zJ2LepEAY7kHIk2STwjJVZcLlQgvEIRWcfYy57rZtYTRZvUTtKtsURcyaDohWiBHq5olNAL6M5c2a35A/8lD0S10RYSv3gSc6tyJR5rqqcbZ2ZMikm+Br1jFCBR+kkSAigVjrDS0BiiAULW02CIQruxIHNIR0UZ+PFvmLzSswRYTGdKs+JokZTgiMDur096i+Rwr/TgllxKEusICrfY1PkDBxhIyfcqXC8R1ZS5ld+MwQ5JZWiIBcq/SW0Q7DHzGo80WQ4UhPBIc4D5KU+oMQmMthzKUpXyKOcNKXW3FyaiLmMEJ/hCqKZCxlAKF3W7/l9MGBw+ZewKuND0SUmkgckUGcPjZyyqI+vX/4IRnlabUYSve7kYFSEAExJ/Y8dSenGuZhgsPsGnAu5QOZ7h/ 8GN5/r78 RwZb5bbm2Ue1q3hN4e8PQ+MAXU3L9Z977SaDcZXsnVi/Fe3+XKUdVXXAfL95xvQCdJYGoVlzjINLlGQokzWjzDf4FZ/I3O5AIioZyB4JsBtyEyVkyNBPYYTzAyqKPypuw835AP9JlN/ojkAMjCfgv0f4mxyC7ibTVYGpNmtpwD/K0ZiwCs27hC5OfWELnI2XNCWAms+IlCiP5ThpvLYfQakamceHyBFJsFxDdgdL0Rn/k3YPpy8E9q8gzu3WRa5xEMJcID16Fyo0LisfJSu/WLtCJzZmhXfS5ygeFEZsBJR7ezMxZZHcZUEVdW/fPWKJfhBH8Z2BPXNCJAGnr2sUF+Otpk44W6fhxPCAZCNlftRtPN1OlQnAz2fSIy1EYmlcRLIaWwKopdVDkSzvlw70tb/ElosF67rT9ttyi7MrI7rEVT5QGyyP9TYLy0NEXUq0DXVSeHjPNnFrSd9DmHunOZ9PWzBZkln8u74Dp2rnpl1Mj7wDXVa0mYMXkLm1uDqD0d+59/PxoC/TAXkt0qZAXBrLgcU708nUyxPnXKLOuYSZ0jiJIN5J7rcr4kpXPqDkLP4kdFqtTL95nXI1Mg9zkqGnqXv9tdnmUsVnoUitWmj3GiQoOqnrs3RWHaQNanX6ow8btRtrM0Vd3Hic= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000009, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Architectures that want pre-HVO of hugetlb vmemmap pages will need to call hugetlb_bootmem_alloc from an earlier spot in boot (before sparse_init). To facilitate some architectures doing this, protect hugetlb_bootmem_alloc against multiple calls. Also provide a helper function to check if it's been called, so that the early HVO code, to be added later, can see if there is anything to do. Signed-off-by: Frank van der Linden --- include/linux/hugetlb.h | 6 ++++++ mm/hugetlb.c | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 9cd7c9dacb88..5061279e5f73 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -175,6 +175,7 @@ extern int sysctl_hugetlb_shm_group; extern struct list_head huge_boot_pages[MAX_NUMNODES]; void hugetlb_bootmem_alloc(void); +bool hugetlb_bootmem_allocated(void); /* arch callbacks */ @@ -1256,6 +1257,11 @@ static inline bool hugetlbfs_pagecache_present( static inline void hugetlb_bootmem_alloc(void) { } + +static inline bool hugetlb_bootmem_allocated(void) +{ + return false; +} #endif /* CONFIG_HUGETLB_PAGE */ static inline spinlock_t *huge_pte_lock(struct hstate *h, diff --git a/mm/hugetlb.c b/mm/hugetlb.c index f9704a0e62de..ea5f22182c6e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4906,16 +4906,28 @@ static int __init default_hugepagesz_setup(char *s) } hugetlb_early_param("default_hugepagesz", default_hugepagesz_setup); +static bool __hugetlb_bootmem_allocated __initdata; + +bool __init hugetlb_bootmem_allocated(void) +{ + return __hugetlb_bootmem_allocated; +} + void __init hugetlb_bootmem_alloc(void) { struct hstate *h; + if (__hugetlb_bootmem_allocated) + return; + hugetlb_parse_params(); for_each_hstate(h) { if (hstate_is_gigantic(h)) hugetlb_hstate_alloc_pages(h); } + + __hugetlb_bootmem_allocated = true; } static unsigned int allowed_mems_nr(struct hstate *h) From patchwork Tue Feb 18 18:16:44 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: 13980415 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 B6EACC021AA for ; Tue, 18 Feb 2025 18:17:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B7B11280184; Tue, 18 Feb 2025 13:17:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id ADF59280181; Tue, 18 Feb 2025 13:17:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 931F2280184; Tue, 18 Feb 2025 13:17:35 -0500 (EST) 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 69A5F280181 for ; Tue, 18 Feb 2025 13:17:35 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 0FED61C6FBA for ; Tue, 18 Feb 2025 18:17:35 +0000 (UTC) X-FDA: 83133873270.25.E320F3D Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by imf19.hostedemail.com (Postfix) with ESMTP id 3D3C41A001A for ; Tue, 18 Feb 2025 18:17:32 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="RFbRofL/"; spf=pass (imf19.hostedemail.com: domain of 3vM60ZwQKCHEUkSaVddVaT.RdbaXcjm-bbZkPRZ.dgV@flex--fvdl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3vM60ZwQKCHEUkSaVddVaT.RdbaXcjm-bbZkPRZ.dgV@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=1739902653; 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=9lCunPNvyoNHPREweiOwt6l2g29bvKIWb/bOkZd5SCY=; b=X8chlEClzIn0wzdlodguikoPDqPtrnk8eMhtNG/lDveqVmj0FHICKF3ufdBUkqJFZW0p2S TDzZsKdUS0FWB3DpKXmOfUzUqYP3ib61bS+UcnhuApfuB6en4fxgiaV4RJTb6FTN85PTdN mtmIsn++PUFefIOBPqJ7EJEpAG7lYzI= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="RFbRofL/"; spf=pass (imf19.hostedemail.com: domain of 3vM60ZwQKCHEUkSaVddVaT.RdbaXcjm-bbZkPRZ.dgV@flex--fvdl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3vM60ZwQKCHEUkSaVddVaT.RdbaXcjm-bbZkPRZ.dgV@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902653; a=rsa-sha256; cv=none; b=RyQCw99vPvb+orzbsIJ89Q7dB/M4dFhGBXZWnVNPOGRp01SMFrok51F/6dos6Ut+rAMNJ6 78Xd/YI2M1s3ErodkhgZKnjObns/10Wwpxxd23GR4inzshhbNboV/Fs2x1NCulpZVCbHk3 dW5srIJ8RroTGphyFogdNEMmtNdBLSM= Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2f46b7851fcso18470723a91.1 for ; Tue, 18 Feb 2025 10:17:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902652; x=1740507452; 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=9lCunPNvyoNHPREweiOwt6l2g29bvKIWb/bOkZd5SCY=; b=RFbRofL/6nmog3TNhuj1WWvbuJiFbLj7aucVmoqEhx03S7XvTkKZviH/mteAjbXBfz NyGbqi8VcMLEn/j2nxV/iYUt5Y1rHoNoYQNyCufyx/agrjRHvkzmNKJbTBapCiklNrdy W+BqIbU5xtT/uTpKTYUv+8RweLaJC+C+4GsKWgHG2oy/zFx/qjeCEgdLHV4+qOCWZG5e 0glaUknCI+sWchmeSBHw3AFKi1iqVoR/pIOT7bywO3l9oFEK2Cz7wXCyEnVwoPT45S3K MX/g5zUD9erN3uqS25O3+nKXYKpKZaLgwPfQcw2VGKbI5hRbhjNzC96ezJ1nb5u0wlER NjTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902652; x=1740507452; 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=9lCunPNvyoNHPREweiOwt6l2g29bvKIWb/bOkZd5SCY=; b=FYswK5F65E+kAguoiuCXVF9tq9EPQFAN5JFuBA87f9oiIvTRBUJo0ZMCBvOpLNrS1u gjFAyp2x6AqIF4z8SGsYvQJxh8R19k+AFx0bz7eHqBWKpTRjPX/oC+3glfSgXzQaN4gk irh2Q6ep5xGtZ5Ia1eBE64LBlujD3EDUl2lPvw4TnLiMMu54F3dhISqliowNJwuKTTqy U8UnhJoUE5IWZUbHdg4fknSedoUGGKcnNS1jzjb745C26lCoY42T8mwutEGfb3xlJWkz 6WI/yZh8V5zshp71jJHfNSUVxaBIDuqTa5i5XVozr6ZPBx5+XRTrYhz6A/CK80i/x6pV Fp5w== X-Forwarded-Encrypted: i=1; AJvYcCWSpH4doVHHeZkrNEtO3zV5a7y96kGZ9Hyg/xA4Hs92vLBSEWa8tfpP2CKLj5OhcAWnk3LxFb88Qg==@kvack.org X-Gm-Message-State: AOJu0YzimtdklyCyYCFYdoFoe5lUpp2T1QiGD/IMfo2f/woVR3TZk2j4 Y56PLqOUVXqwfrYjpDRCQ2Gy7d2aZoHiHiEa49tYT8fUvAKOLFqyjs1gob9hYAWHEejyTQ== X-Google-Smtp-Source: AGHT+IEiGtyScdRky5bkAafNraZwWCRGFXYj414LaJ08JfaMF+efUR8WKUPEyVMq5sIlSaMu51tlCpWi X-Received: from pjc8.prod.google.com ([2002:a17:90b:2f48:b0:2eb:12d7:fedd]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4a09:b0:2ea:9ccb:d1f4 with SMTP id 98e67ed59e1d1-2fc4078e984mr27765805a91.0.1739902652189; Tue, 18 Feb 2025 10:17:32 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:44 +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-17-fvdl@google.com> Subject: [PATCH v4 16/27] mm/hugetlb: move huge_boot_pages list init to hugetlb_bootmem_alloc 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: rspam04 X-Rspamd-Queue-Id: 3D3C41A001A X-Stat-Signature: h771kdk5soydx6fzefninbgw6s551rae X-Rspam-User: X-HE-Tag: 1739902652-662978 X-HE-Meta: U2FsdGVkX1/HUOucww21GnFyTT2BWrpHEm7gMkaobNRqH4SG8plr5OCEJJd9r68mUAFT597o5xnTHBvW/HX1fAQY5ifYYSvCVfbYd3vzZ4Jm3UC//1P8nEZPulynzd4gdf9tZyijqDvJyxK+H2UACnEy7LAGeA8Zz7PSEoBh0Nd+U1koAQXXaiQL9xpY5FZ9TDBmKZqI9oypxQKGy3e20ndo48KTLYv8152LqCUiFgS53o4boGVY41Q0Fv0cDm8gVFtABzjlX67HYqzd0lCHhZIdpnoemyJbbkCgEz3ciVsbJDlmwyckzYBUQgL2puzwlyFVl7vgdlnlMtlci49fg0wKhjjdUwwC5OhjkrIPgDq8XVNYCzyg3vCzQqBhafQA0UqiPDZ78lSd1NA01cx3MagDRwe+7paYFKEM4LIkTZu7R2loPwJaqF8mTZJGfY+J4Uguctb/NEXXieVDANgOcvnaJYxTk9yWzVfs23y7VirZjVFCse0RBcYHbwfs2ogjBAoGdei3Ez2aPLWA75dkPr/0JCE94Sa7wmEOxHqH7efei7Up95AL/Lc165Ut2UFihxtcT7cPpz0impaDmKXO1KsVXuAD0Dxd70qotz67QlixXbHS/+fcFlXhtDvePAVG0OoJ/tFqxvtQltPexlfAGOIntn4QX72n23/MzozR7K0cUuEFv8ZO2Ptq+VrEZrNecuXrBzeuh7/03EUKOy54OM+n+Sv+EDfgoRKb4/vBCXHC07KizMnkohwyPGTpqc6i6cy2E4IhgoWwwaNNrr7Jve5yxBAH5eMMIALktX47W2aOytIYrYf//m/BJBGthyMILGTxxh5HBG2MsaNdcknTfUXP+DblSiNQEEGTrmkxE+9EeRlE904hEy0nhwhakNdpoPcdf3+V7WQKZrY1hlifziYeN7+95uZdFZrTWgAAesaLUWqha+zgPa2e4b38083TT2WGi1yfGTvV5VPb1fq e4eqe7Ae 7UimOqRk2Kbby2yzdK/xXiQ2GG2MFiYQISy3Ie4qOSBW0Ak4fpDGIbV6ur+K8LJz9ThdQPOPjfV30gDZl90b/Ahj12tlRmSHz5PpKVNGoAi8kWC51HQVHVMpY3ZoXgjh3oR0UKYoXHZ1/lyEa3A/rQU5mCN+v+I3OdC4pM5/z3OsbXcHkfIBYUzB6Fp9QiZxhfa3trasq3c9igUhXvKR31gWPDDoGp3KSmMR5EUPbwBG3DbR3NkCjlRYFXpnoUJvlzEY21X4C2/7eZHsknuHny4B2mPiqfspUILKPvvzjjXXxsEyX9xBsI1Ltzw8g0Bzn1ohWRkfnHzeWJo9iM49MKqszu+fvoUJW1vlAehAIbpQ+GJi/TXzDyn1USutD/B65nDCeF4jcvd5mMSB8MmM+VggxC6n/00jGgdAONLmZS2lvWisV2I47BN4c0RMi8vgkoftaeoDkD9xOdyaCRlLkNdD1UKbHrQJmTcGYoD+YrqMi3CjWd0d91n/ChyXx1PIkMA91QCOqin04SV0DV5xsC7G3941GP+ncaEKuHcPwScFHMeptlcKOxQgaQGuxW/8Szi/xE/uhj+j0jT6L6U+lYYoo9FEgHc7o9Z53lttD6El7+t4= 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: Instead of initializing the per-node hugetlb bootmem pages list from the alloc function, we can now do it in a somewhat cleaner way, since there is an explicit hugetlb_bootmem_alloc function. Initialize the lists there. Signed-off-by: Frank van der Linden --- mm/hugetlb.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index ea5f22182c6e..0f14a7736875 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3574,7 +3574,6 @@ static unsigned long __init hugetlb_pages_alloc_boot(struct hstate *h) static void __init hugetlb_hstate_alloc_pages(struct hstate *h) { unsigned long allocated; - static bool initialized __initdata; /* skip gigantic hugepages allocation if hugetlb_cma enabled */ if (hstate_is_gigantic(h) && hugetlb_cma_size) { @@ -3582,17 +3581,6 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) return; } - /* hugetlb_hstate_alloc_pages will be called many times, initialize huge_boot_pages once */ - if (!initialized) { - int i = 0; - - for (i = 0; i < MAX_NUMNODES; i++) - INIT_LIST_HEAD(&huge_boot_pages[i]); - h->next_nid_to_alloc = first_online_node; - h->next_nid_to_free = first_online_node; - initialized = true; - } - /* do node specific alloc */ if (hugetlb_hstate_alloc_pages_specific_nodes(h)) return; @@ -4916,13 +4904,20 @@ bool __init hugetlb_bootmem_allocated(void) void __init hugetlb_bootmem_alloc(void) { struct hstate *h; + int i; if (__hugetlb_bootmem_allocated) return; + for (i = 0; i < MAX_NUMNODES; i++) + INIT_LIST_HEAD(&huge_boot_pages[i]); + hugetlb_parse_params(); for_each_hstate(h) { + h->next_nid_to_alloc = first_online_node; + h->next_nid_to_free = first_online_node; + if (hstate_is_gigantic(h)) hugetlb_hstate_alloc_pages(h); } From patchwork Tue Feb 18 18:16:45 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: 13980416 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 B092FC021AD for ; Tue, 18 Feb 2025 18:17:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F27A8280185; Tue, 18 Feb 2025 13:17:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id ED53F280181; Tue, 18 Feb 2025 13:17:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CDB16280185; Tue, 18 Feb 2025 13:17:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id A609E280181 for ; Tue, 18 Feb 2025 13:17:36 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 6E87D1C6FBA for ; Tue, 18 Feb 2025 18:17:36 +0000 (UTC) X-FDA: 83133873312.07.7369B06 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf08.hostedemail.com (Postfix) with ESMTP id 9333C16000A for ; Tue, 18 Feb 2025 18:17:34 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=QPKY2vyC; spf=pass (imf08.hostedemail.com: domain of 3vc60ZwQKCHIVlTbWeeWbU.SecbYdkn-ccalQSa.ehW@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3vc60ZwQKCHIVlTbWeeWbU.SecbYdkn-ccalQSa.ehW@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902654; a=rsa-sha256; cv=none; b=1cs8JFXL/d7LK/f/nC2P+d/erXW7g5ujseQFci9ef4MgKG8o1Hy4Iy7TuYBDx2BO+f90Aq vcO4De7hPNDk1uSWybmAQVLruUwSJrsMwB4wQJxN/PmV3/egGrh7Zxr5CXpA9yrk/5AZ44 b5FH/UkIqbbDinmBm1M2gG4rBK68QZI= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=QPKY2vyC; spf=pass (imf08.hostedemail.com: domain of 3vc60ZwQKCHIVlTbWeeWbU.SecbYdkn-ccalQSa.ehW@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3vc60ZwQKCHIVlTbWeeWbU.SecbYdkn-ccalQSa.ehW@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=1739902654; 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=H28KJe5MgacBIfLyyRLl5z2RjmgjIpFaHKUhXqFLNBk=; b=I+hW8l47rMOTKbX26z5ZLArFZdEbF8yaNDW8Qh4rrfBTcG8khkFAqEqU+thfidTYu6D1QE 7GKD0M8dMhxT9ooHRzLSJj0PSp94nBtkRe07EYgJBURmxuGXoEGCL22eGefjjoBNa4HFLw 1N3a/hQO/1/+0WvVgLxlc4zLZvguysU= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-220d9d98ea6so149382365ad.3 for ; Tue, 18 Feb 2025 10:17:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902653; x=1740507453; 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=H28KJe5MgacBIfLyyRLl5z2RjmgjIpFaHKUhXqFLNBk=; b=QPKY2vyCRvRwOfx1sYCaOC5aMNj5iwpEaSMPPZGBxxJjH8F7lXMHIOlhvGRK17hl5C qvX+3X+bP1O2WZwRkW+Lj5/QBupDROxxi33+1v4YOOyNY7AD2ik4pmNP6MoMblSSqcmw NtU7V94DFady0/gzPwhjTjnCOYtggOjd+LqufIN3Akg9IsGNURQdO6CR1GoJCK4xFXxa R4IkxaQX4iH91Dc+VWBVNmnB8r9qFD+NTyS3kRnHRkyI9biYDS+urCr4ox1bUhkAheG9 gjXOOs97Acj1oiDEkDmxWbnjqGkPSxVwdmtYgfQkVEN3RweQRwJ28+l9POwsg6mxGpIq 4kyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902653; x=1740507453; 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=H28KJe5MgacBIfLyyRLl5z2RjmgjIpFaHKUhXqFLNBk=; b=AFNOrE8qtvJ4xkR5JWaX2XbNTh+xt5L9uOkFOL1ukZmPvZxBKYDy5Lah95YDKw8ncP qSGi3sanJODpxDOUaKxFr03LUZkASb0sjiQJQsHDJh0DN1qZcR2T+wM2JW/VTuLI824o uO6nQb0mtF7ARX9kQUSV7csYViQO+PYxDk4fLfOwZrfnUyhsekpdzxDe8SkbWqfnMY7D LlSmrmfSU96KPpAqYhydOVURsS25yfeTFER+6Nks9qrDKspSBjhhuXEywgMsu7SPKAtn imUpSf+9gdb9gAA9Ix1xnWryu+W5Te63Z4+w8o/2R/BriinZHY4vU8oBCaDwiv6MF39g Kf/w== X-Forwarded-Encrypted: i=1; AJvYcCXRu0FkaPraPwZCrpdR8eEJ0kDr4j+TyPnYTHDJ1O1yQyJArOhRQSthRCitd1X1iubfaugqUMJSvQ==@kvack.org X-Gm-Message-State: AOJu0Ywy5kq+PjQWtZmT1pEtaRjXWo4aWqs7RlZZeHM8RklvMbU4Lv3K HCXaur8H/rH6oC2L9ET65RkUyEWgE7Hxo8Y3d3PzuK6rBskYqVqX4xYMKxXvoX/hOVR29g== X-Google-Smtp-Source: AGHT+IG4XHG+Obo1vJ71xPprSQ0S+R8qkhjNyCp62AyEMPWnIwuFAP+MCFzfVR2WL5XMuvsvHBwfCzzT X-Received: from pfnd20.prod.google.com ([2002:aa7:8154:0:b0:732:730c:9012]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:a121:b0:1ee:c3dc:974f with SMTP id adf61e73a8af0-1eec3dc9937mr8778861637.25.1739902653508; Tue, 18 Feb 2025 10:17:33 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:45 +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-18-fvdl@google.com> Subject: [PATCH v4 17/27] mm/hugetlb: add pre-HVO framework 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-Stat-Signature: nihahshznekrq4i7qwk889zbfnobw3bg X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 9333C16000A X-Rspam-User: X-HE-Tag: 1739902654-908196 X-HE-Meta: U2FsdGVkX1964rgeAXQeekyKvg58r4kIw87hF6dRRym/fNZ9VrED0qGpHGdp2LifaQcfa9xODfEHSsatS7ajiOohseSQGn3zrftYdCoFOScl0azP0taH3L8lg35iQN3kGH5ZZHGTsnp09SzvB6gMXT2bhcHK7HSWcf9NWbHn2JBIbQ5J5icGitF/huHWo0jCn+uXczAb1be/1w7Zsx2BHh+u7hgkceGDJEh8N4zeGOCQ10bJ0i4tAYlnEUHa8RupxIcl4K6PhAF/iM17myTz40vGRXH/yUQVJKOFG7D6m78a5p9MqJ6nfhvgIF5fwnb45Rf83BoBSawhoqYHrBoPYgf1vmIyk0Trt6yxw80OG+pdwewYoEA46eZkElcOXnMaO4WRFpkOTBstfHP9L5POnzHIaE5Gb6k46yR6moeHZ1z1AoZ9h1o/2W6USB8xEGpjGhj+Op7uGNL6mnoWRUS2nmW55sg6JZiebBUK9OtkVbFF/WlV+8prxVYZtGbF6Nhf2dcoUUu2RVAU5PBXO416bglYV/iEiYeofn1A8910Is4vlH0sVv0czICgfubkpzhe0PEgiGQ8UYWHtJai/vVXGFBh5FPWcqZq6mHJfvshv23lA7TQDYy1rvUOVsJNIDa05f71dm4RigzLbqqMTTEJcGDwZvF7RxNrj5Lhq6iltM6cn+f2oPKS+P6Yy5NUBZjjXEKTf6chMRb69Clkx/HweXs0e68YcbnDF1d3g6eTc05Li5mJfYu/xAWrdY4/MyAuqlu2fHPCURNDk+bf5R6SXwNLFzYOOeWNebwIBc1MbUiV+s7DrWWrh68G8NLhAOylOmQ6A5hVOXNmcI5p4BWuEDSdsUMSResvFdb5mY7xwWsiEJCrNIJdfZzb4oOsOWqHXJuv5giShwkwxpqITq4AZrEad/RT7GW97vtcoFDfhJIEsr3ZJsWCo1KnD4hQlOk14yeDqkkRKvLSnDGZL4t 2sEZNtbK PwnksHP0/RIyG620TJ83ik/U+rQfzG9EhGTKltGPPp5A3gDfxkuJt4nPXEkVD3NR7p2I8NsPbJTRbfTojF2O4khnFCzQv1mtr6Li7CeF4TRXyvwsvy0nWUgDsou1zQ2knFX8q7C/FVfxHUS1i5/IPLHIfsFeI3KDchmh4b4q0eMu469kb8OGcEhjomb+pVRwz/pHjGAKldIyn71dmsuArj4DVDbFcb+gNl8oJLXffA9zhHY0kaU6F1SmFVCa1IIOTH57mc5KU2eVr/H2u2tSsJ21NGauS/VO90beXBC2O/tF6bjISY6QJpGnfIYJbobrdMtcCP7k7xHzx5fpl5+YxVWxt0cx4uuYxmA3/K3sry+kbnobdPFolg22bHwXh0eKWRN4laFF1LRAUsTa28q2GRYe2YOOLfUHVHyYfOnlwtAvjkiz0mQhz2lLHFwYWvaYUZiCd3DmxZu1+M1D0tXwqTzwclSYC0Gkq8P+pEkQI//CwgoWIRMUnuRLbyCO2hDd5iEvz/QOz9JsvDJ8aaRdrcOrlwA== 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 flags for pre-HVOed bootmem hugetlb pages, and act on them. The most important flag is the HVO flag, signalling that a bootmem allocated gigantic page has already been HVO-ed. If this flag is seen by the hugetlb bootmem gather code, the page is marked as HVO optimized. The HVO code will then not try to optimize it again. Instead, it will just map the tail page mirror pages read-only, completing the HVO steps. No functional change, as nothing sets the flags yet. Signed-off-by: Frank van der Linden --- arch/powerpc/mm/hugetlbpage.c | 1 + include/linux/hugetlb.h | 4 +++ mm/hugetlb.c | 24 ++++++++++++++++- mm/hugetlb_vmemmap.c | 50 +++++++++++++++++++++++++++++++++-- mm/hugetlb_vmemmap.h | 7 +++++ 5 files changed, 83 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 6b043180220a..d3c1b749dcfc 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c @@ -113,6 +113,7 @@ static int __init pseries_alloc_bootmem_huge_page(struct hstate *hstate) gpage_freearray[nr_gpages] = 0; list_add(&m->list, &huge_boot_pages[0]); m->hstate = hstate; + m->flags = 0; return 1; } diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 5061279e5f73..10a7ce2b95e1 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -681,8 +681,12 @@ struct hstate { struct huge_bootmem_page { struct list_head list; struct hstate *hstate; + unsigned long flags; }; +#define HUGE_BOOTMEM_HVO 0x0001 +#define HUGE_BOOTMEM_ZONES_VALID 0x0002 + int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list); int replace_free_hugepage_folios(unsigned long start_pfn, unsigned long end_pfn); struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 0f14a7736875..40c88c46b34f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3215,6 +3215,7 @@ int __alloc_bootmem_huge_page(struct hstate *h, int nid) INIT_LIST_HEAD(&m->list); list_add(&m->list, &huge_boot_pages[node]); m->hstate = h; + m->flags = 0; return 1; } @@ -3282,7 +3283,7 @@ static void __init prep_and_add_bootmem_folios(struct hstate *h, struct folio *folio, *tmp_f; /* Send list for bulk vmemmap optimization processing */ - hugetlb_vmemmap_optimize_folios(h, folio_list); + hugetlb_vmemmap_optimize_bootmem_folios(h, folio_list); list_for_each_entry_safe(folio, tmp_f, folio_list, lru) { if (!folio_test_hugetlb_vmemmap_optimized(folio)) { @@ -3311,6 +3312,13 @@ static bool __init hugetlb_bootmem_page_zones_valid(int nid, unsigned long start_pfn; bool valid; + if (m->flags & HUGE_BOOTMEM_ZONES_VALID) { + /* + * Already validated, skip check. + */ + return true; + } + start_pfn = virt_to_phys(m) >> PAGE_SHIFT; valid = !pfn_range_intersects_zones(nid, start_pfn, @@ -3343,6 +3351,11 @@ static void __init hugetlb_bootmem_free_invalid_page(int nid, struct page *page, } } +static bool __init hugetlb_bootmem_page_prehvo(struct huge_bootmem_page *m) +{ + return (m->flags & HUGE_BOOTMEM_HVO); +} + /* * Put bootmem huge pages into the standard lists after mem_map is up. * Note: This only applies to gigantic (order > MAX_PAGE_ORDER) pages. @@ -3383,6 +3396,15 @@ static void __init gather_bootmem_prealloc_node(unsigned long nid) hugetlb_folio_init_vmemmap(folio, h, HUGETLB_VMEMMAP_RESERVE_PAGES); init_new_hugetlb_folio(h, folio); + + if (hugetlb_bootmem_page_prehvo(m)) + /* + * If pre-HVO was done, just set the + * flag, the HVO code will then skip + * this folio. + */ + folio_set_hugetlb_vmemmap_optimized(folio); + list_add(&folio->lru, &folio_list); /* diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 5b484758f813..be6b33ecbc8e 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -649,14 +649,39 @@ static int hugetlb_vmemmap_split_folio(const struct hstate *h, struct folio *fol return vmemmap_remap_split(vmemmap_start, vmemmap_end, vmemmap_reuse); } -void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *folio_list) +static void __hugetlb_vmemmap_optimize_folios(struct hstate *h, + struct list_head *folio_list, + bool boot) { struct folio *folio; + int nr_to_optimize; LIST_HEAD(vmemmap_pages); unsigned long flags = VMEMMAP_REMAP_NO_TLB_FLUSH | VMEMMAP_SYNCHRONIZE_RCU; + nr_to_optimize = 0; list_for_each_entry(folio, folio_list, lru) { - int ret = hugetlb_vmemmap_split_folio(h, folio); + int ret; + unsigned long spfn, epfn; + + if (boot && folio_test_hugetlb_vmemmap_optimized(folio)) { + /* + * Already optimized by pre-HVO, just map the + * mirrored tail page structs RO. + */ + spfn = (unsigned long)&folio->page; + epfn = spfn + pages_per_huge_page(h); + vmemmap_wrprotect_hvo(spfn, epfn, folio_nid(folio), + HUGETLB_VMEMMAP_RESERVE_SIZE); + register_page_bootmem_memmap(pfn_to_section_nr(spfn), + &folio->page, + HUGETLB_VMEMMAP_RESERVE_SIZE); + static_branch_inc(&hugetlb_optimize_vmemmap_key); + continue; + } + + nr_to_optimize++; + + ret = hugetlb_vmemmap_split_folio(h, folio); /* * Spliting the PMD requires allocating a page, thus lets fail @@ -668,6 +693,16 @@ void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *folio_l break; } + if (!nr_to_optimize) + /* + * All pre-HVO folios, nothing left to do. It's ok if + * there is a mix of pre-HVO and not yet HVO-ed folios + * here, as __hugetlb_vmemmap_optimize_folio() will + * skip any folios that already have the optimized flag + * set, see vmemmap_should_optimize_folio(). + */ + goto out; + flush_tlb_all(); list_for_each_entry(folio, folio_list, lru) { @@ -693,10 +728,21 @@ void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *folio_l } } +out: flush_tlb_all(); free_vmemmap_page_list(&vmemmap_pages); } +void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *folio_list) +{ + __hugetlb_vmemmap_optimize_folios(h, folio_list, false); +} + +void hugetlb_vmemmap_optimize_bootmem_folios(struct hstate *h, struct list_head *folio_list) +{ + __hugetlb_vmemmap_optimize_folios(h, folio_list, true); +} + static const struct ctl_table hugetlb_vmemmap_sysctls[] = { { .procname = "hugetlb_optimize_vmemmap", diff --git a/mm/hugetlb_vmemmap.h b/mm/hugetlb_vmemmap.h index 2fcae92d3359..71110a90275f 100644 --- a/mm/hugetlb_vmemmap.h +++ b/mm/hugetlb_vmemmap.h @@ -24,6 +24,8 @@ long hugetlb_vmemmap_restore_folios(const struct hstate *h, struct list_head *non_hvo_folios); void hugetlb_vmemmap_optimize_folio(const struct hstate *h, struct folio *folio); void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *folio_list); +void hugetlb_vmemmap_optimize_bootmem_folios(struct hstate *h, struct list_head *folio_list); + static inline unsigned int hugetlb_vmemmap_size(const struct hstate *h) { @@ -64,6 +66,11 @@ static inline void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list { } +static inline void hugetlb_vmemmap_optimize_bootmem_folios(struct hstate *h, + struct list_head *folio_list) +{ +} + static inline unsigned int hugetlb_vmemmap_optimizable_size(const struct hstate *h) { return 0; From patchwork Tue Feb 18 18:16:46 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: 13980417 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 AC072C021AF for ; Tue, 18 Feb 2025 18:17:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 93DF2280186; Tue, 18 Feb 2025 13:17:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8BB12280181; Tue, 18 Feb 2025 13:17:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 70F51280186; Tue, 18 Feb 2025 13:17:38 -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 450E1280181 for ; Tue, 18 Feb 2025 13:17:38 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id F0F264A109 for ; Tue, 18 Feb 2025 18:17:37 +0000 (UTC) X-FDA: 83133873354.17.AF8023A Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf26.hostedemail.com (Postfix) with ESMTP id 2250E140017 for ; Tue, 18 Feb 2025 18:17:35 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=USjyuYdc; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf26.hostedemail.com: domain of 3v860ZwQKCHQXnVdYggYdW.Ugedafmp-eecnSUc.gjY@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3v860ZwQKCHQXnVdYggYdW.Ugedafmp-eecnSUc.gjY@flex--fvdl.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902656; a=rsa-sha256; cv=none; b=sTqeZK9CkdmgQSM6we5EAUM0gf2tRXcsNLXhk52pgk4rZSarMVJgtrxb0QWxYXPce/Qbyb XGgJA41/H5o5l84Dj1c9k4cS/fju3TNuZ22rNt513z7px65To3PLnZYz7YSOuBkNThXQTD k6MGovruabtjsW4ijb453S+K1SR9wDM= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=USjyuYdc; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf26.hostedemail.com: domain of 3v860ZwQKCHQXnVdYggYdW.Ugedafmp-eecnSUc.gjY@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3v860ZwQKCHQXnVdYggYdW.Ugedafmp-eecnSUc.gjY@flex--fvdl.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739902656; 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=MVW0ADe4T+7DvYpJ3Ja4Izq9wFlQZ3y1S7kL9Nh/bk0=; b=2ZmYlb5coeycTwWujRrgT4q7V9OGC1QOYCxJ2V8QU7CRPlGZFJRE+uk0hjAsKMucxwZy77 SM1M7roUWTBoFi9BH49VVlR6ExfNcxUfWu2fV9G1F7tdcJOZoRnR7O0srWvn7JMu4Rrrbq x8/btvysfpcfVdsd0jQGIbeZDMTFcFg= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-22126a488d7so56753035ad.2 for ; Tue, 18 Feb 2025 10:17:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902655; x=1740507455; 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=MVW0ADe4T+7DvYpJ3Ja4Izq9wFlQZ3y1S7kL9Nh/bk0=; b=USjyuYdcihL79GvZxXwecmsDH5WfFbBCknwIsddg+BFPMuZKklqwb/KfHiOXjgsCmP Vx2FNZ1789wWQqaRAQQ2ayNe9UTWXqf06eGMAWzU+e3vMz5uF4hwigN50VcyMV1xekBm kbzqtGvGrt2qPykLQtP0zAh2WbfSBCKkODS27Iio/1BeUj0FGK0VjPUiw/tirI/WyVCr w+cesZiKQ/Xt8OaGmCNmAsC8ES+zCjbtE8yq8yxetDizRMg3IVTw6wmUINE+F54ufg5Y /clzBQawLC0GEh7NuQpTEq4q2B3TEKLpIvFESzt81U6K++64ynDyp5JqJX5Ct3YhfTnj 6GYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902655; x=1740507455; 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=MVW0ADe4T+7DvYpJ3Ja4Izq9wFlQZ3y1S7kL9Nh/bk0=; b=lli2rlotauJsPt2bThiQWu+C0grFmBGyUMeCcdUai3osRODRJlVHR+6+hSxhEakYw1 6RkKoNq7aZuebljzKjzAsb+4gMXBMXCg3fO8TOGG+tY6XW7zDQVjeBqnGwynE5HeV4l/ G0g62FVuuHtjDC7o3+yVvCSoxXhY+5Seqhu5yKXOPSdpTfXoL9i2Uf8PxMZVfByT4XPk 8EFzHmaCFLR5FlBp31s6uR+748o8gB+ys/j8xqjsPYKZFtcQXDVfK4ERln3I6fPCwBO/ dD5jTWW17h3Pcc8OEEIaJp/AJclZHnOQYKN8j1tbefJtxwTeT7bhTdba04cpy3HpgGdi WvjQ== X-Forwarded-Encrypted: i=1; AJvYcCUqxDh2g4Ks51crB51EGIjZe7c++TBnkz2DZrzIz8/03kx6BOCK/OFuppdsPEogIPJolnmtehyuHA==@kvack.org X-Gm-Message-State: AOJu0YwYwVGF08byL5GHwiSbp0Gc/uKksi2s7imRBVDjRO9YdbXhorv4 MXFq+41YqwqxjcBZU3Df45mvsKQ5mRm/qJ41m0ixre87wZ6pZTacvQJcQaP5ka9VIycXIg== X-Google-Smtp-Source: AGHT+IGDKpSRe1oPu/VwRhWRHLOrhJKjIiM4oVbIlT3ZgWhE4plh+LVQZ2SzbJxbPpAJwZR48LTP+m6K X-Received: from pfaq14.prod.google.com ([2002:a05:6a00:a88e:b0:730:96d1:c213]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:2e82:b0:730:9567:c3d5 with SMTP id d2e1a72fcca58-7326177cbccmr24337762b3a.4.1739902655036; Tue, 18 Feb 2025 10:17:35 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:46 +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-19-fvdl@google.com> Subject: [PATCH v4 18/27] mm/hugetlb_vmemmap: fix hugetlb_vmemmap_restore_folios definition 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-Rspam-User: X-Rspamd-Queue-Id: 2250E140017 X-Rspamd-Server: rspam12 X-Stat-Signature: yogkoppsh5fmrzhgug5dk9w1cz6yj6eg X-HE-Tag: 1739902655-554582 X-HE-Meta: U2FsdGVkX1+raEos2TWu0dI/02PQiV8NcedSnljwbvho51uOEzsONODzvspP1OJxmutn6m4ZdJ0azZ9nRIHWdG35YJ86q5BpOU4H6t13BNhogwej/2MQTjEbWgTzHiDPKwXf1SCOYtLngrDZderyVj4JFoAN5ZS5YQM2kaWYPEtIm/qsKXj2+KeN4973lODTG7Q67Regt2A9E2OfyKMLi/TeJ/nqctbzO+qSuUn6TlIcoWshs6hU/0NEPjM5RtSIUV4pCgkMvQPzSLhpcfnpjuV1pPUDI2nYdkVRexFtZUmVC/wT18BtXPylq3GFOdhIp+gnbQgWQZTSdANA8ES+EdXwQPSNOj0kMZGUhNTuhD6gUTsh7O5DuZZTeybJf3tGIcKMXyEandCOqcxl3LTKZhi8JVdwr+9bXLLTau1eJ3KvvXPK+wGnt3EiuwpUs2q/Hjlf5XXg7VExm+fbnXOKlNimCpy+w9ZDm+cXXuq/rf+yAgU9PK+jsfJmZBUQpq6smq7nz0BPUs2TY2Wik1h6jxcooGfdec2HsJTMJA8XivkP5ADlm3YM9mIBngcBj5gTvq8B2Q3OFs+EnUv9CliRrFJ4bi0HI95zi9o2SHYF1z0938o8pOUTuBc/XQeB9IGtEviSx8hvr/ff49HAmSCwaIY6J4+rL0k5MI2Tl/uyLYnczJBVyZmMtVURUipt5sywUDoWDIF1zBhyGLRFiuZXA37BnU0/IsxDG/lch5wS16A0AjiyrbeJr+wpc9E6GDAeC22woTHLiYd3FiDOgZ+LX8QyFz8GLPkT/8ve3BkeBEbdteh7gZTQNeOiz1K9c+8k3E/TT9jmhJ5YrXtpYO7naubmmlNJ6Mw3KjK3pcFiKqK8jS8UEqjNi2IfXxFOX7iVxyKllS4tdaA5jLyExSGdigYjSKs98OVBWIsOTnn7hqi5aKBLJPY4Tr6TyDVboTVPo85dkhCybswqDZNoZCx mPMfwMzQ LNYLupBz7I63+1EKnThNlxZEYJM7VlhSIY+3xc8YHwfPk4aDOn8nE4ec5EM4cBMp8F8iFGq3Ja4EJQ0O9BzR8EL+bHCJvwdBAQ4EP/rbLEHi+/1+L6OBf9e4iL0yChrUSufkgjwH92zi6F1Ky7iEalrI3sYr3GtXRrocUV5BaEW94baUMelvp+JARK8Y2BIZ6Gf/8itaQj7hjCV5Fkdm3w+IC6vQg/ws3CWE4msxroCqXJ3CaBPz4YE0+GH9ksKieHbspNIHIa0J5UPjBC/iHA+YeSkt/XVOz448eBbtJ6wA9VEeg3YDhuebzG7/u3mzRQVHZQFhg7ZzXIFe3UAUN2iHuINaKxBzMTUeW0gG4JV61zEDX0QRkkJvBNb1PO7OkdglbkcVGf1ZCHKoksaF1FdDYuY5Tx+a7CkTE0g7L3zKhWUUCSYM5NYVAc4WL+CV9wOY8dsLEySyM4lT4h/9iwnHg8n3GzHcb0KqLGiVcN0m7hhpJlr0nhipUJd0D/QEQBkULpNPsGCE1qUI1UbdhDrdmX9+md5yWCwLmCgtoxgNmDgdsYIGGnucC40rViufRuP7GOJBNeDp+R6U= X-Bogosity: Ham, tests=bogofilter, spamicity=0.032405, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Make the hugetlb_vmemmap_restore_folios definition inline for the !CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP case, so that including this file in files other than hugetlb_vmemmap.c will work. Fixes: cfb8c75099db ("hugetlb: perform vmemmap restoration on a list of pages") Signed-off-by: Frank van der Linden --- mm/hugetlb_vmemmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/hugetlb_vmemmap.h b/mm/hugetlb_vmemmap.h index 71110a90275f..62d3d645a793 100644 --- a/mm/hugetlb_vmemmap.h +++ b/mm/hugetlb_vmemmap.h @@ -50,7 +50,7 @@ static inline int hugetlb_vmemmap_restore_folio(const struct hstate *h, struct f return 0; } -static long hugetlb_vmemmap_restore_folios(const struct hstate *h, +static inline long hugetlb_vmemmap_restore_folios(const struct hstate *h, struct list_head *folio_list, struct list_head *non_hvo_folios) { From patchwork Tue Feb 18 18:16:47 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: 13980418 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 92AA2C021AA for ; Tue, 18 Feb 2025 18:17:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 405B1280187; Tue, 18 Feb 2025 13:17:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 38AA8280181; Tue, 18 Feb 2025 13:17:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 16B66280187; Tue, 18 Feb 2025 13:17:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id DE8CD280181 for ; Tue, 18 Feb 2025 13:17:39 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 866C5C03CB for ; Tue, 18 Feb 2025 18:17:39 +0000 (UTC) X-FDA: 83133873438.30.7921E2D Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by imf24.hostedemail.com (Postfix) with ESMTP id B9099180016 for ; Tue, 18 Feb 2025 18:17:37 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=JPIo+knw; spf=pass (imf24.hostedemail.com: domain of 3wM60ZwQKCHUYoWeZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--fvdl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3wM60ZwQKCHUYoWeZhhZeX.Vhfebgnq-ffdoTVd.hkZ@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=1739902657; 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=eP0AuGGA/jTNyPHaz+0221ekTfSMUwsfV2inUw2T3XU=; b=n70kBkpj1Fc14sAGPCqlthbbQ/xSuFsHUI+G4OayHXs1qRywbmHby+oVvXec5aQdtvIRXH cLgQlRRkmvEh7j9P9n9wBarqG24dKrkmrH0ujSlTHBcSiy6b4gIlRBnxJLa9BrAu2PR+HQ 0wllClDxfqO8F1zSa7pnZUcUD1YaXX8= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=JPIo+knw; spf=pass (imf24.hostedemail.com: domain of 3wM60ZwQKCHUYoWeZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--fvdl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3wM60ZwQKCHUYoWeZhhZeX.Vhfebgnq-ffdoTVd.hkZ@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902657; a=rsa-sha256; cv=none; b=cW00GVNMNy1C8jEnGK2AgSTfnWuGy85jACyjZbG9PQnj56uPA09jv9enfSoDT2jTmJco7K BRGkA9Xwcpw1vnmPBkJWXyOzB5PNUA5SU3H3ip+UsYbts1uUH41Yh5htX5VtoSr7ohsUJE tvZi2MtSbhjSbfmSPhtY2MvhvfyiJAI= Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2fc1c3b3dc7so10609566a91.2 for ; Tue, 18 Feb 2025 10:17:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902657; x=1740507457; 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=eP0AuGGA/jTNyPHaz+0221ekTfSMUwsfV2inUw2T3XU=; b=JPIo+knwxCJK8HwUbt2nW/q49DdaWFely1SSdgnBtJnqukvNS30fmImu8ypObqWATt c8g1Nfpz2wZvDb2zxfgI7qPAoo47WogeS3v+/LgTdIQFnLL3owToVVisb/YWJmR1YGz3 YDz/ozRWLKcXwPYEjLjNR3ItoV7BdAfA6toim3z2XiYOeyzsPNziup8qYzzz0bS1POoC XjJ3XQRtjjna5wBPAatfTmNeM1e7mJa/z7fkQ+3E/cckSGgkHdBfNxr6f9fHFeZL5vhk eWzBA1GFDC4disSnYNMkyESiRSytrEgKO2xFR7TxSb81LTxQ+GSL5boCTAgbe6sydcMZ LRpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902657; x=1740507457; 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=eP0AuGGA/jTNyPHaz+0221ekTfSMUwsfV2inUw2T3XU=; b=YpcjrfvWXvVjMGgeLTgyQTaJoexlMXH6va8eNSxV89DtTuivDVdLLQAtwNxMA6kUH8 +9MPo3J/pvq4OrOjQ/NBmUkARa/jtDcgbtAi30EHrA9DXPoKYapvQrIc4NjJtqudBiGH 5Cjv1CbG4SoSDOe5K2ILCE2z5FjzAUO9fjC5SDLgxCK68lJGyNhu8leIeElNcD8sgh5F 4TUui4QFA/qTGcPDu975cFHuhLbYTlBvHxO+orJhJWiS/U9Lv6EYwVU5IhtZHahCaMtD 0pYjYUlgjFH5s/qiCmk2cpum9RfHwi0wXsvkFFSFuR+FHx80HE/NNQnvUR3s1gJ/hSIy OobQ== X-Forwarded-Encrypted: i=1; AJvYcCWpwHrOsMA7EstpBAcf9l9LPaABJDLl1FtSgbt66aPm874qlOL739axmxSHx8OcIUpM9CYDVmIKXw==@kvack.org X-Gm-Message-State: AOJu0YwUlvzh2uW+mUJ0czL/Kxwjh3risfR9pIWZQPbJBJFs1J7t2HwW 4Iv4Pjbb+PnpLDJdB0FPpmuhGZVpe3rUHjrckUANinU1QlTWWpJmFtCHpAZESePrRC70Rw== X-Google-Smtp-Source: AGHT+IFduQgbCRNLRZnaXpDInvEojX9LUGLV+zf9Z4pRhPbL38b/THp8EijDiXQ4hiilnJVfp24fh2cB X-Received: from pfbji12.prod.google.com ([2002:a05:6a00:8f0c:b0:730:50c0:136d]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:3c8e:b0:732:288b:c049 with SMTP id d2e1a72fcca58-7329de4ec7emr452685b3a.1.1739902656672; Tue, 18 Feb 2025 10:17:36 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:47 +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-20-fvdl@google.com> Subject: [PATCH v4 19/27] mm/hugetlb: do pre-HVO for bootmem allocated pages 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-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: B9099180016 X-Stat-Signature: j9mbopu4ngp79mfgfworozsmhsbeadma X-HE-Tag: 1739902657-77277 X-HE-Meta: U2FsdGVkX1924V2srULTVW+u/zs2/SPxR34B6fv1LwdVQnxclaDxjeryIGQ/LT5SOBF/f8P32vDA9aXLs+l1oU7SUXpsWq9+krNeSaRyD/D0LGWDslsxRtoB2P0zacUoVtE6hRkH2/Pj8hmWwJ5qMeyMxQZBawMNVmwu39WqWZSZuyylMjr4XF7EtIU+ErmbiewScTvTphAiF3sZkSGKwvePEOByYHPrjmIzii/ona182gCk3BkIuHYx/KOzRobf87/KYY8qm7cqSwf4tNRoAII6BnqlwvzwyaG9Aeb1Y1PAtoYz+rNv/r2HW+N7eR0A31mKpU2IWdVYodtTLkg9TKI7ZD7R2BrBFlUxZiiVrZIQCAAV1XKNIz5cao6RkHjMgguM25E64/fpnNz6Swr1hGXHqNAwlGcKtkpciGv5MeVgHXbH8Eapqgo8MDuxVAWg1xpKV5eqXiV/xVXja/3uPEX+u9bmdwzQ3vxPBV11I+x75LnBD1q8uFQWkS4YqUYm2N+Ei42dYwMoZPGma89EiccVLV92zbNssSq8tirLJUeekr/l4Vkf3JbJwO3mfX8eTT6/ZZr+XvKrvgpXFfFtZkLQrxnUsjtNj2M4Q2EkWZjzpUhpg8lyyPyW4P60x6zKRrkU2Dl8MHqBdfmJlRyTYnY0wOwk/6/k20+C6RvEcwS5UWzDyMOeH/Tnh/yGo/IjRmFIRi8TaxeuewbmoQafZy+sH8CCli8CAmFNTNtSKC0R9+FVDVnv7RxUy/XGxV7SOQ29f0UPfo8vV+l1nntu/cf5GUuSIiriOCOAdhUwBGeXDWFQpwy2xCxC5QOIYyL8JW9L1M3O3kz3puonZDemTMJm1iXWXx9YPt0hk6hIR+7ka7pi1Ggeth0FinFxrPrrbgOnqpziMyLeLfMtYVFrexQvlq+AzTx9x6q6NjQcoH765GHcjyGeyXdW9fb5bj5tyjlvQLENpBGP3cDFXy1 MNdFTFAL 1JJoKNkG8pFSDJPL0OITzMb6DPNMPAZuplFwyMavdm+7V1B3bpjUBRskVT8f1P+OOmkG3dZSoATINCHB4fo/r/kDaSp9k9PcTqdq12QWUUyWc+zYocKdjouU7h6gO0uN7rrPnItp7dsvVeOTii0xJRCdzsIGosOZmTXeL4IyafQCbHB60l0Iv2v2R3JCBiyxYUgsxXDpR6g7ai6rRB0b38kcqMTjprEjAj5fU60O953ivO3Xd7h0m8O/KKd6t1QlcSXBIEfu2ZS9Z3zOWFem6lDubACOo0o+Qq/10wnjCcE2aRgsCA91ieYPtfe/lQH0ZMpbiVnwcm9IhkssJmiX5gJIG+S0yF71ntbAuEO9z4vhezo+ZWgG5Z8LK9UHrXhS3Sj2d5+4ga6iZlTbP5MtHYYdPL73B4W1jctvQmJSWHqGdZolamqsPhF8TjOoWgk4VIFdX3ZBIr2kRKvM4z6u7BbSTX2skqjbKdiZOf4Lh6+Oz5sRa/txS0WFY1iq7CacpKnqlimh/lmHswHrIpJHXkbecEg== 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: For large systems, the overhead of vmemmap pages for hugetlb is substantial. It's about 1.5% of memory, which is about 45G for a 3T system. If you want to configure most of that system for hugetlb (e.g. to use as backing memory for VMs), there is a chance of running out of memory on boot, even though you know that the 45G will become available later. To avoid this scenario, and since it's a waste to first allocate and then free that 45G during boot, do pre-HVO for hugetlb bootmem allocated pages ('gigantic' pages). pre-HVO is done by adding functions that are called from sparse_init_nid_early and sparse_init_nid_late. The first is called before memmap allocation, so it takes care of allocating memmap HVO-style. The second verifies that all bootmem pages look good, specifically it checks that they do not intersect with multiple zones. This can only be done from sparse_init_nid_late path, when zones have been initialized. The hugetlb page size must be aligned to the section size, and aligned to the size of memory described by the number of page structures contained in one PMD (since pre-HVO is not prepared to split PMDs). This should be true for most 'gigantic' pages, it is for 1G pages on x86, where both of these alignment requirements are 128M. This will only have an effect if hugetlb_bootmem_alloc was called early in boot. If not, it won't do anything, and HVO for bootmem hugetlb pages works as before. Signed-off-by: Frank van der Linden --- include/linux/hugetlb.h | 2 + mm/hugetlb.c | 17 ++++- mm/hugetlb_vmemmap.c | 143 ++++++++++++++++++++++++++++++++++++++++ mm/hugetlb_vmemmap.h | 14 ++++ mm/sparse-vmemmap.c | 4 ++ 5 files changed, 177 insertions(+), 3 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 10a7ce2b95e1..2512463bca49 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -687,6 +687,8 @@ struct huge_bootmem_page { #define HUGE_BOOTMEM_HVO 0x0001 #define HUGE_BOOTMEM_ZONES_VALID 0x0002 +bool hugetlb_bootmem_page_zones_valid(int nid, struct huge_bootmem_page *m); + int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list); int replace_free_hugepage_folios(unsigned long start_pfn, unsigned long end_pfn); struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 40c88c46b34f..634dc53f1e3e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3211,7 +3211,18 @@ int __alloc_bootmem_huge_page(struct hstate *h, int nid) */ memblock_reserved_mark_noinit(virt_to_phys((void *)m + PAGE_SIZE), huge_page_size(h) - PAGE_SIZE); - /* Put them into a private list first because mem_map is not up yet */ + + /* + * Put them into a private list first because mem_map is not up yet. + * + * For pre-HVO to work correctly, pages need to be on the list for + * the node they were actually allocated from. That node may be + * different in the case of fallback by memblock_alloc_try_nid_raw. + * So, extract the actual node first. + */ + if (nid == NUMA_NO_NODE) + node = early_pfn_to_nid(PHYS_PFN(virt_to_phys(m))); + INIT_LIST_HEAD(&m->list); list_add(&m->list, &huge_boot_pages[node]); m->hstate = h; @@ -3306,8 +3317,8 @@ static void __init prep_and_add_bootmem_folios(struct hstate *h, } } -static bool __init hugetlb_bootmem_page_zones_valid(int nid, - struct huge_bootmem_page *m) +bool __init hugetlb_bootmem_page_zones_valid(int nid, + struct huge_bootmem_page *m) { unsigned long start_pfn; bool valid; diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index be6b33ecbc8e..9a99dfa3c495 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -743,6 +743,149 @@ void hugetlb_vmemmap_optimize_bootmem_folios(struct hstate *h, struct list_head __hugetlb_vmemmap_optimize_folios(h, folio_list, true); } +#ifdef CONFIG_SPARSEMEM_VMEMMAP_PREINIT + +/* Return true of a bootmem allocated HugeTLB page should be pre-HVO-ed */ +static bool vmemmap_should_optimize_bootmem_page(struct huge_bootmem_page *m) +{ + unsigned long section_size, psize, pmd_vmemmap_size; + phys_addr_t paddr; + + if (!READ_ONCE(vmemmap_optimize_enabled)) + return false; + + if (!hugetlb_vmemmap_optimizable(m->hstate)) + return false; + + psize = huge_page_size(m->hstate); + paddr = virt_to_phys(m); + + /* + * Pre-HVO only works if the bootmem huge page + * is aligned to the section size. + */ + section_size = (1UL << PA_SECTION_SHIFT); + if (!IS_ALIGNED(paddr, section_size) || + !IS_ALIGNED(psize, section_size)) + return false; + + /* + * The pre-HVO code does not deal with splitting PMDS, + * so the bootmem page must be aligned to the number + * of base pages that can be mapped with one vmemmap PMD. + */ + pmd_vmemmap_size = (PMD_SIZE / (sizeof(struct page))) << PAGE_SHIFT; + if (!IS_ALIGNED(paddr, pmd_vmemmap_size) || + !IS_ALIGNED(psize, pmd_vmemmap_size)) + return false; + + return true; +} + +/* + * Initialize memmap section for a gigantic page, HVO-style. + */ +void __init hugetlb_vmemmap_init_early(int nid) +{ + unsigned long psize, paddr, section_size; + unsigned long ns, i, pnum, pfn, nr_pages; + unsigned long start, end; + struct huge_bootmem_page *m = NULL; + void *map; + + /* + * Noting to do if bootmem pages were not allocated + * early in boot, or if HVO wasn't enabled in the + * first place. + */ + if (!hugetlb_bootmem_allocated()) + return; + + if (!READ_ONCE(vmemmap_optimize_enabled)) + return; + + section_size = (1UL << PA_SECTION_SHIFT); + + list_for_each_entry(m, &huge_boot_pages[nid], list) { + if (!vmemmap_should_optimize_bootmem_page(m)) + continue; + + nr_pages = pages_per_huge_page(m->hstate); + psize = nr_pages << PAGE_SHIFT; + paddr = virt_to_phys(m); + pfn = PHYS_PFN(paddr); + map = pfn_to_page(pfn); + start = (unsigned long)map; + end = start + nr_pages * sizeof(struct page); + + if (vmemmap_populate_hvo(start, end, nid, + HUGETLB_VMEMMAP_RESERVE_SIZE) < 0) + continue; + + memmap_boot_pages_add(HUGETLB_VMEMMAP_RESERVE_SIZE / PAGE_SIZE); + + pnum = pfn_to_section_nr(pfn); + ns = psize / section_size; + + for (i = 0; i < ns; i++) { + sparse_init_early_section(nid, map, pnum, + SECTION_IS_VMEMMAP_PREINIT); + map += section_map_size(); + pnum++; + } + + m->flags |= HUGE_BOOTMEM_HVO; + } +} + +void __init hugetlb_vmemmap_init_late(int nid) +{ + struct huge_bootmem_page *m, *tm; + unsigned long phys, nr_pages, start, end; + unsigned long pfn, nr_mmap; + struct hstate *h; + void *map; + + if (!hugetlb_bootmem_allocated()) + return; + + if (!READ_ONCE(vmemmap_optimize_enabled)) + return; + + list_for_each_entry_safe(m, tm, &huge_boot_pages[nid], list) { + if (!(m->flags & HUGE_BOOTMEM_HVO)) + continue; + + phys = virt_to_phys(m); + h = m->hstate; + pfn = PHYS_PFN(phys); + nr_pages = pages_per_huge_page(h); + + if (!hugetlb_bootmem_page_zones_valid(nid, m)) { + /* + * Oops, the hugetlb page spans multiple zones. + * Remove it from the list, and undo HVO. + */ + list_del(&m->list); + + map = pfn_to_page(pfn); + + start = (unsigned long)map; + end = start + nr_pages * sizeof(struct page); + + vmemmap_undo_hvo(start, end, nid, + HUGETLB_VMEMMAP_RESERVE_SIZE); + nr_mmap = end - start - HUGETLB_VMEMMAP_RESERVE_SIZE; + memmap_boot_pages_add(DIV_ROUND_UP(nr_mmap, PAGE_SIZE)); + + memblock_phys_free(phys, huge_page_size(h)); + continue; + } else + m->flags |= HUGE_BOOTMEM_ZONES_VALID; + } +} +#endif + static const struct ctl_table hugetlb_vmemmap_sysctls[] = { { .procname = "hugetlb_optimize_vmemmap", diff --git a/mm/hugetlb_vmemmap.h b/mm/hugetlb_vmemmap.h index 62d3d645a793..18b490825215 100644 --- a/mm/hugetlb_vmemmap.h +++ b/mm/hugetlb_vmemmap.h @@ -9,6 +9,8 @@ #ifndef _LINUX_HUGETLB_VMEMMAP_H #define _LINUX_HUGETLB_VMEMMAP_H #include +#include +#include /* * Reserve one vmemmap page, all vmemmap addresses are mapped to it. See @@ -25,6 +27,10 @@ long hugetlb_vmemmap_restore_folios(const struct hstate *h, void hugetlb_vmemmap_optimize_folio(const struct hstate *h, struct folio *folio); void hugetlb_vmemmap_optimize_folios(struct hstate *h, struct list_head *folio_list); void hugetlb_vmemmap_optimize_bootmem_folios(struct hstate *h, struct list_head *folio_list); +#ifdef CONFIG_SPARSEMEM_VMEMMAP_PREINIT +void hugetlb_vmemmap_init_early(int nid); +void hugetlb_vmemmap_init_late(int nid); +#endif static inline unsigned int hugetlb_vmemmap_size(const struct hstate *h) @@ -71,6 +77,14 @@ static inline void hugetlb_vmemmap_optimize_bootmem_folios(struct hstate *h, { } +static inline void hugetlb_vmemmap_init_early(int nid) +{ +} + +static inline void hugetlb_vmemmap_init_late(int nid) +{ +} + static inline unsigned int hugetlb_vmemmap_optimizable_size(const struct hstate *h) { return 0; diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 8cc848c4b17c..fd2ab5118e13 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -32,6 +32,8 @@ #include #include +#include "hugetlb_vmemmap.h" + /* * Flags for vmemmap_populate_range and friends. */ @@ -594,6 +596,7 @@ struct page * __meminit __populate_section_memmap(unsigned long pfn, */ void __init sparse_vmemmap_init_nid_early(int nid) { + hugetlb_vmemmap_init_early(nid); } /* @@ -604,5 +607,6 @@ void __init sparse_vmemmap_init_nid_early(int nid) */ void __init sparse_vmemmap_init_nid_late(int nid) { + hugetlb_vmemmap_init_late(nid); } #endif From patchwork Tue Feb 18 18:16:48 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: 13980419 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 D0FF6C021AD for ; Tue, 18 Feb 2025 18:17:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A9348280188; Tue, 18 Feb 2025 13:17:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A1E3D280181; Tue, 18 Feb 2025 13:17:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8726F280188; Tue, 18 Feb 2025 13:17:41 -0500 (EST) 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 64216280181 for ; Tue, 18 Feb 2025 13:17:41 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1922E49470 for ; Tue, 18 Feb 2025 18:17:41 +0000 (UTC) X-FDA: 83133873522.05.05D4EA9 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf05.hostedemail.com (Postfix) with ESMTP id 42DA7100015 for ; Tue, 18 Feb 2025 18:17:39 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="k/ryvaMs"; spf=pass (imf05.hostedemail.com: domain of 3ws60ZwQKCHcaqYgbjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3ws60ZwQKCHcaqYgbjjbgZ.Xjhgdips-hhfqVXf.jmb@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=1739902659; 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=kqfUye2Gqg+na9IHa3QFjTr+lGgP+C+b59c2LGbdQT8=; b=kb6LGODufBrNxZb+/y0zw3G2LUsI/cTUHlPAoCKW0uhwdATEDdLX+YhRWK3DSWxizn9Fhv OQjrwINzWvZo4Xu6hPKIhc9zbubC7OUWPmA1/5VBhxuHZ5T3G2MCzlKzKcLMbloItBOmWm 9pgpldwdU4wYvukdykIEOXnyInSmBqU= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="k/ryvaMs"; spf=pass (imf05.hostedemail.com: domain of 3ws60ZwQKCHcaqYgbjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3ws60ZwQKCHcaqYgbjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902659; a=rsa-sha256; cv=none; b=z1ivkzPiLu7jLYpXk7LkDunqp00D2MuL/ejaeTpfvT35OxEk02rMRHrsLtuFXqsGyXGQRX v8YMvNVqlHgYrha5xVW9JNihjcnQp7KdxmuHXK2k95fVMlFdJCnKngu46vV5BqaCgMFFi2 39NDr91o0+tL+A4+6mxV+huaiJkZox4= Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2fc1e7efdffso16331105a91.0 for ; Tue, 18 Feb 2025 10:17:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902658; x=1740507458; 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=kqfUye2Gqg+na9IHa3QFjTr+lGgP+C+b59c2LGbdQT8=; b=k/ryvaMseGRzrz537F/JoK8oGh4ZAJ8WbT/27hEsf6lc5NX9CEetaILmlJVaTSIgxN Ny0IuTIXOa9xrPxuM23uXGSwOjQlojODFc3XRc75PkE9t/eLhPk7VsfpGOi20+5Tj7eb wf9KKIHPice1qnXzYT+QrymuJ33DD9RAKChkRQeiu4K/l7Oklne334wSDNTSmgBKvFur MjakhsI6FMxdxy180XnXavHXQPgtzYWPNLm9KEy1YDxSpsSuR+ZL56txhii2CFvMSDGC PDkyj7gtGAGtZNqx9ZrZ7CK3+3h6RvzivJhaX6Isnl0x/KjA/+aEUsXgmictdLNnndI+ h3Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902658; x=1740507458; 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=kqfUye2Gqg+na9IHa3QFjTr+lGgP+C+b59c2LGbdQT8=; b=gXi8u5kBmpjVjX8K92pQHMEkrLfnVB7iZfTv0uXjvjHEGR8AGOfPnSiEb0n374aVxl K6JAAMn5fDhfQQ0OkR0c0hixKfE0lSY/b+1h2oTR07WIRylFZRtTVaXh+0CCAqEq7O1K lLlM8iZacIdWPYIG4rj8oYKj+Tj2Fg03MRm+9RelrFdK3fn00aCrEsUcv0/t0BKltblQ 1RHP5GgfdkzKQUkC4uvp6oEUbShE7t3cMQbgo6tKwhVoY0Oca39SKaF9rmRrWpw66wde As96Hh+nvT6ZnmMtFtsypiRQcRDxfmfRoeURryLlTXwxSR2rD7ptxbOZpak2PheIwhJL 6LpA== X-Forwarded-Encrypted: i=1; AJvYcCVyrEfX/bym1AK7GT0xeVlCZjjXtOHXlt3zR+9/qwTT9GjmToelhCt4epyU0nHxI08bnUKUZU1hdQ==@kvack.org X-Gm-Message-State: AOJu0YzaDyz7rey6ngbgyYtQY1YhN3q/0V34nqM/mItc/rzRZHJszbyH mjcCuwnd7v8gsMOFr1oJO5UK8qaQtEm0BRTbdEpH5UDMmYJpnAqxyMa3iHKfjrY0pj2K4A== X-Google-Smtp-Source: AGHT+IGT1727I8G5MvylvWz2EC9dEjwO1xfTuzAsh9q6nSIFNiBLO1VX50pO6D1H6yTl2+Ulds7JKb6Q X-Received: from pfbbd17.prod.google.com ([2002:a05:6a00:2791:b0:730:8a55:44fd]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:cd4:b0:725:9d70:6ace with SMTP id d2e1a72fcca58-73261798a0amr24087264b3a.6.1739902658195; Tue, 18 Feb 2025 10:17:38 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:48 +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-21-fvdl@google.com> Subject: [PATCH v4 20/27] x86/setup: call hugetlb_bootmem_alloc early 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 , Dave Hansen , Andy Lutomirski , Peter Zijlstra X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 42DA7100015 X-Stat-Signature: fffzaqbfzcoxnnfjpza4wgtf6bk8qaon X-Rspam-User: X-HE-Tag: 1739902659-224517 X-HE-Meta: U2FsdGVkX1//B8ozFCJZz2dcW3tFp43stZJoO6QyA7CaeaSGmpRJBe8DyJEngyMJDmU8/AQLFM/PkHxH1UXWyLhZFbd2Ygd/m1muGolS3rO8GM7dOPb2jD9PGAQ5cXNrYiF1AmpgyxN/gdqcRAI54G2Rz1HMTBLgcyHgv1T51cvBAAFxo5ZLn48hTw6g4/mPYMmk62ejf0FAc0DL5WqyQI8mBVZSEbHEj66X9/3zOO88wjENg6taLfneQ8SGEU1UbKze9VeW6oGLEGh0c8IzFZhzzGEPD4FY3cnNV1jyHeg3sR4fdyHETARRuH1e+Uphm9Jf9/zHj3dQrxynvFgn8xlxRY2K+cNVmzWyrYmoiBam0BYPz+QdnjO4N6BHY4sHWTAnuQw5cVbLBoRIS/7AlzPxv78vs4anzdGGaym6BKaTgytWN4sg+qlsPvN2yar4gCEerElRE94IojP9YP9fJSpsd6Wvu4Rd4/l6EtEV4a3XLtBj3nxmk1ic4Rngt/temRY2dj3WuQEg8PWK8wgkrUjdcKMgwRXxEkKwtym24+ZIYvgjf8EzBsw6edqtc0qp9guoYabWBwDjSGHuiIBYpKPmqr5EKfVx6UZske+UTQiPbXndbtqzAnDCJUWjDTRCAwA51bVwqZKdIaVF7n6E7q7djOIZ+ChTdqyukM/pEYL6e6Uqg7r/npkATCOL92E8O2AXaPOjXZ8KzBPQMtWqAIDm4PbBhCbqGt1+JpxXJsUzphB7onhKtMGCS9uuw2rT8nzsVuo78Q8b5EaOhcXhRTnG1x5hRVsiRyvyg3nDkbF8xwXrt+oaNWT5ounpu3EJiTUvm1MxNZ4cWoLOeZrr7Zrhi3gHcgtDscifiIdG433binVaU19u+Cx5AJ1Sa2u6FIHcjozroiD7Kr0XHH1ap1yD0q5uAg96yDihn+YknjGAyD6j4HHnHAPkUqW65fMW+Ii9nLVGensUSO7JPw4 xpRMQXfU yLFhne1/JwhGM4xq13/Rp2oOs622BEKGbbJjNBNpZ9qY7yCEOqp3eE/rM1W39Z3hixB/31oKHv5J77fqa7qy4VK/jAWy5svO4xTtxjiTmZB/Iih23/jSrE8iiR+kFdc9D8wSx4+SaE+sZAMlkfrrTVP3C0VTfUjKezRWOL9N4yOSrn4tZoHE+VS5ic6RNRhhdqh7clNc4F1hoYlXiQtCmCWNty6DqWEkqUs78/5LCezf1OC+sMwV9459eow12GRJiTpRnETMWs1sGi48DJK5nATMcyfto04KdVoeb4ykvufKURCka4Y8Qo9aDssTqTUFc55mUAWU6Bd5MaozBU9g/k09o5BQMKjBqgVIzGNNedJagCRadjhfHcAOyQPivjeKVPu8cr/42fqP3eTC4A8yELqTCPPVulEDfqM1N1ly3O/s5ntxuHthHlxp1XcT3LMuWhk4R29ymsiVByXtHooYOM+IlxCyu+7Nt+mTgqX4b6V297QclPMaMSCyOTfr4tLNOQzWvPkCRavWFXAc5/e72RonlfXGNEiGHU/dz3S74+qVJHgXtGd3Jommgfv03LNGN0gcLbnvKXjPh5IbK6QFYbd2iCzQeekx77J/mE3g1sJq1EBavcFYnxix6uyxi304zuMyfCNphvfbiz7IzAvZd6Cv4kWxJ8tEXwPEJ87lnXkskEXdTUfBCvPAtVg== 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: Call hugetlb_bootmem_allloc in an earlier spot in setup, after hugelb_cma_reserve. This will make vmemmap preinit of the sections covered by the allocated hugetlb pages possible. Cc: Dave Hansen Cc: Andy Lutomirski Cc: Peter Zijlstra Signed-off-by: Frank van der Linden --- arch/x86/kernel/setup.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index cebee310e200..ff8604007b08 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1108,8 +1108,10 @@ void __init setup_arch(char **cmdline_p) initmem_init(); dma_contiguous_reserve(max_pfn_mapped << PAGE_SHIFT); - if (boot_cpu_has(X86_FEATURE_GBPAGES)) + if (boot_cpu_has(X86_FEATURE_GBPAGES)) { hugetlb_cma_reserve(PUD_SHIFT - PAGE_SHIFT); + hugetlb_bootmem_alloc(); + } /* * Reserve memory for crash kernel after SRAT is parsed so that it From patchwork Tue Feb 18 18:16:49 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: 13980420 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 CC34CC021AA for ; Tue, 18 Feb 2025 18:18:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8BDA3280189; Tue, 18 Feb 2025 13:17:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 86CB4280181; Tue, 18 Feb 2025 13:17:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 699B6280189; Tue, 18 Feb 2025 13:17:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 412A8280181 for ; Tue, 18 Feb 2025 13:17:43 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 6644716043A for ; Tue, 18 Feb 2025 18:17:42 +0000 (UTC) X-FDA: 83133873564.02.1EBB69F Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf20.hostedemail.com (Postfix) with ESMTP id 84EA81C001D for ; Tue, 18 Feb 2025 18:17:40 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=R+Dyyj5m; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf20.hostedemail.com: domain of 3w860ZwQKCHgbrZhckkcha.Ykihejqt-iigrWYg.knc@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3w860ZwQKCHgbrZhckkcha.Ykihejqt-iigrWYg.knc@flex--fvdl.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902660; a=rsa-sha256; cv=none; b=CzZRp77Gve4s4RUXDoRkKGDT+xysvyBYvRyp7I0nPh76CO0JuYRevQ3A01CZf3xk2GLICn f3l6n8l1Ld/jFIIJKLh9/fSaEj79MjuQnguK9Pe3EU4f0DWVoUNKOfyCmjwU7HJffBZRjt uxLP+97ySGY3eapEpdM+9vlvNsSlv+g= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=R+Dyyj5m; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf20.hostedemail.com: domain of 3w860ZwQKCHgbrZhckkcha.Ykihejqt-iigrWYg.knc@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3w860ZwQKCHgbrZhckkcha.Ykihejqt-iigrWYg.knc@flex--fvdl.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739902660; 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=C4lxvaanET3KprDs3s7VrwzCEx/dq6Uoz76UzjW+xmI=; b=ApjCsmncXTTxTpHQAdOp/FZNxSd1+j1WZVbnucIlkKwSMxXwjuT6r/ogoIexpiVzeTzXh3 Y2818rZ+9eJyEqgXL3aCfR2tIOKOnVeDngBs7f3VdRPsuVYz7Zeyr0cH83MYYhfBodKOfN WvSPEeWfM5CkDbwmwUrrCLfrp2paxGU= Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2fc4dc34291so5733220a91.3 for ; Tue, 18 Feb 2025 10:17:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902659; x=1740507459; 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=C4lxvaanET3KprDs3s7VrwzCEx/dq6Uoz76UzjW+xmI=; b=R+Dyyj5mEJWXKENFORL+3wZGrJfF+mJ1h87eJwZcTKVYtSJOvxSt2oNhXrt/B2o/I4 9Rhnq4cMs2+OXglyy/PzKKnQnY4SHzJs+Uvzqsfs2870f69e0bmegGWY2GhjXlCf8jYS bXDmY6czj3gl1rRsyjIBJkNaxr134A2J6HuPlvBLt4H+IZio6zba/81Fo288gfbJS8I2 KbkNTc98he+Kk03e9mav3QhfZWNDJj0qFarUpB7h0Q2vZ5DEHbe/wd75wM49+sxo0YPg 8kQ+tbK/Z+bcpp4oTNFG4DOH4aFEIKvZCDoyjFJRiUpV57PZ6QZzqIyNYDmMwH8x0cjO 9I9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902659; x=1740507459; 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=C4lxvaanET3KprDs3s7VrwzCEx/dq6Uoz76UzjW+xmI=; b=iLAYZE17/soTMqY4d23d349iVAkF3RDzxsZor1n+2kxf5BLdVxRLSjhbm4TMzAUmfW /vdRw9cIWGUXNhPytyAkcxL87oEMJgCB+Md5MfVp9b0nVgPz6lZE0plZM7XM/BFoLD7z 6XqYfVEsPHezAjvv6I80ZLev3P+3UqyPaQihJjXGQGeoehkN7ex1jDVvZKsPVljFo5se 2I9sXpFsNp9NCHTIpAhVObofHn3yLpI4woFbbjgeZF0ufRGeAlNniA+DKt82U6Tg5z0C HiV40twfzDW26CbsC9YmUdqUG4Znt4YRyfX6YG0bR2CgEyc6u/C3ZcrJTKK5WCq4oUjJ yC0g== X-Forwarded-Encrypted: i=1; AJvYcCVFSTAjZLohrcm5xKKNaUySS12OhbApopjA0EHE03jkyaJCdRyi4QhU/np/U3h2n+Jdn7pnTkV7QA==@kvack.org X-Gm-Message-State: AOJu0YyRZAI8/0hb0H78upQxfdtFVOdb/UpseDSQ0I9yGulxwkZiHq2k 5m4WUhHvysMcux4/TyLQAhJ5znZhbR2BLEX6zWes+zE4D3L0JLfInYGIJtCsjfsChQkA5A== X-Google-Smtp-Source: AGHT+IFxez6ckyQY1Z+cRSf5y3EPSwk4DytJGyZjzIw5jPp+flAShbFokg8rFRyA+qYRsz2KFf/vnhwg X-Received: from pfbbd17.prod.google.com ([2002:a05:6a00:2791:b0:730:8a55:44fd]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:14c2:b0:730:9659:ff4b with SMTP id d2e1a72fcca58-732618e4fccmr18581142b3a.19.1739902659518; Tue, 18 Feb 2025 10:17:39 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:49 +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-22-fvdl@google.com> Subject: [PATCH v4 21/27] x86/mm: set ARCH_WANT_SPARSEMEM_VMEMMAP_PREINIT 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: 84EA81C001D X-Stat-Signature: j9ipbjy6w5caeqbf4cnuaohgkio6gmtu X-Rspam-User: X-HE-Tag: 1739902660-536437 X-HE-Meta: U2FsdGVkX1+t/wDmWDEXrkYPFHLwmKIBkv1iPETd20wtVD8mzAnj3ADbaREBmX0r30QWsZzkRk4xgQGxVAxfln44rrzqsUnXUHdL5XxYB7bImwzpwpeYW7sr70MV7pMEl7DpXN36fBKEsqQj1AiUxxtvX9CNN/agUHbdRQk/dcRe0HZPpX/lWJbtaYgOFcyhsJzUAC+EF0d4jMK++m2ePVMhEH0Xdg8fiUzFhbz7gYa7bdAD+tuYnA4MzwFgASfO99VHmSYlBxf8O0B50+8JS7mqPGz7rFz+WUSaQ4MFhjweVx4c2AEiKNxvbYJ+OjAiz8hYEALOcIzVISO/ARwL5j/moiSCerIwzjowUw/QiMzPvr3m+d4/gT9pD/cTaggb0iAQDErFgjfzI6J1hR/RPn50hbfna2S+cWBA9lvbs0hK6fy+4gYXkB6P5xhnQmxZ1ZWnfulcDBiu0CMw2jxBIbnR97deka3QXCy+33us0g/H/nQlwTkbkvySSRq/ocfOpQ47Ry5vrU/wZiZLyew8BlHadTr7BJl9bj8/ZwPIa+AVN3h8nIaoBiXcKEgRRXUs7ryyTqlhXuK+IfZD7A4gJqSFOfVAOKxIQnv9tS0/maWPBcwbyYR/r1GNrVeycp0p+/JCWil1Cw0RaSBqlGLXdKpywjgsUoEZlPsUgOdLZxHO+7A2IgoPuwzcK9+G4DZiqIjcleix8e1e7DgFS19KvAmB5I6Edmy8Xp4KFZzZmwQwvjhn1c/mhN3k6lbJu2/WPJCjK5S5zQUaB0t0tNd1FTJUsEj34P8XxBSfOQx4SIXd2Rg8vGBvIY/zCOUQXQJSO8+eyn5KXXWqp2R63mh009+YeSzqHLNsbivBvzjmP+qxvrnzi93fruYjBVsU/f9NCtEjfFJNuDdE4hOFeLrIhg6ulyqjH2uY5725wwERP3aZEq6jxPkbD/GyD8aWcNUJnl2D1bwy0UHJ5SeBKuL /v8QerLC kIWlEHwcuXkrZZoZWJgc66bu/s/V0xrcBdX0DfblWWjiCxE3ePkzOMypI4mEEgwwHumpqw8eeMb/HG5IN/H/evce+RUeJSEhdBsvG8xN/OteqdmboHulTb/jgN9fmiY/x+DdHvK5uA9z9Ee0wuRI8geum2QYQG32eN98JqtcrYJ5Ao3NPMmuCcsPtIh6pCxcIDmO9nR9wefvwi06omgfHJMFGoBBn0q05ENtr+7dOx++OOX5dbDYGC76oOS+5QicskWUd9EN68CDIiW90wEkSSxYtzlOeKk2LtmKyqPSyYw31NyM8F7eCJTroD9EF/QWS6KCUdrHz9z/VoVyYxaOmobLuccNljev8oLjQiKJZ+iAHTmME6H3g7y4+JmAEe8cI436UyFH76yY/qKEJygssd69T9fY7v3Z6FoQ5iFYcqVKpTnOC8fXI9SdSCJMeIfd8gZYPyUS7NgcwuRzx2Zb4mOwErOx+gXmwHrJoYlc3oBfqm3+5lT8v0OQ0JNlbVRDoyBY/QjInpv3EDzdCMftdRkpvtU1NU7B+atF7FG47LF/oft7ueVnEJicbq1FTZSHIFTrc 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: Now that hugetlb bootmem pages are allocated earlier, and available for section preinit (HVO-style), set ARCH_WANT_SPARSEMEM_VMEMMAP_PREINIT for x86_64, so that is can be done. This enables pre-HVO on x86_64. Signed-off-by: Frank van der Linden --- arch/x86/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index be2c311f5118..fa0c0059959c 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -146,6 +146,7 @@ config X86 select ARCH_WANT_LD_ORPHAN_WARN select ARCH_WANT_OPTIMIZE_DAX_VMEMMAP if X86_64 select ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP if X86_64 + select ARCH_WANT_SPARSEMEM_VMEMMAP_PREINIT if X86_64 select ARCH_WANTS_THP_SWAP if X86_64 select ARCH_HAS_PARANOID_L1D_FLUSH select BUILDTIME_TABLE_SORT From patchwork Tue Feb 18 18:16:50 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: 13980421 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 9144FC021AD for ; Tue, 18 Feb 2025 18:18:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A6E2928018A; Tue, 18 Feb 2025 13:17:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A263D280181; Tue, 18 Feb 2025 13:17:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 847AA28018A; Tue, 18 Feb 2025 13:17:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 5E87B280181 for ; Tue, 18 Feb 2025 13:17:44 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 203271C5538 for ; Tue, 18 Feb 2025 18:17:44 +0000 (UTC) X-FDA: 83133873648.19.C96D8EC Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf06.hostedemail.com (Postfix) with ESMTP id 41C9A180017 for ; Tue, 18 Feb 2025 18:17:42 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=tREwi+TO; spf=pass (imf06.hostedemail.com: domain of 3xc60ZwQKCHodtbjemmejc.amkjglsv-kkitYai.mpe@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3xc60ZwQKCHodtbjemmejc.amkjglsv-kkitYai.mpe@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=1739902662; 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=kGTbfuDhtOfrmTloe9TGps+4hlek0DMBo1K39iEQF0Q=; b=eVRcTwAhNmrodAQ1pdAIX2koL6PvD7nJV10CBixlHYjvMFwvgP/kUZktGh4lnZQWNVYpQX yq6G4+5V4uZygyV+P2CxZ33bgEafB5an/nppvFlT8YSNinpl0Au+QYy+AZMJ8PI6NZe7FS Ch9/CXpURaLZNFXCMjoHo1WnXigZYtI= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=tREwi+TO; spf=pass (imf06.hostedemail.com: domain of 3xc60ZwQKCHodtbjemmejc.amkjglsv-kkitYai.mpe@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3xc60ZwQKCHodtbjemmejc.amkjglsv-kkitYai.mpe@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902662; a=rsa-sha256; cv=none; b=BmBfgKUHJnPryvYKc1ywqDRYBYSAjr7Vpk8nw3r94N6hy3GQ19+MJmWzfu6mE9xrV8kJtq 8vyIrT00momVpqb+bhk0BRHpcrSG7Chd0pyoyPH6+zcX+vNy+D+nilNmzpD/14mPaFgKMj M4BMhgLvPKp6DJlD56prCJWhawCRtI0= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-220c1f88eb4so92003225ad.2 for ; Tue, 18 Feb 2025 10:17:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902661; x=1740507461; 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=kGTbfuDhtOfrmTloe9TGps+4hlek0DMBo1K39iEQF0Q=; b=tREwi+TONNSjOeSXJOp8vE2xFH2gBoCzd+MQGzPQQKaraR4fuWUcJhk1ucgZFvLu+9 wGy3t+Im/vUe8jPmhEN+gqa9j0RDn43PSCFfcXbYuW4yG7BbHWTVRWq190gpThjsmtA7 9cXHstZmbu0MibcLIDSLSKl0ENJWgJ8xt1fPOYaLdQVdIzbmktZm10z0QReYGsrSFsZ2 046Arwbfpnw3P9z6Wyaph0IZlZeF8rvbBplPoweLLDhEKo7DPDqf23CNta/ixCOd88R8 ydwXmCNKU7iIl6bzEMF4I59JXar9P2hfJKlmPACFCGMPsUBugKDxDlKblNVHP1JJjKvt 4ToQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902661; x=1740507461; 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=kGTbfuDhtOfrmTloe9TGps+4hlek0DMBo1K39iEQF0Q=; b=RG0BGeWwqUG6OfGL2RxQA4EAYP3/hTLIShdgRVoXH0CyUw1oj0xhM9q+n65QinCMTw boIpr2pyPlQdFDasnxNexNCbpcNjPhzewkKH9Nma9IdSfzQl7DxGqASS+Obdk9Lhbc/I jrY4Hrj15FLz3SrETMa+ToHB55gebyxoKmrKD8tGd/MaHX8OWOqiGy41S33drJxCz3Nb 3haEARKVQ+bVR2dWKwLoPQQ4k/ONtRBZp3K1Z1QoL6gH7X87xVryf7FoDnnfO7p6Hejn 558dfSQ/Lx7jL0QkwqZdfpxn2SEhyDM486fUlcFof0pROfUuGa+K4EMrzzlyQskWQ2iW LcJQ== X-Forwarded-Encrypted: i=1; AJvYcCVtvWexAUWaZM+GSFoeWk4XnxgVVyPwKcKPuWCNj/8qQdWsYiAdTLeA2bRQzHoQu6KKlVbSbeLViA==@kvack.org X-Gm-Message-State: AOJu0YwU4Jsgl2To0jtIgEphq+jnqrfqGAiGYJQo4uVSisDVYRLsoMUk QrWxDTCQ5alvqj5dMYSd4skNmJtlwenbM2pgeBMblFaFURES8zBTk3aRe4IDbutfyQRu+g== X-Google-Smtp-Source: AGHT+IGC76au004/aFeR5ds1UoSeoi/FYjc7RFTvfNZAi/zas3b2Y6TZXHmBA5s4wW0uV/fN5KqM21qn X-Received: from pfbf7.prod.google.com ([2002:a05:6a00:ad87:b0:730:7500:ab0c]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:2443:b0:732:2923:b70f with SMTP id d2e1a72fcca58-7329de80bbemr370375b3a.11.1739902661113; Tue, 18 Feb 2025 10:17:41 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:50 +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-23-fvdl@google.com> Subject: [PATCH v4 22/27] mm/cma: simplify zone intersection check 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-Queue-Id: 41C9A180017 X-Stat-Signature: ow33nhmpanorht31rigo7n1e6z3xozqb X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1739902662-476481 X-HE-Meta: U2FsdGVkX1+fWe5J8hgFhKduhs2WYw/N+kcNuua5kxu2tcoWAKt/bQ3TjuAT1Lw1rkRZhToFXe9+ub9hS7/cSX/PxE4ELjsEDiqx6Iv74wPP8YztLXig7D/2WyBogoxwxnlX3Jzw8a/tYdSWyvAd7nMRCVMq16PIlKlPp8rASAAqzGLUYG5Ceb7VAdRAb408MH8N4xOvIbZrwqlRBQjz/gWp9vy/YB4Yab8LKMgALQtzrdegt+SugjsJmiIGMlEU2c88IEGnxGzLgFH9agmI0UcnlwxhXoKiwCKnJcWA6pZAKJ9AwHhncym4K/SL7pNb01luU7iLN4xbxkAbq5rUoDzNCAEnC5iTGf6SMG02IHla2i4C3ua+ern4zDYtsUOjhw0GUdrniIqKtgjl3PW6vLQSrx+MxevBMFmPyXkTSZPtJ3CgJuxbPKdTwQScDpuvpU66xSxxj3QtUgpojYa3PZDPDV/KXjl6zRO8HVoP5zx7it9wkXHTbNsKkJzGDbKN8pkP2p+ElBBf+/daivIAz58vfVBMQMuDpzWEmdqXxmzOVI9DYaccYOVEtXjWhbH1ILM43pzIxyL9Nq8cWNkWQjvz5qoxmGPlTtKmdGAL05X3G/D1uMpc/QTSvkoc0mCXmTsfXrc/Lx0Hp9tMrE6KOFQGx885Hva6i4t8jDri4dE2hrY5rhfGT9xcj32EO2CSvWiTUsS6mMTNGy0RrnWWKiEdFoGDiDJIa3E+q3mnEmrKY5+ewein1UXcVBmmFLvm5qzhAiby08klxkm5Y/NG8MdhmxE65P8o/sqgqDM9JaTtm5sJZTk6awG/5gCplqz/VArtgSYA1CEgK4VRrUF/UYxVMO/5sHAmLDQoq7ostyj/1DQsNorkaHIxi0MdDCiYxKOONpbWcw95GwT51jBbGN2UX6toFo+GZwFtM5fLqM2Na2k5ygqEfLkm8sVyZvm8904ymjjSxBVst6qyRJ0 PFHC18tP OYGxfBAxQcJSHKRfZiQm6v4GMWGnu06B6+jEY58Es5V7AreiTmKtx0rTTrJcqQ6gXQbXO0zax1Q5s7nEQ9mwYl0CQM+tZZ3bY/8hjzJ4f+4TPWCuq1EfHu5ZJlX8OZZ3D8KHTkE0oA+WJHDEOHYlXifKhYuryIH1GEmpIsnfZI++6SdrFi2DUmnuoh/sTEe8wOhPQhpVwJUnkEG/UseH0rjUnzbqI9NxSf+IhWYc8RN9AwmDQbMv/O0cZfUl1247Z6lcAUlCrTmdf9eKkP177uFSkDYAMWvC6/MKE476C7Saj/JbiNKFz0CYKEZ6NpGj15pOSm4SGEM68a7VE+zW4XqSdD/VCz4SwGQwz96IVB10weeo4rkNnyi7ddEfwHhASYzd1+Fwpwf5SfRIspMmkqV93eyHRA8QqmHDJTIbH8jHlgoyALKE972FlJHH+lzGAiC8xL5GbsoYBf+FE1KofpGh+5kJnnDSe2+Z2Dfc+7TEbdoYPF2wpLGv6om4jwJeO/g6KoIrndGvh2ee5WYJcsi4xew== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000047, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: cma_activate_area walks all pages in the area, checking their zone individually to see if the area resides in more than one zone. Make this a little more efficient by using the recently introduced pfn_range_intersects_zones() function. Store the NUMA node id (if any) in the cma structure to facilitate this. Signed-off-by: Frank van der Linden --- mm/cma.c | 13 ++++++------- mm/cma.h | 2 ++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mm/cma.c b/mm/cma.c index c7116a5819c5..d0227af4bb71 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -103,7 +103,6 @@ static void __init cma_activate_area(struct cma *cma) { unsigned long pfn, base_pfn; int allocrange, r; - struct zone *zone; struct cma_memrange *cmr; for (allocrange = 0; allocrange < cma->nranges; allocrange++) { @@ -124,12 +123,8 @@ static void __init cma_activate_area(struct cma *cma) * CMA resv range to be in the same zone. */ WARN_ON_ONCE(!pfn_valid(base_pfn)); - zone = page_zone(pfn_to_page(base_pfn)); - for (pfn = base_pfn + 1; pfn < base_pfn + cmr->count; pfn++) { - WARN_ON_ONCE(!pfn_valid(pfn)); - if (page_zone(pfn_to_page(pfn)) != zone) - goto cleanup; - } + 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) @@ -261,6 +256,7 @@ int __init cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, cma->ranges[0].base_pfn = PFN_DOWN(base); cma->ranges[0].count = cma->count; cma->nranges = 1; + cma->nid = NUMA_NO_NODE; *res_cma = cma; @@ -497,6 +493,7 @@ int __init cma_declare_contiguous_multi(phys_addr_t total_size, } cma->nranges = nr; + cma->nid = nid; *res_cma = cma; out: @@ -684,6 +681,8 @@ static int __init __cma_declare_contiguous_nid(phys_addr_t base, if (ret) memblock_phys_free(base, size); + (*res_cma)->nid = nid; + return ret; } diff --git a/mm/cma.h b/mm/cma.h index 5f39dd1aac91..ff79dba5508c 100644 --- a/mm/cma.h +++ b/mm/cma.h @@ -50,6 +50,8 @@ struct cma { struct cma_kobject *cma_kobj; #endif bool reserve_pages_on_error; + /* NUMA node (NUMA_NO_NODE if unspecified) */ + int nid; }; extern struct cma cma_areas[MAX_CMA_AREAS]; 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; From patchwork Tue Feb 18 18:16:52 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: 13980423 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 ED3EFC021AF for ; Tue, 18 Feb 2025 18:18:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EFF6928018C; Tue, 18 Feb 2025 13:17:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E89A0280181; Tue, 18 Feb 2025 13:17:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CB39C28018C; Tue, 18 Feb 2025 13:17:47 -0500 (EST) 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 A80D4280181 for ; Tue, 18 Feb 2025 13:17:47 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 675B1490CE for ; Tue, 18 Feb 2025 18:17:47 +0000 (UTC) X-FDA: 83133873774.13.A78B30F Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf18.hostedemail.com (Postfix) with ESMTP id 93E351C0009 for ; Tue, 18 Feb 2025 18:17:45 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=bGxa9aQv; spf=pass (imf18.hostedemail.com: domain of 3yM60ZwQKCH0gwemhpphmf.dpnmjovy-nnlwbdl.psh@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3yM60ZwQKCH0gwemhpphmf.dpnmjovy-nnlwbdl.psh@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=1739902665; 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=vGpYOJcOz/lsGyIjARR6Q+MEJZ3eOZuY6bqPCycZ40I=; b=xWbYtG3TuDOXkbUqcVGKHFYtu80xqOth5DUEIF2gYLZ+y8w3xIUpTN9IBPEeF97j+Y86gp KS1cNWeHM7qFnKxULqevbQMYzJWnrfggqLiQ7GzKzlHi9Tuqtpz7ErFpTCRe/bUY2I7eyP qKTaLqOqecU0OHpv/oyvkofMzaSyWVQ= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=bGxa9aQv; spf=pass (imf18.hostedemail.com: domain of 3yM60ZwQKCH0gwemhpphmf.dpnmjovy-nnlwbdl.psh@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3yM60ZwQKCH0gwemhpphmf.dpnmjovy-nnlwbdl.psh@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902665; a=rsa-sha256; cv=none; b=LCOXJMrX/TNrgIwzh2IQN+c5WU4+L6Y6oHFGV7lgl7TKfC3OFUMzSKVFaOXxifDb7Np7wq eSUAL+/R5fyfg2JL1764vhbCUzcDU6PvDaOpG5As+moeZjwojCrmdJMQG1AgA22QyY4Tx4 2dvUknD1gASZ/p969S46LJOHor06ogY= Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2fc5888c192so5629381a91.0 for ; Tue, 18 Feb 2025 10:17:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902664; x=1740507464; 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=vGpYOJcOz/lsGyIjARR6Q+MEJZ3eOZuY6bqPCycZ40I=; b=bGxa9aQv+KDuI79n4nuFmcc4wG7TpJNLLJt4E+vhPfGvBbRv1ciGhia3wanmFR3AgP Y0BCURFJGKFAeHYl4OUrT53PqNpGGwpReezSblgKdK+07knup259sqMYByDeKLL13vTw EZ8NO+c+r5vPJpZJwi509swWcvAlrAwb3aV1VTI2e20Axt0JF0gOlzWV6IdoiT2mHEsY s4+5okZHazaPF1DsJX3wKNyETcrViSWSkBpZSxDfWOdj5XFTv3fUapBDvSuj+m/zLN8z oZbImxfhEz2M7W+xun/GzaUKzWEldqxP7O9Q4KClj5XeeREYv6YV9rjjqdeFChBooTT+ 8iCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902664; x=1740507464; 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=vGpYOJcOz/lsGyIjARR6Q+MEJZ3eOZuY6bqPCycZ40I=; b=wQ0yrMbZBCTzUQg5WjLS4WlUmPgLPJU5q+LhZVD22VcIRL+z1zNOe7Vh3GGFbwHqq/ ybrzFmTxiKb9mwNDCT6L+/6MnIF6C9+ky4TK44QlYkW4b5pfqaj5fSFX2fTd5ZIxHmrk trZqL2pYi3EXeCbx18hYFBcY3WmV7zgugrJwt1xxrn1uskoGkB1RaazhnNRBKEY9YGYi Qs3gASnYjRv+XB9ZzKU4xDS71iCHcph4TVE0arLHMEYtWpJXAAybOeTgxftqyqz7mham v0PoGCnCJvaKpWwtL7HCvVUMYAC0nVaamGellfAAJtr3ZGXcz4wXn8TSkCUAVFLaq5VW ShYg== X-Forwarded-Encrypted: i=1; AJvYcCUn4EwMDzo8pPTsyVQJvDVAn7zkSXJDS8RnF8xPJT0qbfs+vJQ5Ru0+U7A9HKl2riLXWiPcxVToeQ==@kvack.org X-Gm-Message-State: AOJu0YyWPSWABpmwxkc8Bo6XvGT6nrUHuSY5QWqox1q/9vFI6qR6XtNx hz7PhctVPpPvPK8oVSwinXbOY6LqaHX+GqGLOGaCnbBtLO1fKIQ6xb4KUOMb3ZywVD3VUw== X-Google-Smtp-Source: AGHT+IFh2d5idNjmWGvVf9Xf3cPlznXhdMTwHzwLmt5BRbrt6r+zOP11FtXO72U/qfZB0d+QE+Rinz2m X-Received: from pfbge5.prod.google.com ([2002:a05:6a00:8385:b0:730:85dc:cebb]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:4fc4:b0:730:7499:4036 with SMTP id d2e1a72fcca58-7329df28813mr421658b3a.22.1739902664466; Tue, 18 Feb 2025 10:17:44 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:52 +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-25-fvdl@google.com> Subject: [PATCH v4 24/27] mm/cma: introduce interface for early reservations 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-Queue-Id: 93E351C0009 X-Stat-Signature: cmhmrq84tubfcciofnbtomtnzcq58qx8 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1739902665-134570 X-HE-Meta: U2FsdGVkX1+ufmNMIsl0G9CzLWbqseYzm2YrhZ9AMDzElNC5xrfb2oZnIhOFWiI+lS8cb07uCVb6WXfV9t1ndaCaLqlfLuonEbNWIzJARiJTKcu/YU9qUwhbhDpw5rbnBlMTOqXAapYQ5xffVuAyZWhNHnVfJf4Tu0jrjYJao3s429p3Ks/YKgGDkto7tHmJ4ry/cXkGdM/OKpBiWnq9188WFD+y8I+hOCmBha4s733/J7efh968JEGl8jyOGPL7O9QtAPDJiVW1HqO+j6rP3P7p22RWNvB6cF5EIMGuuG2EfuHvNneuK09yLIsSg5oefc1iJaq7CGDYBd7fTL6MSlGWUlr4V0xuqmTqXOjhxgKdas5SsC736baxQF05lyIZySGFJ7vQj7P4uqGH32uyf9ZI4xNOr40k6JCEWuvYrx0vZvQqN17hCD0U5JWkOhE27R4yaASbrsVtZtD64V/c68vVBLBLMdgnwL5muta+Y3cW74ReS9ylDAipD3/bcEzlAEgNo2akwz53mx3eFtLYKztZ0zC2Q8lZnuDZsXb0aRJVcnNCjfdLcW2QNkWjkdgl6BY6Adhybixp5ZzUCVAODktYYETSPalTs8w2V73jS0anBtNWF5mr9dNN4rmJ9DPjS0/gGuj22NiWacJmIHBA0Kjg9w89CwpIjwBP2CDhwurGVSG0sh8aFBHhly8dgX+YlmeIy9IFZUVV9A0KsQ+fZe7+Mh5O5WdiaEndNtxL+DjAhN5Q/LyKR2JUkvyESE0M69Y393cmPu6gQ0SpPJ5XU8eoakPrG4Y2I5iYbZ1T/jmYY3NwNEh/38ifDjD7mFndbMX0+dbarse1d0eOZy9xTmMwBNaXXOQafJHVLVcbzQAGuwW0vdTjM5pXKG/HxoJ40YpfeNN2PAf3bdVUqRmFr2CdIWGwDy4VmN2NubH9zsnFAbp+i+BXU9bScmFiDvs1Xx4w7E0aQQgQ6tFZaD8 q4G+7enP ZYNRjGfIkBTotDbDJAgOt1MxCoWj2KBMnstgHqPn7nyjKN8H9k8SgIac3AEhdY487kgg5pJ+cA8IYnwbsP7D2fCSL+LtzGWYfdwhY6CbX34W+iWUuQ7fuG9CogthERWgVikWMAbsHReRFSzy8Q1cz/VHVnR+/b1AlwYxHAqYpMBw7VyStfMI7wXjWd83QUWz+yOSEEklVUwURgSqXdFgJ5Md2IpHk0TFMgvcrQa5ZvUZfOwPNw3Ec2hNHBq4w2OjlSBwjD/xdO0Z/xRzLeONJi0fVg+787RKq18OvsPTQRYaGyyocxonHalCWvN6xmjtubcd3XcaWnL1yoTsOEYR/wo0WkGgwqHSzOoIPP8F9AYkzBsXMt8Spu+IR+OaT+zk7+2wMuNke1Z5nU9m43dYGXa52bpyKBKaeH8rfszfJnM9Uj9MfVJ4tVLZvnJ7b3Xxh7NHmIF6sjbL5DI+G4Ejik/0FKTVHBYDN00pKEQ2PZACZ0l+689qoxQxD0j4cLRBsHcrgMgktJQrHEH7sBby7/M5QXg== 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: It can be desirable to reserve memory in a CMA area before it is activated, early in boot. Such reservations would effectively be memblock allocations, but they can be returned to the CMA area later. This functionality can be used to allow hugetlb bootmem allocations from a hugetlb CMA area. A new interface, cma_reserve_early is introduced. This allows for pageblock-aligned reservations. These reservations are skipped during the initial handoff of pages in a CMA area to the buddy allocator. The caller is responsible for making sure that the page structures are set up, and that the migrate type is set correctly, as with other memblock allocations that stick around. If the CMA area fails to activate (because it intersects with multiple zones), the reserved memory is not given to the buddy allocator, the caller needs to take care of that. Signed-off-by: Frank van der Linden --- mm/cma.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++----- mm/cma.h | 8 +++++ mm/internal.h | 16 ++++++++++ mm/mm_init.c | 9 ++++++ 4 files changed, 109 insertions(+), 7 deletions(-) diff --git a/mm/cma.c b/mm/cma.c index 4388d941d381..34a4df29af72 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -144,9 +144,10 @@ bool cma_validate_zones(struct cma *cma) static void __init cma_activate_area(struct cma *cma) { - unsigned long pfn, base_pfn; + unsigned long pfn, end_pfn; int allocrange, r; struct cma_memrange *cmr; + unsigned long bitmap_count, count; for (allocrange = 0; allocrange < cma->nranges; allocrange++) { cmr = &cma->ranges[allocrange]; @@ -161,8 +162,13 @@ static void __init cma_activate_area(struct cma *cma) for (r = 0; r < cma->nranges; r++) { cmr = &cma->ranges[r]; - base_pfn = cmr->base_pfn; - for (pfn = base_pfn; pfn < base_pfn + cmr->count; + if (cmr->early_pfn != cmr->base_pfn) { + count = cmr->early_pfn - cmr->base_pfn; + bitmap_count = cma_bitmap_pages_to_bits(cma, count); + bitmap_set(cmr->bitmap, 0, bitmap_count); + } + + for (pfn = cmr->early_pfn; pfn < cmr->base_pfn + cmr->count; pfn += pageblock_nr_pages) init_cma_reserved_pageblock(pfn_to_page(pfn)); } @@ -173,6 +179,7 @@ static void __init cma_activate_area(struct cma *cma) INIT_HLIST_HEAD(&cma->mem_head); spin_lock_init(&cma->mem_head_lock); #endif + set_bit(CMA_ACTIVATED, &cma->flags); return; @@ -184,9 +191,8 @@ static void __init cma_activate_area(struct cma *cma) 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; - pfn < cmr->base_pfn + cmr->count; - pfn++) + end_pfn = cmr->base_pfn + cmr->count; + for (pfn = cmr->early_pfn; pfn < end_pfn; pfn++) free_reserved_page(pfn_to_page(pfn)); } } @@ -290,6 +296,7 @@ int __init cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, return ret; cma->ranges[0].base_pfn = PFN_DOWN(base); + cma->ranges[0].early_pfn = PFN_DOWN(base); cma->ranges[0].count = cma->count; cma->nranges = 1; cma->nid = NUMA_NO_NODE; @@ -509,6 +516,7 @@ int __init cma_declare_contiguous_multi(phys_addr_t total_size, nr, (u64)mlp->base, (u64)mlp->base + size); cmrp = &cma->ranges[nr++]; cmrp->base_pfn = PHYS_PFN(mlp->base); + cmrp->early_pfn = cmrp->base_pfn; cmrp->count = size >> PAGE_SHIFT; sizeleft -= size; @@ -540,7 +548,6 @@ int __init cma_declare_contiguous_multi(phys_addr_t total_size, pr_info("Reserved %lu MiB in %d range%s\n", (unsigned long)total_size / SZ_1M, nr, nr > 1 ? "s" : ""); - return ret; } @@ -1034,3 +1041,65 @@ bool cma_intersects(struct cma *cma, unsigned long start, unsigned long end) return false; } + +/* + * Very basic function to reserve memory from a CMA area that has not + * yet been activated. This is expected to be called early, when the + * system is single-threaded, so there is no locking. The alignment + * checking is restrictive - only pageblock-aligned areas + * (CMA_MIN_ALIGNMENT_BYTES) may be reserved through this function. + * This keeps things simple, and is enough for the current use case. + * + * The CMA bitmaps have not yet been allocated, so just start + * reserving from the bottom up, using a PFN to keep track + * of what has been reserved. Unreserving is not possible. + * + * The caller is responsible for initializing the page structures + * in the area properly, since this just points to memblock-allocated + * memory. The caller should subsequently use init_cma_pageblock to + * set the migrate type and CMA stats the pageblocks that were reserved. + * + * If the CMA area fails to activate later, memory obtained through + * this interface is not handed to the page allocator, this is + * the responsibility of the caller (e.g. like normal memblock-allocated + * memory). + */ +void __init *cma_reserve_early(struct cma *cma, unsigned long size) +{ + int r; + struct cma_memrange *cmr; + unsigned long available; + void *ret = NULL; + + if (!cma || !cma->count) + return NULL; + /* + * Can only be called early in init. + */ + if (test_bit(CMA_ACTIVATED, &cma->flags)) + return NULL; + + if (!IS_ALIGNED(size, CMA_MIN_ALIGNMENT_BYTES)) + return NULL; + + if (!IS_ALIGNED(size, (PAGE_SIZE << cma->order_per_bit))) + return NULL; + + size >>= PAGE_SHIFT; + + if (size > cma->available_count) + return NULL; + + for (r = 0; r < cma->nranges; r++) { + cmr = &cma->ranges[r]; + available = cmr->count - (cmr->early_pfn - cmr->base_pfn); + if (size <= available) { + ret = phys_to_virt(PFN_PHYS(cmr->early_pfn)); + cmr->early_pfn += size; + cma->available_count -= size; + return ret; + } + } + + return ret; +} diff --git a/mm/cma.h b/mm/cma.h index bddc84b3cd96..df7fc623b7a6 100644 --- a/mm/cma.h +++ b/mm/cma.h @@ -16,9 +16,16 @@ struct cma_kobject { * and the total amount of memory requested, while smaller than the total * amount of memory available, is large enough that it doesn't fit in a * single physical memory range because of memory holes. + * + * Fields: + * @base_pfn: physical address of range + * @early_pfn: first PFN not reserved through cma_reserve_early + * @count: size of range + * @bitmap: bitmap of allocated (1 << order_per_bit)-sized chunks. */ struct cma_memrange { unsigned long base_pfn; + unsigned long early_pfn; unsigned long count; unsigned long *bitmap; #ifdef CONFIG_CMA_DEBUGFS @@ -58,6 +65,7 @@ enum cma_flags { CMA_RESERVE_PAGES_ON_ERROR, CMA_ZONES_VALID, CMA_ZONES_INVALID, + CMA_ACTIVATED, }; extern struct cma cma_areas[MAX_CMA_AREAS]; diff --git a/mm/internal.h b/mm/internal.h index 63fda9bb9426..8318c8e6e589 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -848,6 +848,22 @@ void init_cma_reserved_pageblock(struct page *page); #endif /* CONFIG_COMPACTION || CONFIG_CMA */ +struct cma; + +#ifdef CONFIG_CMA +void *cma_reserve_early(struct cma *cma, unsigned long size); +void init_cma_pageblock(struct page *page); +#else +static inline void *cma_reserve_early(struct cma *cma, unsigned long size) +{ + return NULL; +} +static inline void init_cma_pageblock(struct page *page) +{ +} +#endif + + int find_suitable_fallback(struct free_area *area, unsigned int order, int migratetype, bool only_stealable, bool *can_steal); diff --git a/mm/mm_init.c b/mm/mm_init.c index f7d5b4fe1ae9..f31260fd393e 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -2263,6 +2263,15 @@ void __init init_cma_reserved_pageblock(struct page *page) adjust_managed_page_count(page, pageblock_nr_pages); page_zone(page)->cma_pages += pageblock_nr_pages; } +/* + * Similar to above, but only set the migrate type and stats. + */ +void __init init_cma_pageblock(struct page *page) +{ + set_pageblock_migratetype(page, MIGRATE_CMA); + adjust_managed_page_count(page, pageblock_nr_pages); + page_zone(page)->cma_pages += pageblock_nr_pages; +} #endif void set_zone_contiguous(struct zone *zone) From patchwork Tue Feb 18 18:16:53 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: 13980424 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 A7EDEC021AD for ; Tue, 18 Feb 2025 18:18:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C180828018D; Tue, 18 Feb 2025 13:17:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BC8AD280181; Tue, 18 Feb 2025 13:17:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A41EF28018D; Tue, 18 Feb 2025 13:17:49 -0500 (EST) 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 7A4B1280181 for ; Tue, 18 Feb 2025 13:17:49 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 35F6649654 for ; Tue, 18 Feb 2025 18:17:49 +0000 (UTC) X-FDA: 83133873858.24.FD0A525 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf04.hostedemail.com (Postfix) with ESMTP id 3E88340014 for ; Tue, 18 Feb 2025 18:17:47 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="BIJAuW/a"; spf=pass (imf04.hostedemail.com: domain of 3ys60ZwQKCH8iygojrrjoh.frpolqx0-ppnydfn.ruj@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3ys60ZwQKCH8iygojrrjoh.frpolqx0-ppnydfn.ruj@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902667; a=rsa-sha256; cv=none; b=c3hE1+Ns4sZeamcx7U/yvpE/fU+K9hVznDehqvfYBkcjvmaw5Fn04UuMnOFDoNvcAIWB20 VvqMSpCmwQobI2iRxcWUaQ8jS/tkaIGIg40iWYgx1eRdUeZt1oUJkLY4kqbE3TkvllkDli Fp0nQB+3JP84BUs1i1hbqB20Dc06qcQ= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="BIJAuW/a"; spf=pass (imf04.hostedemail.com: domain of 3ys60ZwQKCH8iygojrrjoh.frpolqx0-ppnydfn.ruj@flex--fvdl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=3ys60ZwQKCH8iygojrrjoh.frpolqx0-ppnydfn.ruj@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=1739902667; 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=jPC4tchnt1N2YhIqVh3vzNfsaSlSSanvoj/zggZqrBE=; b=m44hnHB/+MEqUYHdJFSVzLvyQTw7WRDE1/h692wwrCB0yZL9DaSZhgScpb7q34iPPDB6Gf 6KUQR267kIGu9pkBC/o3dUGnG9lHJ8jNOpAbgaC5sKLkSGyfFOcztWLUECesN4zOwIxGcC KVvWT4a3C60+gGGWYMq46Pb2IFYCGAg= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-220f0382404so88274765ad.1 for ; Tue, 18 Feb 2025 10:17:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902666; x=1740507466; 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=jPC4tchnt1N2YhIqVh3vzNfsaSlSSanvoj/zggZqrBE=; b=BIJAuW/atLdE/pobetJcyzcqZ0Xl2lqF+AJ8DZtJMXmAheXveQ9n/iAhtblNi+VykM xbkxOJOfdRC7wNFWkXxGMjBps/FHd9q142VzaASw8Y7xxrOw5Vt0dMj6RWwgA49Y3GlB IldNcsDTOKF0fJbsKc4jAGUZCPsxV8bRs1+2XdmTVDtnVM738kB+ZrDuopWqZmeL6yOa 8zN7fyl8pYcZoRUFO1kYR7KW5uIDoafmn/cUroobhTFtgtTUniJdDkKFpLXV8r3PCtG7 HKvkqnuhwn1RIarCPkIvIVWGC7ca168tJTJvJdIY+EeIcQFzpwEOIml6Nhv57Sng1nFr ukXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902666; x=1740507466; 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=jPC4tchnt1N2YhIqVh3vzNfsaSlSSanvoj/zggZqrBE=; b=mjDHGoLzLMUTlM9xIE4IsuAbsYZy8HqimWvRr3DNd7d4M5b3wjeYH5Sg6/qCrS/O2c 18TNbOgZMUNe8x1ZSjqFrIWdpOBD77FHliwMG2+kXtdYHSjNF03+s5vozXsCvX3xWK8A 7GOJ/zngL343z/WCKMJPcyA0qRqM0C65sRP2uiLfVtWy+GZN8EPBXELky5uTR1p5h19H P8+uylDMU1H1aJkNBgeYx59zb3k5Zk24shgl+/XlZ5xC19t1aatnh509TSbKWOs9OFaP fE1HirsQvPDR305S8zj2vffYQdX25Vux84spPYqoVqiDX4GwlPLaw3hvpKWhW2UVocAb OETA== X-Forwarded-Encrypted: i=1; AJvYcCVSRg2ZCbeYyr8Y5yNlo34qvTT2HQnhsHh5G3Ti/A8xNQGudQSBBBN8Ioi58+O2JfN6CxXrrDKvBw==@kvack.org X-Gm-Message-State: AOJu0Yy5vDFD/WZSJW9rXF9+J8femn9orN7CakoVajKNkZ1Od2eifrA7 qPkKZYVihSG+SgjoakMPZbYdIKbi1dxnV8exR/oUqd5EzJC+UJy49qoUEw8AWVRNLwpGVQ== X-Google-Smtp-Source: AGHT+IEtEjZxSkaHGNUqLkCYYCbWC6D2V31JmuFgG4Dg2Vo0lypjwM3EadejgHbXDL3fVjUh+UqlBkvb X-Received: from pfbga8.prod.google.com ([2002:a05:6a00:6208:b0:725:e4b6:901f]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:c70b:b0:1ee:c6bf:7c49 with SMTP id adf61e73a8af0-1eed4e3f207mr456118637.6.1739902666173; Tue, 18 Feb 2025 10:17:46 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:53 +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-26-fvdl@google.com> Subject: [PATCH v4 25/27] mm/hugetlb: add hugetlb_cma_only cmdline option 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-Queue-Id: 3E88340014 X-Stat-Signature: sp6ciyfjmiq9z8gaf8sqqhdjtqrk1kja X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1739902667-900452 X-HE-Meta: U2FsdGVkX18dRuc70syy4g/aW7oP0FpOoolChIEPqfUfLTlNBVRWppT3OAWcgidA+/QsVGuteqfyFzehQ2gzn8ryqCl18zN5z5xAIy0lc+ZJI1Nhjl+xl4896SX1Wu1bqjgJjIa8yW3uzw9Fq9qOgxZpVCOoV4FH8azbrkjgXo45bb4qHvL+xVdoKgHgEFf2OJfncejW48rtBlZ2IpDbXJjmTd2P2d4ckhDuLWrl4DBtKyaw40DIhRl0vdPxG5SWTdKJ3qgmpZMdqEb8s1T/2K4AX9xEv/d78P2u99n53r+zG2fuQWs9LbyFRVsJi3oKDYUOUdsEhNVFPJde/E5HJQAHn7y5w9GYC6plujK8D43POvILqwbZcmUV3ETXjxaw3hoz8X5znwgRO8F23NCh8LtrzUtWncIpnUx3AmaxbAOldB69gYUnb35mena37wRIYGRZ82CC7at83QYDu2vSBCYi4c+QYWC8V0JSC7fzdfFqCaS9Rz66kQ3RBqxIF2fIhxcAtECWYVwjIKTAL9gMXgq/L2LPvmikYkKvBoYJfl+k2S1fkhod4zlCnVLiaO6vGSiUSYJiChSCNlftQLcu4prK4oh0ZubTBcXtCCwscUTTPSxwKoI7Oe8GjFsW14tAHfg9x1INRfRy9s8GJ8dfXph9tGos0g3DrMdfxf8QbePtGYMCahyi7yaHaFueq0tXLmdWktBomR771s0tR58hCtip9us+D34Vw577CG+YIFw064dUhO3J/AsSLnRkCTs0OZseZR7l4yWSiLXdlT/n66LhIe/49Nx78xsn58LODvLs1dMwSNEMf1wh8QwiMzqcMJuu78Y4yHpjJ3j44b26daKdGB0nDdK3VFeA+MqwXHn/mt/3re0b9JGN/7PLcTEy68Jqi/qTxU8Sl+2jcSXM7Com3kZ1E3MXWVGQQvxFTta7uG2dhVO6gb0r+E7oRXfo8LOxRdN1Etari8irshF Sg+OTTQR MU2HX7kMq6FLS6oBewt65pM3n6SI+pa7Ry7bqbFdRSXHV04bqC4Y3fsEmZqfCVHiWNxqOSrCTZgMoWx+U28HvaBNYm/AbtiQAa+okODm7e3qZEkTQzzpOE/sgzozNPIc8DReIpK/sa56M12u3yFUHar3YVfEtP9PdfKvdnz63V58mchKu0WD+jlt3VxxJ78ZdKGg56Q0fjTSEjqVjPRyY0axpwU36EGhItr5O8swlmHlgGSBVPXvPWEYrKW4U5TvoNcPG+WUdZ32i5zQjNn6/zjn4WWzGGN48k0ZgwASPs9lD4locK4NPvfF/CZXy7Fht9lnWrHWF19XBcWs/ib7lkM5VkynpPElhhNeqazJtfpvW86dJibV9mUEh0IjukpufDl53twFj5UzmN1nuVxr/tEM0puwi1xqVwUeP3t2I6LUuXvYRD4m0OkzvPCCSW2sxpRV0U4qbEy3eNKYvN6qgWFk63zuCty1FH61KqLBQgnwYBs5jS2GHrDtfg3ob1AuhxOlT4eyf8/i9N033CEHCn+1RzbI0fkFLeP0pW5fCFbatOldt9wAZnTCbMJuO7YsKiw0x+AC+NMgkIXQ= 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: Add an option to force hugetlb gigantic pages to be allocated using CMA only (if hugetlb_cma is enabled). This avoids a fallback to allocation from the rest of system memory if the CMA allocation fails. This makes the size of hugetlb_cma a hard upper boundary for gigantic hugetlb page allocations. This is useful because, with a large CMA area, the kernel's unmovable allocations will have less room to work with and it is undesirable for new hugetlb gigantic page allocations to be done from that remaining area. It will eat in to the space available for unmovable allocations, leading to unwanted system behavior (OOMs because the kernel fails to do unmovable allocations). So, with this enabled, an administrator can force a hard upper bound for runtime gigantic page allocations, and have more predictable system behavior. Signed-off-by: Frank van der Linden --- Documentation/admin-guide/kernel-parameters.txt | 7 +++++++ mm/hugetlb.c | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index ae21d911d1c7..491628ac071a 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -1892,6 +1892,13 @@ hugepages using the CMA allocator. If enabled, the boot-time allocation of gigantic hugepages is skipped. + hugetlb_cma_only= + [HW,CMA,EARLY] When allocating new HugeTLB pages, only + try to allocate from the CMA areas. + + This option does nothing if hugetlb_cma= is not also + specified. + hugetlb_free_vmemmap= [KNL] Requires CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP enabled. diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 634dc53f1e3e..0b483c466656 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -59,6 +59,7 @@ struct hstate hstates[HUGE_MAX_HSTATE]; static struct cma *hugetlb_cma[MAX_NUMNODES]; static unsigned long hugetlb_cma_size_in_node[MAX_NUMNODES] __initdata; #endif +static bool hugetlb_cma_only; static unsigned long hugetlb_cma_size __initdata; __initdata struct list_head huge_boot_pages[MAX_NUMNODES]; @@ -1510,6 +1511,9 @@ static struct folio *alloc_gigantic_folio(struct hstate *h, gfp_t gfp_mask, } #endif if (!folio) { + if (hugetlb_cma_only) + return NULL; + folio = folio_alloc_gigantic(order, gfp_mask, nid, nodemask); if (!folio) return NULL; @@ -4738,6 +4742,9 @@ static __init void hugetlb_parse_params(void) hcp->setup(hcp->val); } + + if (!hugetlb_cma_size) + hugetlb_cma_only = false; } /* @@ -7850,6 +7857,13 @@ static int __init cmdline_parse_hugetlb_cma(char *p) early_param("hugetlb_cma", cmdline_parse_hugetlb_cma); +static int __init cmdline_parse_hugetlb_cma_only(char *p) +{ + return kstrtobool(p, &hugetlb_cma_only); +} + +early_param("hugetlb_cma_only", cmdline_parse_hugetlb_cma_only); + void __init hugetlb_cma_reserve(int order) { unsigned long size, reserved, per_node; From patchwork Tue Feb 18 18:16:54 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: 13980425 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 E0BBCC021AF for ; Tue, 18 Feb 2025 18:18:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4076D2800D5; Tue, 18 Feb 2025 13:17:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 38A892800FF; Tue, 18 Feb 2025 13:17:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E1FB2800D5; Tue, 18 Feb 2025 13:17:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id DC8D0280181 for ; Tue, 18 Feb 2025 13:17:50 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A80761403F8 for ; Tue, 18 Feb 2025 18:17:50 +0000 (UTC) X-FDA: 83133873900.27.3925D9E Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by imf07.hostedemail.com (Postfix) with ESMTP id C7F6140014 for ; Tue, 18 Feb 2025 18:17:48 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=et6w9nHQ; spf=pass (imf07.hostedemail.com: domain of 3y860ZwQKCIAjzhpksskpi.gsqpmry1-qqozego.svk@flex--fvdl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3y860ZwQKCIAjzhpksskpi.gsqpmry1-qqozego.svk@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=1739902668; 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=RAaWg9KYrhZaw2brRcaZF018Jxd4YVbeijwcOr2BboU=; b=2nyG3xNReh+yylucroFH3RjvuMt/DdSlsXSkooPa4Q3AUGQS/3us7A4FaEjNR2e539OBnG lgof9erFnAsaozaM0uc0Ez8AletaLYV01c1NtwqPC59zFXM5hcekMiiZrVwm5lyQXwQhzy TwEF4UmUIsj4oiKcHB7vK9ns9AtnLaE= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=et6w9nHQ; spf=pass (imf07.hostedemail.com: domain of 3y860ZwQKCIAjzhpksskpi.gsqpmry1-qqozego.svk@flex--fvdl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=3y860ZwQKCIAjzhpksskpi.gsqpmry1-qqozego.svk@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902668; a=rsa-sha256; cv=none; b=4oUuaIorMFIZhLq/gN2sLMUKNa1vFZXdrGPDVai7YLNrsbY01zzBmljJCmQSfQ0OO+C3k/ irc0CAb8n3Luh/W4EPD57EVQPZMkJPSdh6djMAYvbhyWm6PGMwOng0+pRVRJw/kFSP9J5q peyXYJNOu2wstyAIDk71HZfqGDSa2n8= Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2fc1a70935fso10797814a91.1 for ; Tue, 18 Feb 2025 10:17:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902668; x=1740507468; 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=RAaWg9KYrhZaw2brRcaZF018Jxd4YVbeijwcOr2BboU=; b=et6w9nHQFzcgsgOiklHj6iQa+UuMWbcy9s5VUdViEHIHwkdow7uzKN4iLnFBSYdjx/ 4j0eviBLF3GwpvzoanFcRQIqOph93YSYMH5w2uBF7ONcMWo3kcGpbC0nR0kM/GaHCU0X lrFBndfvXPqvFpZF5vlJNo6LE5Am3wEBfQOftM2Ppkd0f5SM/N30KkjpDjCmEmaXkYut 8ANfbMy9Pu+zqjWKgPq8V4a16yZ1gPQaRO/CefCeYD9xCPcVDb6wHam4W+iRoJafLBGV v7i99F/0w2iZJxXLxwE/66vveIhFO7ZaGuyngnnY6T73nJMXiBPaycVmLO/4x0q1AXn1 lbTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902668; x=1740507468; 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=RAaWg9KYrhZaw2brRcaZF018Jxd4YVbeijwcOr2BboU=; b=DVfmdBFB0ggC6R6MlMllkY5ZVH95LD8AuvpmbZoG/36oPCrub+Ydolune0kCWhXw6a 6ORjYZmd+Cp+XvxZ5wu+jv6DhIR+oy0qBJzHJm/PakLSPsrXJv61hzShk5mPvN4f1F1w N+nvTBaT2uV4TH02JnrpP/x0Pmshi6l1YwHyEPeg5sXgVK8WjtpbEF195M464hbJE5OM Fs2lh+RGJhu/FqGROWxXqqFF7BGn9oa+iran/VHV3IWQMhA7uWLKoBmzixxnB/ZJZQmw /dZ6FSqKzHVjv5rUI19JhDUs/hFJajgwWyVXn1vmpeLtHB50OyMsVkemfF2XzfD/Ta+T g+ug== X-Forwarded-Encrypted: i=1; AJvYcCUmEATwt473RVt59buGKVu7PQe27vPQaAS/osicQidG7XL9B1JBxy1vHiOOCQCf/FlN33H6QE/c9g==@kvack.org X-Gm-Message-State: AOJu0YzRgc32XH442H8qWi8QvNVb0qTHk9KyFNfT65KFP3Dvdk3MWomP v6kv35D9hQ9+eRpSQ15OSFfTaQDaQV8yd6tY7HtXVqTPks5O+GjTfamvfsSmo/p467FK/g== X-Google-Smtp-Source: AGHT+IFTowpNXmQaQo2ZlNPe3XcaUbY9NeJGdz1k0h7kWZZVby74hjlLnGRqAtEkQUq9LQ1hBIGCheef X-Received: from pfaz25.prod.google.com ([2002:aa7:91d9:0:b0:730:7485:6b59]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:198c:b0:732:2484:e0ce with SMTP id d2e1a72fcca58-732618c1cf1mr20924088b3a.17.1739902667774; Tue, 18 Feb 2025 10:17:47 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:54 +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-27-fvdl@google.com> Subject: [PATCH v4 26/27] mm/hugetlb: enable bootmem allocation from CMA areas 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 , Madhavan Srinivasan , Michael Ellerman , linuxppc-dev@lists.ozlabs.org X-Rspam-User: X-Stat-Signature: yktg6k49sqzk9yf9tzc39oopx3rm1umf X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: C7F6140014 X-HE-Tag: 1739902668-989773 X-HE-Meta: U2FsdGVkX19pHkX9IR0Vbcxyz+9GgSth00Z6MzeWdnXjaVF2p1wYikAKDaS9Y7RuJQD+6btqCyUlMiGyXUFDcMwvlnl1563btoRv5nQ6WqD2n04mEGipQSNkj8yrOECL+3+H7D9PKuY1fP/9lZGS+Ee/2oHsVxH6zNg+dSAhHxi+URiULFN9lcGl9pLhh7CBfbZvUeUnKwD/99JW+RtGh5G6yXbjlz3YNl1GMHm7aYXNPj+r7N0Pg6ISPuVtkvJWte0Tknfhg9kCZuduO09RlzQ+cMvNRRWd9rJwq2q0TCqTvCU66BuQh3ZO3laQQsA249T+/RRSzoldy9QBOX3tC8+xlJCz632D4J/exqesY3CEbXsLZGv5wrYGG9lZ/SjMNCGIqNmv7FA1KPZtbfhKAIdwIyK3/hv0U7NmyXSg5EKOlm4VmChHFFBPFoIzrb6E0T2VkIIMD6KwHNg2gUZwS/m2qWrOdT75EnqGAlKa7NP1bD5g3EUkX4AsHmjGyOc8Hn9Why3vRhkx71aUMv8rT/jsJMKONjD1RZobUheIo+fVp5uHzqRdJdxpaTOV8Y5s/9HHHbU8UK74OFKuMiyiHdyEXcbOmVd4/T3ivOGyL0WIaGDYH2+Y79cpKSW9lJGgFyfElg6DrPz/DxE/bSku7UZShcHZM4MGpXE03EbDXZgv9b5kyy6iQvT7SeJXSbQab/h0y2eXkbQquYnL/VYsg4laj+uzmPf2xvyY31a+oVGZvNpjXw6ggJPSPUddX8G/tyc0uceVcnDEsSNp9e+0JCmSCCfHRzKVIuiK/uiDeE6BOkOTTPrEwc2GYMuM/2/U+KrcK3to5KAUr/Hv1+swPJ0/4o0L5oserNGSCMwloawpYsknurj8s5M4Lybu/RD77AQQoMMd+OW+TpoQbWjH8QI/O4RC7xlSnDdTUNltEB763OjQgDZsHUSaQkTaIsZ59hD3zZihE/EDLQgYSwe ROS1RxXV 2DuCYfyTORPCcKj4f8ndbFjUEf/tBoxiXsNbV0q9cbsGz8t2rpnOzyvEvAdGHXOCDoUdtHi2aL09JTDThuDSDLWKCQYBBrpalsg1xPXzC0Yf5oFsABhQ6bjA2MoiFg+Arhn6WEJIP4uZCF7cOodH7fnAyzWDDkqsK46V3HXmD5oywGzRyF9Tkfi4rcx3s1IN/INRXAVMsu2XsMT/zkM3toOzqeuocYWwW/MOxxLBQnHAIQ7L2MRojcng6gKVF0kMY+uD+03ndAzLi8q13frj4hQcuWQNPOw9DM1nTYcZR9auHwsiZFreS6VtWvzm0fLT528yGdQ9z83loyeBXH/nolu7XoG8RIAP1RAFkHtvQGuKXuVdxn4OG5/MOHI6t1XF+Lx68Vv0ny3Qja6Y2ZGUr/aK2gtJADYXh8UeX0FMiC4Q6VI9ziYXdpebeCIVmBBBFPErGWb7719Mis/tT7WmruxcBlcyKAuJ/DW+kluJ2WWaBwL2PuCkdihoHQZtYRraG71YaRU6BD+a3jLlNy+JBk1/abaQGDqJFRhzhvz0ushMXsTUgPAWRTXLhF2mgz1hRUVvK/QgsVM3Mh/L9V1DT+ryMw2v9p8qLQcQ53I6Kev/7CoM= 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: If hugetlb_cma_only is enabled, we know that hugetlb pages can only be allocated from CMA. Now that there is an interface to do early reservations from a CMA area (returning memblock memory), it can be used to allocate hugetlb pages from CMA. This also allows for doing pre-HVO on these pages (if enabled). Make sure to initialize the page structures and associated data correctly. Create a flag to signal that a hugetlb page has been allocated from CMA to make things a little easier. Some configurations of powerpc have a special hugetlb bootmem allocator, so introduce a boolean arch_specific_huge_bootmem_alloc that returns true if such an allocator is present. In that case, CMA bootmem allocations can't be used, so check that function before trying. Cc: Madhavan Srinivasan Cc: Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Frank van der Linden --- arch/powerpc/include/asm/book3s/64/hugetlb.h | 6 + include/linux/hugetlb.h | 17 ++ mm/hugetlb.c | 168 ++++++++++++++----- 3 files changed, 152 insertions(+), 39 deletions(-) diff --git a/arch/powerpc/include/asm/book3s/64/hugetlb.h b/arch/powerpc/include/asm/book3s/64/hugetlb.h index f0bba9c5f9c3..bb786694dd26 100644 --- a/arch/powerpc/include/asm/book3s/64/hugetlb.h +++ b/arch/powerpc/include/asm/book3s/64/hugetlb.h @@ -94,4 +94,10 @@ static inline int check_and_get_huge_psize(int shift) return mmu_psize; } +#define arch_has_huge_bootmem_alloc arch_has_huge_bootmem_alloc + +static inline bool arch_has_huge_bootmem_alloc(void) +{ + return (firmware_has_feature(FW_FEATURE_LPAR) && !radix_enabled()); +} #endif diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 2512463bca49..6c6546b54934 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -591,6 +591,7 @@ enum hugetlb_page_flags { HPG_freed, HPG_vmemmap_optimized, HPG_raw_hwp_unreliable, + HPG_cma, __NR_HPAGEFLAGS, }; @@ -650,6 +651,7 @@ HPAGEFLAG(Temporary, temporary) HPAGEFLAG(Freed, freed) HPAGEFLAG(VmemmapOptimized, vmemmap_optimized) HPAGEFLAG(RawHwpUnreliable, raw_hwp_unreliable) +HPAGEFLAG(Cma, cma) #ifdef CONFIG_HUGETLB_PAGE @@ -678,14 +680,18 @@ struct hstate { char name[HSTATE_NAME_LEN]; }; +struct cma; + struct huge_bootmem_page { struct list_head list; struct hstate *hstate; unsigned long flags; + struct cma *cma; }; #define HUGE_BOOTMEM_HVO 0x0001 #define HUGE_BOOTMEM_ZONES_VALID 0x0002 +#define HUGE_BOOTMEM_CMA 0x0004 bool hugetlb_bootmem_page_zones_valid(int nid, struct huge_bootmem_page *m); @@ -823,6 +829,17 @@ static inline pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, } #endif +#ifndef arch_has_huge_bootmem_alloc +/* + * Some architectures do their own bootmem allocation, so they can't use + * early CMA allocation. + */ +static inline bool arch_has_huge_bootmem_alloc(void) +{ + return false; +} +#endif + static inline struct hstate *folio_hstate(struct folio *folio) { VM_BUG_ON_FOLIO(!folio_test_hugetlb(folio), folio); diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 0b483c466656..664ccaaa717a 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -131,8 +131,10 @@ static void hugetlb_free_folio(struct folio *folio) #ifdef CONFIG_CMA int nid = folio_nid(folio); - if (cma_free_folio(hugetlb_cma[nid], folio)) + if (folio_test_hugetlb_cma(folio)) { + WARN_ON_ONCE(!cma_free_folio(hugetlb_cma[nid], folio)); return; + } #endif folio_put(folio); } @@ -1508,6 +1510,9 @@ static struct folio *alloc_gigantic_folio(struct hstate *h, gfp_t gfp_mask, break; } } + + if (folio) + folio_set_hugetlb_cma(folio); } #endif if (!folio) { @@ -3174,6 +3179,86 @@ struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, return ERR_PTR(-ENOSPC); } +static bool __init hugetlb_early_cma(struct hstate *h) +{ + if (arch_has_huge_bootmem_alloc()) + return false; + + return (hstate_is_gigantic(h) && hugetlb_cma_only); +} + +static __init void *alloc_bootmem(struct hstate *h, int nid, bool node_exact) +{ + struct huge_bootmem_page *m; + unsigned long flags; + struct cma *cma; + int listnode = nid; + +#ifdef CONFIG_CMA + if (hugetlb_early_cma(h)) { + flags = HUGE_BOOTMEM_CMA; + cma = hugetlb_cma[nid]; + m = cma_reserve_early(cma, huge_page_size(h)); + if (!m) { + int node; + + if (node_exact) + return NULL; + for_each_online_node(node) { + cma = hugetlb_cma[node]; + if (!cma || node == nid) + continue; + m = cma_reserve_early(cma, huge_page_size(h)); + if (m) { + listnode = node; + break; + } + } + } + } else +#endif + { + flags = 0; + cma = NULL; + if (node_exact) + m = memblock_alloc_exact_nid_raw(huge_page_size(h), + huge_page_size(h), 0, + MEMBLOCK_ALLOC_ACCESSIBLE, nid); + else { + m = memblock_alloc_try_nid_raw(huge_page_size(h), + huge_page_size(h), 0, + MEMBLOCK_ALLOC_ACCESSIBLE, nid); + /* + * For pre-HVO to work correctly, pages need to be on + * the list for the node they were actually allocated + * from. That node may be different in the case of + * fallback by memblock_alloc_try_nid_raw. So, + * extract the actual node first. + */ + if (m) + listnode = early_pfn_to_nid(PHYS_PFN(virt_to_phys(m))); + } + } + + if (m) { + /* + * Use the beginning of the huge page to store the + * huge_bootmem_page struct (until gather_bootmem + * puts them into the mem_map). + * + * Put them into a private list first because mem_map + * is not up yet. + */ + INIT_LIST_HEAD(&m->list); + list_add(&m->list, &huge_boot_pages[listnode]); + m->hstate = h; + m->flags = flags; + m->cma = cma; + } + + return m; +} + int alloc_bootmem_huge_page(struct hstate *h, int nid) __attribute__ ((weak, alias("__alloc_bootmem_huge_page"))); int __alloc_bootmem_huge_page(struct hstate *h, int nid) @@ -3183,22 +3268,15 @@ int __alloc_bootmem_huge_page(struct hstate *h, int nid) /* do node specific alloc */ if (nid != NUMA_NO_NODE) { - m = memblock_alloc_exact_nid_raw(huge_page_size(h), huge_page_size(h), - 0, MEMBLOCK_ALLOC_ACCESSIBLE, nid); + m = alloc_bootmem(h, node, true); if (!m) return 0; goto found; } + /* allocate from next node when distributing huge pages */ for_each_node_mask_to_alloc(&h->next_nid_to_alloc, nr_nodes, node, &node_states[N_ONLINE]) { - m = memblock_alloc_try_nid_raw( - huge_page_size(h), huge_page_size(h), - 0, MEMBLOCK_ALLOC_ACCESSIBLE, node); - /* - * Use the beginning of the huge page to store the - * huge_bootmem_page struct (until gather_bootmem - * puts them into the mem_map). - */ + m = alloc_bootmem(h, node, false); if (!m) return 0; goto found; @@ -3216,21 +3294,6 @@ int __alloc_bootmem_huge_page(struct hstate *h, int nid) memblock_reserved_mark_noinit(virt_to_phys((void *)m + PAGE_SIZE), huge_page_size(h) - PAGE_SIZE); - /* - * Put them into a private list first because mem_map is not up yet. - * - * For pre-HVO to work correctly, pages need to be on the list for - * the node they were actually allocated from. That node may be - * different in the case of fallback by memblock_alloc_try_nid_raw. - * So, extract the actual node first. - */ - if (nid == NUMA_NO_NODE) - node = early_pfn_to_nid(PHYS_PFN(virt_to_phys(m))); - - INIT_LIST_HEAD(&m->list); - list_add(&m->list, &huge_boot_pages[node]); - m->hstate = h; - m->flags = 0; return 1; } @@ -3271,13 +3334,25 @@ static void __init hugetlb_folio_init_vmemmap(struct folio *folio, prep_compound_head((struct page *)folio, huge_page_order(h)); } +static bool __init hugetlb_bootmem_page_prehvo(struct huge_bootmem_page *m) +{ + return m->flags & HUGE_BOOTMEM_HVO; +} + +static bool __init hugetlb_bootmem_page_earlycma(struct huge_bootmem_page *m) +{ + return m->flags & HUGE_BOOTMEM_CMA; +} + /* * memblock-allocated pageblocks might not have the migrate type set * if marked with the 'noinit' flag. Set it to the default (MIGRATE_MOVABLE) - * here. + * here, or MIGRATE_CMA if this was a page allocated through an early CMA + * reservation. * - * Note that this will not write the page struct, it is ok (and necessary) - * to do this on vmemmap optimized folios. + * In case of vmemmap optimized folios, the tail vmemmap pages are mapped + * read-only, but that's ok - for sparse vmemmap this does not write to + * the page structure. */ static void __init hugetlb_bootmem_init_migratetype(struct folio *folio, struct hstate *h) @@ -3286,9 +3361,13 @@ static void __init hugetlb_bootmem_init_migratetype(struct folio *folio, WARN_ON_ONCE(!pageblock_aligned(folio_pfn(folio))); - for (i = 0; i < nr_pages; i += pageblock_nr_pages) - set_pageblock_migratetype(folio_page(folio, i), + for (i = 0; i < nr_pages; i += pageblock_nr_pages) { + if (folio_test_hugetlb_cma(folio)) + init_cma_pageblock(folio_page(folio, i)); + else + set_pageblock_migratetype(folio_page(folio, i), MIGRATE_MOVABLE); + } } static void __init prep_and_add_bootmem_folios(struct hstate *h, @@ -3334,10 +3413,16 @@ bool __init hugetlb_bootmem_page_zones_valid(int nid, return true; } + if (hugetlb_bootmem_page_earlycma(m)) { + valid = cma_validate_zones(m->cma); + goto out; + } + start_pfn = virt_to_phys(m) >> PAGE_SHIFT; valid = !pfn_range_intersects_zones(nid, start_pfn, pages_per_huge_page(m->hstate)); +out: if (!valid) hstate_boot_nrinvalid[hstate_index(m->hstate)]++; @@ -3366,11 +3451,6 @@ static void __init hugetlb_bootmem_free_invalid_page(int nid, struct page *page, } } -static bool __init hugetlb_bootmem_page_prehvo(struct huge_bootmem_page *m) -{ - return (m->flags & HUGE_BOOTMEM_HVO); -} - /* * Put bootmem huge pages into the standard lists after mem_map is up. * Note: This only applies to gigantic (order > MAX_PAGE_ORDER) pages. @@ -3420,14 +3500,21 @@ static void __init gather_bootmem_prealloc_node(unsigned long nid) */ folio_set_hugetlb_vmemmap_optimized(folio); + if (hugetlb_bootmem_page_earlycma(m)) + folio_set_hugetlb_cma(folio); + list_add(&folio->lru, &folio_list); /* * We need to restore the 'stolen' pages to totalram_pages * in order to fix confusing memory reports from free(1) and * other side-effects, like CommitLimit going negative. + * + * For CMA pages, this is done in init_cma_pageblock + * (via hugetlb_bootmem_init_migratetype), so skip it here. */ - adjust_managed_page_count(page, pages_per_huge_page(h)); + if (!folio_test_hugetlb_cma(folio)) + adjust_managed_page_count(page, pages_per_huge_page(h)); cond_resched(); } @@ -3612,8 +3699,11 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) { unsigned long allocated; - /* skip gigantic hugepages allocation if hugetlb_cma enabled */ - if (hstate_is_gigantic(h) && hugetlb_cma_size) { + /* + * Skip gigantic hugepages allocation if early CMA + * reservations are not available. + */ + if (hstate_is_gigantic(h) && hugetlb_cma_size && !hugetlb_early_cma(h)) { pr_warn_once("HugeTLB: hugetlb_cma is enabled, skip boot time allocation\n"); return; } From patchwork Tue Feb 18 18:16:55 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: 13980426 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 1B394C021AA for ; Tue, 18 Feb 2025 18:18:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CB60B280181; Tue, 18 Feb 2025 13:17:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C408C2800FF; Tue, 18 Feb 2025 13:17:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A174B280181; Tue, 18 Feb 2025 13:17:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 684532800FF for ; Tue, 18 Feb 2025 13:17:52 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 31DEAA06F0 for ; Tue, 18 Feb 2025 18:17:52 +0000 (UTC) X-FDA: 83133873984.28.7F750AB Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf20.hostedemail.com (Postfix) with ESMTP id 4DA771C0011 for ; Tue, 18 Feb 2025 18:17:50 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=TZdCBxij; spf=pass (imf20.hostedemail.com: domain of 3zc60ZwQKCIIl1jrmuumrk.iusrot03-ssq1giq.uxm@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3zc60ZwQKCIIl1jrmuumrk.iusrot03-ssq1giq.uxm@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=1739902670; 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=m8CyknMDJjzJrkTVy6IkcSYTmou3FMAB5Va5stB7LNQ=; b=8BrKdm4kHY6vP2vSXkjVF8JuOuQQ7VzqtZyd6ZKwBvKHIoKm6eIRCBvAyQkKlGqRCiEdP3 nJ7Bm/wJXLBaIkZzclWDcxLGCHtNRvYtaZuOMXZZpEVpMDeQchY7+n/5UabunbaqAenoUv lgf8Rhkvlr+GD851juiMD6/4tp4RUHY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739902670; a=rsa-sha256; cv=none; b=Z9zTiAI1wM+UDPil9eBPc6twkKK6poPUnxkNSegTlOCsQMxHYMaLaV3nNXSr/AatWjnje2 6nt8XzLs+mHLxSv+FLi+5o9sHZk7wR1PEGKkQhSjbOrTSjx1G8z4Snk79GRLGxQlqEvjFk 6qQ9rbfuXZMrrAsxSmBY4bsSFISdqaw= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=TZdCBxij; spf=pass (imf20.hostedemail.com: domain of 3zc60ZwQKCIIl1jrmuumrk.iusrot03-ssq1giq.uxm@flex--fvdl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3zc60ZwQKCIIl1jrmuumrk.iusrot03-ssq1giq.uxm@flex--fvdl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2fc0bc05c00so18042260a91.2 for ; Tue, 18 Feb 2025 10:17:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902669; x=1740507469; 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=m8CyknMDJjzJrkTVy6IkcSYTmou3FMAB5Va5stB7LNQ=; b=TZdCBxijI8s9ONV7nJy1EaAjcXuIHtKw0RIHG6TundUWO+WPuOxY0SxRbJX1DmhoAY 6ic6K1Eilog4NwKXInx9IVGh/RWk+d58Me+vKdfrEkVTj+R3Rv7uNsMXUa1E+3ibLhm5 fMyw/hrc/GPd8aJ3LFA3qwTUIysBEVdw9GMCPlQFF1WpDp7xou2aPxHxDy3tW0Rkthr0 KjaJEfOLn6pYcyew9NcbYK+rbKE5JvktnXsY4As8yD5+R1jSaRZykoolmykt+6GIckzO MerXfBUOkIRFNb1rES4ZMXFNpNzX88WcEmYid/T7kxcPbqawrhYzUqdXQ8e9Dw1hffoO v+qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902669; x=1740507469; 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=m8CyknMDJjzJrkTVy6IkcSYTmou3FMAB5Va5stB7LNQ=; b=rcvtWk4+Qtn0q3u+eVX4qfmO6YXFp5leJ0P4s30PyYHrM4PSgZ1QL0+52kjjsb15SH MV1HPv+B+XDXBJkol0sRc+G3gtLAD/mCfoZVPRwG+4ozGWgqON9pQ6rBYscZmengnN6B pYnbLgcevKBe6OUqdMEIgDneC2tANghsXV47Pka7CIqcbvuGXPIbAqo/vulbXLkV0Ofm Gface4GtZy72TYZ7Io0H+QlhyF4+MxNseDY6nzAtIxCRK4TXi3fA14TPXPIpxAFCfZb/ iKGnCkP/41RIkg+aFiYfJXAqLc4DzUXG+Mr98ijzpf3w1Zwf9j7/ExUc+us05aM2iuG/ w0Jw== X-Forwarded-Encrypted: i=1; AJvYcCWxiyYyGauIybtfZeqebSVLeXZFZltOkg/MPnoQvSHLo+zbSjJW1ZEJcwf2HRrT5U4Ee/b7ZVhjFQ==@kvack.org X-Gm-Message-State: AOJu0Yxzxo9mmIkFTASbkxihQg3R7/vKqRXQBRN4EL1RuGhQFflM6Ifi HPeMZ8vIvNBYzG1JN3ir6XXyWhv4pnVTWPKS0CfEUfD3jN1Zw3euTEkJ4orlg86SPhcZdQ== X-Google-Smtp-Source: AGHT+IHXMpw6FIP/L3jEDwREl+IdX5acSAi6rD8V1X1Cno/4U0esuOK2FJGg9O734CFyoJuWToI/XP0C X-Received: from pfbgd3.prod.google.com ([2002:a05:6a00:8303:b0:730:8c7f:979]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1707:b0:732:5276:4ac5 with SMTP id d2e1a72fcca58-7326179975emr22919412b3a.9.1739902669132; Tue, 18 Feb 2025 10:17:49 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:55 +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-28-fvdl@google.com> Subject: [PATCH v4 27/27] mm/hugetlb: move hugetlb CMA code in to its own file 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-Rspam-User: X-Rspamd-Queue-Id: 4DA771C0011 X-Rspamd-Server: rspam07 X-Stat-Signature: 8ygpgy3idz4g665w4u3wxg9tsu4rzf85 X-HE-Tag: 1739902670-824005 X-HE-Meta: U2FsdGVkX19YXzB29S0X3xwAFcrtzFGR2ulc8zwa1+tNUfGmMFRRqfJ5+Vz5JBD7x50OfTNJAVVMb219krIFdMeRQPEKtZdjBnMDVG2WD7lFTUL1qKpNDFgHH729qAZNEz5AF9PjiYOI3CcDneR5K62rQeWHz+tRvDullvGmoBODac2icsXgTYl9u8r8p4f1+gYh2dzdEdiyED3+CvJ16t15RSmRwXX6ZrsEVYC3smV/AqDDOHqGsQzNYkoL6jFNDb/Os1F7Shefgye3N25+e+whzGC61eRvQloBjsUbXR9frqU7M8fXwtOJNy9T2F4G24QX55pbjqFIimVVOsK8QPUAb1X0C1TvEtU9aRYsdnGQ6pJH4aGoAnmEdTZY9NuXnDnNQdGnPKfo0Ci6zey/HJQEtBcGPRyEPT4ccSA01DFvtS6VQfm8/kQtpGrvst512DKh06L2ZOxbiTEsI8cBdBy9YAKJaN24i41a1Dp+WymV81K6Oqi4yljB6jRUa0QrX/CSgdB3p2U9u9/sfGUQNvFs790TyfzZfozVN8ollcqoCg6DLO5qgnK14quayJGkLzfhBuAsaAnGAQPxo3mG4zCieO4u/bQHZCNBAs6Mrpyme8ByUvOsI9ZKC/9fKBSfeS9NulhRc9XNri/cceH9Sr7Vbp5n5ErmZp+86Ntf+8itRWLf5zzwY3+1Y+TlvvbGjNN/v5G91eIGrmPuSlkZcVvKgRX53L1o4c+mxqvli8gbudEQV6nk7tE1ddH9FAzUkUwcNWykOHE4cbfLyCkn9WAL2Dm89hU+b80eVAL9K/uw20yVQWJo83Qq/0e0pC8QABELrTILeZgS1lpMn4fzz/b1Y8R4kYTdXxAWYxq+v+aTqDD/hi+QzIV6zMWtw9Sjomo5fdTJSFMCk4qUOHt4DxR/JfyVW/RhCaIOMuD482mWIZlpjhD9f5ZF0jpAZmSn9uzhH9eEod1hK852PqK HtqvbJ3H qfM6pFVM8nstoWjZCWLxx9KMZcdce+/4KqrSwX99DQRPgmTvz0p7LPavJHSHcDIMLp6pr4VgVPCeRxXp1xQ3f30MAIyPgNJGvJZphuZoshCfUCptqGhTO1bt5imc6FL/k1dD//j4Uy4c7tW/2QLGEtGdmOCNeZgG28WWf8wXC/Jxhf5442EWLRhASWOM8NMsMOD/8ejIi/fL6NYMEbQ4COhSJIO1CjAxuBzQ6mbqUkd4RFPW0ssIcYlaiqGqJBUwn+/Nz8sH33Gl/KkWNGSWDsN1nIecvLiVKpB4Mn4jQcVLnI5pIvrMHHXK0FoqIuOJt2K7n5pbXtWn2x8jAyc3TsQF+yuseJaazhRiOT+6Tzql2n7DYgrtu8XyrS7ky2OgoRsr8CC6shvIbtnJIKOaHXflnMC0lphf90bpXCXJ3p5UvoTkjMkXMF6Y8vee7PqkAZTTKydtIzu7nOBDzsoGKn3jR+FKlD9cFKFQmbeO26sb+P/iwrOHlzR4a/+GjNjmwMFG3OnnFAZ8ZbGBK9tv/H5LQUg== 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: hugetlb.c contained a number of CONFIG_CMA ifdefs, and the code inside them was large enough to merit being in its own file, so move it, cleaning up things a bit. Hide some direct variable access behind functions to accommodate the move. No functional change intended. Signed-off-by: Frank van der Linden --- MAINTAINERS | 2 + mm/Makefile | 3 + mm/hugetlb.c | 269 +++------------------------------------------ mm/hugetlb_cma.c | 275 +++++++++++++++++++++++++++++++++++++++++++++++ mm/hugetlb_cma.h | 57 ++++++++++ 5 files changed, 354 insertions(+), 252 deletions(-) create mode 100644 mm/hugetlb_cma.c create mode 100644 mm/hugetlb_cma.h diff --git a/MAINTAINERS b/MAINTAINERS index efee40ea589f..04edbbfcb467 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10702,6 +10702,8 @@ F: fs/hugetlbfs/ F: include/linux/hugetlb.h F: include/trace/events/hugetlbfs.h F: mm/hugetlb.c +F: mm/hugetlb_cma.c +F: mm/hugetlb_cma.h F: mm/hugetlb_vmemmap.c F: mm/hugetlb_vmemmap.h F: tools/testing/selftests/cgroup/test_hugetlb_memcg.c diff --git a/mm/Makefile b/mm/Makefile index 850386a67b3e..810ccd45d270 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -79,6 +79,9 @@ obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o swap_slots.o obj-$(CONFIG_ZSWAP) += zswap.o obj-$(CONFIG_HAS_DMA) += dmapool.o obj-$(CONFIG_HUGETLBFS) += hugetlb.o +ifdef CONFIG_CMA +obj-$(CONFIG_HUGETLBFS) += hugetlb_cma.o +endif obj-$(CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP) += hugetlb_vmemmap.o obj-$(CONFIG_NUMA) += mempolicy.o obj-$(CONFIG_SPARSEMEM) += sparse.o diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 664ccaaa717a..3ee98f612137 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -49,19 +49,13 @@ #include #include "internal.h" #include "hugetlb_vmemmap.h" +#include "hugetlb_cma.h" #include int hugetlb_max_hstate __read_mostly; unsigned int default_hstate_idx; struct hstate hstates[HUGE_MAX_HSTATE]; -#ifdef CONFIG_CMA -static struct cma *hugetlb_cma[MAX_NUMNODES]; -static unsigned long hugetlb_cma_size_in_node[MAX_NUMNODES] __initdata; -#endif -static bool hugetlb_cma_only; -static unsigned long hugetlb_cma_size __initdata; - __initdata struct list_head huge_boot_pages[MAX_NUMNODES]; static unsigned long hstate_boot_nrinvalid[HUGE_MAX_HSTATE] __initdata; @@ -128,14 +122,11 @@ static struct resv_map *vma_resv_map(struct vm_area_struct *vma); static void hugetlb_free_folio(struct folio *folio) { -#ifdef CONFIG_CMA - int nid = folio_nid(folio); - if (folio_test_hugetlb_cma(folio)) { - WARN_ON_ONCE(!cma_free_folio(hugetlb_cma[nid], folio)); + hugetlb_cma_free_folio(folio); return; } -#endif + folio_put(folio); } @@ -1492,31 +1483,9 @@ static struct folio *alloc_gigantic_folio(struct hstate *h, gfp_t gfp_mask, if (nid == NUMA_NO_NODE) nid = numa_mem_id(); retry: - folio = NULL; -#ifdef CONFIG_CMA - { - int node; - - if (hugetlb_cma[nid]) - folio = cma_alloc_folio(hugetlb_cma[nid], order, gfp_mask); - - if (!folio && !(gfp_mask & __GFP_THISNODE)) { - for_each_node_mask(node, *nodemask) { - if (node == nid || !hugetlb_cma[node]) - continue; - - folio = cma_alloc_folio(hugetlb_cma[node], order, gfp_mask); - if (folio) - break; - } - } - - if (folio) - folio_set_hugetlb_cma(folio); - } -#endif + folio = hugetlb_cma_alloc_folio(h, gfp_mask, nid, nodemask); if (!folio) { - if (hugetlb_cma_only) + if (hugetlb_cma_exclusive_alloc()) return NULL; folio = folio_alloc_gigantic(order, gfp_mask, nid, nodemask); @@ -3179,47 +3148,14 @@ struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, return ERR_PTR(-ENOSPC); } -static bool __init hugetlb_early_cma(struct hstate *h) -{ - if (arch_has_huge_bootmem_alloc()) - return false; - - return (hstate_is_gigantic(h) && hugetlb_cma_only); -} - static __init void *alloc_bootmem(struct hstate *h, int nid, bool node_exact) { struct huge_bootmem_page *m; - unsigned long flags; - struct cma *cma; int listnode = nid; -#ifdef CONFIG_CMA - if (hugetlb_early_cma(h)) { - flags = HUGE_BOOTMEM_CMA; - cma = hugetlb_cma[nid]; - m = cma_reserve_early(cma, huge_page_size(h)); - if (!m) { - int node; - - if (node_exact) - return NULL; - for_each_online_node(node) { - cma = hugetlb_cma[node]; - if (!cma || node == nid) - continue; - m = cma_reserve_early(cma, huge_page_size(h)); - if (m) { - listnode = node; - break; - } - } - } - } else -#endif - { - flags = 0; - cma = NULL; + if (hugetlb_early_cma(h)) + m = hugetlb_cma_alloc_bootmem(h, &listnode, node_exact); + else { if (node_exact) m = memblock_alloc_exact_nid_raw(huge_page_size(h), huge_page_size(h), 0, @@ -3238,6 +3174,11 @@ static __init void *alloc_bootmem(struct hstate *h, int nid, bool node_exact) if (m) listnode = early_pfn_to_nid(PHYS_PFN(virt_to_phys(m))); } + + if (m) { + m->flags = 0; + m->cma = NULL; + } } if (m) { @@ -3252,8 +3193,6 @@ static __init void *alloc_bootmem(struct hstate *h, int nid, bool node_exact) INIT_LIST_HEAD(&m->list); list_add(&m->list, &huge_boot_pages[listnode]); m->hstate = h; - m->flags = flags; - m->cma = cma; } return m; @@ -3703,7 +3642,8 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) * Skip gigantic hugepages allocation if early CMA * reservations are not available. */ - if (hstate_is_gigantic(h) && hugetlb_cma_size && !hugetlb_early_cma(h)) { + if (hstate_is_gigantic(h) && hugetlb_cma_total_size() && + !hugetlb_early_cma(h)) { pr_warn_once("HugeTLB: hugetlb_cma is enabled, skip boot time allocation\n"); return; } @@ -3740,7 +3680,7 @@ static void __init hugetlb_init_hstates(void) */ if (hstate_is_gigantic(h) && !gigantic_page_runtime_supported()) continue; - if (hugetlb_cma_size && h->order <= HUGETLB_PAGE_ORDER) + if (hugetlb_cma_total_size() && h->order <= HUGETLB_PAGE_ORDER) continue; for_each_hstate(h2) { if (h2 == h) @@ -4642,14 +4582,6 @@ static void hugetlb_register_all_nodes(void) { } #endif -#ifdef CONFIG_CMA -static void __init hugetlb_cma_check(void); -#else -static inline __init void hugetlb_cma_check(void) -{ -} -#endif - static void __init hugetlb_sysfs_init(void) { struct hstate *h; @@ -4833,8 +4765,7 @@ static __init void hugetlb_parse_params(void) hcp->setup(hcp->val); } - if (!hugetlb_cma_size) - hugetlb_cma_only = false; + hugetlb_cma_validate_params(); } /* @@ -7904,169 +7835,3 @@ void hugetlb_unshare_all_pmds(struct vm_area_struct *vma) hugetlb_unshare_pmds(vma, ALIGN(vma->vm_start, PUD_SIZE), ALIGN_DOWN(vma->vm_end, PUD_SIZE)); } - -#ifdef CONFIG_CMA -static bool cma_reserve_called __initdata; - -static int __init cmdline_parse_hugetlb_cma(char *p) -{ - int nid, count = 0; - unsigned long tmp; - char *s = p; - - while (*s) { - if (sscanf(s, "%lu%n", &tmp, &count) != 1) - break; - - if (s[count] == ':') { - if (tmp >= MAX_NUMNODES) - break; - nid = array_index_nospec(tmp, MAX_NUMNODES); - - s += count + 1; - tmp = memparse(s, &s); - hugetlb_cma_size_in_node[nid] = tmp; - hugetlb_cma_size += tmp; - - /* - * Skip the separator if have one, otherwise - * break the parsing. - */ - if (*s == ',') - s++; - else - break; - } else { - hugetlb_cma_size = memparse(p, &p); - break; - } - } - - return 0; -} - -early_param("hugetlb_cma", cmdline_parse_hugetlb_cma); - -static int __init cmdline_parse_hugetlb_cma_only(char *p) -{ - return kstrtobool(p, &hugetlb_cma_only); -} - -early_param("hugetlb_cma_only", cmdline_parse_hugetlb_cma_only); - -void __init hugetlb_cma_reserve(int order) -{ - unsigned long size, reserved, per_node; - bool node_specific_cma_alloc = false; - int nid; - - /* - * HugeTLB CMA reservation is required for gigantic - * huge pages which could not be allocated via the - * page allocator. Just warn if there is any change - * breaking this assumption. - */ - VM_WARN_ON(order <= MAX_PAGE_ORDER); - cma_reserve_called = true; - - if (!hugetlb_cma_size) - return; - - for (nid = 0; nid < MAX_NUMNODES; nid++) { - if (hugetlb_cma_size_in_node[nid] == 0) - continue; - - if (!node_online(nid)) { - pr_warn("hugetlb_cma: invalid node %d specified\n", nid); - hugetlb_cma_size -= hugetlb_cma_size_in_node[nid]; - hugetlb_cma_size_in_node[nid] = 0; - continue; - } - - if (hugetlb_cma_size_in_node[nid] < (PAGE_SIZE << order)) { - pr_warn("hugetlb_cma: cma area of node %d should be at least %lu MiB\n", - nid, (PAGE_SIZE << order) / SZ_1M); - hugetlb_cma_size -= hugetlb_cma_size_in_node[nid]; - hugetlb_cma_size_in_node[nid] = 0; - } else { - node_specific_cma_alloc = true; - } - } - - /* Validate the CMA size again in case some invalid nodes specified. */ - if (!hugetlb_cma_size) - return; - - if (hugetlb_cma_size < (PAGE_SIZE << order)) { - pr_warn("hugetlb_cma: cma area should be at least %lu MiB\n", - (PAGE_SIZE << order) / SZ_1M); - hugetlb_cma_size = 0; - return; - } - - if (!node_specific_cma_alloc) { - /* - * If 3 GB area is requested on a machine with 4 numa nodes, - * let's allocate 1 GB on first three nodes and ignore the last one. - */ - per_node = DIV_ROUND_UP(hugetlb_cma_size, nr_online_nodes); - pr_info("hugetlb_cma: reserve %lu MiB, up to %lu MiB per node\n", - hugetlb_cma_size / SZ_1M, per_node / SZ_1M); - } - - reserved = 0; - for_each_online_node(nid) { - int res; - char name[CMA_MAX_NAME]; - - if (node_specific_cma_alloc) { - if (hugetlb_cma_size_in_node[nid] == 0) - continue; - - size = hugetlb_cma_size_in_node[nid]; - } else { - size = min(per_node, hugetlb_cma_size - reserved); - } - - size = round_up(size, PAGE_SIZE << order); - - snprintf(name, sizeof(name), "hugetlb%d", nid); - /* - * Note that 'order per bit' is based on smallest size that - * may be returned to CMA allocator in the case of - * huge page demotion. - */ - res = cma_declare_contiguous_multi(size, PAGE_SIZE << order, - HUGETLB_PAGE_ORDER, name, - &hugetlb_cma[nid], nid); - if (res) { - pr_warn("hugetlb_cma: reservation failed: err %d, node %d", - res, nid); - continue; - } - - reserved += size; - pr_info("hugetlb_cma: reserved %lu MiB on node %d\n", - size / SZ_1M, nid); - - if (reserved >= hugetlb_cma_size) - break; - } - - if (!reserved) - /* - * hugetlb_cma_size is used to determine if allocations from - * cma are possible. Set to zero if no cma regions are set up. - */ - hugetlb_cma_size = 0; -} - -static void __init hugetlb_cma_check(void) -{ - if (!hugetlb_cma_size || cma_reserve_called) - return; - - pr_warn("hugetlb_cma: the option isn't supported by current arch\n"); -} - -#endif /* CONFIG_CMA */ diff --git a/mm/hugetlb_cma.c b/mm/hugetlb_cma.c new file mode 100644 index 000000000000..e0f2d5c3a84c --- /dev/null +++ b/mm/hugetlb_cma.c @@ -0,0 +1,275 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include +#include +#include +#include + +#include +#include + +#include +#include "internal.h" +#include "hugetlb_cma.h" + + +static struct cma *hugetlb_cma[MAX_NUMNODES]; +static unsigned long hugetlb_cma_size_in_node[MAX_NUMNODES] __initdata; +static bool hugetlb_cma_only; +static unsigned long hugetlb_cma_size __initdata; + +void hugetlb_cma_free_folio(struct folio *folio) +{ + int nid = folio_nid(folio); + + WARN_ON_ONCE(!cma_free_folio(hugetlb_cma[nid], folio)); +} + + +struct folio *hugetlb_cma_alloc_folio(struct hstate *h, gfp_t gfp_mask, + int nid, nodemask_t *nodemask) +{ + int node; + int order = huge_page_order(h); + struct folio *folio = NULL; + + if (hugetlb_cma[nid]) + folio = cma_alloc_folio(hugetlb_cma[nid], order, gfp_mask); + + if (!folio && !(gfp_mask & __GFP_THISNODE)) { + for_each_node_mask(node, *nodemask) { + if (node == nid || !hugetlb_cma[node]) + continue; + + folio = cma_alloc_folio(hugetlb_cma[node], order, gfp_mask); + if (folio) + break; + } + } + + if (folio) + folio_set_hugetlb_cma(folio); + + return folio; +} + +struct huge_bootmem_page * __init +hugetlb_cma_alloc_bootmem(struct hstate *h, int *nid, bool node_exact) +{ + struct cma *cma; + struct huge_bootmem_page *m; + int node = *nid; + + cma = hugetlb_cma[*nid]; + m = cma_reserve_early(cma, huge_page_size(h)); + if (!m) { + if (node_exact) + return NULL; + + for_each_online_node(node) { + cma = hugetlb_cma[node]; + if (!cma || node == *nid) + continue; + m = cma_reserve_early(cma, huge_page_size(h)); + if (m) { + *nid = node; + break; + } + } + } + + if (m) { + m->flags = HUGE_BOOTMEM_CMA; + m->cma = cma; + } + + return m; +} + + +static bool cma_reserve_called __initdata; + +static int __init cmdline_parse_hugetlb_cma(char *p) +{ + int nid, count = 0; + unsigned long tmp; + char *s = p; + + while (*s) { + if (sscanf(s, "%lu%n", &tmp, &count) != 1) + break; + + if (s[count] == ':') { + if (tmp >= MAX_NUMNODES) + break; + nid = array_index_nospec(tmp, MAX_NUMNODES); + + s += count + 1; + tmp = memparse(s, &s); + hugetlb_cma_size_in_node[nid] = tmp; + hugetlb_cma_size += tmp; + + /* + * Skip the separator if have one, otherwise + * break the parsing. + */ + if (*s == ',') + s++; + else + break; + } else { + hugetlb_cma_size = memparse(p, &p); + break; + } + } + + return 0; +} + +early_param("hugetlb_cma", cmdline_parse_hugetlb_cma); + +static int __init cmdline_parse_hugetlb_cma_only(char *p) +{ + return kstrtobool(p, &hugetlb_cma_only); +} + +early_param("hugetlb_cma_only", cmdline_parse_hugetlb_cma_only); + +void __init hugetlb_cma_reserve(int order) +{ + unsigned long size, reserved, per_node; + bool node_specific_cma_alloc = false; + int nid; + + /* + * HugeTLB CMA reservation is required for gigantic + * huge pages which could not be allocated via the + * page allocator. Just warn if there is any change + * breaking this assumption. + */ + VM_WARN_ON(order <= MAX_PAGE_ORDER); + cma_reserve_called = true; + + if (!hugetlb_cma_size) + return; + + for (nid = 0; nid < MAX_NUMNODES; nid++) { + if (hugetlb_cma_size_in_node[nid] == 0) + continue; + + if (!node_online(nid)) { + pr_warn("hugetlb_cma: invalid node %d specified\n", nid); + hugetlb_cma_size -= hugetlb_cma_size_in_node[nid]; + hugetlb_cma_size_in_node[nid] = 0; + continue; + } + + if (hugetlb_cma_size_in_node[nid] < (PAGE_SIZE << order)) { + pr_warn("hugetlb_cma: cma area of node %d should be at least %lu MiB\n", + nid, (PAGE_SIZE << order) / SZ_1M); + hugetlb_cma_size -= hugetlb_cma_size_in_node[nid]; + hugetlb_cma_size_in_node[nid] = 0; + } else { + node_specific_cma_alloc = true; + } + } + + /* Validate the CMA size again in case some invalid nodes specified. */ + if (!hugetlb_cma_size) + return; + + if (hugetlb_cma_size < (PAGE_SIZE << order)) { + pr_warn("hugetlb_cma: cma area should be at least %lu MiB\n", + (PAGE_SIZE << order) / SZ_1M); + hugetlb_cma_size = 0; + return; + } + + if (!node_specific_cma_alloc) { + /* + * If 3 GB area is requested on a machine with 4 numa nodes, + * let's allocate 1 GB on first three nodes and ignore the last one. + */ + per_node = DIV_ROUND_UP(hugetlb_cma_size, nr_online_nodes); + pr_info("hugetlb_cma: reserve %lu MiB, up to %lu MiB per node\n", + hugetlb_cma_size / SZ_1M, per_node / SZ_1M); + } + + reserved = 0; + for_each_online_node(nid) { + int res; + char name[CMA_MAX_NAME]; + + if (node_specific_cma_alloc) { + if (hugetlb_cma_size_in_node[nid] == 0) + continue; + + size = hugetlb_cma_size_in_node[nid]; + } else { + size = min(per_node, hugetlb_cma_size - reserved); + } + + size = round_up(size, PAGE_SIZE << order); + + snprintf(name, sizeof(name), "hugetlb%d", nid); + /* + * Note that 'order per bit' is based on smallest size that + * may be returned to CMA allocator in the case of + * huge page demotion. + */ + res = cma_declare_contiguous_multi(size, PAGE_SIZE << order, + HUGETLB_PAGE_ORDER, name, + &hugetlb_cma[nid], nid); + if (res) { + pr_warn("hugetlb_cma: reservation failed: err %d, node %d", + res, nid); + continue; + } + + reserved += size; + pr_info("hugetlb_cma: reserved %lu MiB on node %d\n", + size / SZ_1M, nid); + + if (reserved >= hugetlb_cma_size) + break; + } + + if (!reserved) + /* + * hugetlb_cma_size is used to determine if allocations from + * cma are possible. Set to zero if no cma regions are set up. + */ + hugetlb_cma_size = 0; +} + +void __init hugetlb_cma_check(void) +{ + if (!hugetlb_cma_size || cma_reserve_called) + return; + + pr_warn("hugetlb_cma: the option isn't supported by current arch\n"); +} + +bool hugetlb_cma_exclusive_alloc(void) +{ + return hugetlb_cma_only; +} + +unsigned long __init hugetlb_cma_total_size(void) +{ + return hugetlb_cma_size; +} + +void __init hugetlb_cma_validate_params(void) +{ + if (!hugetlb_cma_size) + hugetlb_cma_only = false; +} + +bool __init hugetlb_early_cma(struct hstate *h) +{ + if (arch_has_huge_bootmem_alloc()) + return false; + + return hstate_is_gigantic(h) && hugetlb_cma_only; +} diff --git a/mm/hugetlb_cma.h b/mm/hugetlb_cma.h new file mode 100644 index 000000000000..f7d7fb9880a2 --- /dev/null +++ b/mm/hugetlb_cma.h @@ -0,0 +1,57 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_HUGETLB_CMA_H +#define _LINUX_HUGETLB_CMA_H + +#ifdef CONFIG_CMA +void hugetlb_cma_free_folio(struct folio *folio); +struct folio *hugetlb_cma_alloc_folio(struct hstate *h, gfp_t gfp_mask, + int nid, nodemask_t *nodemask); +struct huge_bootmem_page *hugetlb_cma_alloc_bootmem(struct hstate *h, int *nid, + bool node_exact); +void hugetlb_cma_check(void); +bool hugetlb_cma_exclusive_alloc(void); +unsigned long hugetlb_cma_total_size(void); +void hugetlb_cma_validate_params(void); +bool hugetlb_early_cma(struct hstate *h); +#else +static inline void hugetlb_cma_free_folio(struct folio *folio) +{ +} + +static inline struct folio *hugetlb_cma_alloc_folio(struct hstate *h, + gfp_t gfp_mask, int nid, nodemask_t *nodemask) +{ + return NULL; +} + +static inline +struct huge_bootmem_page *hugetlb_cma_alloc_bootmem(struct hstate *h, int *nid, + bool node_exact) +{ + return NULL; +} + +static inline void hugetlb_cma_check(void) +{ +} + +static inline bool hugetlb_cma_exclusive_alloc(void) +{ + return false; +} + +static inline unsigned long hugetlb_cma_total_size(void) +{ + return 0; +} + +static inline void hugetlb_cma_validate_params(void) +{ +} + +static inline bool hugetlb_early_cma(struct hstate *h) +{ + return false; +} +#endif +#endif