From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8899134404A for ; Wed, 8 Jul 2026 03:11:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783480297; cv=none; b=B94N5pigaJwIsEc+8OTUXlT/CXfrcskp6LJy/lTumiSsq1sL7f8cFsqONHrLmxnzAsOXn5BsPLWFw15KdWhaxplqh3Z0DzBfFoaPaHm00qlEgmUgoVD1gBHXJ8OeDPxp2p7OlvYzhFPMEGNMbFvkamctGdlSaELd9Kb6Y0S1fS0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783480297; c=relaxed/simple; bh=p752UQnP/2qeO6gJFIOKQqJPIHZheq1utP0EvqKgAH8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=FQ7ZZgvtxmykSCVoSBAhI9KksyR091P0Afg3k4L9bwqV+CaczogTW0837XThgMhDVgjLAYdQt8wd+LpjyLvmV75JBzRBgI4RrJij8dcJuQhuODp9wePUMnxsmcw5CoAViIDjzmzKeO7VgzlU7a9jW4zrdKj36qHSnML3tKC6hnw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jthoughton.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=B9WE/yPQ; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jthoughton.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="B9WE/yPQ" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-3855a987c0aso329673a91.3 for ; Tue, 07 Jul 2026 20:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1783480296; x=1784085096; darn=vger.kernel.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=Yn77aa8uoI89j7RCjY/OwI/1RZwt436WtRsFNItz3AY=; b=B9WE/yPQTX6wAW5/c9uKI4dshxO+AAOUfu/nPfHdhT7XtoXuZvFmRsdedKEzOLnsfU W3xyczL+4GJ+wJd9dYjDIxyhGj16Rf3jNmynluyFjyLr+8ay8rDSDakACNJRVNhtdaFr BukxmDIcx7bLPj2n3sjGXcSUQfkHY/GvaluAC0Rngv7s2DQgg7XCflnZgWaMRVa/D3mh abatw7/w21AFUJFHYwZsIpiSXVvjkD5ynS+o2oRv9YzA25VRek3rnNjw/uXZeTCNFnVG cvAyY/Pz2AsJIB0aadDH05/RSIx+doIEAbFHZbhIkBxVYgddpgtzFp2dtfOjwsc15qcm E3vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783480296; x=1784085096; 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=Yn77aa8uoI89j7RCjY/OwI/1RZwt436WtRsFNItz3AY=; b=J1ggqoyfB9I8C5CaDhjKYyLBPY1/gmt8KPn9CIGkT/YhK+9kL9c9uFw4fn4D4RLtqw /7f3yF2owVR26V7MQ/uPI06r+qrD4RZ1SRgKLuaawwjm2+IP86lIh86X1G00geao5fY4 2NikXqEVt5jdfA5FlKlZqgbrDoBNCS7JOFar6LMY7EE9X7LyFTgwMtFat9T1tWR12JnU a9FDWBamM4oZUsixz4WII3RWhcqDbDeVJXrBZcCqIWO3sYz1Lt0XUxiSXlYgztcEAiG0 WuxqNATZY2VweBKOSN6KQSUCpayHClhHlKm/kzFcNoYwPnHKZr5x7LP1XBL2Z10S0PM7 Nh0w== X-Forwarded-Encrypted: i=1; AHgh+RosVdCNLjB+mV+toe+c6j0LdUgtwhh694adh75eDSPFB79J9sbtS/0/Uuv4o4xWYFQIE4y7MVSXYyis6ts=@vger.kernel.org X-Gm-Message-State: AOJu0YwjjMbFw1T9C63lTTDctGerx0iLZZW1aEhI9l0q3bLlJhb7huJ0 HekOLwuEKeKdqh83vFCkoxkD4cTMuZFIlnH5YS3BTwUwfvq9n0n5jZkLZfB4Z2zq7Krxih5xaxh 0+IwHhnEWgUzXf1fs8WmM2w== X-Received: from plkb6.prod.google.com ([2002:a17:903:fa6:b0:2ca:c401:c941]) (user=jthoughton job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5290:b0:381:6466:7160 with SMTP id 98e67ed59e1d1-38941acc1ddmr622962a91.26.1783480295545; Tue, 07 Jul 2026 20:11:35 -0700 (PDT) Date: Wed, 8 Jul 2026 03:11:12 +0000 In-Reply-To: <20260708031129.3503195-1-jthoughton@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260708031129.3503195-1-jthoughton@google.com> X-Mailer: git-send-email 2.55.0.795.g602f6c329a-goog Message-ID: <20260708031129.3503195-3-jthoughton@google.com> Subject: [PATCH 02/18] hugetlb_vmemmap: Move vmemmap_get_tail up From: James Houghton To: Will Deacon , Catalin Marinas , Muchun Song , Oscar Salvador Cc: Nikos Nikoleris , Linu Cherian , Mark Rutland , David Hildenbrand , Andrew Morton , Ryan Roberts , Nanyong Sun , Yu Zhao , Frank van der Linden , David Rientjes , James Houghton , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" In a follow-up patch, it will be used in vmemmap_remap_alloc(). No functional change intended. Signed-off-by: James Houghton --- mm/hugetlb_vmemmap.c | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index da29954e9533..8d4e8ee51fdd 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -355,6 +355,32 @@ static int alloc_vmemmap_page_list(unsigned long start, unsigned long end, return -ENOMEM; } +static struct page *vmemmap_get_tail(unsigned int order, struct zone *zone) +{ + const unsigned int idx = order - VMEMMAP_TAIL_MIN_ORDER; + struct page *tail, *p; + int node = zone_to_nid(zone); + + tail = READ_ONCE(zone->vmemmap_tails[idx]); + if (likely(tail)) + return tail; + + tail = alloc_pages_node(node, GFP_KERNEL | __GFP_ZERO, 0); + if (!tail) + return NULL; + + p = page_to_virt(tail); + for (int i = 0; i < PAGE_SIZE / sizeof(struct page); i++) + init_compound_tail(p + i, NULL, order, zone); + + if (cmpxchg(&zone->vmemmap_tails[idx], NULL, tail)) { + __free_page(tail); + tail = READ_ONCE(zone->vmemmap_tails[idx]); + } + + return tail; +} + /** * vmemmap_remap_alloc - remap the vmemmap virtual address range [@start, end) * to the page which is from the @vmemmap_pages @@ -491,32 +517,6 @@ static bool vmemmap_should_optimize_folio(const struct hstate *h, struct folio * return true; } -static struct page *vmemmap_get_tail(unsigned int order, struct zone *zone) -{ - const unsigned int idx = order - VMEMMAP_TAIL_MIN_ORDER; - struct page *tail, *p; - int node = zone_to_nid(zone); - - tail = READ_ONCE(zone->vmemmap_tails[idx]); - if (likely(tail)) - return tail; - - tail = alloc_pages_node(node, GFP_KERNEL | __GFP_ZERO, 0); - if (!tail) - return NULL; - - p = page_to_virt(tail); - for (int i = 0; i < PAGE_SIZE / sizeof(struct page); i++) - init_compound_tail(p + i, NULL, order, zone); - - if (cmpxchg(&zone->vmemmap_tails[idx], NULL, tail)) { - __free_page(tail); - tail = READ_ONCE(zone->vmemmap_tails[idx]); - } - - return tail; -} - static int __hugetlb_vmemmap_optimize_folio(const struct hstate *h, struct folio *folio, struct list_head *vmemmap_pages, -- 2.55.0.795.g602f6c329a-goog