Merge branch 'akpm' (patches from Andrew)

Merge updates from Andrew Morton:

 - a few misc bits

 - ocfs2

 - most(?) of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (125 commits)
  thp: fix comments of __pmd_trans_huge_lock()
  cgroup: remove unnecessary 0 check from css_from_id()
  cgroup: fix idr leak for the first cgroup root
  mm: memcontrol: fix documentation for compound parameter
  mm: memcontrol: remove BUG_ON in uncharge_list
  mm: fix build warnings in <linux/compaction.h>
  mm, thp: convert from optimistic swapin collapsing to conservative
  mm, thp: fix comment inconsistency for swapin readahead functions
  thp: update Documentation/{vm/transhuge,filesystems/proc}.txt
  shmem: split huge pages beyond i_size under memory pressure
  thp: introduce CONFIG_TRANSPARENT_HUGE_PAGECACHE
  khugepaged: add support of collapse for tmpfs/shmem pages
  shmem: make shmem_inode_info::lock irq-safe
  khugepaged: move up_read(mmap_sem) out of khugepaged_alloc_page()
  thp: extract khugepaged from mm/huge_memory.c
  shmem, thp: respect MADV_{NO,}HUGEPAGE for file mappings
  shmem: add huge pages support
  shmem: get_unmapped_area align huge page
  shmem: prepare huge= mount option and sysfs knob
  mm, rmap: account shmem thp pages
  ...

2 files changed, 59 insertions, 13 deletions

diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h
index 551ba4acde4d..04f58acda8e8 100644
--- a/include/trace/events/huge_memory.h
+++ b/include/trace/events/huge_memory.h
@@ -13,7 +13,7 @@
         EM( SCAN_EXCEED_NONE_PTE,       "exceed_none_pte")              \
         EM( SCAN_PTE_NON_PRESENT,       "pte_non_present")              \
         EM( SCAN_PAGE_RO,               "no_writable_page")             \
-        EM( SCAN_NO_REFERENCED_PAGE,    "no_referenced_page")           \
+        EM( SCAN_LACK_REFERENCED_PAGE,  "lack_referenced_page")         \
         EM( SCAN_PAGE_NULL,             "page_null")                    \
         EM( SCAN_SCAN_ABORT,            "scan_aborted")                 \
         EM( SCAN_PAGE_COUNT,            "not_suitable_page_count")      \
@@ -28,7 +28,9 @@
         EM( SCAN_SWAP_CACHE_PAGE,       "page_swap_cache")              \
         EM( SCAN_DEL_PAGE_LRU,          "could_not_delete_page_from_lru")\
         EM( SCAN_ALLOC_HUGE_PAGE_FAIL,  "alloc_huge_page_failed")       \
-        EMe( SCAN_CGROUP_CHARGE_FAIL,   "ccgroup_charge_failed")
+        EM( SCAN_CGROUP_CHARGE_FAIL,    "ccgroup_charge_failed")        \
+        EM( SCAN_EXCEED_SWAP_PTE,       "exceed_swap_pte")              \
+        EMe(SCAN_TRUNCATED,             "truncated")                    \
 
 #undef EM
 #undef EMe
@@ -45,17 +47,18 @@ SCAN_STATUS
 TRACE_EVENT(mm_khugepaged_scan_pmd,
 
         TP_PROTO(struct mm_struct *mm, struct page *page, bool writable,
-                 bool referenced, int none_or_zero, int status),
+                 int referenced, int none_or_zero, int status, int unmapped),
 
