From mboxrd@z Thu Jan 1 00:00:00 1970 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 92C97C001DC for ; Sat, 29 Jul 2023 07:35:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CCAD66B0071; Sat, 29 Jul 2023 03:34:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C7BFF6B0072; Sat, 29 Jul 2023 03:34:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B438C8D0001; Sat, 29 Jul 2023 03:34:59 -0400 (EDT) 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 A0F636B0071 for ; Sat, 29 Jul 2023 03:34:59 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 65802803A2 for ; Sat, 29 Jul 2023 07:34:59 +0000 (UTC) X-FDA: 81063837918.13.594E5F8 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf01.hostedemail.com (Postfix) with ESMTP id B55734000D for ; Sat, 29 Jul 2023 07:34:57 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=QDNQ0ysN; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf01.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690616097; 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=FhaMwsjgFEFbkVmXcg7GMBAwAwWybMA90kmbiRsLjTc=; b=K9XCpwgPMWEIuCMrXQf00NfbR5LCFvQ0CeuHXLJiHcrWZ2nxKcfxp7XcZ+ORw7P6MSR6/j DUU7RPEk1lGI2Vtk2iej+MwaXwcvvfAD6Iqejn8ydn92y5Qj5dnF1RewyvGMLqB+RKtkn3 r0jmVHp216kYyrV42eNiV1E6EgzE4R4= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=QDNQ0ysN; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf01.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690616097; a=rsa-sha256; cv=none; b=n2Gky9yfW55+m3kaZCajUxMplCHkfhZbrPUF2avCO3+DD0D0dgdpJq31tmjTUJbuO50Kus b486L2NKyqmw2kosqB92Kut5mmrcFnNOioaJyVdvnCcxL+W7nnyPVzsNwS2pWk5gqWdFju 1P2W2myrUwLsqTknNlzw5JqL/RBKtR0= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B49F660691; Sat, 29 Jul 2023 07:34:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D045EC433C8; Sat, 29 Jul 2023 07:34:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690616096; bh=7T7BeCkdVSU1pWl7CE1rGUMEw6xG4RHncvq3JCfjuts=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=QDNQ0ysNagGLvDqYwdcTd8+YIpPqaRhNv/bYRc87RK49GGpjt+EGIchucFE4r2YT3 mTnHlGkVc9+aXx9pqQEScJrXrh7DoyKQSvEzIz5+sPlP4j7J/jo0Vm993BqL7qpHqw JJubgeHDcXf47UfQsxJfY9o8l68iK2rPYkBidPnev/0yUM0YH2gOeFh7c7i3zwHkGB DtgDjI4NGDdkCuRF1HNDMMKfbIss0m05Tc5wwZQa+tENS735K4QNfPgoRJzli/2xWM Rh55+avUp8bCvMPmMYWQPC7hP2DaiVPxjl4Q1UWFg0MefHNeOloAKl+qkNt2OKzJgK LVa6qzu8dM+rg== Date: Sat, 29 Jul 2023 10:34:16 +0300 From: Mike Rapoport To: Usama Arif Cc: linux-mm@kvack.org, muchun.song@linux.dev, mike.kravetz@oracle.com, linux-kernel@vger.kernel.org, fam.zheng@bytedance.com, liangma@liangbit.com, simon.evans@bytedance.com, punit.agrawal@bytedance.com Subject: Re: [v1 5/6] mm: move allocation of gigantic hstates to the start of mm_core_init Message-ID: <20230729073416.GG1901145@kernel.org> References: <20230727204624.1942372-1-usama.arif@bytedance.com> <20230727204624.1942372-6-usama.arif@bytedance.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230727204624.1942372-6-usama.arif@bytedance.com> X-Rspamd-Queue-Id: B55734000D X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 5pybjxd1ads1g4r1pmyaq4j3bboq3w3x X-HE-Tag: 1690616097-769066 X-HE-Meta: U2FsdGVkX186LRyvtQ6OrXUA4mMME+SM1GJRn3EsuWbsDln6D+Di08ocTOTu+FZnAEGQ5Dej5eXzz5TjsFqiw1cdOPXozgar+xPMvjU1HJOi0zqs/f/kFDC29nZVRvfcixVumhfYX7zd/FUN42OnwVz+PUDI9Zl+QkKjQ4q/OJTmwMp0zToCMGitcvs+rjNmkvQJkctMvNjk7C827no8qStWjd9l2cpue0JaPIHQNHgksafU58vFaz3Vyxg4OObKZq+4ZAyvJyTdQXrBxODh/VUNgMHACjXqfNiyPXI8GO63qRDulXdz5YvzaC+CJPvoBVp0Bg+rqI5BYK/SuB0uiYLz/uwe1bbf60njZzsjPA1coD0hYN/JnNFSvWH/suENlHzw/62jAMGfcOqVPCP/meS+WneFoOTdEqsGnOGR29mD45rB8teJR1d7IbvDMCSZg4/WFAC/k4YbEvh5DVDJBGzqlTpzniELpywkTn7zumAicDr9IWjEaoQLoaJyo7yTWc8uzIop1bv7WZfOfPxrj/ITFF9hGzr0ogG7nqSsujbd/oLiyhgGTEhO1gB1Uu2w7b8ZIQHixRbRcqXwXZQdN6fzp25no6/chX5GQnWeplHQg9vD7MEjsN0Q5JD3DkoWsXj5GS6aZUbDH/GX1raYmvaq7lVssutusS/BR/Wzjpkse3U+SFDJqOFoCjwHfAktkMnt0hoZMv3vjeIkRJVpQZHedmkHFADXS1eYpio8v9bTynVJBfwDfnx/Bqu0fCblHNuOQmGFSV5+2ArOymlZ3wiZTqMxtt4gm/fOgsHO5p+Zj8xtRf/yDnldzxjZxbi2bNFSdB3Fxag+bvFPyUocUCWQssyXhDB0xyyWosxxm5/HyCbPXGlRKy74hawH8ES2bZkR2cjVgC0InHja1bre/2i/JEhIqOHABZ65DQTL91HycOf3N7WEdwdKggEMu5bl+lKhv3WDbutws8+OmGm EjGAVJAV s94o/Zxq8vsFVN6ZJKxmEC28z/8JptX+Fw86bLAxHJ2jzvo4Z1f40b46wVhKivmRnb4LQ0eVAwTzYwjJfexznVD5YE2CZjkGmSXn0rsYKOSD0ZCR2C5pqk/I8OJQaoZyGBI8B4IyDwfy7dRY3oTMeU2V4kob5GAquA5ieft1JNXsFJzy618fKf+3tcfM/WiAdmnLyWu7W895+OXCw39dhGOA+Xy34mPm+9BRK83V4Yu3KvLN9SFkJdvhxtaslq+kEPGDcXqR3w+6e4p5vi5nUrUA5N3/b3Nyja6P8fz2QZBu2qLNxIVIiPAKcOURY+97rKYW2Eb+Mpv73hO4bnEjvAmPtrnarIIXKB5y0RkheBIw/yEaAcOrEEXkAgEcLymyoriqgW7Thxno/IkmU1oPJ1nCIvpppuxXjlEe7xF6FhGsHDd58M6c+7f6pew== 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: On Thu, Jul 27, 2023 at 09:46:23PM +0100, Usama Arif wrote: > Whether the initialization of tail struct pages of a hugepage > happens or not will become dependent on the commandline > parameter hugetlb_free_vmemmap in the future. Hence, > hugetlb_hstate_alloc_pages needs to be after command line parameters > are parsed and the start of mm_core_init is a good point. > > Signed-off-by: Usama Arif > --- > include/linux/hugetlb.h | 1 + > mm/hugetlb.c | 18 ++++++++++-------- > mm/mm_init.c | 4 ++++ > 3 files changed, 15 insertions(+), 8 deletions(-) > > diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h > index ca3c8e10f24a..2b20553deef3 100644 > --- a/include/linux/hugetlb.h > +++ b/include/linux/hugetlb.h > @@ -1271,4 +1271,5 @@ hugetlb_walk(struct vm_area_struct *vma, unsigned long addr, unsigned long sz) > return huge_pte_offset(vma->vm_mm, addr, sz); > } > > +void __init hugetlb_hstate_alloc_gigantic_pages(void); this should be in mm/internal.h with a static inline stub for !CONFIG_HUGETLBFS > #endif /* _LINUX_HUGETLB_H */ > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 58cf5978bee1..c1fcf2af591a 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -4418,14 +4418,6 @@ 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; > @@ -4437,6 +4429,16 @@ static int __init hugepages_setup(char *s) > } > __setup("hugepages=", hugepages_setup); > > +void __init hugetlb_hstate_alloc_gigantic_pages(void) > +{ > + int i; > + > + for (i = 0; i < HUGE_MAX_HSTATE; i++) { > + if (hstate_is_gigantic(&hstates[i])) > + hugetlb_hstate_alloc_pages(&hstates[i]); > + } > +} > + > /* > * hugepagesz command line processing > * A specific huge page size can only be specified once with hugepagesz. > diff --git a/mm/mm_init.c b/mm/mm_init.c > index a1963c3322af..5585c66c3c42 100644 > --- a/mm/mm_init.c > +++ b/mm/mm_init.c > @@ -26,6 +26,7 @@ > #include > #include > #include > +#include > #include "internal.h" > #include "slab.h" > #include "shuffle.h" > @@ -2768,6 +2769,9 @@ static void __init mem_init_print_info(void) > */ > void __init mm_core_init(void) > { > +#ifdef CONFIG_HUGETLBFS > + hugetlb_hstate_alloc_gigantic_pages(); > +#endif Please add a comment why it should be called here. > /* Initializations relying on SMP setup */ > build_all_zonelists(NULL); > page_alloc_init_cpuhp(); > -- > 2.25.1 > -- Sincerely yours, Mike.