]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
mm/migrate_device: remove dead migration entry check in migrate_vma_collect_huge_pmd()
authorDavidlohr Bueso <dave@stgolabs.net>
Thu, 12 Feb 2026 01:46:11 +0000 (17:46 -0800)
committerAndrew Morton <akpm@linux-foundation.org>
Sat, 18 Apr 2026 07:10:56 +0000 (00:10 -0700)
The softleaf_is_migration() check is unreachable as entries that are not
device_private are filtered out.  Similarly, the PTE-level equivalent in
migrate_vma_collect_pmd() skips migration entries.

This dead branch also contained a double spin_unlock(ptl) bug.

Link: https://lore.kernel.org/20260212014611.416695-1-dave@stgolabs.net
Fixes: a30b48bf1b244 ("mm/migrate_device: implement THP migration of zone device pages")
Signed-off-by: Davidlohr Bueso <dave@stgolabs.net>
Suggested-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Alistair Popple <apopple@nvidia.com>
Acked-by: Balbir Singh <balbirs@nvidia.com>
Acked-by: David Hildenbrand (Arm) <david@kernel.org>
Cc: Byungchul Park <byungchul@sk.com>
Cc: Gregory Price <gourry@gourry.net>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Joshua Hahn <joshua.hahnjy@gmail.com>
Cc: Mathew Brost <matthew.brost@intel.com>
Cc: Rakie Kim <rakie.kim@sk.com>
Cc: Ying Huang <ying.huang@linux.alibaba.com>
Cc: Zi Yan <ziy@nvidia.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/migrate_device.c

index 2912eba575d5eaa06470a30ca2b7e61a28d389d3..fbfe5715f6351c69c150154b4c6cdee98785a5b6 100644 (file)
@@ -175,12 +175,6 @@ static int migrate_vma_collect_huge_pmd(pmd_t *pmdp, unsigned long start,
                        return migrate_vma_collect_skip(start, end, walk);
                }
 
-               if (softleaf_is_migration(entry)) {
-                       softleaf_entry_wait_on_locked(entry, ptl);
-                       spin_unlock(ptl);
-                       return -EAGAIN;
-               }
-
                if (softleaf_is_device_private_write(entry))
                        write = MIGRATE_PFN_WRITE;
        } else {