Skip to content
  • Hugh Dickins's avatar
    mm/rmap: fix old bug: munlocking THP missed other mlocks · d9770fcc
    Hugh Dickins authored
    The kernel recovers in due course from missing Mlocked pages: but there
    was no point in calling page_mlock() (formerly known as
    try_to_munlock()) on a THP, because nothing got done even when it was
    found to be mapped in another VM_LOCKED vma.
    
    It's true that we need to be careful: Mlocked accounting of pte-mapped
    THPs is too difficult (so consistently avoided); but Mlocked accounting
    of only-pmd-mapped THPs is supposed to work, even when multiple mappings
    are mlocked and munlocked or munmapped.  Refine the tests.
    
    There is already a VM_BUG_ON_PAGE(PageDoubleMap) in page_mlock(), so
    page_mlock_one() does not even have to worry about that complication.
    
    (I said the kernel recovers: but would page reclaim be likely to split
    THP before rediscovering that it's VM_LOCKED? I've not followed that up)
    
    Fixes: 9a73f61b
    
     ("thp, mlock: do not mlock PTE-mapped file huge pages")
    Signed-off-by: default avatarHugh Dickins <hughd@google.com>
    Reviewed-by: default avatarShakeel Butt <shakeelb@google.com>
    Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
    Link: https://lore.kernel.org/lkml/cfa154c-d595-406-eb7d-eb9df730f944@google.com/
    
    
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Alistair Popple <apopple@nvidia.com>
    Cc: Jason Gunthorpe <jgg@nvidia.com>
    Cc: Ralph Campbell <rcampbell@nvidia.com>
    Cc: Christoph Hellwig <hch@lst.de>
    Cc: Yang Shi <shy828301@gmail.com>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    d9770fcc