Merge branch 'master' into for-next

Sync with Linus' tree to be able to apply patch to a newer
code (namely drivers/gpu/drm/gma500/psb_intel_lvds.c)

8 files changed, 336 insertions, 16 deletions

diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h
index b31702ac15be..84f3001a568d 100644
--- a/include/trace/events/btrfs.h
+++ b/include/trace/events/btrfs.h
@@ -16,6 +16,8 @@ struct btrfs_delayed_ref_node;
 struct btrfs_delayed_tree_ref;
 struct btrfs_delayed_data_ref;
 struct btrfs_delayed_ref_head;
+struct btrfs_block_group_cache;
+struct btrfs_free_cluster;
 struct map_lookup;
 struct extent_buffer;
 
@@ -44,6 +46,17 @@ struct extent_buffer;
         obj, ((obj >= BTRFS_DATA_RELOC_TREE_OBJECTID) ||                \
               (obj <= BTRFS_CSUM_TREE_OBJECTID )) ? __show_root_type(obj) : "-"
 
+#define BTRFS_GROUP_FLAGS       \
+        { BTRFS_BLOCK_GROUP_DATA,       "DATA"}, \
+        { BTRFS_BLOCK_GROUP_SYSTEM,     "SYSTEM"}, \
+        { BTRFS_BLOCK_GROUP_METADATA,   "METADATA"}, \
+        { BTRFS_BLOCK_GROUP_RAID0,      "RAID0"}, \
+        { BTRFS_BLOCK_GROUP_RAID1,      "RAID1"}, \
+        { BTRFS_BLOCK_GROUP_DUP,        "DUP"}, \
+        { BTRFS_BLOCK_GROUP_RAID10,     "RAID10"}
+
+#define BTRFS_UUID_SIZE 16
+
 TRACE_EVENT(btrfs_transaction_commit,
 
         TP_PROTO(struct btrfs_root *root),
@@ -621,6 +634,34 @@ TRACE_EVENT(btrfs_cow_block,
                   __entry->cow_level)
 );
 
