From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Kirill A. Shutemov" Subject: [PATCHv3, RFC 34/34] thp: map file-backed huge pages on fault Date: Fri, 5 Apr 2013 14:59:58 +0300 Message-ID: <1365163198-29726-35-git-send-email-kirill.shutemov@linux.intel.com> References: <1365163198-29726-1-git-send-email-kirill.shutemov@linux.intel.com> 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" To: Andrea Arcangeli , Andrew Morton Return-path: Received: from mga11.intel.com ([192.55.52.93]:64477 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161574Ab3DEL60 (ORCPT ); Fri, 5 Apr 2013 07:58:26 -0400 In-Reply-To: <1365163198-29726-1-git-send-email-kirill.shutemov@linux.intel.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: 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 | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index c6e3aef..c175c78 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -80,7 +80,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) return do_huge_pmd_anonymous_page(mm, vma, address, pmd, flags); + return do_huge_linear_fault(mm, vma, address, pmd, flags); } else { pmd_t orig_pmd = *pmd; int ret; -- 1.7.10.4