Merge tag 'perf-urgent-for-mingo-4.16-20180205' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

- Fix 'period' and 'freq' handling for 'perf record', also
  related: add Add PERF_SAMPLE_PERIOD into PEBS_FREERUNNING_FLAGS
  in the x86 perf kernel driver (Jiri Olsa)

- Fix 'perf trace -i perf.data' callgraph handling (Ravi Bangoria)

- Synchronize tooling headers for asound, s390 and powerpc KVM,
  sched and x86 features (Arnaldo Carvalho de Melo)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

5 files changed, 18 insertions, 5 deletions

diff --git a/tools/perf/.gitignore b/tools/perf/.gitignore
index 643cc4ba6872..3e5135dded16 100644
--- a/tools/perf/.gitignore
+++ b/tools/perf/.gitignore
@@ -31,5 +31,6 @@ config.mak.autogen
 .config-detected
 util/intel-pt-decoder/inat-tables.c
 arch/*/include/generated/
+trace/beauty/generated/
 pmu-events/pmu-events.c
 pmu-events/jevents
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 65681a1a292a..bf4ca749d1ac 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -1566,7 +1566,8 @@ static struct option __record_options[] = {
         OPT_BOOLEAN_SET('T', "timestamp", &record.opts.sample_time,
                         &record.opts.sample_time_set,
                         "Record the sample timestamps"),
-        OPT_BOOLEAN('P', "period", &record.opts.period, "Record the sample period"),
+        OPT_BOOLEAN_SET('P', "period", &record.opts.period, &record.opts.period_set,
+                        "Record the sample period"),
         OPT_BOOLEAN('n', "no-samples", &record.opts.no_samples,
                     "don't sample"),
         OPT_BOOLEAN_SET('N', "no-buildid-cache", &record.no_buildid_cache,
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 17d11deeb88d..e7f1b182fc15 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -1661,9 +1661,12 @@ static int trace__resolve_callchain(struct trace *trace, struct perf_evsel *evse
                                     struct callchain_cursor *cursor)
 {
         struct addr_location al;
+        int max_stack = evsel->attr.sample_max_stack ?
+                        evsel->attr.sample_max_stack :
+                        trace->max_stack;
 
         if (machine__resolve(trace->host, &al, sample) < 0 ||
-            thread__resolve_callchain(al.thread, cursor, evsel, sample, NULL, NULL, evsel->attr.sample_max_stack))
+            thread__resolve_callchain(al.thread, cursor, evsel, sample, NULL, NULL, max_stack))
                 return -1;
 
         return 0;
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 2357f4ccc9c7..cfe46236a5e5 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -50,6 +50,7 @@ struct record_opts {
         bool         sample_time_set;
         bool         sample_cpu;
         bool         period;
+        bool         period_set;
         bool         running_time;
         bool         full_auxtrace;
         bool         auxtrace_snapshot_mode;
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 66fa45198a11..ff359c9ece2e 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -745,12 +745,14 @@ static void apply_config_terms(struct perf_evsel *evsel,
                         if (!(term->weak && opts->user_interval != ULLONG_MAX)) {
                                 attr->sample_period = term->val.period;
                                 attr->freq = 0;
+                                perf_evsel__reset_sample_bit(evsel, PERIOD);
                         }
                         break;
                 case PERF_EVSEL__CONFIG_TERM_FREQ:
                         if (!(term->weak && opts->user_freq != UINT_MAX)) {
                                 attr->sample_freq = term->val.freq;
                                 attr->freq = 1;
+                                perf_evsel__set_sample_bit(evsel, PERIOD);
                         }
                         break;
                 case PERF_EVSEL__CONFIG_TERM_TIME:
@@ -969,9 +971,6 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts,
         if (target__has_cpu(&opts->target) || opts->sample_cpu)
                 perf_evsel__set_sample_bit(evsel, CPU);
 
-        if (opts->period)
-                perf_evsel__set_sample_bit(evsel, PERIOD);
-
         /*
          * When the user explicitly disabled time don't force it here.
          */
@@ -1073,6 +1072,14 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts,
         apply_config_terms(evsel, opts, track);
 
         evsel->ignore_missing_thread = opts->ignore_missing_thread;
+
+        /* The --period option takes the precedence. */
+        if (opts->period_set) {
+                if (opts->period)
+                        perf_evsel__set_sample_bit(evsel, PERIOD);
+                else
+                        perf_evsel__reset_sample_bit(evsel, PERIOD);
+        }
 }
 
 static int perf_evsel__alloc_fd(struct perf_evsel *evsel, int ncpus, int nthreads)