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 605B1C7EE30 for ; Tue, 1 Jul 2025 04:30:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B27DA6B00A1; Tue, 1 Jul 2025 00:30:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AFF606B00A2; Tue, 1 Jul 2025 00:30:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A15256B00A3; Tue, 1 Jul 2025 00:30:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 8E6B66B00A1 for ; Tue, 1 Jul 2025 00:30:25 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 14BBC1210BF for ; Tue, 1 Jul 2025 04:30:25 +0000 (UTC) X-FDA: 83614419210.12.F77667C Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf28.hostedemail.com (Postfix) with ESMTP id 1D73CC000F for ; Tue, 1 Jul 2025 04:30:22 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@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=1751344223; 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=1bNBEJ5pFFR6lUjJJs02bSMAKZfPO6/Z1noAC9QTmkc=; b=jpJvXe4TSYrtOLiVrCuX7nqHns3E9s1IiRSEt8BV4uJh5fSVzNjvDxQY5PAHKdOKxluiq5 gaQHZF7uKmrNQC9OT2HG15SeMefJLouspa4odRimniv6EYomcgq627SW61fghEbsB9NayK yxL6xO0TsOAAqGJWJyIgr4TJcdHCMkM= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751344223; a=rsa-sha256; cv=none; b=zt1nvb67csz5gPkZMW6ylW4+3rFqzJLjtYNO94pjXQWTYAk2WaNI3MIqCeN3GfXU4KogIg mnCRpUGOS7Fp8Ct9IP1LIHXaQiZY9vy4J8dqq7mRjTzU4ZvbUh/ShbqyfuBy8iXha+3n4I /OKcc4xg3R3EguzH7uoNNlw8b5qXwY4= 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 AA41F15A1; Mon, 30 Jun 2025 21:30:06 -0700 (PDT) Received: from [10.164.146.16] (J09HK2D2RT.blr.arm.com [10.164.146.16]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4DC223F58B; Mon, 30 Jun 2025 21:30:18 -0700 (PDT) Message-ID: <3e4576fb-d25c-4415-9df8-8133039af7cd@arm.com> Date: Tue, 1 Jul 2025 10:00:15 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] khugepaged: Reduce race probability between migration and khugepaged To: Dev Jain , Lorenzo Stoakes Cc: akpm@linux-foundation.org, david@redhat.com, ziy@nvidia.com, baolin.wang@linux.alibaba.com, Liam.Howlett@oracle.com, npache@redhat.com, ryan.roberts@arm.com, baohua@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20250630044837.4675-1-dev.jain@arm.com> <4e2ea3d3-d519-43cb-8026-d448e1d8df98@arm.com> Content-Language: en-US From: Anshuman Khandual In-Reply-To: <4e2ea3d3-d519-43cb-8026-d448e1d8df98@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 1D73CC000F X-Stat-Signature: gyop14ykbgfencp4d7ck55ph3eyiiqkr X-HE-Tag: 1751344222-110207 X-HE-Meta: U2FsdGVkX1+i3JE3uVbNJREFrw27dDx8KFTooFe40wzaV1XoNehi9vR9HBUfXz7FOFgz/snddPQQsdrnDPCXRbW5hh7NfGcOU22fqco9wT9IGzJU2XEagfYsfV5JdkZgG/NnsCPghN6CGwpBzMzUFzL4dnWPIlOrP9I7O0/ZY9T1yVaAabTTtSJy3Ieb7Mr21wYhqwUb15F8ob48Tnrd64HwFMOQiTQv60lO+iCSaEclYBhY8XahKkPjjNiI33Zr2PIOOtoW68Ik29j5TXDv94VkaO51JVpuukdrSNuTyvdHAR7cTuSuLlae6txm42+/gzueA8RwabNMCahQ1xqwjuGdiKolq6VqsbQqWkx/BjvpWQj8083WMMCoSMaptdBHJXfDllrxIog1JePUxarhCfnlm3xuYjaYneOhL/sahj74d/JB63tiNOuCriapIcVhAVAmFrAJQ7aGI2ipX93B4gAkDuVe+57hwtgpvqnli7FLX9ECFMG/kHbthSKabwDfzcyjVrUt+s+cc14atvNZlOZPHuN6k//r6RgVuYs/J8glTNG4cG7ZHJKTKACx7cb9SBQytXWXqiCACWFxeo+jD2XSBAH7baY7bfX1E0Z2zOc7v+RxuNQnIfkxCdxS1gtxFX3HUFFtQFLXVtEgZCr6S7jgNUZ0PNbEaah7Xl45k/06k/hSwOT5rPSzmxzFY6rSjo5bungq2lJi4iU/DItJjrwcrEhQl/BVJwBC2x60SRRJRx9gvFShbQ6kKCchd50mPpTdURQP33OhGsaLfbcDPFIfMIggtbMR7lU9OlQPIvsU4BnZL9CxDQSFEbaeYekeVCdMq855XxaL+Ot84OSG9OkU9WIRx110y1UwQ9ATEfB+70b2TDaqdlviTc2JdM23igty6DYWc2juFpWJbxONY0mBYE1pVYU3/zlm1MtRxR6Bkix04X9jsbgPJa++FB/hmZLgkuXU6k+Ih/U9eVp i2fCTUMw wnaEqrNgOC65Jr9C/RWEXMkmIF2nm/jK30X7cQYv/HDtPSEdH0SfyC5Gvshj0GfXIOirTVM/F5PVnF6pq5jsfkMMyynurswB//k8n34b2BVldUQeINxaYV9tU222ktKedCv1Y5vFShpyHidpuYiMFtxXJoSFggIAoQdriLTrIidBB/AZGdXxjpsoZMycyaSnCPM9fTYvQmMq6/2/pXcgRGdZxJu+UI1NOH7hCERcCChpSMar1FZnMiolxw27IG63xA080Qz3biRoHMI7FMnwdZy5wiwIoXMxPSvFQ 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 30/06/25 8:00 PM, Dev Jain wrote: > > On 30/06/25 6:57 pm, Lorenzo Stoakes wrote: >> On Mon, Jun 30, 2025 at 10:18:37AM +0530, Dev Jain wrote: >>> Suppose a folio is under migration, and khugepaged is also trying to >>> collapse it. collapse_pte_mapped_thp() will retrieve the folio from the >>> page cache via filemap_lock_folio(), thus taking a reference on the folio >>> and sleeping on the folio lock, since the lock is held by the migration >>> path. Migration will then fail in >>> __folio_migrate_mapping -> folio_ref_freeze. Reduce the probability of >>> such a race happening (leading to migration failure) by bailing out >>> if we detect a PMD is marked with a migration entry. >> This is a nice find! >> >>> This fixes the migration-shared-anon-thp testcase failure on Apple M3. >>> >>> Note that, this is not a "fix" since it only reduces the chance of >>> interference of khugepaged with migration, wherein both the kernel >>> functionalities are deemed "best-effort". >> Thanks for separating this out, appreciated! >> >>> Signed-off-by: Dev Jain >>> --- >>> >>> This patch was part of >>> https://lore.kernel.org/all/20250625055806.82645-1-dev.jain@arm.com/ >>> but I have sent it separately on suggestion of Lorenzo, and also because >>> I plan to send the first two patches after David Hildenbrand's >>> folio_pte_batch series gets merged. >>> >>>   mm/khugepaged.c | 12 ++++++++++-- >>>   1 file changed, 10 insertions(+), 2 deletions(-) >>> >>> diff --git a/mm/khugepaged.c b/mm/khugepaged.c >>> index 1aa7ca67c756..99977bb9bf6a 100644 >>> --- a/mm/khugepaged.c >>> +++ b/mm/khugepaged.c >>> @@ -31,6 +31,7 @@ enum scan_result { >>>       SCAN_FAIL, >>>       SCAN_SUCCEED, >>>       SCAN_PMD_NULL, >>> +    SCAN_PMD_MIGRATION, >>>       SCAN_PMD_NONE, >>>       SCAN_PMD_MAPPED, >>>       SCAN_EXCEED_NONE_PTE, >>> @@ -941,6 +942,8 @@ static inline int check_pmd_state(pmd_t *pmd) >>> >>>       if (pmd_none(pmde)) >>>           return SCAN_PMD_NONE; >>> +    if (is_pmd_migration_entry(pmde)) >>> +        return SCAN_PMD_MIGRATION; >> With David's suggestions I guess this boils down to simply adding this line. > > I think it should be > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index 1aa7ca67c756..8a6ba5c8ba4d 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -941,10 +941,10 @@ static inline int check_pmd_state(pmd_t *pmd) >   >      if (pmd_none(pmde)) >          return SCAN_PMD_NONE; > +    if (is_pmd_migration_entry(pmde) || pmd_trans_huge(pmde)) > +        return SCAN_PMD_MAPPED; >      if (!pmd_present(pmde)) >          return SCAN_PMD_NULL; > -    if (pmd_trans_huge(pmde)) > -        return SCAN_PMD_MAPPED; >      if (pmd_bad(pmde)) >          return SCAN_PMD_NULL; >      return SCAN_SUCCEED; > > Moving this line above since we don't want to exit prematurely > due to !pmd_present(pmde). Might be cleaner to just add the migration test separately before the pmd_present() and without modifying existing pmd_trans_huge(). if (is_pmd_migration_entry(pmde)) return SCAN_PMD_MAPPED; > > >> >> Could we add a quick comment to explain why here? > > Sure. > >> >> Thanks! >> >>>       if (!pmd_present(pmde)) >>>           return SCAN_PMD_NULL; >>>       if (pmd_trans_huge(pmde)) >>> @@ -1502,9 +1505,12 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, >>>           !range_in_vma(vma, haddr, haddr + HPAGE_PMD_SIZE)) >>>           return SCAN_VMA_CHECK; >>> >>> -    /* Fast check before locking page if already PMD-mapped */ >>> +    /* >>> +     * Fast check before locking folio if already PMD-mapped, or if the >>> +     * folio is under migration >>> +     */ >>>       result = find_pmd_or_thp_or_none(mm, haddr, &pmd); >>> -    if (result == SCAN_PMD_MAPPED) >>> +    if (result == SCAN_PMD_MAPPED || result == SCAN_PMD_MIGRATION) >>>           return result; >>> >>>       /* >>> @@ -2716,6 +2722,7 @@ static int madvise_collapse_errno(enum scan_result r) >>>       case SCAN_PAGE_LRU: >>>       case SCAN_DEL_PAGE_LRU: >>>       case SCAN_PAGE_FILLED: >>> +    case SCAN_PMD_MIGRATION: >>>           return -EAGAIN; >>>       /* >>>        * Other: Trying again likely not to succeed / error intrinsic to >>> @@ -2802,6 +2809,7 @@ int madvise_collapse(struct vm_area_struct *vma, unsigned long start, >>>               goto handle_result; >>>           /* Whitelisted set of results where continuing OK */ >>>           case SCAN_PMD_NULL: >>> +        case SCAN_PMD_MIGRATION: >>>           case SCAN_PTE_NON_PRESENT: >>>           case SCAN_PTE_UFFD_WP: >>>           case SCAN_PAGE_RO: >>> -- >>> 2.30.2 >>> >