Skip to content

Commit

Permalink
mm: pagemap: avoid unnecessary overhead when tracepoints are deactivated
Browse files Browse the repository at this point in the history
This was formerly the series "Improve sequential read throughput" which
noted some major differences in performance of tiobench since 3.0.
While there are a number of factors, two that dominated were the
introduction of the fair zone allocation policy and changes to CFQ.

The behaviour of fair zone allocation policy makes more sense than
tiobench as a benchmark and CFQ defaults were not changed due to
insufficient benchmarking.

This series is what's left.  It's one functional fix to the fair zone
allocation policy when used on NUMA machines and a reduction of overhead
in general.  tiobench was used for the comparison despite its flaws as
an IO benchmark as in this case we are primarily interested in the
overhead of page allocator and page reclaim activity.

On UMA, it makes little difference to overhead

          3.16.0-rc3   3.16.0-rc3
             vanilla lowercost-v5
User          383.61      386.77
System        403.83      401.74
Elapsed      5411.50     5413.11

On a 4-socket NUMA machine it's a bit more noticable

          3.16.0-rc3   3.16.0-rc3
             vanilla lowercost-v5
User          746.94      802.00
System      65336.22    40852.33
Elapsed     27553.52    27368.46

This patch (of 6):

The LRU insertion and activate tracepoints take PFN as a parameter
forcing the overhead to the caller.  Move the overhead to the tracepoint
fast-assign method to ensure the cost is only incurred when the
tracepoint is active.

Signed-off-by: Mel Gorman <mgorman@suse.de>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Mel Gorman authored and torvalds committed Aug 7, 2014
1 parent 2c51856 commit 24b7e58
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
16 changes: 7 additions & 9 deletions include/trace/events/pagemap.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@ TRACE_EVENT(mm_lru_insertion,

TP_PROTO(
struct page *page,
unsigned long pfn,
int lru,
unsigned long flags
int lru
),

TP_ARGS(page, pfn, lru, flags),
TP_ARGS(page, lru),

TP_STRUCT__entry(
__field(struct page *, page )
Expand All @@ -44,9 +42,9 @@ TRACE_EVENT(mm_lru_insertion,

TP_fast_assign(
__entry->page = page;
__entry->pfn = pfn;
__entry->pfn = page_to_pfn(page);
__entry->lru = lru;
__entry->flags = flags;
__entry->flags = trace_pagemap_flags(page);
),

/* Flag format is based on page-types.c formatting for pagemap */
Expand All @@ -64,9 +62,9 @@ TRACE_EVENT(mm_lru_insertion,

TRACE_EVENT(mm_lru_activate,

TP_PROTO(struct page *page, unsigned long pfn),
TP_PROTO(struct page *page),

TP_ARGS(page, pfn),
TP_ARGS(page),

TP_STRUCT__entry(
__field(struct page *, page )
Expand All @@ -75,7 +73,7 @@ TRACE_EVENT(mm_lru_activate,

TP_fast_assign(
__entry->page = page;
__entry->pfn = pfn;
__entry->pfn = page_to_pfn(page);
),

/* Flag format is based on page-types.c formatting for pagemap */
Expand Down
4 changes: 2 additions & 2 deletions mm/swap.c
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ static void __activate_page(struct page *page, struct lruvec *lruvec,
SetPageActive(page);
lru += LRU_ACTIVE;
add_page_to_lru_list(page, lruvec, lru);
trace_mm_lru_activate(page, page_to_pfn(page));
trace_mm_lru_activate(page);

__count_vm_event(PGACTIVATE);
update_page_reclaim_stat(lruvec, file, 1);
Expand Down Expand Up @@ -988,7 +988,7 @@ static void __pagevec_lru_add_fn(struct page *page, struct lruvec *lruvec,
SetPageLRU(page);
add_page_to_lru_list(page, lruvec, lru);
update_page_reclaim_stat(lruvec, file, active);
trace_mm_lru_insertion(page, page_to_pfn(page), lru, trace_pagemap_flags(page));
trace_mm_lru_insertion(page, lru);
}

/*
Expand Down

0 comments on commit 24b7e58

Please sign in to comment.