From patchwork Mon Sep 16 09:43:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dev Jain X-Patchwork-Id: 13805221 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 51098C3ABA2 for ; Mon, 16 Sep 2024 09:44:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BD07B6B008A; Mon, 16 Sep 2024 05:43:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B59816B008C; Mon, 16 Sep 2024 05:43:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9FAB36B0092; Mon, 16 Sep 2024 05:43:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 80DBD6B008A for ; Mon, 16 Sep 2024 05:43:59 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CFF2C4026B for ; Mon, 16 Sep 2024 09:43:58 +0000 (UTC) X-FDA: 82570114956.29.A78BE60 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf17.hostedemail.com (Postfix) with ESMTP id 184654000A for ; Mon, 16 Sep 2024 09:43:56 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1726479782; 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=pFGmsS1X9fE0WUIlV/AQIuYULpk6EoWAEXC0YtgMdS8=; b=6j0gpuD0Z9q7OFHuarqMeOAZ4/r2LB9MPve6wFQbnj6NmpiNhcBldWQHoxYPvLoy5HV7cs OLN7D5xlDlk9RpPLPBqN6/Jja0oFTQsonT3gbT/RbnltVIMBDqmBCClpYkZG3RNuZpAwE2 PC9Vthw6VMVFz7h6peK+wbmQXCmZhEE= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1726479782; a=rsa-sha256; cv=none; b=fYMCcUO0PYSPqi19QY2EmeTSH3JEZMnF6JxLXtwgQsaamLtPSpiU1dRCSP7F0NkiP5HTnb qtYQOvruzxwo4u0YqWRm9DF85q8pmz2lUwlpjm2Vjt8/GX0YlMCX07MStv+AwzTOV3Oxu9 xkh38sNLlt10oahPKXkmFBJNUf47FIo= 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 7918012FC; Mon, 16 Sep 2024 02:44:25 -0700 (PDT) Received: from e116581.blr.arm.com (e116581.arm.com [10.162.42.11]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 7FB153F66E; Mon, 16 Sep 2024 02:43:47 -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, wangkefeng.wang@huawei.com, ziy@nvidia.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Dev Jain Subject: [PATCH v4 1/2] mm: Abstract THP allocation Date: Mon, 16 Sep 2024 15:13:08 +0530 Message-Id: <20240916094309.1226908-2-dev.jain@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240916094309.1226908-1-dev.jain@arm.com> References: <20240916094309.1226908-1-dev.jain@arm.com> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 184654000A X-Stat-Signature: rdiebgw8un1s63ahxt87oisyob9pwhz1 X-HE-Tag: 1726479836-167680 X-HE-Meta: U2FsdGVkX18LiSf1hOCAyyY9tNF4aGOJaU+AzeCb+ejsBOxJahAgCbRrWLK2ZqYEz1f7wMNzKMFJAiWfKdieKz2MPm6gYq0gSppq2QtW2mDB0kzOWh8A8RxCBuUL79cL613nqVdR7ViRjfkLcG5VjAMjdddo1//02vjGVbqhY0LKMnAvzkhjuvV5ADg8ZVCnu/wRNnA2iru41doKVhXpBN1E0jx5zRzvHZpcocafAJDpn3La5gLU9eMuCkp83j1UpNo++ghUqSFr2lXUTivneKsbKIMPH5wRW6MnVKVmKMzgxIPoOsFctXVC5l3pVFwhpOh6NAlI/Qocg+x3z7PQELWhdGTq+BP5Hprq84VMz9sHOlY6Lsmw3xAk2Ew6ig7Y3K9OKTqNlfn9prJiX5+UxK1Pr/+IuYciadTIGUBbEenG8ua6VCNuGnL+V9tf/BJ9hITA+v8RRetPpNrXEJjACskn+keaoxu8AXLW3WnT3wRO7jjD023SyQubLSV8bf34fVqcPp/FkxYNSzfh9hmbPzbv7mEf9atgD+EFHh3laY2FuwpSEoVIQmaDmMaioYOE8M18w3csGVNiY8md0GP7GRPt7v06zL1z+qMEWVDC1aKIbwn6PQkCu5JW8GwCSLZZYLmtGGIaSZSocY8NDdP/Cbs6+Qks8ch2XPNdu9OG+2gQ+nBOfohKWyB+zd9uySRKrmW8AXk73nF697dipjvoZwux5E08kXWpqFZ5IsmEv2IM4Ea9Rla77Ry0thCrD9dP8LjJlns/acBnkQ/U6TJpkYybioDrAvnRkqa3e9etgwtlyaMP86vZEUSoZdjrcjtODeQbE4qk0yAF5n2ips5hPfw0sqKo84TZvcb9+3nzJLKLfGlNU5LTf4ptvMPRD62b07COjL/gfCxsX1vUnvQCXhEBE2GOup7WIK/LqS9waSiChOs0IhtVdLAerZLlBIiCWvjnd32ni3066hlQNaY XHsi2WW7 xjBARLidKNFT3k3jyj8EB5P4KRruYkoQAo2NGwpgiqPB2bpJyFa49WymxxN1ypci6C5BM+cl3sjdJtfXkN9onrP2fKteNlfNcC1ZFmihHYXP9QoQFCv3v7Gq9oC1DMYlvn2XbDMSGTiZjoh/Y71rfmqLdYEQgndTOFV0yaaDcsL/iEaXqkh48aCET0J8iU7LDUQOODHCm7S+x7KE= 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, except that, as David notes at [1], a PMD-aligned address should be passed to update_mmu_cache_pmd(). [1]: https://lore.kernel.org/all/ddd3fcd2-48b3-4170-bcaa-2fe66e093f43@redhat.com/ Signed-off-by: Dev Jain Acked-by: David Hildenbrand --- mm/huge_memory.c | 108 +++++++++++++++++++++++++++++------------------ 1 file changed, 66 insertions(+), 42 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 2a73efea02d7..cdc632b8dc9c 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1146,47 +1146,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 *vma_alloc_anon_folio_pmd(struct vm_area_struct *vma, + 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; + unsigned long haddr = addr & HPAGE_PMD_MASK; + gfp_t gfp = vma_thp_gfp_mask(vma); + const int order = HPAGE_PMD_ORDER; + 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); + return 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; +} + +static void __pmd_thp_fault_success_stats(struct vm_area_struct *vma) +{ + 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); +} + +static void map_anon_folio_pmd(struct folio *folio, pmd_t *pmd, + struct vm_area_struct *vma, unsigned long haddr) +{ + 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); + set_pmd_at(vma->vm_mm, haddr, pmd, entry); + update_mmu_cache_pmd(vma, haddr, pmd); + add_mm_counter(vma->vm_mm, MM_ANONPAGES, HPAGE_PMD_NR); + __pmd_thp_fault_success_stats(vma); +} + +static vm_fault_t __do_huge_pmd_anonymous_page(struct vm_fault *vmf) +{ + unsigned long haddr = vmf->address & HPAGE_PMD_MASK; + struct vm_area_struct *vma = vmf->vma; + pgtable_t pgtable = NULL; + struct folio *folio; + vm_fault_t ret = 0; + + folio = vma_alloc_anon_folio_pmd(vma, vmf->address); + if (unlikely(!folio)) { + ret = VM_FAULT_FALLBACK; + goto release; + } + + pgtable = pte_alloc_one(vma->vm_mm); + if (unlikely(!pgtable)) { + ret = VM_FAULT_OOM; + 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; @@ -1200,21 +1241,11 @@ 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); + map_anon_folio_pmd(folio, vmf->pmd, vma, haddr); mm_inc_nr_ptes(vma->vm_mm); deferred_split_folio(folio, false); 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); } return 0; @@ -1223,7 +1254,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; } @@ -1281,8 +1313,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; @@ -1333,14 +1363,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,