Skip to content

Commit 414fd08

Browse files
Yu Zhaotorvalds
authored andcommitted
mm/gup: fix gup_pmd_range() for dax
For dax pmd, pmd_trans_huge() returns false but pmd_huge() returns true on x86. So the function works as long as hugetlb is configured. However, dax doesn't depend on hugetlb. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Yu Zhao <[email protected]> Reviewed-by: Jan Kara <[email protected]> Cc: Dan Williams <[email protected]> Cc: Huang Ying <[email protected]> Cc: Matthew Wilcox <[email protected]> Cc: Keith Busch <[email protected]> Cc: "Michael S . Tsirkin" <[email protected]> Cc: John Hubbard <[email protected]> Cc: Wei Yang <[email protected]> Cc: Mike Rapoport <[email protected]> Cc: Andrea Arcangeli <[email protected]> Cc: "Kirill A . Shutemov" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent a9a238e commit 414fd08

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

mm/gup.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1674,7 +1674,8 @@ static int gup_pmd_range(pud_t pud, unsigned long addr, unsigned long end,
16741674
if (!pmd_present(pmd))
16751675
return 0;
16761676

1677-
if (unlikely(pmd_trans_huge(pmd) || pmd_huge(pmd))) {
1677+
if (unlikely(pmd_trans_huge(pmd) || pmd_huge(pmd) ||
1678+
pmd_devmap(pmd))) {
16781679
/*
16791680
* NUMA hinting faults need to be handled in the GUP
16801681
* slowpath for accounting purposes and so that they

0 commit comments

Comments
 (0)