From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934670Ab3CNRtq (ORCPT ); Thu, 14 Mar 2013 13:49:46 -0400 Received: from mga01.intel.com ([192.55.52.88]:8545 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934640Ab3CNRt3 (ORCPT ); Thu, 14 Mar 2013 13:49:29 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,845,1355126400"; d="scan'208";a="302979161" From: "Kirill A. Shutemov" To: Andrea Arcangeli , Andrew Morton , Al Viro , Hugh Dickins Cc: Wu Fengguang , Jan Kara , Mel Gorman , linux-mm@kvack.org, Andi Kleen , Matthew Wilcox , "Kirill A. Shutemov" , Hillf Danton , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv2, RFC 30/30] thp: map file-backed huge pages on fault Date: Thu, 14 Mar 2013 19:50:35 +0200 Message-Id: <1363283435-7666-31-git-send-email-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363283435-7666-1-git-send-email-kirill.shutemov@linux.intel.com> References: <1363283435-7666-1-git-send-email-kirill.shutemov@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx157.postini.com [74.125.245.157]) by kanga.kvack.org (Postfix) with SMTP id 689FF6B0062 for ; Thu, 14 Mar 2013 13:49:29 -0400 (EDT) From: "Kirill A. Shutemov" Subject: [PATCHv2, RFC 30/30] thp: map file-backed huge pages on fault Date: Thu, 14 Mar 2013 19:50:35 +0200 Message-Id: <1363283435-7666-31-git-send-email-kirill.shutemov@linux.intel.com> In-Reply-To: <1363283435-7666-1-git-send-email-kirill.shutemov@linux.intel.com> References: <1363283435-7666-1-git-send-email-kirill.shutemov@linux.intel.com> Sender: owner-linux-mm@kvack.org List-ID: To: Andrea Arcangeli , Andrew Morton , Al Viro , Hugh Dickins Cc: Wu Fengguang , Jan Kara , Mel Gorman , linux-mm@kvack.org, Andi Kleen , Matthew Wilcox , "Kirill A. Shutemov" , Hillf Danton , 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 | 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 -- 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