From patchwork Fri Aug 30 08:41:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dev Jain X-Patchwork-Id: 13784560 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 193C2CA0EF5 for ; Fri, 30 Aug 2024 08:42:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9C8E76B00D6; Fri, 30 Aug 2024 04:42:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 951246B00D7; Fri, 30 Aug 2024 04:42:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7F29D6B00D8; Fri, 30 Aug 2024 04:42:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 5FDCD6B00D6 for ; Fri, 30 Aug 2024 04:42:17 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0D11B121628 for ; Fri, 30 Aug 2024 08:42:17 +0000 (UTC) X-FDA: 82508269914.22.1F23364 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf15.hostedemail.com (Postfix) with ESMTP id 671DAA0002 for ; Fri, 30 Aug 2024 08:42:15 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf15.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725007314; a=rsa-sha256; cv=none; b=daNiDdqrf+Xw9Oyb3cuc+qto+MLkXjS1LFzeku6wEaXXDBFpqooQM/TuokIV5yBdAnY+Sp KbGIWUn3OyLUGo+9rSF3eYTx0ncv55GqxajSSfl/t7Eyge+LhlwGibCtnAUCUjrGCanayY 8ZVhrSWvlGVhml2GwagoZa4eBKO6lag= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf15.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725007314; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5+9+FeYz2DUP6232m6GQOk9dgfUm2NXyDGYmbXvmmEQ=; b=Y+JWQ1FhIr6dyQ8DYDrFIFCNbGSQ5WdDeRvdPXlwdSvP/Cg8YXM7Hnp2dxNTBzJjfVNOi4 5PJV4gjzYfmItazVo1mitzHwKFadl2cv923YjKaE7W3gEN8ayD+UZeH9YvxHNBXlir/y0O RgMeWP4+BO5QlYzqSQFLgn9bvMoi4h4= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A87481063; Fri, 30 Aug 2024 01:42:40 -0700 (PDT) Received: from e116581.blr.arm.com (e116581.arm.com [10.162.40.24]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 249723F762; Fri, 30 Aug 2024 01:42:05 -0700 (PDT) From: Dev Jain To: akpm@linux-foundation.org, david@redhat.com, willy@infradead.org, kirill.shutemov@linux.intel.com Cc: ryan.roberts@arm.com, anshuman.khandual@arm.com, catalin.marinas@arm.com, cl@gentwo.org, vbabka@suse.cz, mhocko@suse.com, apopple@nvidia.com, dave.hansen@linux.intel.com, will@kernel.org, baohua@kernel.org, jack@suse.cz, mark.rutland@arm.com, hughd@google.com, aneesh.kumar@kernel.org, yang@os.amperecomputing.com, peterx@redhat.com, ioworker0@gmail.com, jglisse@google.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Dev Jain Subject: [PATCH 1/2] mm: Abstract THP allocation Date: Fri, 30 Aug 2024 14:11:16 +0530 Message-Id: <20240830084117.4079805-2-dev.jain@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240830084117.4079805-1-dev.jain@arm.com> References: <20240830084117.4079805-1-dev.jain@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 671DAA0002 X-Rspamd-Server: rspam01 X-Stat-Signature: maebsqj1fuihhwdnhektfx5ztwtkanpe X-HE-Tag: 1725007335-116124 X-HE-Meta: U2FsdGVkX196t4ybnplVs0yQE3weROBjduTh0xEW1Srbg7tTEdAvHIaB3r1TJ6xzkk3+y2Ivnrmon7JayTjdbTBFrW2voc0l0vgTUv36vwhejWPgG/Q8SSo4uZ3j1LwjOEikmXRZCFK74BD40JOBIyJvkitSxD7HF+rJhcfBOnKhwoCdx6S3cGJ56nx0nEmripUi2fskuSPDvfF3Y/L+tH1SVP3b0+GZ+MytPBW6bk52F/dGEfDAIuaa4DO2IkZu4Bb7LiPqpgLAAcFWlz1+lq3oj7cJfCPup2M32jm+GARl5tXhQlmToJdovhKAVltyormhotzyV9xu99r6NF7CFAnqe2RptpplJYjy2k0TunhAjMtoRTeup76GiNiA9E27mUDYbfJK0n5HxqNIxFMr+hCFkd7wvmB+2nZyg5/6DSLmcFmadN63GeTk3T5VSNabfjLWeWdNMN2x6hYKVRrlkXFUev564EP70kPsl41oR2e58VRTVkwpvZbTUORqtg1ZQ0m9EOdRBFrs0kfrZB7ddFs68/tx/szfFRzIFVxSzGDYVVZGOpTxmuigtShhuesSFLY6/ahw0lxgQDjE7goxJt0vbeIyeMrQuaU/0Uu35eG3VyCEyyADC3sfuY3u/bH8ykbkGRa6sBfaVw+c4ujg1/cTzj1WKGYxKIic5ARLzIsH7DP6Dc1Y5LZvIySNgWZK3XSfE+b2PkEHAUj7K6LvLC3JoRHgmwlckvTqrDO6hKD8X54v4umLSwhwsi1l0zXUbFwrDM3uk8L6odaxYRfyL2nSsIS4CFtSpglenDbxFVONElEK8+WGGBEUv3rbcMTyEDiGWRZMHChCZVyY//xTKiu8pZn504xsPSyga48EvoHd/Zy5cB+A95OEnjDMDYMiiXJvRN+dXLwnMO8il34GZLckOaOGbA+SJxAJ94aZxF1c/FhIM9rNQAoTDnDM93ZxYluo/xRRzjUChk/kAuT z+yXMJ9f 1tXkIGjwVuia3YMwnvAINcfwQ6Dp7RtDfJ6R8MMrzThdkV6n/SLJSOzD+VhAtqFD5OQYqfz+pIn3SHwG2u/O6TcLAA8zDqL7g/QrH8tHn2VMaSlussn3Sr5Q0fiQUlXxCLQBenZ56jGpudUsxAzMXeUIULA== 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: 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 | 113 +++++++++++++++++++++++++++++------------------ 1 file changed, 69 insertions(+), 44 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 67c86a5d64a6..e5b568e2bb34 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -943,47 +943,92 @@ 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 vm_fault_t thp_fault_alloc(gfp_t gfp, int order, struct vm_area_struct *vma, + unsigned long haddr, struct folio **foliop, + 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; + struct folio *folio = vma_alloc_folio(gfp, order, vma, haddr, true); - VM_BUG_ON_FOLIO(!folio_test_large(folio), folio); + *foliop = folio; + if (unlikely(!folio)) { + count_vm_event(THP_FAULT_FALLBACK); + count_mthp_stat(order, MTHP_STAT_ANON_FAULT_FALLBACK); + return VM_FAULT_FALLBACK; + } + 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); + count_mthp_stat(order, MTHP_STAT_ANON_FAULT_FALLBACK); + count_mthp_stat(order, MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE); return VM_FAULT_FALLBACK; } 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); + return 0; +} + +static void __thp_fault_success_stats(struct vm_area_struct *vma, int order) +{ + count_vm_event(THP_FAULT_ALLOC); + count_mthp_stat(order, MTHP_STAT_ANON_FAULT_ALLOC); + count_memcg_event_mm(vma->vm_mm, THP_FAULT_ALLOC); +} + +static void map_pmd_thp(struct folio *folio, struct vm_fault *vmf, + struct vm_area_struct *vma, unsigned long haddr, + pgtable_t pgtable) + __releases(vmf->ptl) +{ + pmd_t entry; + + entry = mk_huge_pmd(&folio->page, vma->vm_page_prot); + entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); + folio_add_new_anon_rmap(folio, vma, haddr, RMAP_EXCLUSIVE); + folio_add_lru_vma(folio, vma); + pgtable_trans_huge_deposit(vma->vm_mm, vmf->pmd, pgtable); + set_pmd_at(vma->vm_mm, haddr, vmf->pmd, entry); + update_mmu_cache_pmd(vma, vmf->address, vmf->pmd); + add_mm_counter(vma->vm_mm, MM_ANONPAGES, HPAGE_PMD_NR); + mm_inc_nr_ptes(vma->vm_mm); + spin_unlock(vmf->ptl); + __thp_fault_success_stats(vma, HPAGE_PMD_ORDER); +} + +static vm_fault_t __do_huge_pmd_anonymous_page(struct vm_fault *vmf) +{ + struct vm_area_struct *vma = vmf->vma; + struct folio *folio = NULL; + pgtable_t pgtable; + unsigned long haddr = vmf->address & HPAGE_PMD_MASK; + vm_fault_t ret = 0; + gfp_t gfp = vma_thp_gfp_mask(vma); + + pgtable = pte_alloc_one(vma->vm_mm); + if (unlikely(!pgtable)) { + ret = VM_FAULT_OOM; + goto release; + } + + ret = thp_fault_alloc(gfp, HPAGE_PMD_ORDER, vma, haddr, &folio, + vmf->address); + if (ret) + goto release; vmf->ptl = pmd_lock(vma->vm_mm, vmf->pmd); + if (unlikely(!pmd_none(*vmf->pmd))) { goto unlock_release; } else { - pmd_t entry; - ret = check_stable_address_space(vma->vm_mm); if (ret) goto unlock_release; @@ -997,20 +1042,7 @@ static vm_fault_t __do_huge_pmd_anonymous_page(struct vm_fault *vmf, VM_BUG_ON(ret & VM_FAULT_FALLBACK); return ret; } - - entry = mk_huge_pmd(page, vma->vm_page_prot); - entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); - folio_add_new_anon_rmap(folio, vma, haddr, RMAP_EXCLUSIVE); - folio_add_lru_vma(folio, vma); - pgtable_trans_huge_deposit(vma->vm_mm, vmf->pmd, pgtable); - set_pmd_at(vma->vm_mm, haddr, vmf->pmd, entry); - update_mmu_cache_pmd(vma, vmf->address, vmf->pmd); - add_mm_counter(vma->vm_mm, MM_ANONPAGES, HPAGE_PMD_NR); - mm_inc_nr_ptes(vma->vm_mm); - spin_unlock(vmf->ptl); - count_vm_event(THP_FAULT_ALLOC); - count_mthp_stat(HPAGE_PMD_ORDER, MTHP_STAT_ANON_FAULT_ALLOC); - count_memcg_event_mm(vma->vm_mm, THP_FAULT_ALLOC); + map_pmd_thp(folio, vmf, vma, haddr, pgtable); } return 0; @@ -1019,7 +1051,8 @@ static vm_fault_t __do_huge_pmd_anonymous_page(struct vm_fault *vmf, release: if (pgtable) pte_free(vma->vm_mm, pgtable); - folio_put(folio); + if (folio) + folio_put(folio); return ret; } @@ -1077,8 +1110,6 @@ static void set_huge_zero_folio(pgtable_t pgtable, struct mm_struct *mm, vm_fault_t do_huge_pmd_anonymous_page(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; - gfp_t gfp; - struct folio *folio; unsigned long haddr = vmf->address & HPAGE_PMD_MASK; vm_fault_t ret; @@ -1129,14 +1160,8 @@ vm_fault_t do_huge_pmd_anonymous_page(struct vm_fault *vmf) } return ret; } - gfp = vma_thp_gfp_mask(vma); - folio = vma_alloc_folio(gfp, HPAGE_PMD_ORDER, vma, haddr, true); - if (unlikely(!folio)) { - count_vm_event(THP_FAULT_FALLBACK); - count_mthp_stat(HPAGE_PMD_ORDER, MTHP_STAT_ANON_FAULT_FALLBACK); - return VM_FAULT_FALLBACK; - } - return __do_huge_pmd_anonymous_page(vmf, &folio->page, gfp); + + return __do_huge_pmd_anonymous_page(vmf); } static void insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr,