From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757510Ab3JOASw (ORCPT ); Mon, 14 Oct 2013 20:18:52 -0400 Received: from mail-pb0-f47.google.com ([209.85.160.47]:49479 "EHLO mail-pb0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757325Ab3JOASu (ORCPT ); Mon, 14 Oct 2013 20:18:50 -0400 Date: Mon, 14 Oct 2013 17:18:45 -0700 From: Ning Qu To: Andrea Arcangeli , Andrew Morton , "Kirill A. Shutemov" , Hugh Dickins Cc: Al Viro , Hugh Dickins , 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, Ning Qu Subject: [PATCH 12/12] mm, thp, tmpfs: misc fixes for thp tmpfs Message-ID: <20131015001845.GM3432@hippobay.mtv.corp.google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 1) get rid of the actor function pointer in shm as what Kirill did in generic file operations. 2) add kernel command line option to turn on/off the thp page cache support. Signed-off-by: Ning Qu --- mm/huge_memory.c | 27 +++++++++++++++++++++++++++ mm/shmem.c | 7 ++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index d36bdac..ea79a70 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -711,6 +711,33 @@ out: } __setup("transparent_hugepage=", setup_transparent_hugepage); +#ifdef CONFIG_TRANSPARENT_HUGEPAGE_PAGECACHE +static int __init setup_transparent_hugepage_pagecache(char *str) +{ + int ret = 0; + if (!str) + goto out; + if (!strcmp(str, "on")) { + set_bit(TRANSPARENT_HUGEPAGE_PAGECACHE, + &transparent_hugepage_flags); + ret = 1; + } else if (!strcmp(str, "off")) { + clear_bit(TRANSPARENT_HUGEPAGE_PAGECACHE, + &transparent_hugepage_flags); + ret = 1; + } +out: + if (!ret) + printk(KERN_WARNING + "transparent_hugepage_pagecache= cannot parse, " + "ignored\n"); + return ret; +} + +__setup("transparent_hugepage_pagecache=", + setup_transparent_hugepage_pagecache); +#endif + pmd_t maybe_pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma) { if (likely(vma->vm_flags & VM_WRITE)) diff --git a/mm/shmem.c b/mm/shmem.c index 50a3335..18f1d28 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1783,7 +1783,8 @@ static unsigned long pos_to_off(struct page *page, loff_t pos) return pos & ~page_cache_to_mask(page); } -static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_t *desc, read_actor_t actor) +static void do_shmem_file_read(struct file *filp, loff_t *ppos, + read_descriptor_t *desc) { struct inode *inode = file_inode(filp); gfp_t gfp = mapping_gfp_mask(inode->i_mapping); @@ -1885,7 +1886,7 @@ static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_ * "pos" here (the actor routine has to update the user buffer * pointers and the remaining count). */ - ret = actor(desc, page, pos_to_off(page, *ppos), nr); + ret = file_read_actor(desc, page, pos_to_off(page, *ppos), nr); *ppos += ret; index = *ppos >> PAGE_CACHE_SHIFT; @@ -1922,7 +1923,7 @@ static ssize_t shmem_file_aio_read(struct kiocb *iocb, if (desc.count == 0) continue; desc.error = 0; - do_shmem_file_read(filp, ppos, &desc, file_read_actor); + do_shmem_file_read(filp, ppos, &desc); retval += desc.written; if (desc.error) { retval = retval ?: desc.error; -- 1.8.4