-        TP_ARGS(mm, page, writable, referenced, none_or_zero, status),
+        TP_ARGS(mm, page, writable, referenced, none_or_zero, status, unmapped),
 
         TP_STRUCT__entry(
                 __field(struct mm_struct *, mm)
                 __field(unsigned long, pfn)
                 __field(bool, writable)
-                __field(bool, referenced)
+                __field(int, referenced)
                 __field(int, none_or_zero)
                 __field(int, status)
+                __field(int, unmapped)
         ),
 
         TP_fast_assign(
@@ -65,15 +68,17 @@ TRACE_EVENT(mm_khugepaged_scan_pmd,
                 __entry->referenced = referenced;
                 __entry->none_or_zero = none_or_zero;
                 __entry->status = status;
+                __entry->unmapped = unmapped;
         ),
 
-        TP_printk("mm=%p, scan_pfn=0x%lx, writable=%d, referenced=%d, none_or_zero=%d, status=%s",
+        TP_printk("mm=%p, scan_pfn=0x%lx, writable=%d, referenced=%d, none_or_zero=%d, status=%s, unmapped=%d",
                 __entry->mm,
                 __entry->pfn,
                 __entry->writable,
                 __entry->referenced,
                 __entry->none_or_zero,
-                __print_symbolic(__entry->status, SCAN_STATUS))
+                __print_symbolic(__entry->status, SCAN_STATUS),
+                __entry->unmapped)
 );
 
 TRACE_EVENT(mm_collapse_huge_page,
@@ -103,14 +108,14 @@ TRACE_EVENT(mm_collapse_huge_page,
 TRACE_EVENT(mm_collapse_huge_page_isolate,
 
         TP_PROTO(struct page *page, int none_or_zero,
-                 bool referenced, bool  writable, int status),
+                 int referenced, bool  writable, int status),
 
         TP_ARGS(page, none_or_zero, referenced, writable, status),
 
         TP_STRUCT__entry(
                 __field(unsigned long, pfn)
                 __field(int, none_or_zero)
-                __field(bool, referenced)
+                __field(int, referenced)
                 __field(bool, writable)
                 __field(int, status)
         ),
@@ -131,5 +136,32 @@ TRACE_EVENT(mm_collapse_huge_page_isolate,
                 __print_symbolic(__entry->status, SCAN_STATUS))
 );
 
+TRACE_EVENT(mm_collapse_huge_page_swapin,
+
+        TP_PROTO(struct mm_struct *mm, int swapped_in, int referenced, int ret),
+
+        TP_ARGS(mm, swapped_in, referenced, ret),
+
+        TP_STRUCT__entry(
+                __field(struct mm_struct *, mm)
+                __field(int, swapped_in)
+                __field(int, referenced)
+                __field(int, ret)
+        ),
+
+        TP_fast_assign(
+                __entry->mm = mm;
+                __entry->swapped_in = swapped_in;
+                __entry->referenced = referenced;
+                __entry->ret = ret;
+        ),
+
+        TP_printk("mm=%p, swapped_in=%d, referenced=%d, ret=%d",
+                __entry->mm,
+                __entry->swapped_in,
+                __entry->referenced,
+                __entry->ret)
+);
+
 #endif /* __HUGE_MEMORY_H */
 #include <trace/define_trace.h>
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index 73614ce1d204..531f5811ff6b 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -696,7 +696,7 @@ DEFINE_EVENT(writeback_single_inode_template, writeback_single_inode,
         TP_ARGS(inode, wbc, nr_to_write)
 );
 
-DECLARE_EVENT_CLASS(writeback_lazytime_template,
+DECLARE_EVENT_CLASS(writeback_inode_template,
         TP_PROTO(struct inode *inode),
 
         TP_ARGS(inode),
@@ -723,25 +723,39 @@ DECLARE_EVENT_CLASS(writeback_lazytime_template,
                   show_inode_state(__entry->state), __entry->mode)
 );
 
-DEFINE_EVENT(writeback_lazytime_template, writeback_lazytime,
+DEFINE_EVENT(writeback_inode_template, writeback_lazytime,
         TP_PROTO(struct inode *inode),
 
         TP_ARGS(inode)
 );
 
-DEFINE_EVENT(writeback_lazytime_template, writeback_lazytime_iput,
+DEFINE_EVENT(writeback_inode_template, writeback_lazytime_iput,
         TP_PROTO(struct inode *inode),
 
         TP_ARGS(inode)
 );
 
-DEFINE_EVENT(writeback_lazytime_template, writeback_dirty_inode_enqueue,
+DEFINE_EVENT(writeback_inode_template, writeback_dirty_inode_enqueue,
 
         TP_PROTO(struct inode *inode),
 
         TP_ARGS(inode)
 );
 
+/*
+ * Inode writeback list tracking.
+ */
+
+DEFINE_EVENT(writeback_inode_template, sb_mark_inode_writeback,
+        TP_PROTO(struct inode *inode),