From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C6ACF42A168 for ; Sat, 1 Aug 2026 08:49:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785574189; cv=none; b=R2HXHSdbRTq6NwNy06XulxPygBjx3IaVRXvGNZ6MsXnLHdiQhd6yjgxL5N+nq1+PsPWMdlI5qautLGle9jFO3TYT2jq+P177DFZnWFHIHaye+eeb95pbhVeq9n8/LEo2kShSWlGmiPgcRVjHJAiHsc9n/12ucW/66GZt3zZrwz0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785574189; c=relaxed/simple; bh=5pBEYQR2oSDoZO4NmgLCPV9svDwAWdgdBz20bA0OiOs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kKg1rcEcz/H6J1fP/7laMpTiSZvuBeAnASgc4a68F7RrIxAPNWQIspfEgiq4CR0JaByuzzimxC/Bs0RioGLz3aQPDirhHq0heIrJclyFTDwqhESgfBZ+SKRrv+DTm4Q1Wczs5DLH4JSa5Nd+yOd9pnStX6U03z8lMHhD6+1dgfI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bzWr+9fM; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bzWr+9fM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72E071F00ADB; Sat, 1 Aug 2026 08:49:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785574185; bh=8jWUj8mEuI70BURr/iwksxqdZh09vWaLH/yvaQwQxNw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bzWr+9fMDT40ul//Wh0slIyzzEidBdejxO5cR7NbPRtOVVvAqGyj34Wcjl0GVsVL/ e5AAu7R5FuHpcwcl0vT5OxO4mOGW6ILzHpmz1KtFmnmjro7qyVe+AFD+y2/hzuRoeR /Hu3VoM24gw7pmHajQ3lZpvlkeatiCzIECuyvAIw4f7aG4fZf+RCCf3dQv4wsPaSDA Qjh2zuOfvgXZucv5/6fXHsA2A8fVnoSZGc3IFtIq6SHTpqIt6xJv+tlsXY0H6I+VmU IkJQNnthGSgjr3scbIY1IHtNXps73QQ06RmRq9jsU1okpl4j6xT0vNrXsqKoMLoN1R MgEOeKb/B0UXA== From: Pratyush Yadav To: Mike Rapoport , Pasha Tatashin , Pratyush Yadav , Alexander Graf , Muchun Song , Oscar Salvador , David Hildenbrand , Andrew Morton , Jason Miu , Jork Loeser Cc: kexec@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 21/22] memblock: add memblock_reserved_hugetlb_size() Date: Sat, 1 Aug 2026 10:48:30 +0200 Message-ID: <20260801084833.1897543-22-pratyush@kernel.org> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog In-Reply-To: <20260801084833.1897543-1-pratyush@kernel.org> References: <20260801084833.1897543-1-pratyush@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Pratyush Yadav (Google)" Similar to memblock_reserved_kern_size(), but calculates only the memory reserved for hugetlb pages. This is needed in an upcoming commit that subtracts hugetlb reservation size when computing the size of KHO scratch areas. Signed-off-by: Pratyush Yadav (Google) --- include/linux/memblock.h | 1 + mm/memblock.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 678fe466529a..d62db9e776cf 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -487,6 +487,7 @@ static inline __init_memblock bool memblock_bottom_up(void) phys_addr_t memblock_phys_mem_size(void); phys_addr_t memblock_reserved_size(void); phys_addr_t memblock_reserved_kern_size(phys_addr_t limit, int nid); +phys_addr_t memblock_reserved_hugetlb_size(phys_addr_t limit, int nid); unsigned long memblock_estimated_nr_free_pages(void); phys_addr_t memblock_start_of_DRAM(void); phys_addr_t memblock_end_of_DRAM(void); diff --git a/mm/memblock.c b/mm/memblock.c index 77c6540e7528..37e06e70c1d0 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1899,6 +1899,28 @@ phys_addr_t __init_memblock memblock_reserved_size(void) return memblock.reserved.total_size; } +phys_addr_t __init_memblock memblock_reserved_hugetlb_size(phys_addr_t limit, int nid) +{ + struct memblock_region *r; + phys_addr_t total = 0; + + for_each_reserved_mem_region(r) { + phys_addr_t size = r->size; + + if (r->base > limit) + break; + + if (r->base + r->size > limit) + size = limit - r->base; + + if (nid == memblock_get_region_node(r) || !numa_valid_node(nid)) + if (r->flags & MEMBLOCK_RSRV_HUGETLB) + total += size; + } + + return total; +} + phys_addr_t __init_memblock memblock_reserved_kern_size(phys_addr_t limit, int nid) { struct memblock_region *r; -- 2.55.0.571.g244d577d93-goog