Skip to content

Commit 1e86ee5

Browse files
Kenohnaz
authored andcommitted
mm/huge_memory.c: respect FOLL_FORCE/FOLL_COW for thp
In 19be0ea ("mm: remove gup_flags FOLL_WRITE games from __get_user_pages()"), the mm code was changed from unsetting FOLL_WRITE after a COW was resolved to setting the (newly introduced) FOLL_COW instead. Simultaneously, the check in gup.c was updated to still allow writes with FOLL_FORCE set if FOLL_COW had also been set. However, a similar check in huge_memory.c was forgotten. As a result, remote memory writes to ro regions of memory backed by transparent huge pages cause an infinite loop in the kernel (handle_mm_fault sets FOLL_COW and returns 0 causing a retry, but follow_trans_huge_pmd bails out immidiately because `(flags & FOLL_WRITE) && !pmd_write(*pmd)` is true. While in this state the process is stil SIGKILLable, but little else works (e.g. no ptrace attach, no other signals). This is easily reproduced with the following code (assuming thp are set to always): #include <assert.h> #include <fcntl.h> #include <stdint.h> #include <stdio.h> #include <string.h> #include <sys/mman.h> #include <sys/stat.h> #include <sys/types.h> #include <sys/wait.h> #include <unistd.h> #define TEST_SIZE 5 * 1024 * 1024 int main(void) { int status; pid_t child; int fd = open("/proc/self/mem", O_RDWR); void *addr = mmap(NULL, TEST_SIZE, PROT_READ, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0); assert(addr != MAP_FAILED); pid_t parent_pid = getpid(); if ((child = fork()) == 0) { void *addr2 = mmap(NULL, TEST_SIZE, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0); assert(addr2 != MAP_FAILED); memset(addr2, 'a', TEST_SIZE); pwrite(fd, addr2, TEST_SIZE, (uintptr_t)addr); return 0; } assert(child == waitpid(child, &status, 0)); assert(WIFEXITED(status) && WEXITSTATUS(status) == 0); return 0; } Fix this by updating follow_trans_huge_pmd in huge_memory.c analogously to the update in gup.c in the original commit. The same pattern exists in follow_devmap_pmd. However, we should not be able to reach that check with FOLL_COW set, so add WARN_ONCE to make sure we notice if we ever do. Link: http://lkml.kernel.org/r/20170106015025.GA38411@juliacomputing.com Signed-off-by: Keno Fischer <keno@juliacomputing.com> Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Greg Thelen <gthelen@google.com> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Willy Tarreau <w@1wt.eu> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Kees Cook <keescook@chromium.org> Cc: Andy Lutomirski <luto@kernel.org> Cc: Michal Hocko <mhocko@suse.com> Cc: Hugh Dickins <hughd@google.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 66f86c3 commit 1e86ee5

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

mm/huge_memory.c

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,12 @@ struct page *follow_devmap_pmd(struct vm_area_struct *vma, unsigned long addr,
783783

784784
assert_spin_locked(pmd_lockptr(mm, pmd));
785785

786+
/*
787+
* When we COW a devmap PMD entry, we split it into PTEs, so we should
788+
* not be in this function with `flags & FOLL_COW` set.
789+
*/
790+
WARN_ONCE(flags & FOLL_COW, "mm: In follow_devmap_pmd with FOLL_COW set");
791+
786792
if (flags & FOLL_WRITE && !pmd_write(*pmd))
787793
return NULL;
788794

@@ -1128,6 +1134,16 @@ int do_huge_pmd_wp_page(struct vm_fault *vmf, pmd_t orig_pmd)
11281134
return ret;
11291135
}
11301136

1137+
/*
1138+
* FOLL_FORCE can write to even unwritable pmd's, but only
1139+
* after we've gone through a COW cycle and they are dirty.
1140+
*/
1141+
static inline bool can_follow_write_pmd(pmd_t pmd, unsigned int flags)
1142+
{
1143+
return pmd_write(pmd) ||
1144+
((flags & FOLL_FORCE) && (flags & FOLL_COW) && pmd_dirty(pmd));
1145+
}
1146+
11311147
struct page *follow_trans_huge_pmd(struct vm_area_struct *vma,
11321148
unsigned long addr,
11331149
pmd_t *pmd,
@@ -1138,7 +1154,7 @@ struct page *follow_trans_huge_pmd(struct vm_area_struct *vma,
11381154

11391155
assert_spin_locked(pmd_lockptr(mm, pmd));
11401156

1141-
if (flags & FOLL_WRITE && !pmd_write(*pmd))
1157+
if (flags & FOLL_WRITE && !can_follow_write_pmd(*pmd, flags))
11421158
goto out;
11431159

11441160
/* Avoid dumping huge zero page */

0 commit comments

Comments
 (0)