Skip to contentSkip to conversation

mm-memory-failurec-catch-unexpected-efault-from-vma_address.patch removed from -mm tree

merged Andrew Morton 1 participant 1 message Mar 25, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The patch titled
Subject: mm/memory-failure.c: catch unexpected -EFAULT from vma_address()
has been removed from the -mm tree. Its filename was
mm-memory-failurec-catch-unexpected-efault-from-vma_address.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Miaohe Lin <[email protected]>
Subject: mm/memory-failure.c: catch unexpected -EFAULT from vma_address()

It's unexpected to walk the page table when vma_address() return -EFAULT. But dev_pagemap_mapping_shift() is called only when vma associated to the error page is found already in collect_procs_{file,anon}, so vma_address() should not return -EFAULT except with some bug, as Naoya pointed out. We can use VM_BUG_ON_VMA() to catch this bug here.

---

 mm/memory-failure.c |    1 +
 1 file changed, 1 insertion(+)
mm/memory-failure.c renamed from mm/memory-failure.c~mm-memory-failurec-catch-unexpected-efault-from-vma_address +1 -0
@@ -315,6 +315,7 @@ static unsigned long dev_pagemap_mapping
 	pmd_t *pmd;
 	pte_t *pte;
 
+	VM_BUG_ON_VMA(address == -EFAULT, vma);
 	pgd = pgd_offset(vma->vm_mm, address);
 	if (!pgd_present(*pgd))
 		return 0;

_

Patches currently in -mm which might be from [email protected] are

mm-huge_memory-make-is_transparent_hugepage-static.patch