[PATCH v9 00/10] mm: page migration enhancement for thp
From: Zi Yan
Date: Mon Jul 17 2017 - 15:40:39 EST
From: Zi Yan <zi.yan@xxxxxxxxxxxxxx>
Hi Andrew,
The patches are rebased on mmotm-2017-07-12-15-11 with the feedbacks
from v8 patches. Is there anything I need to do to get them merged?
Patch 1 factors out common code. It could be picked up easily.
Patch 2 moves _PAGE_SWP_SOFT_DIRTY bit to prepare for THP migration.
Patch 3 adds a new TTU flag to avoid the conflict between TTU_MIGRATION and THP migration.
Patch 4-6 are the core part of THP migration.
Patch 7 adds soft dirty bit to THP migraiton.
Patch 8-10 enables THP migration in the various locations in the kernel.
Thanks.
Motivations
===========================================
1. THP migration becomes important in the upcoming heterogeneous memory systems.
As David Nellans from NVIDIA pointed out from other threads
(http://www.mail-archive.com/linux-kernel@xxxxxxxxxxxxxxx/msg1349227.html),
future GPUs or other accelerators will have their memory managed by operating
systems. Moving data into and out of these memory nodes efficiently is critical
to applications that use GPUs or other accelerators. Existing page migration
only supports base pages, which has a very low memory bandwidth utilization.
My experiments (see below) show THP migration can migrate pages more efficiently.
2. Base page migration vs THP migration throughput.
Here are cross-socket page migration results from calling
move_pages() syscall:
In x86_64, a Intel two-socket E5-2640v3 box,
single 4KB base page migration takes 62.47 us, using 0.06 GB/s BW,
single 2MB THP migration takes 658.54 us, using 2.97 GB/s BW,
512 4KB base page migration takes 1987.38 us, using 0.98 GB/s BW.
In ppc64, a two-socket Power8 box,
single 64KB base page migration takes 49.3 us, using 1.24 GB/s BW,
single 16MB THP migration takes 2202.17 us, using 7.10 GB/s BW,
256 64KB base page migration takes 2543.65 us, using 6.14 GB/s BW.
THP migration can give us 3x and 1.15x throughput over base page migration
in x86_64 and ppc64 respectivley.
You can test it out by using the code here:
https://github.com/x-y-z/thp-migration-bench
3. Existing page migration splits THP before migration and cannot guarantee
the migrated pages are still contiguous. Contiguity is always what GPUs and
accelerators look for. Without THP migration, khugepaged needs to do extra work
to reassemble the migrated pages back to THPs.
ChangeLog
===========================================
Changes since v8:
* Avoid shmem THP migrations, which are not supported yet.
* Simplify PMD-mapped THP checks in try_to_unmap_one() and remove_migration_pte().
* Fix VM_BUG_ON()s that trigger false alarms.
Changes since v7:
* Remove BUILD_BUG() in pmd_to_swp_entry() and swp_entry_to_pmd() to allow
replacing macro with IS_ENABLED at several code chunks. This makes them
easy to read.
* Rename variable 'migration' to 'flush_needed' for better understanding.
* Use pmdp_invdalite() to avoid race with MADV_DONTNEED.
* Remove unnecessary tlb flush in remove_migration_pmd().
* Add the missing migration flag check in page_vma_mapped_walk().
* Remove not used code in do_huge_pmd_wp_page().
* Add migration entry permission change comment to change_huge_pmd()
to avoid confusion.
Changes since v6:
* Fix the kbuild bot warning in swp_entry_to_pmd().
* Add macro to disable the code when thp migration is not enabled. This fixes
the kbuild bot errors while building kernels without THP migration enabled.
* In memory hotremove, move THP allocation code from new_node_page() to
new_page_nodemask(). This follows the patch ("mm: unify new_node_page and
alloc_migrate_target") in latest mmotm.
Changes since v5:
* THP migration support for soft-offline patch is dropped, because it needs
more discussion. I will send it separately.
* Better commit message in Patch 2 (on moving _PAGE_SWP_SOFT_DIRTY bit),
thanks for Dave Hansen's help.
Changes since v4:
* In Patch 5, I dropped PTE-mapped THP migration handling code, since it is
already well handled by existing code.
* In Patch 6, I did a thorough check on PMD handling places and corrected all
errors I discovered.
* In Patch 6, I use is_swap_pmd() to check PMD migration entries and add
VM_BUG_ON to make sure only migration entries present. It should be useful
later when someone wants to add PMD swap entries, since VM_BUG_ON will
catch the missing code path.
* In Patch 6, I keep pmd_none() in pmd_none_or_trans_huge_or_clear_bad() to
avoid confusion on the function name. I also add a comment to explain it.
* In Patch 7-11, I added some missing soft dirty bit preserving code and
corrected page stats countings.
Changes since v3:
* I dropped my fix on zap_pmd_range() since THP migration will not trigger
it and Kirill has posted patches to fix the bug triggered by MADV_DONTNEED.
* In Patch 6, I used !pmd_present() instead of is_pmd_migration_entry()
in pmd_none_or_trans_huge_or_clear_bad() to avoid moving the function to
linux/swapops.h. Currently, !pmd_present() is equivalent to
is_pmd_migration_entry(). Any suggestion is welcome to this change.
Changes since v2:
* I fix a bug in zap_pmd_range() and include the fixes in Patches 1-3.
The racy check in zap_pmd_range() can miss pmd_protnone and pmd_migration_entry,
which leads to PTE page table not freed.
* In Patch 4, I move _PAGE_SWP_SOFT_DIRTY to bit 1. Because bit 6 (used in v2)
can be set by some CPUs by mistake and the new swap entry format does not use
bit 1-4.
* I also adjust two core migration functions, set_pmd_migration_entry() and
remove_migration_pmd(), to use Kirill A. Shutemov's page_vma_mapped_walk()
function. Patch 8 needs Kirill's comments, since I also add changes
to his page_vma_mapped_walk() function with pmd_migration_entry handling.
* In Patch 8, I replace pmdp_huge_get_and_clear() with pmdp_huge_clear_flush()
in set_pmd_migration_entry() to avoid data corruption after page migration.
* In Patch 9, I include is_pmd_migration_entry() in pmd_none_or_trans_huge_or_clear_bad().
Otherwise, a pmd_migration_entry is treated as pmd_bad and cleared, which
leads to deposited PTE page table not freed.
* I personally use this patchset with my customized kernel to test frequent
page migrations by replacing page reclaim with page migration.
The bugs fixed in Patches 1-3 and 8 was discovered while I am testing my kernel.
I did a 16-hour stress test that has ~7 billion total page migrations.
No error or data corruption was found.
General description
===========================================
This patchset enhances page migration functionality to handle thp migration
for various page migration's callers:
- mbind(2)
- move_pages(2)
- migrate_pages(2)
- cgroup/cpuset migration
- memory hotremove
The main benefit is that we can avoid unnecessary thp splits, which helps us
avoid performance decrease when your applications handles NUMA optimization on
their own.
The implementation is similar to that of normal page migration, the key point
is that we modify a pmd to a pmd migration entry in swap-entry like format.
Naoya Horiguchi (8):
mm: mempolicy: add queue_pages_required()
mm: x86: move _PAGE_SWP_SOFT_DIRTY from bit 7 to bit 1
mm: thp: introduce separate TTU flag for thp freezing
mm: thp: introduce CONFIG_ARCH_ENABLE_THP_MIGRATION
mm: soft-dirty: keep soft-dirty bits over thp migration
mm: mempolicy: mbind and migrate_pages support thp migration
mm: migrate: move_pages() supports thp migration
mm: memory_hotplug: memory hotremove supports thp migration
Zi Yan (2):
mm: thp: enable thp migration in generic path
mm: thp: check pmd migration entry in common path
arch/x86/Kconfig | 4 +
arch/x86/include/asm/pgtable.h | 17 ++++
arch/x86/include/asm/pgtable_64.h | 14 ++-
arch/x86/include/asm/pgtable_types.h | 10 +-
fs/proc/task_mmu.c | 59 +++++++-----
include/asm-generic/pgtable.h | 52 ++++++++++-
include/linux/huge_mm.h | 24 ++++-
include/linux/migrate.h | 15 ++-
include/linux/rmap.h | 3 +-
include/linux/swapops.h | 69 +++++++++++++-
mm/Kconfig | 3 +
mm/gup.c | 22 ++++-
mm/huge_memory.c | 174 ++++++++++++++++++++++++++++++++---
mm/memcontrol.c | 5 +
mm/memory.c | 12 ++-
mm/memory_hotplug.c | 4 +-
mm/mempolicy.c | 130 +++++++++++++++++++-------
mm/migrate.c | 77 +++++++++++++---
mm/mprotect.c | 4 +-
mm/mremap.c | 2 +-
mm/page_vma_mapped.c | 18 +++-
mm/pgtable-generic.c | 3 +-
mm/rmap.c | 20 +++-
23 files changed, 627 insertions(+), 114 deletions(-)
--
2.11.0