lkml.org 
[lkml]   [2023]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/9] perf bpf filter: Add 'pid' sample data support
    Date
    The pid is special because it's saved in the PERF_SAMPLE_TID together.
    So it needs to differenciate tid and pid using the 'part' field in the
    perf bpf filter entry struct.

    Acked-by: Jiri Olsa <jolsa@kernel.org>
    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    ---
    tools/perf/util/bpf-filter.c | 4 +++-
    tools/perf/util/bpf-filter.h | 3 ++-
    tools/perf/util/bpf-filter.l | 11 ++++++++++-
    tools/perf/util/bpf-filter.y | 7 +++++--
    tools/perf/util/bpf_skel/sample-filter.h | 3 ++-
    tools/perf/util/bpf_skel/sample_filter.bpf.c | 5 ++++-
    6 files changed, 26 insertions(+), 7 deletions(-)

    diff --git a/tools/perf/util/bpf-filter.c b/tools/perf/util/bpf-filter.c
    index 7bd6f2e41513..743c69fd6cd4 100644
    --- a/tools/perf/util/bpf-filter.c
    +++ b/tools/perf/util/bpf-filter.c
    @@ -36,6 +36,7 @@ int perf_bpf_filter__prepare(struct evsel *evsel)
    list_for_each_entry(expr, &evsel->bpf_filters, list) {
    struct perf_bpf_filter_entry entry = {
    .op = expr->op,
    + .part = expr->part,
    .flags = expr->sample_flags,
    .value = expr->val,
    };
    @@ -76,7 +77,7 @@ u64 perf_bpf_filter__lost_count(struct evsel *evsel)
    return skel ? skel->bss->dropped : 0;
    }

    -struct perf_bpf_filter_expr *perf_bpf_filter_expr__new(unsigned long sample_flags,
    +struct perf_bpf_filter_expr *perf_bpf_filter_expr__new(unsigned long sample_flags, int part,
    enum perf_bpf_filter_op op,
    unsigned long val)
    {
    @@ -85,6 +86,7 @@ struct perf_bpf_filter_expr *perf_bpf_filter_expr__new(unsigned long sample_flag
    expr = malloc(sizeof(*expr));
    if (expr != NULL) {
    expr->sample_flags = sample_flags;
    + expr->part = part;
    expr->op = op;
    expr->val = val;
    }
    diff --git a/tools/perf/util/bpf-filter.h b/tools/perf/util/bpf-filter.h
    index f0c66764c6d0..3f8827bd965f 100644
    --- a/tools/perf/util/bpf-filter.h
    +++ b/tools/perf/util/bpf-filter.h
    @@ -9,6 +9,7 @@
    struct perf_bpf_filter_expr {
    struct list_head list;
    enum perf_bpf_filter_op op;
    + int part;
    unsigned long sample_flags;
    unsigned long val;
    };
    @@ -16,7 +17,7 @@ struct perf_bpf_filter_expr {
    struct evsel;

    #ifdef HAVE_BPF_SKEL
    -struct perf_bpf_filter_expr *perf_bpf_filter_expr__new(unsigned long sample_flags,
    +struct perf_bpf_filter_expr *perf_bpf_filter_expr__new(unsigned long sample_flags, int part,
    enum perf_bpf_filter_op op,
    unsigned long val);
    int perf_bpf_filter__parse(struct list_head *expr_head, const char *str);
    diff --git a/tools/perf/util/bpf-filter.l b/tools/perf/util/bpf-filter.l
    index f6c0b74ea285..ec12fc4d2ab8 100644
    --- a/tools/perf/util/bpf-filter.l
    +++ b/tools/perf/util/bpf-filter.l
    @@ -11,7 +11,15 @@

    static int sample(unsigned long sample_flag)
    {
    - perf_bpf_filter_lval.sample = sample_flag;
    + perf_bpf_filter_lval.sample.type = sample_flag;
    + perf_bpf_filter_lval.sample.part = 0;
    + return BFT_SAMPLE;
    +}
    +
    +static int sample_part(unsigned long sample_flag, int part)
    +{
    + perf_bpf_filter_lval.sample.type = sample_flag;
    + perf_bpf_filter_lval.sample.part = part;
    return BFT_SAMPLE;
    }

    @@ -56,6 +64,7 @@ ident [_a-zA-Z][_a-zA-Z0-9]+
    ip { return sample(PERF_SAMPLE_IP); }
    id { return sample(PERF_SAMPLE_ID); }
    tid { return sample(PERF_SAMPLE_TID); }
    +pid { return sample_part(PERF_SAMPLE_TID, 1); }
    cpu { return sample(PERF_SAMPLE_CPU); }
    time { return sample(PERF_SAMPLE_TIME); }
    addr { return sample(PERF_SAMPLE_ADDR); }
    diff --git a/tools/perf/util/bpf-filter.y b/tools/perf/util/bpf-filter.y
    index 13eca612ecca..0ca6532afd8d 100644
    --- a/tools/perf/util/bpf-filter.y
    +++ b/tools/perf/util/bpf-filter.y
    @@ -20,7 +20,10 @@ static void perf_bpf_filter_error(struct list_head *expr __maybe_unused,
    %union
    {
    unsigned long num;
    - unsigned long sample;
    + struct {
    + unsigned long type;
    + int part;
    + } sample;
    enum perf_bpf_filter_op op;
    struct perf_bpf_filter_expr *expr;
    }
    @@ -48,7 +51,7 @@ filter_term
    filter_term:
    BFT_SAMPLE BFT_OP BFT_NUM
    {
    - $$ = perf_bpf_filter_expr__new($1, $2, $3);
    + $$ = perf_bpf_filter_expr__new($1.type, $1.part, $2, $3);
    }

    %%
    diff --git a/tools/perf/util/bpf_skel/sample-filter.h b/tools/perf/util/bpf_skel/sample-filter.h
    index 862060bfda14..6b9fd554ad7b 100644
    --- a/tools/perf/util/bpf_skel/sample-filter.h
    +++ b/tools/perf/util/bpf_skel/sample-filter.h
    @@ -17,7 +17,8 @@ enum perf_bpf_filter_op {
    /* BPF map entry for filtering */
    struct perf_bpf_filter_entry {
    enum perf_bpf_filter_op op;
    - __u64 flags;
    + __u32 part; /* sub-sample type info when it has multiple values */
    + __u64 flags; /* perf sample type flags */
    __u64 value;
    };

    diff --git a/tools/perf/util/bpf_skel/sample_filter.bpf.c b/tools/perf/util/bpf_skel/sample_filter.bpf.c
    index c07256279c3e..dddf38c27bb7 100644
    --- a/tools/perf/util/bpf_skel/sample_filter.bpf.c
    +++ b/tools/perf/util/bpf_skel/sample_filter.bpf.c
    @@ -40,7 +40,10 @@ static inline __u64 perf_get_sample(struct bpf_perf_event_data_kern *kctx,
    case PERF_SAMPLE_ID:
    return kctx->data->id;
    case PERF_SAMPLE_TID:
    - return kctx->data->tid_entry.tid;
    + if (entry->part)
    + return kctx->data->tid_entry.pid;
    + else
    + return kctx->data->tid_entry.tid;
    case PERF_SAMPLE_CPU:
    return kctx->data->cpu_entry.cpu;
    case PERF_SAMPLE_TIME:
    --
    2.40.0.rc1.284.g88254d51c5-goog
    \
     
     \ /
      Last update: 2023-03-27 00:48    [W:6.430 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site