lkml.org 
[lkml]   [2019]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 26/44] perf record: Replace option --bpf-event with --no-bpf-event
    Date
    From: Song Liu <songliubraving@fb.com>

    Currently, monitoring of BPF programs through bpf_event is off by
    default for 'perf record'.

    To turn it on, the user need to use option "--bpf-event". As BPF gets
    wider adoption in different subsystems, this option becomes
    inconvenient.

    This patch makes bpf_event on by default, and adds option "--no-bpf-event"
    to turn it off. Since option --bpf-event is not released yet, it is safe
    to remove it.

    Signed-off-by: Song Liu <songliubraving@fb.com>
    Reviewed-by: Jiri Olsa <jolsa@kernel.org>
    Cc: Alexei Starovoitov <ast@kernel.org>
    Cc: Daniel Borkmann <daniel@iogearbox.net>
    Cc: kernel-team@fb.com
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stanislav Fomichev <sdf@google.com>
    Link: http://lkml.kernel.org/r/20190312053051.2690567-2-songliubraving@fb.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/builtin-record.c | 2 +-
    tools/perf/perf.h | 2 +-
    tools/perf/util/bpf-event.c | 2 +-
    tools/perf/util/evsel.c | 2 +-
    4 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
    index e7144a1c1c82..f29874192d3e 100644
    --- a/tools/perf/builtin-record.c
    +++ b/tools/perf/builtin-record.c
    @@ -1891,7 +1891,7 @@ static struct option __record_options[] = {
    OPT_BOOLEAN(0, "tail-synthesize", &record.opts.tail_synthesize,
    "synthesize non-sample events at the end of output"),
    OPT_BOOLEAN(0, "overwrite", &record.opts.overwrite, "use overwrite mode"),
    - OPT_BOOLEAN(0, "bpf-event", &record.opts.bpf_event, "record bpf events"),
    + OPT_BOOLEAN(0, "no-bpf-event", &record.opts.no_bpf_event, "record bpf events"),
    OPT_BOOLEAN(0, "strict-freq", &record.opts.strict_freq,
    "Fail if the specified frequency can't be used"),
    OPT_CALLBACK('F', "freq", &record.opts, "freq or 'max'",
    diff --git a/tools/perf/perf.h b/tools/perf/perf.h
    index b120e547ddc7..c59743def8d3 100644
    --- a/tools/perf/perf.h
    +++ b/tools/perf/perf.h
    @@ -66,7 +66,7 @@ struct record_opts {
    bool ignore_missing_thread;
    bool strict_freq;
    bool sample_id;
    - bool bpf_event;
    + bool no_bpf_event;
    unsigned int freq;
    unsigned int mmap_pages;
    unsigned int auxtrace_mmap_pages;
    diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c
    index 028c8ec1f62a..ea012b735a37 100644
    --- a/tools/perf/util/bpf-event.c
    +++ b/tools/perf/util/bpf-event.c
    @@ -187,7 +187,7 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_tool *tool,
    }

    /* Synthesize PERF_RECORD_BPF_EVENT */
    - if (opts->bpf_event) {
    + if (!opts->no_bpf_event) {
    *bpf_event = (struct bpf_event){
    .header = {
    .type = PERF_RECORD_BPF_EVENT,
    diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
    index 1a2023da5d9c..7835e05f0c0a 100644
    --- a/tools/perf/util/evsel.c
    +++ b/tools/perf/util/evsel.c
    @@ -1036,7 +1036,7 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts,
    attr->mmap2 = track && !perf_missing_features.mmap2;
    attr->comm = track;
    attr->ksymbol = track && !perf_missing_features.ksymbol;
    - attr->bpf_event = track && opts->bpf_event &&
    + attr->bpf_event = track && !opts->no_bpf_event &&
    !perf_missing_features.bpf_event;

    if (opts->record_namespaces)
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-03-21 19:56    [W:3.390 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site