mm, page_alloc: keep pcp count and list contents in sync if struct page is corrupted

[mirror_ubuntu-artful-kernel.git] / mm / mlock.c

diff --git a/mm/mlock.c b/mm/mlock.c
index 145a4258ddbc775d1d2acf133a21b83280a8f282..cdbed8aaa4268c94abb44a8adf6c93873d37856a 100644 (file)
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -190,10 +190,13 @@ unsigned int munlock_vma_page(struct page *page)
         */
        spin_lock_irq(zone_lru_lock(zone));
 
-       nr_pages = hpage_nr_pages(page);
-       if (!TestClearPageMlocked(page))
+       if (!TestClearPageMlocked(page)) {
+               /* Potentially, PTE-mapped THP: do not skip the rest PTEs */
+               nr_pages = 1;
                goto unlock_out;
+       }
 
+       nr_pages = hpage_nr_pages(page);
        __mod_zone_page_state(zone, NR_MLOCK, -nr_pages);
 
        if (__munlock_isolate_lru_page(page, true)) {