]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
mm: thp: fix potential clearing to referenced flag in page_idle_clear_pte_refs_one()
authorYang Shi <yang.shi@linux.alibaba.com>
Thu, 5 Apr 2018 23:22:35 +0000 (16:22 -0700)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Mon, 27 Aug 2018 14:40:05 +0000 (16:40 +0200)
BugLink: http://bugs.launchpad.net/bugs/1786352
[ Upstream commit f0849ac0b8e072073ec5fcc7fadd05a77434364e ]

For PTE-mapped THP, the compound THP has not been split to normal 4K
pages yet, the whole THP is considered referenced if any one of sub page
is referenced.

When walking PTE-mapped THP by pvmw, all relevant PTEs will be checked
to retrieve referenced bit.  But, the current code just returns the
result of the last PTE.  If the last PTE has not referenced, the
referenced flag will be cleared.

Just set referenced when ptep{pmdp}_clear_young_notify() returns true.

Link: http://lkml.kernel.org/r/1518212451-87134-1-git-send-email-yang.shi@linux.alibaba.com
Signed-off-by: Yang Shi <yang.shi@linux.alibaba.com>
Reported-by: Gang Deng <gavin.dg@linux.alibaba.com>
Suggested-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
mm/page_idle.c

index 0a49374e693194504e715be8e54489f3eb1db2f1..e412a63b2b74f7820298751e1cf382fe90c48005 100644 (file)
@@ -65,11 +65,15 @@ static bool page_idle_clear_pte_refs_one(struct page *page,
        while (page_vma_mapped_walk(&pvmw)) {
                addr = pvmw.address;
                if (pvmw.pte) {
-                       referenced = ptep_clear_young_notify(vma, addr,
-                                       pvmw.pte);
+                       /*
+                        * For PTE-mapped THP, one sub page is referenced,
+                        * the whole THP is referenced.
+                        */
+                       if (ptep_clear_young_notify(vma, addr, pvmw.pte))
+                               referenced = true;
                } else if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) {
-                       referenced = pmdp_clear_young_notify(vma, addr,
-                                       pvmw.pmd);
+                       if (pmdp_clear_young_notify(vma, addr, pvmw.pmd))
+                               referenced = true;
                } else {
                        /* unexpected pmd-mapped page? */
                        WARN_ON_ONCE(1);