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 X-Spam-Level: X-Spam-Status: No, score=-17.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1008C433DB for ; Fri, 12 Feb 2021 09:50:11 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5820664E38 for ; Fri, 12 Feb 2021 09:50:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5820664E38 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id DD1AD8D0030; Fri, 12 Feb 2021 04:50:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D5B898D0015; Fri, 12 Feb 2021 04:50:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C228D8D0030; Fri, 12 Feb 2021 04:50:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0084.hostedemail.com [216.40.44.84]) by kanga.kvack.org (Postfix) with ESMTP id A7E7C8D0015 for ; Fri, 12 Feb 2021 04:50:10 -0500 (EST) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 57D738249980 for ; Fri, 12 Feb 2021 09:50:10 +0000 (UTC) X-FDA: 77809144980.07.49AC51B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf05.hostedemail.com (Postfix) with ESMTP id BD68EE0001AC for ; Fri, 12 Feb 2021 09:50:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613123409; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ibCpcRXbNGbZ0c4IJYIhAiMzMee7fTcrcQjumXKkexE=; b=ZiPggyrEGf1jhQUX+rjvXoRpeU2gKJo1xHhC2Xb7lb9AVaZY9WDugyuqlkOgZIGDRyMn6p FTVT3iywiNxv3Kx6t6LBGTAkbCW8P85McYp3rc3hDbJo80/QDUqRCPctu+eHIiG68nLhHD yYEfAEMfQBqngb3r6MR1SAlEh12cegA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-594-f0X1JRbpNYaYzLEOwMoXZA-1; Fri, 12 Feb 2021 04:50:05 -0500 X-MC-Unique: f0X1JRbpNYaYzLEOwMoXZA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 33D89801975; Fri, 12 Feb 2021 09:50:04 +0000 (UTC) Received: from [10.36.114.178] (ovpn-114-178.ams2.redhat.com [10.36.114.178]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10FCC1F45B; Fri, 12 Feb 2021 09:50:02 +0000 (UTC) Subject: Re: [PATCH v2] mm/hugetlb: use helper huge_page_size() to get hugepage size To: Miaohe Lin , akpm@linux-foundation.org, mike.kravetz@oracle.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20210209021803.49211-1-linmiaohe@huawei.com> From: David Hildenbrand Organization: Red Hat GmbH Message-ID: <357ade66-8176-8ea6-92bd-f18fa540af93@redhat.com> Date: Fri, 12 Feb 2021 10:50:02 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 In-Reply-To: <20210209021803.49211-1-linmiaohe@huawei.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Stat-Signature: 4r9he65p8bud88typkd8xfboyut7b4bq X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: BD68EE0001AC Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf05; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=63.128.21.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1613123408-552100 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 09.02.21 03:18, Miaohe Lin wrote: > We can use helper huge_page_size() to get the hugepage size directly to > simplify the code slightly. > > Reviewed-by: Mike Kravetz > Signed-off-by: Miaohe Lin > --- > v1 -> v2 > change huge_page_size(h) >> 10 to huge_page_size(h) / SZ_1K > collect Reviewed-by tag > --- > mm/hugetlb.c | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 18628f8dbfb0..06719fdf9fd6 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -3199,7 +3199,7 @@ void __init hugetlb_add_hstate(unsigned int order) > BUG_ON(order == 0); > h = &hstates[hugetlb_max_hstate++]; > h->order = order; > - h->mask = ~((1ULL << (order + PAGE_SHIFT)) - 1); > + h->mask = ~(huge_page_size(h) - 1); > for (i = 0; i < MAX_NUMNODES; ++i) > INIT_LIST_HEAD(&h->hugepage_freelists[i]); > INIT_LIST_HEAD(&h->hugepage_activelist); > @@ -3474,7 +3474,7 @@ void hugetlb_report_meminfo(struct seq_file *m) > for_each_hstate(h) { > unsigned long count = h->nr_huge_pages; > > - total += (PAGE_SIZE << huge_page_order(h)) * count; > + total += huge_page_size(h) * count; > > if (h == &default_hstate) > seq_printf(m, > @@ -3487,10 +3487,10 @@ void hugetlb_report_meminfo(struct seq_file *m) > h->free_huge_pages, > h->resv_huge_pages, > h->surplus_huge_pages, > - (PAGE_SIZE << huge_page_order(h)) / 1024); > + huge_page_size(h) / SZ_1K); > } > > - seq_printf(m, "Hugetlb: %8lu kB\n", total / 1024); > + seq_printf(m, "Hugetlb: %8lu kB\n", total / SZ_1K); > } > > int hugetlb_report_node_meminfo(char *buf, int len, int nid) > @@ -3524,7 +3524,7 @@ void hugetlb_show_meminfo(void) > h->nr_huge_pages_node[nid], > h->free_huge_pages_node[nid], > h->surplus_huge_pages_node[nid], > - 1UL << (huge_page_order(h) + PAGE_SHIFT - 10)); > + huge_page_size(h) / SZ_1K); > } > > void hugetlb_report_usage(struct seq_file *m, struct mm_struct *mm) > @@ -3647,9 +3647,7 @@ static int hugetlb_vm_op_split(struct vm_area_struct *vma, unsigned long addr) > > static unsigned long hugetlb_vm_op_pagesize(struct vm_area_struct *vma) > { > - struct hstate *hstate = hstate_vma(vma); > - > - return 1UL << huge_page_shift(hstate); > + return huge_page_size(hstate_vma(vma)); > } > > /* > Reviewed-by: David Hildenbrand Thanks! -- Thanks, David / dhildenb