diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2020-10-15 20:05:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-16 11:11:15 -0700 |
| commit | e2333dad2d4a3543f07beb5da61401046e54f2ff (patch) | |
| tree | daa3e8aa0b4d4c66fc0743d97dde9cdb9a2da71b /mm/huge_memory.c | |
| parent | 65dfe3c3bc411caa04c4f6c7d81418b90d6a2ce8 (diff) | |
| download | lwn-e2333dad2d4a3543f07beb5da61401046e54f2ff.tar.gz lwn-e2333dad2d4a3543f07beb5da61401046e54f2ff.zip | |
mm/huge_memory: fix can_split_huge_page assumption of THP size
Ask the page how many subpages it has instead of assuming it's PMD size.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: SeongJae Park <sjpark@amazon.de>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: "Huang, Ying" <ying.huang@intel.com>
Link: https://lkml.kernel.org/r/20200908195539.25896-8-willy@infradead.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/huge_memory.c')
| -rw-r--r-- | mm/huge_memory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 6fb75df0e8c0..4474cc3b1a48 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2582,9 +2582,9 @@ bool can_split_huge_page(struct page *page, int *pextra_pins) /* Additional pins from page cache */ if (PageAnon(page)) - extra_pins = PageSwapCache(page) ? HPAGE_PMD_NR : 0; + extra_pins = PageSwapCache(page) ? thp_nr_pages(page) : 0; else - extra_pins = HPAGE_PMD_NR; + extra_pins = thp_nr_pages(page); if (pextra_pins) *pextra_pins = extra_pins; return total_mapcount(page) == page_count(page) - extra_pins - 1; |