The patch titled
Subject: mm: fix incorrect pfn passed to untrack_pfn() in remap_pfn_range()
has been removed from the -mm tree. Its filename was
mm-fix-incorrect-pfn-passed-to-untrack_pfn-in-remap_pfn_range.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Yongji Xie <xyjxie@xxxxxxxxxxxxxxxxxx>
Subject: mm: fix incorrect pfn passed to untrack_pfn() in remap_pfn_range()
We use generic hooks in remap_pfn_range() to help archs to track pfnmap
regions. The code is something like:
int remap_pfn_range()
{
...
track_pfn_remap(vma, &prot, pfn, addr, PAGE_ALIGN(size));
...
pfn -= addr >> PAGE_SHIFT;
...
untrack_pfn(vma, pfn, PAGE_ALIGN(size));
...
}
Here we can easily find the pfn is changed but not recovered before
untrack_pfn() is called. That's incorrect.
Signed-off-by: Yongji Xie <xyjxie@xxxxxxxxxxxxxxxxxx>
Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Jerome Marchand <jmarchan@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: Matthew Wilcox <matthew.r.wilcox@xxxxxxxxx>
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Andy Lutomirski <luto@xxxxxxxxxx>
Cc: David Hildenbrand <dahi@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory.c | 1 +
1 file changed, 1 insertion(+)
diff -puN mm/memory.c~mm-fix-incorrect-pfn-passed-to-untrack_pfn-in-remap_pfn_range mm/memory.c
--- a/mm/memory.c~mm-fix-incorrect-pfn-passed-to-untrack_pfn-in-remap_pfn_range
+++ a/mm/memory.c
@@ -1795,6 +1795,7 @@ int remap_pfn_range(struct vm_area_struc
break;
} while (pgd++, addr = next, addr != end);
+ pfn += (end - PAGE_ALIGN(size)) >> PAGE_SHIFT;
if (err)
untrack_pfn(vma, pfn, PAGE_ALIGN(size));
_
Patches currently in -mm which might be from xyjxie@xxxxxxxxxxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
