diff options
| author |   Andrew Morton <akpm@linux-foundation.org> | 2022-09-26 13:13:15 -0700 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2022-09-26 13:13:15 -0700 |
| commit | 6d751329e761338faa9c24c2c9736f27bc54282b (patch) | |
| tree | 6e1778a7448552c58d12da88f70f6ad2718d55da /mm/khugepaged.c | |
| parent | mm: fix PageAnonExclusive clearing racing with concurrent RCU GUP-fast (diff) | |
| parent | x86/uaccess: avoid check_object_size() in copy_from_user_nmi() (diff) | |
| download | linux-dev-6d751329e761338faa9c24c2c9736f27bc54282b.tar.xz linux-dev-6d751329e761338faa9c24c2c9736f27bc54282b.zip | |
Merge branch 'mm-hotfixes-stable' into mm-stable
Diffstat (limited to 'mm/khugepaged.c')
| -rw-r--r-- | mm/khugepaged.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 5f7c60b8b269..0bcba493ebb4 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1071,10 +1071,12 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, pmd_ptl = pmd_lock(mm, pmd); /* probably unnecessary */ /* - * After this gup_fast can't run anymore. This also removes - * any huge TLB entry from the CPU so we won't allow - * huge and small TLB entries for the same virtual address - * to avoid the risk of CPU bugs in that area. + * This removes any huge TLB entry from the CPU so we won't allow + * huge and small TLB entries for the same virtual address to + * avoid the risk of CPU bugs in that area. + * + * Parallel fast GUP is fine since fast GUP will back off when + * it detects PMD is changed. */ _pmd = pmdp_collapse_flush(vma, address, pmd); spin_unlock(pmd_ptl); |