+TRACE_EVENT(btrfs_space_reservation,
+
+        TP_PROTO(struct btrfs_fs_info *fs_info, char *type, u64 val,
+                 u64 bytes, int reserve),
+
+        TP_ARGS(fs_info, type, val, bytes, reserve),
+
+        TP_STRUCT__entry(
+                __array(        u8,     fsid,   BTRFS_UUID_SIZE )
+                __string(       type,   type                    )
+                __field(        u64,    val                     )
+                __field(        u64,    bytes                   )
+                __field(        int,    reserve                 )
+        ),
+
+        TP_fast_assign(
+                memcpy(__entry->fsid, fs_info->fsid, BTRFS_UUID_SIZE);
+                __assign_str(type, type);
+                __entry->val            = val;
+                __entry->bytes          = bytes;
+                __entry->reserve        = reserve;
+        ),
+
+        TP_printk("%pU: %s: %Lu %s %Lu", __entry->fsid, __get_str(type),
+                  __entry->val, __entry->reserve ? "reserve" : "release",
+                  __entry->bytes)
+);
+
 DECLARE_EVENT_CLASS(btrfs__reserved_extent,
 
         TP_PROTO(struct btrfs_root *root, u64 start, u64 len),
@@ -659,6 +700,168 @@ DEFINE_EVENT(btrfs__reserved_extent,  btrfs_reserved_extent_free,
         TP_ARGS(root, start, len)
 );
 
+TRACE_EVENT(find_free_extent,
+
+        TP_PROTO(struct btrfs_root *root, u64 num_bytes, u64 empty_size,
+                 u64 data),
+
+        TP_ARGS(root, num_bytes, empty_size, data),
+
+        TP_STRUCT__entry(
+                __field(        u64,    root_objectid           )
+                __field(        u64,    num_bytes               )
+                __field(        u64,    empty_size              )
+                __field(        u64,    data                    )
+        ),
+
+        TP_fast_assign(
+                __entry->root_objectid  = root->root_key.objectid;
+                __entry->num_bytes      = num_bytes;
+                __entry->empty_size     = empty_size;
+                __entry->data           = data;
+        ),
+
+        TP_printk("root = %Lu(%s), len = %Lu, empty_size = %Lu, "
+                  "flags = %Lu(%s)", show_root_type(__entry->root_objectid),
+                  __entry->num_bytes, __entry->empty_size, __entry->data,
+                  __print_flags((unsigned long)__entry->data, "|",
+                                 BTRFS_GROUP_FLAGS))
+);
+
+DECLARE_EVENT_CLASS(btrfs__reserve_extent,
+
+        TP_PROTO(struct btrfs_root *root,
+                 struct btrfs_block_group_cache *block_group, u64 start,
+                 u64 len),
+
+        TP_ARGS(root, block_group, start, len),
+
+        TP_STRUCT__entry(
+                __field(        u64,    root_objectid           )
+                __field(        u64,    bg_objectid             )
+                __field(        u64,    flags                   )
+                __field(        u64,    start                   )
+                __field(        u64,    len                     )
+        ),
+
+        TP_fast_assign(
+                __entry->root_objectid  = root->root_key.objectid;
+                __entry->bg_objectid    = block_group->key.objectid;
+                __entry->flags          = block_group->flags;
+                __entry->start          = start;
+                __entry->len            = len;
+        ),
+
+        TP_printk("root = %Lu(%s), block_group = %Lu, flags = %Lu(%s), "
+                  "start = %Lu, len = %Lu",
+                  show_root_type(__entry->root_objectid), __entry->bg_objectid,
+                  __entry->flags, __print_flags((unsigned long)__entry->flags,
+                                                "|", BTRFS_GROUP_FLAGS),
+                  __entry->start, __entry->len)
+);
+
+DEFINE_EVENT(btrfs__reserve_extent, btrfs_reserve_extent,
+
+        TP_PROTO(struct btrfs_root *root,
+                 struct btrfs_block_group_cache *block_group, u64 start,
+                 u64 len),
+
+        TP_ARGS(root, block_group, start, len)
+);
+
+DEFINE_EVENT(btrfs__reserve_extent, btrfs_reserve_extent_cluster,
+
+        TP_PROTO(struct btrfs_root *root,
+                 struct btrfs_block_group_cache *block_group, u64 start,
+                 u64 len),
+
+        TP_ARGS(root, block_group, start, len)
+);
+
+TRACE_EVENT(btrfs_find_cluster,
+
+        TP_PROTO(struct btrfs_block_group_cache *block_group, u64 start,
+                 u64 bytes, u64 empty_size, u64 min_bytes),
+
+        TP_ARGS(block_group, start, bytes, empty_size, min_bytes),
+
+        TP_STRUCT__entry(
+                __field(        u64,    bg_objectid             )
+                __field(        u64,    flags                   )
+                __field(        u64,    start                   )
+                __field(        u64,    bytes                   )
+                __field(        u64,    empty_size              )
+                __field(        u64,    min_bytes               )
+        ),
+
+        TP_fast_assign(
+                __entry->bg_objectid    = block_group->key.objectid;
+                __entry->flags          = block_group->flags;
+                __entry->start          = start;
+                __entry->bytes          = bytes;
+                __entry->empty_size     = empty_size;
+                __entry->min_bytes      = min_bytes;
+        ),
+
+        TP_printk("block_group = %Lu, flags = %Lu(%s), start = %Lu, len = %Lu,"
+                  " empty_size = %Lu, min_bytes = %Lu", __entry->bg_objectid,
+                  __entry->flags,
+                  __print_flags((unsigned long)__entry->flags, "|",
+                                BTRFS_GROUP_FLAGS), __entry->start,
+                  __entry->bytes, __entry->empty_size,  __entry->min_bytes)
+);
+
+TRACE_EVENT(btrfs_failed_cluster_setup,
+
+        TP_PROTO(struct btrfs_block_group_cache *block_group),
+
+        TP_ARGS(block_group),
+
+        TP_STRUCT__entry(
+                __field(        u64,    bg_objectid             )
+        ),
+
+        TP_fast_assign(
+                __entry->bg_objectid    = block_group->key.objectid;
+        ),
+
+        TP_printk("block_group = %Lu", __entry->bg_objectid)
+);
+
+TRACE_EVENT(btrfs_setup_cluster,
+
+        TP_PROTO(struct btrfs_block_group_cache *block_group,
+                 struct btrfs_free_cluster *cluster, u64 size, int bitmap),
+
+        TP_ARGS(block_group, cluster, size, bitmap),
+
+        TP_STRUCT__entry(
+                __field(        u64,    bg_objectid             )
+                __field(        u64,    flags                   )
+                __field(        u64,    start                   )
+                __field(        u64,    max_size                )
+                __field(        u64,    size                    )
+                __field(        int,    bitmap                  )
+        ),
+
+        TP_fast_assign(
+                __entry->bg_objectid    = block_group->key.objectid;
+                __entry->flags          = block_group->flags;
+                __entry->start          = cluster->window_start;
+                __entry->max_size       = cluster->max_size;
+                __entry->size           = size;
+                __entry->bitmap         = bitmap;
+        ),
+
+        TP_printk("block_group = %Lu, flags = %Lu(%s), window_start = %Lu, "
+                  "size = %Lu, max_size = %Lu, bitmap = %d",
+                  __entry->bg_objectid,
+                  __entry->flags,
+                  __print_flags((unsigned long)__entry->flags, "|",
+                                BTRFS_GROUP_FLAGS), __entry->start,
+                  __entry->size, __entry->max_size, __entry->bitmap)
+);
+
 #endif /* _TRACE_BTRFS_H */
 
 /* This part must be outside protection */
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 748ff7cbe555..319538bf17d2 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -573,9 +573,9 @@ TRACE_EVENT(ext4_mb_release_inode_pa,
 );
 
 TRACE_EVENT(ext4_mb_release_group_pa,
-        TP_PROTO(struct ext4_prealloc_space *pa),
+        TP_PROTO(struct super_block *sb, struct ext4_prealloc_space *pa),
 
-        TP_ARGS(pa),
+        TP_ARGS(sb, pa),
 
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
@@ -585,7 +585,7 @@ TRACE_EVENT(ext4_mb_release_group_pa,
         ),
 
         TP_fast_assign(
-                __entry->dev            = pa->pa_inode->i_sb->s_dev;
+                __entry->dev            = sb->s_dev;
                 __entry->pa_pstart      = pa->pa_pstart;
                 __entry->pa_len         = pa->pa_len;
         ),
diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h
index a9c87ad8331c..5f889f16b0c8 100644
--- a/include/trace/events/kmem.h
+++ b/include/trace/events/kmem.h
@@ -147,7 +147,7 @@ DEFINE_EVENT(kmem_free, kmem_cache_free,
         TP_ARGS(call_site, ptr)
 );
 
-TRACE_EVENT(mm_page_free_direct,
+TRACE_EVENT(mm_page_free,
 
         TP_PROTO(struct page *page, unsigned int order),
 
@@ -169,7 +169,7 @@ TRACE_EVENT(mm_page_free_direct,
                         __entry->order)
 );
 
-TRACE_EVENT(mm_pagevec_free,
+TRACE_EVENT(mm_page_free_batched,
 
         TP_PROTO(struct page *page, int cold),
 
diff --git a/include/trace/events/oom.h b/include/trace/events/oom.h
new file mode 100644
index 000000000000..dd4ba3b92002
--- /dev/null
+++ b/include/trace/events/oom.h
@@ -0,0 +1,33 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM oom
+
+#if !defined(_TRACE_OOM_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_OOM_H
+#include <linux/tracepoint.h>
+
+TRACE_EVENT(oom_score_adj_update,
+
+        TP_PROTO(struct task_struct *task),
+
+        TP_ARGS(task),
+
+        TP_STRUCT__entry(
+                __field(        pid_t,  pid)
+                __array(        char,   comm,   TASK_COMM_LEN )
+                __field(         int,   oom_score_adj)
+        ),
+
+        TP_fast_assign(
+                __entry->pid = task->pid;
+                memcpy(__entry->comm, task->comm, TASK_COMM_LEN);
+                __entry->oom_score_adj = task->signal->oom_score_adj;
+        ),
+
+        TP_printk("pid=%d comm=%s oom_score_adj=%d",
+                __entry->pid, __entry->comm, __entry->oom_score_adj)
+);
+
+#endif
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/regmap.h b/include/trace/events/regmap.h
index 1e3193b8fcc8..12fbf43524e9 100644
--- a/include/trace/events/regmap.h
+++ b/include/trace/events/regmap.h
@@ -55,6 +55,15 @@ DEFINE_EVENT(regmap_reg, regmap_reg_read,
 
 );
 
+DEFINE_EVENT(regmap_reg, regmap_reg_read_cache,
+
+        TP_PROTO(struct device *dev, unsigned int reg,
+                 unsigned int val),
+
+        TP_ARGS(dev, reg, val)
+
+);
+
 DECLARE_EVENT_CLASS(regmap_block,
 
         TP_PROTO(struct device *dev, unsigned int reg, int count),
diff --git a/include/trace/events/task.h b/include/trace/events/task.h
new file mode 100644
index 000000000000..b53add02e929
--- /dev/null
+++ b/include/trace/events/task.h
@@ -0,0 +1,61 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM task
+
+#if !defined(_TRACE_TASK_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_TASK_H
+#include <linux/tracepoint.h>
+
+TRACE_EVENT(task_newtask,
+
+        TP_PROTO(struct task_struct *task, unsigned long clone_flags),
+
+        TP_ARGS(task, clone_flags),
+
+        TP_STRUCT__entry(
+                __field(        pid_t,  pid)
+                __array(        char,   comm, TASK_COMM_LEN)
+                __field( unsigned long, clone_flags)
+                __field(        int,    oom_score_adj)
+        ),
+
+        TP_fast_assign(
+                __entry->pid = task->pid;
+                memcpy(__entry->comm, task->comm, TASK_COMM_LEN);
+                __entry->clone_flags = clone_flags;
+                __entry->oom_score_adj = task->signal->oom_score_adj;
+        ),
+
+        TP_printk("pid=%d comm=%s clone_flags=%lx oom_score_adj=%d",
+                __entry->pid, __entry->comm,
+                __entry->clone_flags, __entry->oom_score_adj)
+);
+
+TRACE_EVENT(task_rename,
+
+        TP_PROTO(struct task_struct *task, char *comm),
+
+        TP_ARGS(task, comm),
+
+        TP_STRUCT__entry(
+                __field(        pid_t,  pid)
+                __array(        char, oldcomm,  TASK_COMM_LEN)
+                __array(        char, newcomm,  TASK_COMM_LEN)
+                __field(        int, oom_score_adj)
+        ),
+
+        TP_fast_assign(
+                __entry->pid = task->pid;
+                memcpy(entry->oldcomm, task->comm, TASK_COMM_LEN);
+                memcpy(entry->newcomm, comm, TASK_COMM_LEN);
+                __entry->oom_score_adj = task->signal->oom_score_adj;
+        ),
+
+        TP_printk("pid=%d oldcomm=%s newcomm=%s oom_score_adj=%d",
+                __entry->pid, __entry->oldcomm,
+                __entry->newcomm, __entry->oom_score_adj)
+);
+
+#endif
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index edc4b3d25a2d..f64560e204bc 100644
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@@ -266,9 +266,10 @@ DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template,
                 unsigned long nr_lumpy_taken,
                 unsigned long nr_lumpy_dirty,
                 unsigned long nr_lumpy_failed,
-                isolate_mode_t isolate_mode),
+                isolate_mode_t isolate_mode,
+                int file),
 
-        TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode),
+        TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode, file),
 
         TP_STRUCT__entry(
                 __field(int, order)
@@ -279,6 +280,7 @@ DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template,
                 __field(unsigned long, nr_lumpy_dirty)
                 __field(unsigned long, nr_lumpy_failed)
                 __field(isolate_mode_t, isolate_mode)
+                __field(int, file)
         ),
 
         TP_fast_assign(
@@ -290,9 +292,10 @@ DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template,
                 __entry->nr_lumpy_dirty = nr_lumpy_dirty;
                 __entry->nr_lumpy_failed = nr_lumpy_failed;
                 __entry->isolate_mode = isolate_mode;
+                __entry->file = file;
         ),
 
-        TP_printk("isolate_mode=%d order=%d nr_requested=%lu nr_scanned=%lu nr_taken=%lu contig_taken=%lu contig_dirty=%lu contig_failed=%lu",
+        TP_printk("isolate_mode=%d order=%d nr_requested=%lu nr_scanned=%lu nr_taken=%lu contig_taken=%lu contig_dirty=%lu contig_failed=%lu file=%d",
                 __entry->isolate_mode,
                 __entry->order,
                 __entry->nr_requested,
@@ -300,7 +303,8 @@ DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template,
                 __entry->nr_taken,
                 __entry->nr_lumpy_taken,
                 __entry->nr_lumpy_dirty,
-                __entry->nr_lumpy_failed)
+                __entry->nr_lumpy_failed,
+                __entry->file)
 );
 
 DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_lru_isolate,
@@ -312,9 +316,10 @@ DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_lru_isolate,
                 unsigned long nr_lumpy_taken,
                 unsigned long nr_lumpy_dirty,
                 unsigned long nr_lumpy_failed,
-                isolate_mode_t isolate_mode),
+                isolate_mode_t isolate_mode,
+                int file),
 
