aboutsummaryrefslogtreecommitdiffstats
path: root/mm/hugetlb.c
diff options
context:
space:
mode:
authorNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>2010-09-07 21:19:35 -0400
committerAndi Kleen <ak@linux.intel.com>2010-10-08 03:32:45 -0400
commit290408d4a25002f099efeee7b6a5778d431154d6 (patch)
treec0a69a11ce963ef8a22607f5e782ae667ca5d538 /mm/hugetlb.c
parent0ebabb416f585ace711769057422af4bbc9d1110 (diff)
hugetlb: hugepage migration core
This patch extends page migration code to support hugepage migration. One of the potential users of this feature is soft offlining which is triggered by memory corrected errors (added by the next patch.) Todo: - there are other users of page migration such as memory policy, memory hotplug and memocy compaction. They are not ready for hugepage support for now. ChangeLog since v4: - define migrate_huge_pages() - remove changes on isolation/putback_lru_page() ChangeLog since v2: - refactor isolate/putback_lru_page() to handle hugepage - add comment about race on unmap_and_move_huge_page() ChangeLog since v1: - divide migration code path for hugepage - define routine checking migration swap entry for hugetlb - replace "goto" with "if/else" in remove_migration_pte() Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com> Acked-by: Mel Gorman <mel@csn.ul.ie> Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'mm/hugetlb.c')
-rw-r--r--mm/hugetlb.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index a73dbdcb89eb..0fa9de8361bd 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2217,6 +2217,19 @@ nomem:
2217 return -ENOMEM; 2217 return -ENOMEM;
2218} 2218}
2219 2219
2220static int is_hugetlb_entry_migration(pte_t pte)
2221{
2222 swp_entry_t swp;
2223
2224 if (huge_pte_none(pte) || pte_present(pte))
2225 return 0;
2226 swp = pte_to_swp_entry(pte);
2227 if (non_swap_entry(swp) && is_migration_entry(swp)) {
2228 return 1;
2229 } else
2230 return 0;
2231}
2232
2220static int is_hugetlb_entry_hwpoisoned(pte_t pte) 2233static int is_hugetlb_entry_hwpoisoned(pte_t pte)
2221{ 2234{
2222 swp_entry_t swp; 2235 swp_entry_t swp;
@@ -2648,7 +2661,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
2648 ptep = huge_pte_offset(mm, address); 2661 ptep = huge_pte_offset(mm, address);
2649 if (ptep) { 2662 if (ptep) {
2650 entry = huge_ptep_get(ptep); 2663 entry = huge_ptep_get(ptep);
2651 if (unlikely(is_hugetlb_entry_hwpoisoned(entry))) 2664 if (unlikely(is_hugetlb_entry_migration(entry))) {
2665 migration_entry_wait(mm, (pmd_t *)ptep, address);
2666 return 0;
2667 } else if (unlikely(is_hugetlb_entry_hwpoisoned(entry)))
2652 return VM_FAULT_HWPOISON; 2668 return VM_FAULT_HWPOISON;
2653 } 2669 }
2654 2670