mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

hugetlb: don't delete vma_lock in hugetlb MADV_DONTNEED processing

Browse source 
madvise(MADV_DONTNEED) ends up calling zap_page_range() to clear page
tables associated with the address range.  For hugetlb vmas,
zap_page_range will call __unmap_hugepage_range_final.  However,
__unmap_hugepage_range_final assumes the passed vma is about to be removed
and deletes the vma_lock to prevent pmd sharing as the vma is on the way
out.  In the case of madvise(MADV_DONTNEED) the vma remains, but the
missing vma_lock prevents pmd sharing and could potentially lead to issues
with truncation/fault races.

This issue was originally reported here [1] as a BUG triggered in
page_try_dup_anon_rmap.  Prior to the introduction of the hugetlb
vma_lock, __unmap_hugepage_range_final cleared the VM_MAYSHARE flag to
prevent pmd sharing.  Subsequent faults on this vma were confused as
VM_MAYSHARE indicates a sharable vma, but was not set so page_mapping was
not set in new pages added to the page table.  This resulted in pages that
appeared anonymous in a VM_SHARED vma and triggered the BUG.

Address issue by adding a new zap flag ZAP_FLAG_UNMAP to indicate an unmap
call from unmap_vmas().  This is used to indicate the 'final' unmapping of
a hugetlb vma.  When called via MADV_DONTNEED, this flag is not set and
the vm_lock is not deleted.

[1] https://lore.kernel.org/lkml/CAO4mrfdLMXsao9RF4fUE8-Wfde8xmjsKrTNMNC9wjUb6JudD0g@mail.gmail.com/

Link: https://lkml.kernel.org/r/20221114235507.294320-3-mike.kravetz@oracle.com
Fixes: 90e7e7f5ef ("mm: enable MADV_DONTNEED for hugetlb mappings")
Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
Reported-by: Wei Chen <harperchen1110@gmail.com>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Mina Almasry <almasrymina@google.com>
Cc: Nadav Amit <nadav.amit@gmail.com>
Cc: Naoya Horiguchi <naoya.horiguchi@linux.dev>
Cc: Peter Xu <peterx@redhat.com>
Cc: Rik van Riel <riel@surriel.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Mike Kravetz 2022-11-14 15:55:06 -08:00 committed by Andrew Morton
parent 21b85b0952
commit 04ada095dc
3 changed files with 19 additions and 12 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/mm.h
View file

@ -1868,6 +1868,8 @@ struct zap_details {
* default, the flag is not set. * default, the flag is not set.
*/ */
#define ZAP_FLAG_DROP_MARKER ((__force zap_flags_t) BIT(0)) #define ZAP_FLAG_DROP_MARKER ((__force zap_flags_t) BIT(0))
/* Set in unmap_vmas() to indicate a final unmap call. Only used by hugetlb */
#define ZAP_FLAG_UNMAP ((__force zap_flags_t) BIT(1))
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
extern bool can_do_mlock(void); extern bool can_do_mlock(void);

27
mm/hugetlb.c
View file

@ -5206,17 +5206,22 @@ void __unmap_hugepage_range_final(struct mmu_gather *tlb,
__unmap_hugepage_range(tlb, vma, start, end, ref_page, zap_flags); __unmap_hugepage_range(tlb, vma, start, end, ref_page, zap_flags);
/* if (zap_flags & ZAP_FLAG_UNMAP) { /* final unmap */
* Unlock and free the vma lock before releasing i_mmap_rwsem. When /*
* the vma_lock is freed, this makes the vma ineligible for pmd * Unlock and free the vma lock before releasing i_mmap_rwsem.
* sharing. And, i_mmap_rwsem is required to set up pmd sharing. * When the vma_lock is freed, this makes the vma ineligible
* This is important as page tables for this unmapped range will * for pmd sharing. And, i_mmap_rwsem is required to set up
* be asynchrously deleted. If the page tables are shared, there * pmd sharing. This is important as page tables for this
* will be issues when accessed by someone else. * unmapped range will be asynchrously deleted. If the page
*/ * tables are shared, there will be issues when accessed by
__hugetlb_vma_unlock_write_free(vma); * someone else.
*/
i_mmap_unlock_write(vma->vm_file->f_mapping); __hugetlb_vma_unlock_write_free(vma);
i_mmap_unlock_write(vma->vm_file->f_mapping);
} else {
i_mmap_unlock_write(vma->vm_file->f_mapping);
hugetlb_vma_unlock_write(vma);
}
} }
void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start,

2
mm/memory.c
View file

@ -1711,7 +1711,7 @@ void unmap_vmas(struct mmu_gather *tlb, struct maple_tree *mt,
{ {
struct mmu_notifier_range range; struct mmu_notifier_range range;
struct zap_details details = { struct zap_details details = {
.zap_flags = ZAP_FLAG_DROP_MARKER, .zap_flags = ZAP_FLAG_DROP_MARKER | ZAP_FLAG_UNMAP,
/* Careful - we need to zap private pages too! */ /* Careful - we need to zap private pages too! */
.even_cows = true, .even_cows = true,
}; };