-        TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode)
+        TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode, file)
 
 );
 
@@ -327,9 +332,10 @@ DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_isolate,
                 unsigned long nr_lumpy_taken,
                 unsigned long nr_lumpy_dirty,
                 unsigned long nr_lumpy_failed,
-                isolate_mode_t isolate_mode),
+                isolate_mode_t isolate_mode,
+                int file),
 
-        TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode)
+        TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode, file)
 
 );
 
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index 99d1d0decf88..8588a8918023 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -300,12 +300,13 @@ TRACE_EVENT(balance_dirty_pages,
                  unsigned long dirty_ratelimit,
                  unsigned long task_ratelimit,
                  unsigned long dirtied,
+                 unsigned long period,
                  long pause,
                  unsigned long start_time),
 
         TP_ARGS(bdi, thresh, bg_thresh, dirty, bdi_thresh, bdi_dirty,
                 dirty_ratelimit, task_ratelimit,
-                dirtied, pause, start_time),
+                dirtied, period, pause, start_time),
 
         TP_STRUCT__entry(
                 __array(         char,  bdi, 32)
@@ -320,6 +321,8 @@ TRACE_EVENT(balance_dirty_pages,
                 __field(unsigned int,   dirtied_pause)
                 __field(unsigned long,  paused)
                 __field(         long,  pause)
+                __field(unsigned long,  period)
+                __field(         long,  think)
         ),
 
         TP_fast_assign(
@@ -336,6 +339,9 @@ TRACE_EVENT(balance_dirty_pages,
                 __entry->task_ratelimit = KBps(task_ratelimit);
                 __entry->dirtied        = dirtied;
                 __entry->dirtied_pause  = current->nr_dirtied_pause;
+                __entry->think          = current->dirty_paused_when == 0 ? 0 :
+                         (long)(jiffies - current->dirty_paused_when) * 1000/HZ;
+                __entry->period         = period * 1000 / HZ;
                 __entry->pause          = pause * 1000 / HZ;
                 __entry->paused         = (jiffies - start_time) * 1000 / HZ;
         ),
@@ -346,7 +352,7 @@ TRACE_EVENT(balance_dirty_pages,
                   "bdi_setpoint=%lu bdi_dirty=%lu "
                   "dirty_ratelimit=%lu task_ratelimit=%lu "
                   "dirtied=%u dirtied_pause=%u "
-                  "paused=%lu pause=%ld",
+                  "paused=%lu pause=%ld period=%lu think=%ld",
                   __entry->bdi,
                   __entry->limit,
                   __entry->setpoint,
@@ -358,7 +364,9 @@ TRACE_EVENT(balance_dirty_pages,
                   __entry->dirtied,
                   __entry->dirtied_pause,
                   __entry->paused,      /* ms */
-                  __entry->pause        /* ms */
+                  __entry->pause,       /* ms */
+                  __entry->period,      /* ms */
+                  __entry->think        /* ms */
           )
 );