13 files changed, 1148 insertions, 360 deletions

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index affa830a198c..c5cde87329c7 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -53,7 +53,7 @@ static struct percpu_rw_semaphore dup_mmap_sem;
 
 struct uprobe {
         struct rb_node          rb_node;        /* node in the rb tree */
-        atomic_t                ref;
+        refcount_t              ref;
         struct rw_semaphore     register_rwsem;
         struct rw_semaphore     consumer_rwsem;
         struct list_head        pending_list;
@@ -547,13 +547,13 @@ set_orig_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long v
 
 static struct uprobe *get_uprobe(struct uprobe *uprobe)
 {
-        atomic_inc(&uprobe->ref);
+        refcount_inc(&uprobe->ref);
         return uprobe;
 }
 
 static void put_uprobe(struct uprobe *uprobe)
 {
-        if (atomic_dec_and_test(&uprobe->ref)) {
+        if (refcount_dec_and_test(&uprobe->ref)) {
                 /*
                  * If application munmap(exec_vma) before uprobe_unregister()
                  * gets called, we don't get a chance to remove uprobe from
@@ -644,7 +644,7 @@ static struct uprobe *__insert_uprobe(struct uprobe *uprobe)
         rb_link_node(&uprobe->rb_node, parent, p);
         rb_insert_color(&uprobe->rb_node, &uprobes_tree);
         /* get access + creation ref */
-        atomic_set(&uprobe->ref, 2);
+        refcount_set(&uprobe->ref, 2);
 
         return u;
 }
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index aac7847c0214..fa79323331b2 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -3702,6 +3702,31 @@ enter_record(struct ftrace_hash *hash, struct dyn_ftrace *rec, int clear_filter)
 }
 
 static int
+add_rec_by_index(struct ftrace_hash *hash, struct ftrace_glob *func_g,
+                 int clear_filter)
+{
+        long index = simple_strtoul(func_g->search, NULL, 0);
+        struct ftrace_page *pg;
+        struct dyn_ftrace *rec;
+
+        /* The index starts at 1 */
+        if (--index < 0)
+                return 0;
+
+        do_for_each_ftrace_rec(pg, rec) {
+                if (pg->index <= index) {
+                        index -= pg->index;
+                        /* this is a double loop, break goes to the next page */
+                        break;
+                }
+                rec = &pg->records[index];
+                enter_record(hash, rec, clear_filter);
+                return 1;
+        } while_for_each_ftrace_rec();
+        return 0;
+}
+
+static int
 ftrace_match_record(struct dyn_ftrace *rec, struct ftrace_glob *func_g,
                 struct ftrace_glob *mod_g, int exclude_mod)
 {
@@ -3769,6 +3794,11 @@ match_records(struct ftrace_hash *hash, char *func, int len, char *mod)
         if (unlikely(ftrace_disabled))
                 goto out_unlock;
 
+        if (func_g.type == MATCH_INDEX) {
+                found = add_rec_by_index(hash, &func_g, clear_filter);
+                goto out_unlock;
+        }
+
         do_for_each_ftrace_rec(pg, rec) {
 
                 if (rec->flags & FTRACE_FL_DISABLED)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 06e864a334bb..9a91479bbbfe 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -353,20 +353,6 @@ static void rb_init_page(struct buffer_data_page *bpage)
         local_set(&bpage->commit, 0);
 }
 
-/**
- * ring_buffer_page_len - the size of data on the page.
- * @page: The page to read
- *
- * Returns the amount of data on the page, including buffer page header.
- */
-size_t ring_buffer_page_len(void *page)
-{
-        struct buffer_data_page *bpage = page;
-
-        return (local_read(&bpage->commit) & ~RB_MISSED_FLAGS)
-                + BUF_PAGE_HDR_SIZE;
-}
-
 /*
  * Also stolen from mm/slob.c. Thanks to Mathieu Desnoyers for pointing
  * this issue out.
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index c4238b441624..d7325eb1bc83 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -894,7 +894,7 @@ int __trace_bputs(unsigned long ip, const char *str)
 EXPORT_SYMBOL_GPL(__trace_bputs);
 
 #ifdef CONFIG_TRACER_SNAPSHOT
-void tracing_snapshot_instance(struct trace_array *tr)
+void tracing_snapshot_instance_cond(struct trace_array *tr, void *cond_data)
 {
         struct tracer *tracer = tr->current_trace;
         unsigned long flags;
@@ -920,10 +920,15 @@ void tracing_snapshot_instance(struct trace_array *tr)
         }
 
         local_irq_save(flags);
-        update_max_tr(tr, current, smp_processor_id());
+        update_max_tr(tr, current, smp_processor_id(), cond_data);
         local_irq_restore(flags);
 }
 
+void tracing_snapshot_instance(struct trace_array *tr)
+{
+        tracing_snapshot_instance_cond(tr, NULL);
+}
+
 /**
  * tracing_snapshot - take a snapshot of the current buffer.
  *
@@ -946,6 +951,54 @@ void tracing_snapshot(void)
 }
 EXPORT_SYMBOL_GPL(tracing_snapshot);
 
+/**
+ * tracing_snapshot_cond - conditionally take a snapshot of the current buffer.
+ * @tr:         The tracing instance to snapshot
+ * @cond_data:  The data to be tested conditionally, and possibly saved
+ *
+ * This is the same as tracing_snapshot() except that the snapshot is
+ * conditional - the snapshot will only happen if the
+ * cond_snapshot.update() implementation receiving the cond_data
+ * returns true, which means that the trace array's cond_snapshot
+ * update() operation used the cond_data to determine whether the
+ * snapshot should be taken, and if it was, presumably saved it along
+ * with the snapshot.
+ */
+void tracing_snapshot_cond(struct trace_array *tr, void *cond_data)
+{
+        tracing_snapshot_instance_cond(tr, cond_data);
+}
+EXPORT_SYMBOL_GPL(tracing_snapshot_cond);
+
+/**
+ * tracing_snapshot_cond_data - get the user data associated with a snapshot
+ * @tr:         The tracing instance
+ *
+ * When the user enables a conditional snapshot using
+ * tracing_snapshot_cond_enable(), the user-defined cond_data is saved
+ * with the snapshot.  This accessor is used to retrieve it.
+ *
+ * Should not be called from cond_snapshot.update(), since it takes
+ * the tr->max_lock lock, which the code calling
+ * cond_snapshot.update() has already done.
+ *
+ * Returns the cond_data associated with the trace array's snapshot.
+ */
+void *tracing_cond_snapshot_data(struct trace_array *tr)
+{
+        void *cond_data = NULL;
+
+        arch_spin_lock(&tr->max_lo