The patch titled readahead: call scheme: catch thrashing on lookahead time has been added to the -mm tree. Its filename is readahead-call-scheme-catch-thrashing-on-lookahead-time.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: readahead: call scheme: catch thrashing on lookahead time From: Fengguang Wu <wfg@xxxxxxxxxxxxxxxx> Move the call to thrashing_recovery_readahead() before state_based_readahead(). That catches the rare case where thrashing happened on the time we are to read the page at ra->lookahead_index. Obviously this case should be handled by thrashing_recovery_readahead() instead of state_based_readahead(). Signed-off-by: Fengguang Wu <wfg@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/readahead.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff -puN mm/readahead.c~readahead-call-scheme-catch-thrashing-on-lookahead-time mm/readahead.c --- a/mm/readahead.c~readahead-call-scheme-catch-thrashing-on-lookahead-time +++ a/mm/readahead.c @@ -1638,6 +1638,13 @@ page_cache_readahead_adaptive(struct add return initial_readahead(mapping, filp, ra, req_size); /* + * Recover from possible thrashing. + */ + if (!page && offset - ra->prev_page <= 1 && ra_has_index(ra, offset)) + return thrashing_recovery_readahead(mapping, filp, ra, + offset, ra_max); + + /* * State based sequential read-ahead. */ if (offset == ra->prev_page + 1 && @@ -1647,13 +1654,6 @@ page_cache_readahead_adaptive(struct add offset, req_size, ra_max); /* - * Recover from possible thrashing. - */ - if (!page && offset - ra->prev_page <= 1 && ra_has_index(ra, offset)) - return thrashing_recovery_readahead(mapping, filp, ra, - offset, ra_max); - - /* * Backward read-ahead. */ if (!page && try_backward_prefetching(ra, offset, req_size, ra_max)) _ Patches currently in -mm which might be from wfg@xxxxxxxxxxxxxxxx are readahead-kconfig-options.patch radixtree-introduce-scan-hole-data-functions.patch mm-introduce-probe_page.patch mm-introduce-pg_readahead.patch readahead-add-look-ahead-support-to-__do_page_cache_readahead.patch readahead-insert-cond_resched-calls.patch readahead-minmax_ra_pages.patch readahead-events-accounting.patch readahead-rescue_pages.patch readahead-sysctl-parameters.patch readahead-min-max-sizes.patch readahead-state-based-method-aging-accounting.patch readahead-state-based-method-routines.patch readahead-state-based-method.patch readahead-state-based-method-check-node-id.patch readahead-state-based-method-decouple-readahead_ratio-from-growth_limit.patch readahead-state-based-method-cancel-lookahead-gracefully.patch readahead-context-based-method.patch readahead-initial-method-guiding-sizes.patch readahead-initial-method-thrashing-guard-size.patch readahead-initial-method-user-recommended-size.patch readahead-initial-method.patch readahead-backward-prefetching-method.patch readahead-thrashing-recovery-method.patch readahead-thrashing-recovery-method-check-unbalanced-aging.patch readahead-thrashing-recovery-method-refill-holes.patch readahead-call-scheme.patch readahead-call-scheme-cleanup.patch readahead-call-scheme-catch-thrashing-on-lookahead-time.patch readahead-laptop-mode.patch readahead-loop-case.patch readahead-nfsd-case.patch readahead-remove-parameter-ra_max-from-thrashing_recovery_readahead.patch readahead-remove-parameter-ra_max-from-adjust_rala.patch readahead-state-based-method-protect-against-tiny-size.patch readahead-rename-state_based_readahead-to-clock_based_readahead.patch readahead-account-i-o-block-times-for-stock-readahead.patch readahead-rescue_pages-updates.patch readahead-remove-noaction-shrink-events.patch readahead-remove-size-limit-on-read_ahead_kb.patch readahead-remove-size-limit-of-max_sectors_kb-on-read_ahead_kb.patch readahead-partial-sendfile-fix.patch readahead-turn-on-by-default.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html