diff options
author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2016-08-10 19:27:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-10 19:40:56 -0400 |
commit | c8efc390c1e0eca195ae59a2f7cec46773620e0c (patch) | |
tree | bfa63d82ed661fd8581371da3479837d56bafa49 /mm | |
parent | 6423aa8192c596848e1b23bd4193dc0924e7274d (diff) |
mm, rmap: fix false positive VM_BUG() in page_add_file_rmap()
PageTransCompound() doesn't distinguish THP from from any other type of
compound pages. This can lead to false-positive VM_BUG_ON() in
page_add_file_rmap() if called on compound page from a driver[1].
I think we can exclude such cases by checking if the page belong to a
mapping.
The VM_BUG_ON_PAGE() is downgraded to VM_WARN_ON_ONCE(). This path
should not cause any harm to non-THP page, but good to know if we step
on anything else.
[1] http://lkml.kernel.org/r/c711e067-0bff-a6cb-3c37-04dfe77d2db1@redhat.com
Link: http://lkml.kernel.org/r/20160810161345.GA67522@black.fi.intel.com
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reported-by: Laura Abbott <labbott@redhat.com>
Tested-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/rmap.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1284,8 +1284,9 @@ void page_add_file_rmap(struct page *page, bool compound) | |||
1284 | VM_BUG_ON_PAGE(!PageSwapBacked(page), page); | 1284 | VM_BUG_ON_PAGE(!PageSwapBacked(page), page); |
1285 | __inc_node_page_state(page, NR_SHMEM_PMDMAPPED); | 1285 | __inc_node_page_state(page, NR_SHMEM_PMDMAPPED); |
1286 | } else { | 1286 | } else { |
1287 | if (PageTransCompound(page)) { | 1287 | if (PageTransCompound(page) && page_mapping(page)) { |
1288 | VM_BUG_ON_PAGE(!PageLocked(page), page); | 1288 | VM_WARN_ON_ONCE(!PageLocked(page)); |
1289 | |||
1289 | SetPageDoubleMap(compound_head(page)); | 1290 | SetPageDoubleMap(compound_head(page)); |
1290 | if (PageMlocked(page)) | 1291 | if (PageMlocked(page)) |
1291 | clear_page_mlock(compound_head(page)); | 1292 | clear_page_mlock(compound_head(page)); |