From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qc0-f169.google.com (mail-qc0-f169.google.com [209.85.216.169]) by kanga.kvack.org (Postfix) with ESMTP id 451936B0035 for ; Thu, 28 Aug 2014 21:52:44 -0400 (EDT) Received: by mail-qc0-f169.google.com with SMTP id l6so1798218qcy.14 for ; Thu, 28 Aug 2014 18:52:44 -0700 (PDT) Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id 20si8512105qgo.58.2014.08.28.18.52.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Aug 2014 18:52:43 -0700 (PDT) From: Naoya Horiguchi Subject: [PATCH v3 5/6] mm/hugetlb: add migration entry check in __unmap_hugepage_range Date: Thu, 28 Aug 2014 21:38:59 -0400 Message-Id: <1409276340-7054-6-git-send-email-n-horiguchi@ah.jp.nec.com> In-Reply-To: <1409276340-7054-1-git-send-email-n-horiguchi@ah.jp.nec.com> References: <1409276340-7054-1-git-send-email-n-horiguchi@ah.jp.nec.com> Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton , Hugh Dickins Cc: David Rientjes , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Naoya Horiguchi If __unmap_hugepage_range() tries to unmap the address range over which hugepage migration is on the way, we get the wrong page because pte_page() doesn't work for migration entries. This patch calls pte_to_swp_entry() and migration_entry_to_page() to get the right page for migration entries. Signed-off-by: Naoya Horiguchi Cc: # [2.6.36+] --- mm/hugetlb.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git mmotm-2014-08-25-16-52.orig/mm/hugetlb.c mmotm-2014-08-25-16-52/mm/hugetlb.c index 1ed9df6def54..0a4511115ee0 100644 --- mmotm-2014-08-25-16-52.orig/mm/hugetlb.c +++ mmotm-2014-08-25-16-52/mm/hugetlb.c @@ -2652,6 +2652,13 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, if (huge_pte_none(pte)) goto unlock; + if (unlikely(is_hugetlb_entry_migration(pte))) { + swp_entry_t entry = pte_to_swp_entry(pte); + + page = migration_entry_to_page(entry); + goto clear; + } + /* * HWPoisoned hugepage is already unmapped and dropped reference */ @@ -2677,7 +2684,7 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, */ set_vma_resv_flags(vma, HPAGE_RESV_UNMAPPED); } - +clear: pte = huge_ptep_get_and_clear(mm, address, ptep); tlb_remove_tlb_entry(tlb, ptep, address); if (huge_pte_dirty(pte)) -- 1.9.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org