diff options
| author | Andy Whitcroft <apw@canonical.com> | 2010-07-29 09:46:41 +0100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-03-17 17:04:02 -0600 |
| commit | 6ae5e3017467cc525702de00743420735e3f0eda (patch) | |
| tree | 9ee14ff92f7877097a977f0499c1481e9c1be41e /mm | |
| parent | b2f40b3bbbc7ea59a063fc5b74d7bdcd484b7a38 (diff) | |
UBUNTU: SAUCE: (no-up) add tracing for user initiated readahead requests
Track pages which undergo readahead and for each record which were
actually consumed, via either read or faulted into a map. This allows
userspace readahead applications (such as ureadahead) to track which
pages in core at the end of a boot are actually required and generate an
optimal readahead pack. It also allows pack adjustment and optimisation
in parallel with readahead, allowing the pack to evolve to be accurate
as userspace paths change. The status of the pages are reported back via
the mincore() call using a newly allocated bit.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/filemap.c | 3 | ||||
| -rw-r--r-- | mm/memory.c | 7 | ||||
| -rw-r--r-- | mm/mincore.c | 2 | ||||
| -rw-r--r-- | mm/readahead.c | 1 |
4 files changed, 12 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index b66275757c2..0263ff5d49c 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1313,6 +1313,9 @@ int file_read_actor(read_descriptor_t *desc, struct page *page, if (size > count) size = count; + if (PageReadaheadUnused(page)) + ClearPageReadaheadUnused(page); + /* * Faults on the destination of a read are common, so do it before * taking the kmap. diff --git a/mm/memory.c b/mm/memory.c index fa2f04e0337..1235a6312cc 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3222,10 +3222,15 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma, else VM_BUG_ON(!PageLocked(vmf.page)); + page = vmf.page; + + /* Mark the page as used on fault. */ + if (PageReadaheadUnused(page)) + ClearPageReadaheadUnused(page); + /* * Should we do an early C-O-W break? */ - page = vmf.page; if (flags & FAULT_FLAG_WRITE) { if (!(vma->vm_flags & VM_SHARED)) { page = cow_page; diff --git a/mm/mincore.c b/mm/mincore.c index 636a86876ff..a0c0d1e64ef 100644 --- a/mm/mincore.c +++ b/mm/mincore.c @@ -80,6 +80,8 @@ static unsigned char mincore_page(struct address_space *mapping, pgoff_t pgoff) #endif if (page) { present = PageUptodate(page); + if (present) + present |= (PageReadaheadUnused(page) << 7); page_cache_release(page); } diff --git a/mm/readahead.c b/mm/readahead.c index cbcbb02f3e2..2acb81591a3 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -187,6 +187,7 @@ __do_page_cache_readahead(struct address_space *mapping, struct file *filp, list_add(&page->lru, &page_pool); if (page_idx == nr_to_read - lookahead_size) SetPageReadahead(page); + SetPageReadaheadUnused(page); ret++; } |