Merge branch 'perf/core-v3' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into perf/hw_breakpoints

Pull AMD range breakpoints support from Frederic Weisbecker:

" - Extend breakpoint tools and core to support address range through perf
    event with initial backend support for AMD extended breakpoints.

    Syntax is:

           perf record -e mem:addr/len:type

    For example set write breakpoint from 0x1000 to 0x1200 (0x1000 + 512)

           perf record -e mem:0x1000/512:w

 - Clean up a bit breakpoint code validation

 It has been acked by Jiri and Oleg. "

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

1 files changed, 25 insertions, 0 deletions

diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index b65eb0507b38..3c0f3d4fb021 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -1132,6 +1132,10 @@ kvm_events_record(struct perf_kvm_stat *kvm, int argc, const char **argv)
                 "-m", "1024",
                 "-c", "1",
         };
+        const char * const kvm_stat_record_usage[] = {
+                "perf kvm stat record [<options>]",
+                NULL
+        };
         const char * const *events_tp;
         events_tp_size = 0;
 
@@ -1159,6 +1163,27 @@ kvm_events_record(struct perf_kvm_stat *kvm, int argc, const char **argv)
         for (j = 1; j < (unsigned int)argc; j++, i++)
                 rec_argv[i] = argv[j];
 
+        set_option_flag(record_options, 'e', "event", PARSE_OPT_HIDDEN);
+        set_option_flag(record_options, 0, "filter", PARSE_OPT_HIDDEN);
+        set_option_flag(record_options, 'R', "raw-samples", PARSE_OPT_HIDDEN);
+
+        set_option_flag(record_options, 'F', "freq", PARSE_OPT_DISABLED);
+        set_option_flag(record_options, 0, "group", PARSE_OPT_DISABLED);
+        set_option_flag(record_options, 'g', NULL, PARSE_OPT_DISABLED);
+        set_option_flag(record_options, 0, "call-graph", PARSE_OPT_DISABLED);
+        set_option_flag(record_options, 'd', "data", PARSE_OPT_DISABLED);
+        set_option_flag(record_options, 'T', "timestamp", PARSE_OPT_DISABLED);
+        set_option_flag(record_options, 'P', "period", PARSE_OPT_DISABLED);
+        set_option_flag(record_options, 'n', "no-samples", PARSE_OPT_DISABLED);
+        set_option_flag(record_options, 'N', "no-buildid-cache", PARSE_OPT_DISABLED);
+        set_option_flag(record_options, 'B', "no-buildid", PARSE_OPT_DISABLED);
+        set_option_flag(record_options, 'G', "cgroup", PARSE_OPT_DISABLED);
+        set_option_flag(record_options, 'b', "branch-any", PARSE_OPT_DISABLED);
+        set_option_flag(record_options, 'j', "branch-filter", PARSE_OPT_DISABLED);
+        set_option_flag(record_options, 'W', "weight", PARSE_OPT_DISABLED);
+        set_option_flag(record_options, 0, "transaction", PARSE_OPT_DISABLED);
+
+        record_usage = kvm_stat_record_usage;
         return cmd_record(i, rec_argv, NULL);
 }