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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EE139CF9C71 for ; Wed, 25 Sep 2024 05:32:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=U9xPt3+NdpCDyoZfDzz7j/gt28W2fhEGJWjCveT1DpI=; b=FW1XTFw2MzLKPtK4/8n/91b4Uu IKPduK0qUM6Z4KrOTE2K88Tnq0qWoiX66+RD139SgWvrWPObqYi9IcNujc9fp5pdh8FzGwozusCBN H0rUkNmqZlMALcDI/tSH/8yZWdtBAZc9a2BYb8OxgaRRgK9zT7jAcNuQZdvY9UgYOAZw0rGjV6J8T wX3lDjkGYBMvuJFoaMAK/LPCJVjl3jjR8llh9Z3Y0wvwPFYcmR6WSxDpNsoSPnHhAFFWEei9V9e05 rsODhKk3gtAAbcmBQDkt2UmrQhU34EjM12tV8Lc7+789HYpDOq65QS3SSqcfynPqN0Gljm+opG9gZ 4FbC5QuA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1stKdh-000000043kG-0c0K; Wed, 25 Sep 2024 05:32:37 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1stKcX-000000043Tr-04lL for linux-arm-kernel@lists.infradead.org; Wed, 25 Sep 2024 05:31:26 +0000 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 2B0F0DA7; Tue, 24 Sep 2024 22:31:53 -0700 (PDT) Received: from [10.162.43.26] (e116581.arm.com [10.162.43.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 22D523F528; Tue, 24 Sep 2024 22:31:14 -0700 (PDT) Message-ID: <903de160-e2cf-42cc-93ee-6b356cdca6de@arm.com> Date: Wed, 25 Sep 2024 11:01:11 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 2/2] mm: Allocate THP on hugezeropage wp-fault To: Kefeng Wang , 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, ziy@nvidia.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20240924101654.1777697-1-dev.jain@arm.com> <20240924101654.1777697-3-dev.jain@arm.com> <7d21314c-9c53-4aa0-9a27-b07d21da429e@huawei.com> Content-Language: en-US From: Dev Jain In-Reply-To: <7d21314c-9c53-4aa0-9a27-b07d21da429e@huawei.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240924_223125_169141_971DF22A X-CRM114-Status: GOOD ( 16.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 9/24/24 18:43, Kefeng Wang wrote: > > > On 2024/9/24 18:16, Dev Jain wrote: >> Introduce do_huge_zero_wp_pmd() to handle wp-fault on a hugezeropage and >> replace it with a PMD-mapped THP. Remember to flush TLB entry >> corresponding to the hugezeropage. In case of failure, fallback >> to splitting the PMD. >> >> Signed-off-by: Dev Jain >> --- >>   mm/huge_memory.c | 44 +++++++++++++++++++++++++++++++++++++++++++- >>   1 file changed, 43 insertions(+), 1 deletion(-) >> >> diff --git a/mm/huge_memory.c b/mm/huge_memory.c >> index bdbf67c18f6c..fbb195bc2038 100644 >> --- a/mm/huge_memory.c >> +++ b/mm/huge_memory.c >> @@ -1790,6 +1790,41 @@ void huge_pmd_set_accessed(struct vm_fault *vmf) >>       spin_unlock(vmf->ptl); >>   } >>   +static vm_fault_t do_huge_zero_wp_pmd(struct vm_fault *vmf) >> +{ >> +    unsigned long haddr = vmf->address & HPAGE_PMD_MASK; >> +    struct vm_area_struct *vma = vmf->vma; >> +    struct mmu_notifier_range range; >> +    struct folio *folio; >> +    vm_fault_t ret = 0; >> + >> +    folio = vma_alloc_anon_folio_pmd(vma, vmf->address); >> +    if (unlikely(!folio)) { >> +        ret = VM_FAULT_FALLBACK; > > I'd like to return VM_FAULT_FALLBACK if you re-post. That's cleaner. I need to keep my "goto" obsession in control... > > Reviewed-by: Kefeng Wang Thanks! > >> +        goto out; >> +    } >> + >> +    mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma->vm_mm, >> haddr, >> +                haddr + HPAGE_PMD_SIZE); >> +    mmu_notifier_invalidate_range_start(&range); >> +    vmf->ptl = pmd_lock(vma->vm_mm, vmf->pmd); >> +    if (unlikely(!pmd_same(pmdp_get(vmf->pmd), vmf->orig_pmd))) >> +        goto release; >> +    ret = check_stable_address_space(vma->vm_mm); >> +    if (ret) >> +        goto release; >> +    (void)pmdp_huge_clear_flush(vma, haddr, vmf->pmd); >> +    map_anon_folio_pmd(folio, vmf->pmd, vma, haddr); >> +    goto unlock; >> +release: >> +    folio_put(folio); >> +unlock: >> +    spin_unlock(vmf->ptl); >> +    mmu_notifier_invalidate_range_end(&range); >> +out: >> +    return ret; >> +} >> + >>   vm_fault_t do_huge_pmd_wp_page(struct vm_fault *vmf) >>   { >>       const bool unshare = vmf->flags & FAULT_FLAG_UNSHARE; >> @@ -1802,8 +1837,15 @@ vm_fault_t do_huge_pmd_wp_page(struct vm_fault >> *vmf) >>       vmf->ptl = pmd_lockptr(vma->vm_mm, vmf->pmd); >>       VM_BUG_ON_VMA(!vma->anon_vma, vma); >>   -    if (is_huge_zero_pmd(orig_pmd)) >> +    if (is_huge_zero_pmd(orig_pmd)) { >> +        vm_fault_t ret = do_huge_zero_wp_pmd(vmf); >> + >> +        if (!(ret & VM_FAULT_FALLBACK)) >> +            return ret; >> + >> +        /* Fallback to splitting PMD if THP cannot be allocated */ >>           goto fallback; >> +    } >>         spin_lock(vmf->ptl); > >