From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7444D3C873B for ; Tue, 14 Apr 2026 09:51:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776160271; cv=none; b=ZE6i2NhRIyW5SUfKb/7iDHtsnz8uZ4Y1HOUluOkxatAFbtL3vQVrh/T2wxcUHE0adgpbtzTMxMtsW5tTKm2PipNfXB1JYHvWPb34PISCAXRGCV4GlPQv8YzAQ4MUER0Lha0a8YdRb54y1MxBETLdXkKK3RwOIr5Sk/U3++xNPBA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776160271; c=relaxed/simple; bh=50boV389vtA1+fAhY6j7k57/eNUILSasLReQVNKDYe4=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=clE1ypopKxHywl3x8EICCjjQWC5lw1i8uHL3lpbC8OrCDHYYehE0zyxbP+Hxk4pypfO/7ShVVry9lsYt8tYshkP+fmidgVoEcJOjPwFSvXORWqEw4S6R3ZB47omAg9qe6MeEnjzTszuiRs0I3oP1vsG8ts4uj5/miUmprEfoGM0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nRrQy0Mm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nRrQy0Mm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE048C2BCB5; Tue, 14 Apr 2026 09:51:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776160271; bh=50boV389vtA1+fAhY6j7k57/eNUILSasLReQVNKDYe4=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=nRrQy0Mme0Zu5CmHdzP0kUS4hRX/b17AcEx5OY8UEXG+t6/Lv/c5bBDJCjZ3XOutK WUGiIJJZ9rEgXUikzo18NL0l4sqDdvC4iHxGFC+LILjeFo6+SGbnn29Gwbd8VCVlDL zjmWudHYcVd0j2qG9oi82PfgptpnLdO5ek6Jf4qvdTZOC++n0SVHLzNAetbhaws2pb DE7V1nzK+8FJjhHH03Qxjoo4TFWGxPTOE4ieYMvcBHZ06A1J7iAJuVejSGioFSCPA5 3D4jbnpPvh7Jq/PSVB1wHKknH0V4Qnc+KNM/P1Tj37q1RGAZpXaQxnSLCcv/SUG4a2 QnXLODj/wCIfg== Message-ID: <5914d296-934a-4662-b1cf-d0f23757df5b@kernel.org> Date: Tue, 14 Apr 2026 11:51:04 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm/migrate_device: fix double unlock and remove dead code To: Zi Yan Cc: Sunny Patel , Andrew Morton , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Balbir Singh References: <20260413130927.13263-1-nueralspacetech@gmail.com> <7579105a-1261-45db-90ba-5e660d202b80@kernel.org> <6073CBA5-2762-4FE4-98F5-27BC92482531@nvidia.com> From: "David Hildenbrand (Arm)" Content-Language: en-US Autocrypt: addr=david@kernel.org; keydata= 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 qIws/H2t In-Reply-To: <6073CBA5-2762-4FE4-98F5-27BC92482531@nvidia.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 4/13/26 22:03, Zi Yan wrote: > On 13 Apr 2026, at 15:38, David Hildenbrand (Arm) wrote: > >> On 4/13/26 15:09, Sunny Patel wrote: >>> Fix two bugs in device migration paths: >>> >>> 1) migrate_vma_collect_huge_pmd() calls spin_unlock after >>> softleaf_entry_wait_on_locked(), which already releases the ptl. >>> >>> 2) migrate_vma_insert_huge_pmd_page() has a dead else-if branch and this >>> branch is always unreachable. >>> >> >> Can you move 1) into a separate patch, add a Fixes: tag an CC stable? >> >> I think it is >> >> Fixes: a30b48bf1b24 ("mm/migrate_device: implement THP migration of zone >> device pages") >> >> 2) will then be a pure cleanup patch. >> >> Thanks! >> >>> Signed-off-by: Sunny Patel >>> --- >>> mm/migrate_device.c | 4 +--- >>> 1 file changed, 1 insertion(+), 3 deletions(-) >>> >>> diff --git a/mm/migrate_device.c b/mm/migrate_device.c >>> index 8079676c8f1f..0e005c26ee88 100644 >>> --- a/mm/migrate_device.c >>> +++ b/mm/migrate_device.c >>> @@ -177,7 +177,6 @@ static int migrate_vma_collect_huge_pmd(pmd_t *pmdp, unsigned long start, >>> >>> if (softleaf_is_migration(entry)) { >>> softleaf_entry_wait_on_locked(entry, ptl); >>> - spin_unlock(ptl); >> >> >> Yes, that looks correct to me. >> >>> return -EAGAIN; >>> } >>> >>> @@ -869,8 +868,7 @@ static int migrate_vma_insert_huge_pmd_page(struct migrate_vma *migrate, >>> if (!is_huge_zero_pmd(*pmdp)) >>> goto unlock_abort; >>> flush = true; >>> - } else if (!pmd_none(*pmdp)) >>> - goto unlock_abort; >>> + } >> >> Huh, how did that happen. I hope that it's not a typo and we wanted to >> check for something else. >> > > > Looking at the function and trying to figure this out, but find > VM_WARN_ON_FOLIO(!folio, folio) at the top, where folio is from page_folio(page). > It is either a nop or a zero dereferencing. It should be removed. Heh, VM_WARN_ON_FOLIO(!folio, folio) itself is completely odd. Dump NULL if NULL. Agreed that this should be removed. Or replaced by a VM_WARN_ON_ONCE(page); > > VM_WARN_ON_ONCE(!pmd_none(*pmdp) && !is_huge_zero_pmd(*pmdp)) can be removed > too, since the above ifs takes !pmd_none(*pmdp) && !is_huge_zero_pmd(*pmdp) > to unlock_abort. Right, and if that's an unexpected case, we should warn on that path instead. Like if (WARN_ON_ONCE(!is_huge_zero_pmd(*pmdp))) goto unlock_abort; > > Back to the above code: > > if (!pmd_none(*pmdp)) { > if (!is_huge_zero_pmd(*pmdp)) > goto unlock_abort; > flush = true; > } else if (!pmd_none(*pmdp)) > goto unlock_abort; > > It seems to me that the first if should be removed, since if pmdp is > not pmd_none(), others filled pmd entry before us, so no further > action should be taken, otherwise, the function will overwrite > some valid pmd entry. > > OK, look at migrate_vma_insert_page(), which does PTE level work, > the above code might be intended to do: > > if (pmd_present(*pmdp)) { > if (!is_huge_zero_pmd(*pmdp)) > goto unlock_abort; > flush = true; > } else if (!pmd_none(*pmdp)) > goto unlock_abort; Agreed, that makes more sense. Thanks! -- Cheers, David