The patch titled
Subject: mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix
has been removed from the -mm tree. Its filename was
mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix.patch
This patch was dropped because it was folded into mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-ks.patch
------------------------------------------------------
From: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx>
Subject: mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix
Passing 'vma' to hugepage_vma_revlidate() is useless. It doesn't make use
of it anyway.
Link: http://lkml.kernel.org/r/20160530095058.GA53044@xxxxxxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/1466021202-61880-3-git-send-email-kirill.shutemov@xxxxxxxxxxxxxxx
Cc: Ebru Akagunduz <ebru.akagunduz@xxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/huge_memory.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff -puN mm/huge_memory.c~mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix mm/huge_memory.c
--- a/mm/huge_memory.c~mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix
+++ a/mm/huge_memory.c
@@ -2380,10 +2380,9 @@ static bool hugepage_vma_check(struct vm
* value (scan code).
*/
-static int hugepage_vma_revalidate(struct mm_struct *mm,
- struct vm_area_struct *vma,
- unsigned long address)
+static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address)
{
+ struct vm_area_struct *vma;
unsigned long hstart, hend;
if (unlikely(khugepaged_test_exit(mm)))
@@ -2432,7 +2431,7 @@ static bool __collapse_huge_page_swapin(
if (ret & VM_FAULT_RETRY) {
down_read(&mm->mmap_sem);
/* vma is no longer available, don't continue to swapin */
- if (hugepage_vma_revalidate(mm, vma, address))
+ if (hugepage_vma_revalidate(mm, address))
return false;
}
if (ret & VM_FAULT_ERROR) {
@@ -2483,7 +2482,7 @@ static void collapse_huge_page(struct mm
}
down_read(&mm->mmap_sem);
- result = hugepage_vma_revalidate(mm, vma, address);
+ result = hugepage_vma_revalidate(mm, address);
if (result)
goto out;
@@ -2510,7 +2509,7 @@ static void collapse_huge_page(struct mm
* handled by the anon_vma lock + PG_lock.
*/
down_write(&mm->mmap_sem);
- result = hugepage_vma_revalidate(mm, vma, address);
+ result = hugepage_vma_revalidate(mm, address);
if (result)
goto out;
_
Patches currently in -mm which might be from kirill.shutemov@xxxxxxxxxxxxxxx are
mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-ks.patch
khugepaged-recheck-pmd-after-mmap_sem-re-acquired.patch
thp-mlock-update-unevictable-lrutxt.patch
mm-do-not-pass-mm_struct-into-handle_mm_fault.patch
mm-introduce-fault_env.patch
mm-postpone-page-table-allocation-until-we-have-page-to-map.patch
rmap-support-file-thp.patch
mm-introduce-do_set_pmd.patch
thp-vmstats-add-counters-for-huge-file-pages.patch
thp-support-file-pages-in-zap_huge_pmd.patch
thp-handle-file-pages-in-split_huge_pmd.patch
thp-handle-file-cow-faults.patch
thp-skip-file-huge-pmd-on-copy_huge_pmd.patch
thp-prepare-change_huge_pmd-for-file-thp.patch
thp-run-vma_adjust_trans_huge-outside-i_mmap_rwsem.patch
thp-file-pages-support-for-split_huge_page.patch
thp-mlock-do-not-mlock-pte-mapped-file-huge-pages.patch
vmscan-split-file-huge-pages-before-paging-them-out.patch
page-flags-relax-policy-for-pg_mappedtodisk-and-pg_reclaim.patch
radix-tree-implement-radix_tree_maybe_preload_order.patch
filemap-prepare-find-and-delete-operations-for-huge-pages.patch
truncate-handle-file-thp.patch
mm-rmap-account-shmem-thp-pages.patch
shmem-prepare-huge=-mount-option-and-sysfs-knob.patch
shmem-add-huge-pages-support.patch
shmem-thp-respect-madv_nohugepage-for-file-mappings.patch
thp-extract-khugepaged-from-mm-huge_memoryc.patch
khugepaged-move-up_readmmap_sem-out-of-khugepaged_alloc_page.patch
shmem-make-shmem_inode_info-lock-irq-safe.patch
khugepaged-add-support-of-collapse-for-tmpfs-shmem-pages.patch
thp-introduce-config_transparent_huge_pagecache.patch
shmem-split-huge-pages-beyond-i_size-under-memory-pressure.patch
thp-update-documentation-vm-transhugefilesystems-proctxt.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
