mm: remove swap token code

The swap token code no longer fits in with the current VM model.  It
does not play well with cgroups or the better NUMA placement code in
development, since we have only one swap token globally.

It also has the potential to mess with scalability of the system, by
increasing the number of non-reclaimable pages on the active and
inactive anon LRU lists.

Last but not least, the swap token code has been broken for a year
without complaints, as reported by Konstantin Khlebnikov.  This suggests
we no longer have much use for it.

The days of sub-1G memory systems with heavy use of swap are over.  If
we ever need thrashing reducing code in the future, we will have to
implement something that does scale.

Signed-off-by: Rik van Riel <riel@redhat.com>
Cc: Konstantin Khlebnikov <khlebnikov@openvz.org>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Hugh Dickins <hughd@google.com>
Acked-by: Bob Picco <bpicco@meloft.net>
Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 0 insertions, 82 deletions

diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index f64560e204bc..572195459d58 100644
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@@ -395,88 +395,6 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive,
                 show_reclaim_flags(__entry->reclaim_flags))
 );
 
-TRACE_EVENT(replace_swap_token,
-        TP_PROTO(struct mm_struct *old_mm,
-                 struct mm_struct *new_mm),
-
-        TP_ARGS(old_mm, new_mm),
-
-        TP_STRUCT__entry(
-                __field(struct mm_struct*,      old_mm)
-                __field(unsigned int,           old_prio)
-                __field(struct mm_struct*,      new_mm)
-                __field(unsigned int,           new_prio)
-        ),
-
-        TP_fast_assign(
-                __entry->old_mm   = old_mm;
-                __entry->old_prio = old_mm ? old_mm->token_priority : 0;
-                __entry->new_mm   = new_mm;
-                __entry->new_prio = new_mm->token_priority;
-        ),
-
-        TP_printk("old_token_mm=%p old_prio=%u new_token_mm=%p new_prio=%u",
-                  __entry->old_mm, __entry->old_prio,
-                  __entry->new_mm, __entry->new_prio)
-);
-
-DECLARE_EVENT_CLASS(put_swap_token_template,
-        TP_PROTO(struct mm_struct *swap_token_mm),
-
-        TP_ARGS(swap_token_mm),
-
-        TP_STRUCT__entry(
-                __field(struct mm_struct*, swap_token_mm)
-        ),
-
-        TP_fast_assign(
-                __entry->swap_token_mm = swap_token_mm;
-        ),
-
-        TP_printk("token_mm=%p", __entry->swap_token_mm)
-);
-
-DEFINE_EVENT(put_swap_token_template, put_swap_token,
-        TP_PROTO(struct mm_struct *swap_token_mm),
-        TP_ARGS(swap_token_mm)
-);
-
-DEFINE_EVENT_CONDITION(put_swap_token_template, disable_swap_token,
-        TP_PROTO(struct mm_struct *swap_token_mm),
-        TP_ARGS(swap_token_mm),
-        TP_CONDITION(swap_token_mm != NULL)
-);
-
-TRACE_EVENT_CONDITION(update_swap_token_priority,
-        TP_PROTO(struct mm_struct *mm,
-                 unsigned int old_prio,
-                 struct mm_struct *swap_token_mm),
-
-        TP_ARGS(mm, old_prio, swap_token_mm),
-
-        TP_CONDITION(mm->token_priority != old_prio),
-
-        TP_STRUCT__entry(
-                __field(struct mm_struct*, mm)
-                __field(unsigned int, old_prio)
-                __field(unsigned int, new_prio)
-                __field(struct mm_struct*, swap_token_mm)
-                __field(unsigned int, swap_token_prio)
-        ),
-
-        TP_fast_assign(
-                __entry->mm             = mm;
-                __entry->old_prio       = old_prio;
-                __entry->new_prio       = mm->token_priority;
-                __entry->swap_token_mm  = swap_token_mm;
-                __entry->swap_token_prio = swap_token_mm ? swap_token_mm->token_priority : 0;
-        ),
-
-        TP_printk("mm=%p old_prio=%u new_prio=%u swap_token_mm=%p token_prio=%u",
-                  __entry->mm, __entry->old_prio, __entry->new_prio,
-                  __entry->swap_token_mm, __entry->swap_token_prio)
-);
-
 #endif /* _TRACE_VMSCAN_H */
 
 /* This part must be outside protection */