From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751840Ab0CAFif (ORCPT ); Mon, 1 Mar 2010 00:38:35 -0500 Received: from mga09.intel.com ([134.134.136.24]:39534 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751327Ab0CAFh6 (ORCPT ); Mon, 1 Mar 2010 00:37:58 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.49,557,1262592000"; d="scan'208";a="496512755" Message-Id: <20100301053621.946764025@intel.com> User-Agent: quilt/0.48-1 Date: Mon, 01 Mar 2010 13:27:03 +0800 From: Wu Fengguang To: Andrew Morton CC: Jens Axboe , Rik van Riel , Linus Torvalds , Wu Fengguang CC: Chris Mason CC: Peter Zijlstra CC: Clemens Ladisch CC: Olivier Galibert cc: Vivek Goyal cc: Christian Ehrhardt cc: Matt Mackall CC: Nick Piggin cc: Linux Memory Management List CC: Cc: LKML Subject: [PATCH 12/16] readahead: dont do start-of-file readahead after lseek() References: <20100301052651.857984880@intel.com> Content-Disposition: inline; filename=readahead-lseek.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some applications (eg. blkid, id3tool etc.) seek around the file to get information. For example, blkid does seek to 0 read 1024 seek to 1536 read 16384 The start-of-file readahead heuristic is wrong for them, whose access pattern can be identified by lseek() calls. So test-and-set a READAHEAD_LSEEK flag on lseek() and don't do start-of-file readahead on seeing it. Proposed by Linus. Acked-by: Rik van Riel Acked-by: Linus Torvalds Signed-off-by: Wu Fengguang --- fs/read_write.c | 3 +++ include/linux/fs.h | 1 + mm/readahead.c | 5 +++++ 3 files changed, 9 insertions(+) --- linux.orig/mm/readahead.c 2010-03-01 13:23:45.000000000 +0800 +++ linux/mm/readahead.c 2010-03-01 13:23:45.000000000 +0800 @@ -670,6 +670,11 @@ ondemand_readahead(struct address_space if (!offset) { ra_set_pattern(ra, RA_PATTERN_INITIAL); ra->start = offset; + if ((ra->ra_flags & READAHEAD_LSEEK) && req_size <= max) { + ra->size = req_size; + ra->async_size = 0; + goto readit; + } ra->size = get_init_ra_size(req_size, max); ra->async_size = ra->size > req_size ? ra->size - req_size : ra->size; --- linux.orig/fs/read_write.c 2010-03-01 13:21:43.000000000 +0800 +++ linux/fs/read_write.c 2010-03-01 13:23:45.000000000 +0800 @@ -71,6 +71,9 @@ generic_file_llseek_unlocked(struct file file->f_version = 0; } + if (!(file->f_ra.ra_flags & READAHEAD_LSEEK)) + file->f_ra.ra_flags |= READAHEAD_LSEEK; + return offset; } EXPORT_SYMBOL(generic_file_llseek_unlocked); --- linux.orig/include/linux/fs.h 2010-03-01 13:23:42.000000000 +0800 +++ linux/include/linux/fs.h 2010-03-01 13:23:45.000000000 +0800 @@ -899,6 +899,7 @@ struct file_ra_state { #define READAHEAD_MMAP_MISS 0x00000fff /* cache misses for mmap access */ #define READAHEAD_THRASHED 0x10000000 #define READAHEAD_MMAP 0x20000000 +#define READAHEAD_LSEEK 0x40000000 /* be conservative after lseek() */ /* * Which policy makes decision to do the current read-ahead IO?