The patch titled
From: Hillf Danton <dhillf@xxxxxxxxx>
has been added to the -mm tree. Its filename is
mm-huge_memory-fix-copying-user-highpage.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: Hillf Danton <dhillf@xxxxxxxxx>
Subject: mm/huge_memory: fix copying user highpage
The THP copy-on-write handler falls back to regular-sized pages for a huge
page replacement upon allocation failure or if THP has been individually
disabled in the target VMA. The loop responsible for copying page-sized
chunks accidentally uses multiples of PAGE_SHIFT instead of PAGE_SIZE as
the virtual address arg for copy_user_highpage().
Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
Acked-by: Johannes Weiner <jweiner@xxxxxxxxxx>
Reviewed-by: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxx>
---
mm/huge_memory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/huge_memory.c~mm-huge_memory-fix-copying-user-highpage mm/huge_memory.c
--- a/mm/huge_memory.c~mm-huge_memory-fix-copying-user-highpage
+++ a/mm/huge_memory.c
@@ -829,7 +829,7 @@ static int do_huge_pmd_wp_page_fallback(
for (i = 0; i < HPAGE_PMD_NR; i++) {
copy_user_highpage(pages[i], page + i,
- haddr + PAGE_SHIFT*i, vma);
+ haddr + PAGE_SIZE * i, vma);
__SetPageUptodate(pages[i]);
cond_resched();
}
_
Subject: From: Hillf Danton <dhillf@xxxxxxxxx>
Patches currently in -mm which might be from dhillf@xxxxxxxxx are
origin.patch
linux-next.patch
mm-huge_memory-fix-copying-user-highpage.patch
--
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
