From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx189.postini.com [74.125.245.189]) by kanga.kvack.org (Postfix) with SMTP id 0EEA86B0088 for ; Sat, 11 May 2013 21:21:43 -0400 (EDT) From: "Kirill A. Shutemov" Subject: [PATCHv4 39/39] thp: map file-backed huge pages on fault Date: Sun, 12 May 2013 04:23:36 +0300 Message-Id: <1368321816-17719-40-git-send-email-kirill.shutemov@linux.intel.com> In-Reply-To: <1368321816-17719-1-git-send-email-kirill.shutemov@linux.intel.com> References: <1368321816-17719-1-git-send-email-kirill.shutemov@linux.intel.com> Sender: owner-linux-mm@kvack.org List-ID: To: Andrea Arcangeli , Andrew Morton Cc: Al Viro , Hugh Dickins , Wu Fengguang , Jan Kara , Mel Gorman , linux-mm@kvack.org, Andi Kleen , Matthew Wilcox , "Kirill A. Shutemov" , Hillf Danton , Dave Hansen , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" From: "Kirill A. Shutemov" Look like all pieces are in place, we can map file-backed huge-pages now. Signed-off-by: Kirill A. Shutemov --- include/linux/huge_mm.h | 4 +++- mm/memory.c | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index f4d6626..903f097 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -78,7 +78,9 @@ extern bool is_vma_temporary_stack(struct vm_area_struct *vma); (1<vm_flags & VM_HUGEPAGE))) && \ !((__vma)->vm_flags & VM_NOHUGEPAGE) && \ - !is_vma_temporary_stack(__vma)) + !is_vma_temporary_stack(__vma) && \ + (!(__vma)->vm_ops || \ + mapping_can_have_hugepages((__vma)->vm_file->f_mapping))) #define transparent_hugepage_defrag(__vma) \ ((transparent_hugepage_flags & \ (1<vm_ops) ret = do_huge_pmd_anonymous_page(mm, vma, address, pmd, flags); + else + ret = do_huge_linear_fault(mm, vma, address, + pmd, flags); if ((ret & VM_FAULT_FALLBACK) == 0) return ret; } else { -- 1.7.10.4 -- 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