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 CDE16EE4990 for ; Wed, 11 Sep 2024 10:52:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2111E940026; Wed, 11 Sep 2024 06:52:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 19A98940021; Wed, 11 Sep 2024 06:52:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 062AD940026; Wed, 11 Sep 2024 06:52:53 -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 DB189940021 for ; Wed, 11 Sep 2024 06:52:52 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 53F4741162 for ; Wed, 11 Sep 2024 10:52:52 +0000 (UTC) X-FDA: 82552144584.13.1A91956 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf16.hostedemail.com (Postfix) with ESMTP id A4D83180012 for ; Wed, 11 Sep 2024 10:52:49 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf16.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1726051867; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fmd6fhhjKVXwCWkf/KCDHIlRATy2Ezj5r7ZKuLC3k0s=; b=gp+LnljybudWrVx4JswrGibmz7ffDQGo3n2kbkfB59UGVEb7SWKMCFV24cdVSJh+8rrC3Q CMLwTcwLVhLbGtHqwJVwC7cdETkP24PHh6KDUOFUPQaq9ifAQU84Mh6HdMeI6TQDKG9kUC g3mPMt0/H4HFly/Pd/DVtP0mXJr6QJ8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1726051867; a=rsa-sha256; cv=none; b=S4EcRJHrK0PqUv5q6bO7rU2E7kCfZhMIG67M8OBMy03P2C4LIPemBCt9RWU04MpE+VC7Dc kia+hpx+77C5WVHMdB/vvvZzQ4zSBg5XO4SOq652BABNRy8e+rl+PzfYdodW+KR1yxxJPV J8th7Cn/hjq32UtQ39cP5/UPa9lNskw= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf16.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com Received: from mail.maildlp.com (unknown [172.19.88.194]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4X3cnk1rXkzyRLW; Wed, 11 Sep 2024 18:51:38 +0800 (CST) Received: from dggpemf100008.china.huawei.com (unknown [7.185.36.138]) by mail.maildlp.com (Postfix) with ESMTPS id 26086140156; Wed, 11 Sep 2024 18:52:45 +0800 (CST) Received: from [10.174.177.243] (10.174.177.243) by dggpemf100008.china.huawei.com (7.185.36.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Wed, 11 Sep 2024 18:52:44 +0800 Message-ID: <170988b0-db8a-4612-a70c-b20ea2d4c020@huawei.com> Date: Wed, 11 Sep 2024 18:52:43 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 1/2] mm: Abstract THP allocation Content-Language: en-US To: Dev Jain , , , , CC: , , , , , , , , , , , , , , , , , , , , , References: <20240911065600.1002644-1-dev.jain@arm.com> <20240911065600.1002644-2-dev.jain@arm.com> From: Kefeng Wang In-Reply-To: <20240911065600.1002644-2-dev.jain@arm.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemf100008.china.huawei.com (7.185.36.138) X-Rspamd-Queue-Id: A4D83180012 X-Stat-Signature: mkrxi8s87wob4qsqn55whckko54r6jj7 X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1726051969-438951 X-HE-Meta: U2FsdGVkX1+ae1Ksr9d3hKwprbUwi/gtL8yQWndbqExG6w7bROhcay47oi7C9YvMxk39DyEjdoe6pF10Hxmi9wTHyCbxU1sBFosNCFpBwtJanGWkWVM6/4wz7SV1zsyfcMtg/XXTCwHqxA9SbMzDLgHNWTdn+gfqKFGOe8DiTX07MKVc6D9KWUoSTvHcjpE9KaYTZciP9eLS5eKVEjYf62GOPtUr85eFUUnW2EaChQCIBMjt/P3t7gWT8vwKj0CQivBdLsFJUXgxXbBZGVRPPYdVe9qyjForcQaZFWDHUZ/bZdbF+L8P6KXzeb90O0nEQFhQ45WR1DkhE1T3AeoRvvutdcPCb7DnMkH0bfT/JP2R5vhByJjvoaMbciY6MiMG3DJ0LiuPrbzEFqfSExNUatOSTL9TdEh92ZzM7Ln4knWlIb6VUD4JAAM9fEdKxWgfKQsT2DELHVUdBoJ3QiKi+KPv481HLUCJn1wIzZYPlIpJ38URu43ma9rG/15r+7LX5xx2hEsbYN8VFTJmkO+dMAfnEJ99ke7/oWI7PSBwCYZO6POU/59Y1dow/sxbOAmAAwTqRsXw85efN9qn5hjVuW/x6fkTlGxEYSOo02lUMNBSJiqwbnOPSIS0qpaoI2JHesUj3MmU+rWLtSYECA1O/1oGoibiYcbyahZ0FTYStnjdYJ+SKdQ8sLOeqP9qBDVqbXSsjfTej+4TLqfo5h9EhVb76yemA/wPDOsd9NcWqUFmqRTfGJVyRj31dVrNxyY47z4DO7IjCN3AxvnoWA/5f8DYXDvNJsAn+zU+G3Jq2XpWzvIPAG2km+kBWwTmrJLg7cSOY2bqyhU2NjziwQWvqKAGwTMTIYCdqdoxYsce7WL4SMT2l4Pminx6YbbISDou2oOGVjSSLBNTU+M0yeMtgHp8e3iQxykq2BHi8r/Vm9xVSkj+5RlShnJ0gakQmNNAH0+vg6HG3vC31TvFjX4 rCZkxzHJ nHAYGvRopzN4BBnZrcXW+YXbC2UbeyLSHl24ooIJ4v1bGnCvnVgWalES6wipMs8Dgh/nsvGeQ+d77RL9jQIf2wacXi1dTa/Hk9QEqQ2duvap4IhzZnrh886Ktxh/R7l+atIIUYT/wYIzGaIfFUoC0voTf2GZp4liYM7wtyNmTGnaC64pv7YqbfT7/1PdVUAeQe8uosqF5gnEVcq7yTVZ1NnfeTl/Q+SZU2vSN10aHP+YFr98= 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: List-Subscribe: List-Unsubscribe: On 2024/9/11 14:55, Dev Jain wrote: > In preparation for the second patch, abstract away the THP allocation > logic present in the create_huge_pmd() path, which corresponds to the > faulting case when no page is present. > > There should be no functional change as a result of applying > this patch. > > Signed-off-by: Dev Jain > --- > mm/huge_memory.c | 110 +++++++++++++++++++++++++++++------------------ > 1 file changed, 67 insertions(+), 43 deletions(-) > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 67c86a5d64a6..b96a1ff2bf40 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -943,47 +943,88 @@ unsigned long thp_get_unmapped_area(struct file *filp, unsigned long addr, > } > EXPORT_SYMBOL_GPL(thp_get_unmapped_area); > > -static vm_fault_t __do_huge_pmd_anonymous_page(struct vm_fault *vmf, > - struct page *page, gfp_t gfp) > +static struct folio *pmd_thp_fault_alloc(gfp_t gfp, struct vm_area_struct *vma, > + unsigned long haddr, unsigned long addr) > { > - struct vm_area_struct *vma = vmf->vma; > - struct folio *folio = page_folio(page); > - pgtable_t pgtable; > - unsigned long haddr = vmf->address & HPAGE_PMD_MASK; > - vm_fault_t ret = 0; > + const int order = HPAGE_PMD_ORDER; Maybe move vma_thp_gfp_mask() into this function too. > + struct folio *folio = vma_alloc_folio(gfp, order, vma, haddr, true); > > - VM_BUG_ON_FOLIO(!folio_test_large(folio), folio); > + if (unlikely(!folio)) { > + count_vm_event(THP_FAULT_FALLBACK); > + count_mthp_stat(order, MTHP_STAT_ANON_FAULT_FALLBACK); > + goto out; > + } > > + VM_BUG_ON_FOLIO(!folio_test_large(folio), folio); > if (mem_cgroup_charge(folio, vma->vm_mm, gfp)) { > folio_put(folio); > count_vm_event(THP_FAULT_FALLBACK); > count_vm_event(THP_FAULT_FALLBACK_CHARGE); > - count_mthp_stat(HPAGE_PMD_ORDER, MTHP_STAT_ANON_FAULT_FALLBACK); > - count_mthp_stat(HPAGE_PMD_ORDER, MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE); > - return VM_FAULT_FALLBACK; > + count_mthp_stat(order, MTHP_STAT_ANON_FAULT_FALLBACK); > + count_mthp_stat(order, MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE); > + goto out; We need to return NULL here as folio not set to null, > } > folio_throttle_swaprate(folio, gfp); > > - pgtable = pte_alloc_one(vma->vm_mm); > - if (unlikely(!pgtable)) { > - ret = VM_FAULT_OOM; > - goto release; > - } > - > - folio_zero_user(folio, vmf->address); > + folio_zero_user(folio, addr); > /* > * The memory barrier inside __folio_mark_uptodate makes sure that > * folio_zero_user writes become visible before the set_pmd_at() > * write. > */ > __folio_mark_uptodate(folio); > +out: > + return folio; > +} > +