Merge tag 'v5.2-rc3' into locking/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

5 files changed, 37 insertions, 15 deletions

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 2c92b3d9ea30..1c80521fd436 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -8910,12 +8910,8 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode)
 
                 cnt++;
 
-                /* reset all but tr, trace, and overruns */
-                memset(&iter.seq, 0,
-                       sizeof(struct trace_iterator) -
-                       offsetof(struct trace_iterator, seq));
+                trace_iterator_reset(&iter);
                 iter.iter_flags |= TRACE_FILE_LAT_FMT;
-                iter.pos = -1;
 
                 if (trace_find_next_entry_inc(&iter) != NULL) {
                         int ret;
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 1974ce818ddb..005f08629b8b 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -15,7 +15,6 @@
 #include <linux/trace_seq.h>
 #include <linux/trace_events.h>
 #include <linux/compiler.h>
-#include <linux/trace_seq.h>
 #include <linux/glob.h>
 
 #ifdef CONFIG_FTRACE_SYSCALLS
@@ -1967,4 +1966,22 @@ static inline void tracer_hardirqs_off(unsigned long a0, unsigned long a1) { }
 
 extern struct trace_iterator *tracepoint_print_iter;
 
+/*
+ * Reset the state of the trace_iterator so that it can read consumed data.
+ * Normally, the trace_iterator is used for reading the data when it is not
+ * consumed, and must retain state.
+ */
+static __always_inline void trace_iterator_reset(struct trace_iterator *iter)
+{
+        const size_t offset = offsetof(struct trace_iterator, seq);
+
+        /*
+         * Keep gcc from complaining about overwriting more than just one
+         * member in the structure.
+         */
+        memset((char *)iter + offset, 0, sizeof(struct trace_iterator) - offset);
+
+        iter->pos = -1;
+}
+
 #endif /* _LINUX_KERNEL_TRACE_H */
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index d3e59312ef40..5079d1db3754 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -428,7 +428,7 @@ predicate_parse(const char *str, int nr_parens, int nr_preds,
         op_stack = kmalloc_array(nr_parens, sizeof(*op_stack), GFP_KERNEL);
         if (!op_stack)
                 return ERR_PTR(-ENOMEM);
-        prog_stack = kmalloc_array(nr_preds, sizeof(*prog_stack), GFP_KERNEL);
+        prog_stack = kcalloc(nr_preds, sizeof(*prog_stack), GFP_KERNEL);
         if (!prog_stack) {
                 parse_error(pe, -ENOMEM, 0);
                 goto out_free;
@@ -579,7 +579,11 @@ predicate_parse(const char *str, int nr_parens, int nr_preds,
 out_free:
         kfree(op_stack);
         kfree(inverts);
-        kfree(prog_stack);
+        if (prog_stack) {
+                for (i = 0; prog_stack[i].pred; i++)
+                        kfree(prog_stack[i].pred);
+                kfree(prog_stack);
+        }
         return ERR_PTR(ret);
 }
 
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 7fca3457c705..ca6b0dff60c5 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -59,7 +59,7 @@
         C(NO_CLOSING_PAREN,     "No closing paren found"),              \
         C(SUBSYS_NOT_FOUND,     "Missing subsystem"),                   \
         C(INVALID_SUBSYS_EVENT, "Invalid subsystem or event name"),     \
-        C(INVALID_REF_KEY,      "Using variable references as keys not supported"), \
+        C(INVALID_REF_KEY,      "Using variable references in keys not supported"), \
         C(VAR_NOT_FOUND,        "Couldn't find variable"),              \
         C(FIELD_NOT_FOUND,      "Couldn't find field"),
 
@@ -1854,6 +1854,9 @@ static u64 hist_field_var_ref(struct hist_field *hist_field,
         struct hist_elt_data *elt_data;
         u64 var_val = 0;
 
+        if (WARN_ON_ONCE(!elt))
+                return var_val;
+
         elt_data = elt->private_data;
         var_val = elt_data->var_ref_vals[hist_field->var_ref_idx];
 
@@ -3582,14 +3585,20 @@ static bool cond_snapshot_update(struct trace_array *tr, void *cond_data)
         struct track_data *track_data = tr->cond_snapshot->cond_data;
         struct hist_elt_data *elt_data, *track_elt_data;
         struct snapshot_context *context = cond_data;
+        struct action_data *action;
         u64 track_val;
 
         if (!track_data)
                 return false;
 
+        action = track_data->action_data;
+
         track_val = get_track_val(track_data->hist_data, context->elt,
                                   track_data->action_data);
 
+        if (!action->track_data.check_val(track_data->track_val, track_val))
+                return false;
+
         track_data->track_val = track_val;
         memcpy(track_data->key, context->key, track_data->key_len);
 
@@ -4503,7 +4512,7 @@ static int create_key_field(struct hist_trigger_data *hist_data,
                         goto out;
                 }
 
-                if (hist_field->flags & HIST_FIELD_FL_VAR_REF) {
+                if (field_has_hist_vars(hist_field, 0)) {
                         hist_err(tr, HIST_ERR_INVALID_REF_KEY, errpos(field_str));
                         destroy_hist_field(hist_field, 0);
                         ret = -EINVAL;
diff --git a/kernel/trace/trace_kdb.c b/kernel/trace/trace_kdb.c
index 6c1ae6b752d1..cca65044c14c 100644
--- a/kernel/trace/trace_kdb.c
+++ b/kernel/trace/trace_kdb.c
@@ -37,12 +37,8 @@ static void ftrace_dump_buf(int skip_entries, long cpu_file)
         if (skip_entries)
                 kdb_printf("(skipping %d entries)\n", skip_entries);
 
-        /* reset all but tr, trace, and overruns */
-        memset(&iter.seq, 0,
-                   sizeof(struct trace_iterator) -
-                   offsetof(struct trace_iterator, seq));
+        trace_iterator_reset(&iter);
         iter.iter_flags |= TRACE_FILE_LAT_FMT;
-        iter.pos = -1;
 
         if (cpu_file == RING_BUFFER_ALL_CPUS) {
                 for_each_tracing_cpu(cpu) {