This fixes inefficient page-by-page reads on POSIX_FADV_RANDOM. POSIX_FADV_RANDOM used to set ra_pages=0, which leads to poor performance: a 16K read will be carried out in 4 _sync_ 1-page reads. In other places, ra_pages==0 means - it's ramfs/tmpfs/hugetlbfs/sysfs/configfs - some IO error happened where multi-page read IO won't help or should be avoided. POSIX_FADV_RANDOM actually want a different semantics: to disable the *heuristic* readahead algorithm, and to use a dumb one which faithfully submit read IO for whatever application requests. So introduce a flag O_RANDOM for POSIX_FADV_RANDOM. It will be visible to fcntl(F_GETFL), but open(O_RANDOM) is disabled for now. Note that the random hint is not likely to help random reads performance noticeably. And it may be too permissive on huge request size (its IO size is not limited by read_ahead_kb). In Quentin's report (http://lkml.org/lkml/2009/12/24/145), the overall (NFS read) performance of the application increased by 313%! v5: use bit 0200000000; explicitly nuke the O_RANDOM bit in __dentry_open() (Stephen Rothwell) v4: resolve bit conflicts with sparc and parisc; use bit 040000000(=FMODE_NONOTIFY), which will be masked out by __dentry_open(), so that open(O_RANDOM) is disabled (Stephen Rothwell and Christoph Hellwig) v3: use O_RANDOM to indicate both read/write access pattern as in posix_fadvise(), although it only takes effect for read() now (proposed by Quentin) v2: use O_RANDOM_READ to avoid race conditions (pointed out by Andi) CC: Nick Piggin <npiggin@xxxxxxx> CC: Andi Kleen <andi@xxxxxxxxxxxxxx> CC: Steven Whitehouse <swhiteho@xxxxxxxxxx> CC: David Howells <dhowells@xxxxxxxxxx> CC: Al Viro <viro@xxxxxxxxxxxxxxxxxx> CC: Jonathan Corbet <corbet@xxxxxxx> CC: Christoph Hellwig <hch@xxxxxxxxxxxxx> Tested-by: Quentin Barnes <qbarnes+nfs@xxxxxxxxxxxxx> Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx> --- fs/open.c | 2 +- include/asm-generic/fcntl.h | 7 +++++++ mm/fadvise.c | 10 +++++++++- mm/readahead.c | 6 ++++++ 4 files changed, 23 insertions(+), 2 deletions(-) --- linux.orig/include/asm-generic/fcntl.h 2010-01-04 12:39:29.000000000 +0800 +++ linux/include/asm-generic/fcntl.h 2010-01-05 11:13:17.000000000 +0800 @@ -80,6 +80,13 @@ #define O_NDELAY O_NONBLOCK #endif +/* + * usage of open(O_RANDOM) is disabled: __dentry_open() will nuke this bit + */ +#ifndef O_RANDOM +#define O_RANDOM 0200000000 /* random access pattern hint */ +#endif + #define F_DUPFD 0 /* dup */ #define F_GETFD 1 /* get close_on_exec */ #define F_SETFD 2 /* set/clear close_on_exec */ --- linux.orig/mm/fadvise.c 2010-01-04 12:39:29.000000000 +0800 +++ linux/mm/fadvise.c 2010-01-04 12:39:30.000000000 +0800 @@ -77,12 +77,20 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, lof switch (advice) { case POSIX_FADV_NORMAL: file->f_ra.ra_pages = bdi->ra_pages; + spin_lock(&file->f_lock); + file->f_flags &= ~O_RANDOM; + spin_unlock(&file->f_lock); break; case POSIX_FADV_RANDOM: - file->f_ra.ra_pages = 0; + spin_lock(&file->f_lock); + file->f_flags |= O_RANDOM; + spin_unlock(&file->f_lock); break; case POSIX_FADV_SEQUENTIAL: file->f_ra.ra_pages = bdi->ra_pages * 2; + spin_lock(&file->f_lock); + file->f_flags &= ~O_RANDOM; + spin_unlock(&file->f_lock); break; case POSIX_FADV_WILLNEED: if (!mapping->a_ops->readpage) { --- linux.orig/mm/readahead.c 2010-01-04 12:39:29.000000000 +0800 +++ linux/mm/readahead.c 2010-01-05 10:20:29.000000000 +0800 @@ -501,6 +501,12 @@ void page_cache_sync_readahead(struct ad if (!ra->ra_pages) return; + /* be dumb */ + if (filp->f_flags & O_RANDOM) { + force_page_cache_readahead(mapping, filp, offset, req_size); + return; + } + /* do read-ahead */ ondemand_readahead(mapping, ra, filp, false, offset, req_size); } --- linux.orig/fs/open.c 2010-01-05 09:41:50.000000000 +0800 +++ linux/fs/open.c 2010-01-05 10:34:40.000000000 +0800 @@ -862,7 +862,7 @@ static struct file *__dentry_open(struct } ima_counts_get(f); - f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC); + f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC | O_RANDOM); file_ra_state_init(&f->f_ra, f->f_mapping->host->i_mapping); -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
