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 6EEB0C43334 for ; Thu, 16 Jun 2022 03:51:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DB1FF6B0072; Wed, 15 Jun 2022 23:51:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D61056B0073; Wed, 15 Jun 2022 23:51:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BDB026B0074; Wed, 15 Jun 2022 23:51:01 -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 AD9BE6B0072 for ; Wed, 15 Jun 2022 23:51:01 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7DCBF2133B for ; Thu, 16 Jun 2022 03:51:01 +0000 (UTC) X-FDA: 79582723122.10.9477733 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf01.hostedemail.com (Postfix) with ESMTP id F0280400A4 for ; Thu, 16 Jun 2022 03:51:00 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 596C81F966; Thu, 16 Jun 2022 03:50:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1655351459; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kgekXoCDL26pheijKCAbO6D+nCr6WwwLdj7j0T3u+/A=; b=OpJuqgXMMfz+tNzD3+xYrklWCIAxh1JDRO9FJpP3iKnVcWxAlBnd6D8Ty2Rexjg0LJV98G EIVGPOoU7jHZ+ifRsOZ1W5rnevFqwh8U0UWqv61c5ljnc0NdCn16jNDf+XvPhB5oj/4/bN +cJjR2DEHjyklwX8ycdVH+EVS6uN54w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1655351459; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kgekXoCDL26pheijKCAbO6D+nCr6WwwLdj7j0T3u+/A=; b=JaDcKUWz9UYhbnX49/Q7zIcvfL36cu57dKQVoTCr75wCFZh8fdFGnTl1MgVvhi1IPSe/WV MPXEK9jD+DWflVCg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 00DEF1344E; Thu, 16 Jun 2022 03:50:58 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id ZyPSOKKoqmK8KwAAMHmgww (envelope-from ); Thu, 16 Jun 2022 03:50:58 +0000 Date: Thu, 16 Jun 2022 05:50:57 +0200 From: Oscar Salvador To: Muchun Song Cc: mike.kravetz@oracle.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mm: hugetlb: remove minimum_order variable Message-ID: References: <20220616033846.96937-1-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220616033846.96937-1-songmuchun@bytedance.com> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655351461; 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=kgekXoCDL26pheijKCAbO6D+nCr6WwwLdj7j0T3u+/A=; b=wP7t3eUgFfycH64ZJmErrOWZg9n+n022Fo/ht8gzOESJbavCxKCdDTxP2Jb91nlmFNpltL rAtRulG9LoKhfDtJrsa7EAV8rok9zrH8Mf/Ts3eB4kDPIabiFKlfzFGSt2DHN4ay0zF6oj ooYRyW3Gj/SzXQNFekUdCQCY6UWEQns= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=OpJuqgXM; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=JaDcKUWz; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf01.hostedemail.com: domain of osalvador@suse.de designates 195.135.220.29 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655351461; a=rsa-sha256; cv=none; b=UqLho92VGvr3rObyDeL7hxgDiLiKbTF6L6td/AOr0CvMxLleD0scSyXNkeI//xGnI/4VK+ OePLBkgf1TVSduXCRaOphmyZ1ApW9JHU8xdVQF3iIy88nrX+b3ips9fvsB+L78qyhOEgE/ G5Wsttxn+yphJi40c126/opq8t58N38= X-Rspamd-Queue-Id: F0280400A4 X-Rspam-User: X-Stat-Signature: spk5cz78zjkqrxp6bzaaq3oityprh1ro Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=OpJuqgXM; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=JaDcKUWz; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf01.hostedemail.com: domain of osalvador@suse.de designates 195.135.220.29 as permitted sender) smtp.mailfrom=osalvador@suse.de X-Rspamd-Server: rspam04 X-HE-Tag: 1655351460-151640 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, Jun 16, 2022 at 11:38:46AM +0800, Muchun Song wrote: > The following commit: > > commit 641844f5616d ("mm/hugetlb: introduce minimum hugepage order") > > fixed a static checker warning and introduced a global variable minimum_order > to fix the warning. However, the local variable in dissolve_free_huge_pages() > can be initialized to huge_page_order(&default_hstate) to fix the warning. > So remove minimum_order to simplify the code. > > Signed-off-by: Muchun Song Reviewed-by: Oscar Salvador > --- > mm/hugetlb.c | 18 +++++++----------- > 1 file changed, 7 insertions(+), 11 deletions(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 8ea4e51d8186..405d1c7441c9 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -66,12 +66,6 @@ static bool hugetlb_cma_page(struct page *page, unsigned int order) > #endif > static unsigned long hugetlb_cma_size __initdata; > > -/* > - * Minimum page order among possible hugepage sizes, set to a proper value > - * at boot time. > - */ > -static unsigned int minimum_order __read_mostly = UINT_MAX; > - > __initdata LIST_HEAD(huge_boot_pages); > > /* for command line parsing */ > @@ -2161,11 +2155,17 @@ int dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn) > unsigned long pfn; > struct page *page; > int rc = 0; > + unsigned int order; > + struct hstate *h; > > if (!hugepages_supported()) > return rc; > > - for (pfn = start_pfn; pfn < end_pfn; pfn += 1 << minimum_order) { > + order = huge_page_order(&default_hstate); > + for_each_hstate(h) > + order = min(order, huge_page_order(h)); > + > + for (pfn = start_pfn; pfn < end_pfn; pfn += 1 << order) { > page = pfn_to_page(pfn); > rc = dissolve_free_huge_page(page); > if (rc) > @@ -3157,9 +3157,6 @@ static void __init hugetlb_init_hstates(void) > struct hstate *h, *h2; > > for_each_hstate(h) { > - if (minimum_order > huge_page_order(h)) > - minimum_order = huge_page_order(h); > - > /* oversize hugepages were init'ed in early boot */ > if (!hstate_is_gigantic(h)) > hugetlb_hstate_alloc_pages(h); > @@ -3184,7 +3181,6 @@ static void __init hugetlb_init_hstates(void) > h->demote_order = h2->order; > } > } > - VM_BUG_ON(minimum_order == UINT_MAX); > } > > static void __init report_hugepages(void) > -- > 2.11.0 > > -- Oscar Salvador SUSE Labs