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=-5.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no 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 0806DC2D0A3 for ; Mon, 9 Nov 2020 17:21:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8A3A820809 for ; Mon, 9 Nov 2020 17:21:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8A3A820809 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 00D016B0036; Mon, 9 Nov 2020 12:21:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id ED9496B005C; Mon, 9 Nov 2020 12:21:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D7A816B005D; Mon, 9 Nov 2020 12:21:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0216.hostedemail.com [216.40.44.216]) by kanga.kvack.org (Postfix) with ESMTP id A895E6B0036 for ; Mon, 9 Nov 2020 12:21:50 -0500 (EST) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 3C6F41EE6 for ; Mon, 9 Nov 2020 17:21:50 +0000 (UTC) X-FDA: 77465547180.17.mark97_1d02ad1272ee Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 1CCAC180D0185 for ; Mon, 9 Nov 2020 17:21:50 +0000 (UTC) X-HE-Tag: mark97_1d02ad1272ee X-Filterd-Recvd-Size: 3402 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf15.hostedemail.com (Postfix) with ESMTP for ; Mon, 9 Nov 2020 17:21:49 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id DEEADAD07; Mon, 9 Nov 2020 17:21:47 +0000 (UTC) Date: Mon, 9 Nov 2020 18:21:44 +0100 From: Oscar Salvador To: Muchun Song Cc: corbet@lwn.net, mike.kravetz@oracle.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, viro@zeniv.linux.org.uk, akpm@linux-foundation.org, paulmck@kernel.org, mchehab+huawei@kernel.org, pawan.kumar.gupta@linux.intel.com, rdunlap@infradead.org, oneukum@suse.com, anshuman.khandual@arm.com, jroedel@suse.de, almasrymina@google.com, rientjes@google.com, willy@infradead.org, mhocko@suse.com, duanxiongchun@bytedance.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH v3 05/21] mm/hugetlb: Introduce pgtable allocation/freeing helpers Message-ID: <20201109172144.GB17356@linux> References: <20201108141113.65450-1-songmuchun@bytedance.com> <20201108141113.65450-6-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201108141113.65450-6-songmuchun@bytedance.com> User-Agent: Mutt/1.10.1 (2018-07-13) 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 Sun, Nov 08, 2020 at 10:10:57PM +0800, Muchun Song wrote: > +static inline unsigned int pgtable_pages_to_prealloc_per_hpage(struct hstate *h) > +{ > + unsigned long vmemmap_size = vmemmap_pages_size_per_hpage(h); > + > + /* > + * No need pre-allocate page tabels when there is no vmemmap pages > + * to free. s /tabels/tables/ > +static int vmemmap_pgtable_prealloc(struct hstate *h, struct page *page) > +{ > + int i; > + pgtable_t pgtable; > + unsigned int nr = pgtable_pages_to_prealloc_per_hpage(h); > + > + if (!nr) > + return 0; > + > + vmemmap_pgtable_init(page); > + > + for (i = 0; i < nr; i++) { > + pte_t *pte_p; > + > + pte_p = pte_alloc_one_kernel(&init_mm); > + if (!pte_p) > + goto out; > + vmemmap_pgtable_deposit(page, virt_to_page(pte_p)); > + } > + > + return 0; > +out: > + while (i-- && (pgtable = vmemmap_pgtable_withdraw(page))) > + pte_free_kernel(&init_mm, page_to_virt(pgtable)); would not be enough to: while (pgtable = vmemmap_pgtable_withdrag(page)) pte_free_kernel(&init_mm, page_to_virt(pgtable)); > + return -ENOMEM; > +} > + > +static void vmemmap_pgtable_free(struct hstate *h, struct page *page) > +{ > + pgtable_t pgtable; > + unsigned int nr = pgtable_pages_to_prealloc_per_hpage(h); > + > + if (!nr) > + return; We can get rid of "nr" and its check and keep only the check below, right? AFAICS, they go together, e.g: if page_huge_pte does not return null, it means that we preallocated a pagetable, and viceversa. > + > + pgtable = page_huge_pte(page); > + if (!pgtable) > + return; > + > + while (nr-- && (pgtable = vmemmap_pgtable_withdraw(page))) > + pte_free_kernel(&init_mm, page_to_virt(pgtable)); Same as above, that "nr" can go? -- Oscar Salvador SUSE L3