Skip to contentSkip to conversation

mm/migrate_device: fix pgtable leak in migrate_vma_insert_huge_pmd_page

PATCH Superseded Sunny Patel 3 participants 5 messages Apr 25 – Apr 27

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm/migrate_device: fix pgtable leak in migrate_vma_insert_huge_pmd_page

When migrate_vma_insert_huge_pmd_page() jumps to unlock_abort due to a PMD check failure, the pgtable allocated earlier via pte_alloc_one() is never freed, causing a memory leak.

Add a pte_free() call in the unlock_abort error path to release the pgtable before returning.

---
 mm/migrate_device.c | 1 +
 1 file changed, 1 insertion(+)
mm/migrate_device.c +1 -0
index fbfe5715f635..457bab5c7c31 100644
@@ -893,6 +893,7 @@ static int migrate_vma_insert_huge_pmd_page(struct migrate_vma *migrate,
 
 unlock_abort:
 	spin_unlock(ptl);
+	pte_free(vma->vm_mm, pgtable);
 abort:
 	for (i = 0; i < HPAGE_PMD_NR; i++)
 		src[i] &= ~MIGRATE_PFN_MIGRATE;
Signature · 1 line
2.43.0
reviewer Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Sunny Patel

When migrate_vma_insert_huge_pmd_page() jumps to unlock_abort due to a PMD check failure, the pgtable allocated earlier via pte_alloc_one() is never freed, causing a memory leak.

Quoted 8 lines

Add a pte_free() call in the unlock_abort error path to release the pgtable before returning.

---
 mm/migrate_device.c | 1 +
 1 file changed, 1 insertion(+)

LGTM.

--
Best Regards,
Yan, Zi

reviewer
#2 lore raw
In reply to Sunny Patel
Quoted 26 lines · Sunny Patel

When migrate_vma_insert_huge_pmd_page() jumps to unlock_abort due to a PMD check failure, the pgtable allocated earlier via pte_alloc_one() is never freed, causing a memory leak.

Add a pte_free() call in the unlock_abort error path to release the pgtable before returning.

---
 mm/migrate_device.c | 1 +
 1 file changed, 1 insertion(+)
mm/migrate_device.c +1 -0
index fbfe5715f635..457bab5c7c31 100644
@@ -893,6 +893,7 @@ static int migrate_vma_insert_huge_pmd_page(struct migrate_vma *migrate,
 
 unlock_abort:
 	spin_unlock(ptl);
+	pte_free(vma->vm_mm, pgtable);
 abort:
 	for (i = 0; i < HPAGE_PMD_NR; i++)
 		src[i] &= ~MIGRATE_PFN_MIGRATE;
Signature · 1 line
2.43.0

Actually,

I think the "goto abort" above pmd_lock() need to do pte_free():

        if (folio_is_device_private(folio)) {
			...
        } else {
                if (folio_is_zone_device(folio) &&
                    !folio_is_device_coherent(folio)) {
                        goto abort; <-- this one
                }
			...
        }

The lock is not taken yet, so you might need to add a pte_free() before goto abort.

--
Best Regards,
Yan, Zi

#3 lore raw
Quoted 12 lines · Zi Yan

I think the "goto abort" above pmd_lock() need to do pte_free():

        if (folio_is_device_private(folio)) {
                        ...
        } else {
                if (folio_is_zone_device(folio) &&
                    !folio_is_device_coherent(folio)) {
                        goto abort; <-- this one
                }
                        ...
        }
Quoted 2 lines

The lock is not taken yet, so you might need to add a pte_free() before goto abort.

You are right. The pgtable is allocated before this check and the lock has not been taken yet at this point, so goto unlock_abort would be incorrect here. A pte_free() call is needed before this goto abort.

Sent v2 with the changes.
https://lore.kernel.org/linux-mm/[email protected]/

Thanks for catching this.

Regards,
Sunny Patel

reviewer
#4 lore raw
In reply to Sunny Patel

Hi, Sunny,

Thanks for working on this!

Quoted 17 lines · Sunny Patel

When migrate_vma_insert_huge_pmd_page() jumps to unlock_abort due to a PMD check failure, the pgtable allocated earlier via pte_alloc_one() is never freed, causing a memory leak.

Add a pte_free() call in the unlock_abort error path to release the pgtable before returning.

---
 mm/migrate_device.c | 1 +
 1 file changed, 1 insertion(+)
mm/migrate_device.c +0 -0
index fbfe5715f635..457bab5c7c31 100644

mm/migrate_device.c static int migrate_vma_insert_huge_pmd_page(struct migrate_vma *migrate, · line 899

Quoted 7 lines
mm/migrate_device.c +1 -0
@@ -893,6 +893,7 @@ static int migrate_vma_insert_huge_pmd_page(struct migrate_vma *migrate,
 
 unlock_abort:
 	spin_unlock(ptl);
+	pte_free(vma->vm_mm, pgtable);
 abort:
 	for (i = 0; i < HPAGE_PMD_NR; i++)
 		src[i] &= ~MIGRATE_PFN_MIGRATE;

Is it better to use guard based automatic memory freeing?

And check whether guard can help unlock case too?

---
Best Regards,
Huang, Ying