From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ning Qu Subject: Re: [PATCH 05/12] mm, thp, tmpfs: request huge page in shm_fault when needed Date: Tue, 15 Oct 2013 11:49:17 -0700 Message-ID: References: <20131015001242.GF3432@hippobay.mtv.corp.google.com> <20131015103744.A0BD3E0090@blue.fi.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: Andrea Arcangeli , Andrew Morton , Hugh Dickins , Al Viro , Wu Fengguang , Jan Kara , Mel Gorman , linux-mm@kvack.org, Andi Kleen , Matthew Wilcox , Hillf Danton , Dave Hansen , Alexander Shishkin , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org To: "Kirill A. Shutemov" Return-path: In-Reply-To: <20131015103744.A0BD3E0090@blue.fi.intel.com> Sender: owner-linux-mm@kvack.org List-Id: linux-fsdevel.vger.kernel.org Will fix this. Best wishes, --=20 Ning Qu (=E6=9B=B2=E5=AE=81) | Software Engineer | quning@google.com | +1-4= 08-418-6066 On Tue, Oct 15, 2013 at 3:37 AM, Kirill A. Shutemov wrote: > Ning Qu wrote: >> Add the function to request huge page in shm_fault when needed. >> And it will fall back to regular page if huge page can't be >> satisfied or allocated. >> >> If small page requested but huge page is found, the huge page will >> be splitted. >> >> Signed-off-by: Ning Qu >> --- >> mm/shmem.c | 32 +++++++++++++++++++++++++++++--- >> 1 file changed, 29 insertions(+), 3 deletions(-) >> >> diff --git a/mm/shmem.c b/mm/shmem.c >> index 68a0e1d..2fc450d 100644 >> --- a/mm/shmem.c >> +++ b/mm/shmem.c >> @@ -1472,19 +1472,45 @@ unlock: >> static int shmem_fault(struct vm_area_struct *vma, struct vm_fault *vmf= ) >> { >> struct inode *inode =3D file_inode(vma->vm_file); >> + struct page *page =3D NULL; >> int error; >> int ret =3D VM_FAULT_LOCKED; >> gfp_t gfp =3D mapping_gfp_mask(inode->i_mapping); >> - >> - error =3D shmem_getpage(inode, vmf->pgoff, &vmf->page, SGP_CACHE, = gfp, >> - 0, &ret); >> + bool must_use_thp =3D vmf->flags & FAULT_FLAG_TRANSHUGE; >> + int flags =3D 0; >> +#ifdef CONFIG_TRANSPARENT_HUGEPAGE_PAGECACHE >> + flags |=3D AOP_FLAG_TRANSHUGE; >> +#endif > > ifdef is not needed: shmem_getpage will ignore AOP_FLAG_TRANSHUGE if > CONFIG_TRANSPARENT_HUGEPAGE_PAGECACHE is not defined. > > -- > Kirill A. Shutemov -- 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