From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755575Ab1K2N1t (ORCPT ); Tue, 29 Nov 2011 08:27:49 -0500 Received: from mga03.intel.com ([143.182.124.21]:46421 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755313Ab1K2N0Q (ORCPT ); Tue, 29 Nov 2011 08:26:16 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.69,590,1315206000"; d="scan'208";a="80197574" Message-Id: <20111129131456.405886521@intel.com> User-Agent: quilt/0.48-1 Date: Tue, 29 Nov 2011 21:09:04 +0800 From: Wu Fengguang To: Andrew Morton cc: Andi Kleen , Wu Fengguang cc: Linux Memory Management List , Cc: LKML Subject: [PATCH 4/9] readahead: tag mmap page fault call sites References: <20111129130900.628549879@intel.com> Content-Disposition: inline; filename=readahead-for-mmap Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce a bit field ra->for_mmap for tagging mmap reads. The tag will be cleared immediate after submitting the IO. Signed-off-by: Wu Fengguang --- include/linux/fs.h | 1 + mm/filemap.c | 6 +++++- mm/readahead.c | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) --- linux-next.orig/include/linux/fs.h 2011-11-29 10:12:19.000000000 +0800 +++ linux-next/include/linux/fs.h 2011-11-29 10:13:08.000000000 +0800 @@ -947,6 +947,7 @@ struct file_ra_state { unsigned int ra_pages; /* Maximum readahead window */ u16 mmap_miss; /* Cache miss stat for mmap accesses */ u8 pattern; /* one of RA_PATTERN_* */ + unsigned int for_mmap:1; /* readahead for mmap accesses */ loff_t prev_pos; /* Cache last read() position */ }; --- linux-next.orig/mm/filemap.c 2011-11-29 09:48:49.000000000 +0800 +++ linux-next/mm/filemap.c 2011-11-29 10:13:08.000000000 +0800 @@ -1592,6 +1592,7 @@ static void do_sync_mmap_readahead(struc return; if (VM_SequentialReadHint(vma)) { + ra->for_mmap = 1; page_cache_sync_readahead(mapping, ra, file, offset, ra->ra_pages); return; @@ -1611,6 +1612,7 @@ static void do_sync_mmap_readahead(struc /* * mmap read-around */ + ra->for_mmap = 1; ra->pattern = RA_PATTERN_MMAP_AROUND; ra_pages = max_sane_readahead(ra->ra_pages); ra->start = max_t(long, 0, offset - ra_pages / 2); @@ -1636,9 +1638,11 @@ static void do_async_mmap_readahead(stru return; if (ra->mmap_miss > 0) ra->mmap_miss--; - if (PageReadahead(page)) + if (PageReadahead(page)) { + ra->for_mmap = 1; page_cache_async_readahead(mapping, ra, file, page, offset, ra->ra_pages); + } } /** --- linux-next.orig/mm/readahead.c 2011-11-29 09:48:49.000000000 +0800 +++ linux-next/mm/readahead.c 2011-11-29 10:13:08.000000000 +0800 @@ -267,6 +267,7 @@ unsigned long ra_submit(struct file_ra_s actual = __do_page_cache_readahead(mapping, filp, ra->start, ra->size, ra->async_size); + ra->for_mmap = 0; return actual; }