From nobody Fri Feb 13 16:35:59 2026 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E8DA84D23 for ; Fri, 24 May 2024 20:52:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716583969; cv=none; b=jrYgPCiQfhbXWzXIJ0IRVQu5MXlTi+HQex/87P3xddO2Xkj8Af8/+02Hl7jbwm0nb9hyhminRSpt6aK6/p1RH7NYcYzFZCOlFgfA3Z8bbg7Chy0+6K3a459228G4/IATqu6zDIOFGluni+cT7b/00uOZppcjhHeZKieRQaCjptI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716583969; c=relaxed/simple; bh=ZnGq+U2OIJc8CFOxYnwHINc8fAzFLeXXKEEzqgA1xQ4=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=HSt5s4TVHl36i+CWKGByoAd/X190zWYtSSrwq36DF6uE6FXkKwxh2mQ63rL2ASo1nndk+eZcgJeMKnHaPP4QhttpO8VC0Q8vDZ+8nwQChkYOlhef9eq29pQyLUdNL2wWXsPdt0j0Bm1mRjvHi6BjJrASwCV16UwcG+JBOx+W5+g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=wX/EEv5u; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="wX/EEv5u" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-df4dc93d0d3so1186772276.2 for ; Fri, 24 May 2024 13:52:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1716583967; x=1717188767; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=0tdgyhrssiD6flV8LyTViKC4JwWvZK4NlD2rV/pZIIc=; b=wX/EEv5uskHSSf6O+CtP+Qxl0vjSAVZYWfDKOCoTBLz85AY1ar867UAMzE/HfkmTTW izpEjTbccov18WwXdGJvFuPOe49J82HfdSWooP0fetedcVa7jK02CAVERuLq80qRfgpE SOhajhV7kVDItV1RS0aPH1xKxQSUWv7sbF0+qvYeEnELgiciW0JTxgzlDUWXKAnAhlLT IyMMlzv/zcyXFELTADVVQ7syYAX29i5CG8Iev+IHCVkE1fdCq0Igh/f8QzKzu8z0asSY oJ4lTFQmi0kqZems6rxIQUrzQD81xS+4pdUR2EGwaDF7HYfC7wDBWUO/2DDYKQs3opei ycIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716583967; x=1717188767; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0tdgyhrssiD6flV8LyTViKC4JwWvZK4NlD2rV/pZIIc=; b=qVTN9GSOHrDIHEPutzc7Z2YcoLcLyVQluKEV0z/oBVWa2rBxbuEgT9ZJWVWBmJAI67 jQa6DHR65q+aaaAb1l37KV+scE+EvZH/MSFBRlsyxj+Vf0gd8h7z+TB2v6zVl2BZhdt0 c3BLKAyf9fL7V3Xfvl2f6RzdDYeh8T7j+Xwtnoa7n/8Rmt6rgxW7IZbwnpyxnVayS0Za eABeDoRBX9klBi7GO1ITk/HwcVEb7wyVgZZKqnIUXNppHuHqerDdcyJLF0boykQR4tXD PINRdbgD0sB2JQNq9z5bKHtwIvsn7Da3TFuWkVzssaDjGsUpLd2oFqPamf54wmtQ0LHq V8Ag== X-Forwarded-Encrypted: i=1; AJvYcCV5A02b/IeSQKJtgMVSeXu2QYorrrAMOErrs5IBfmYK/D3oOI5bOhKa8mM4CvA9pNvR0DUdeezASlJYIkSmVU3ILgnE99mdTZgZ+nSC X-Gm-Message-State: AOJu0YzcRVy62geNTLpJY9ZMqgF8lf4zInbQyrvXA5kGVsThbCEwtiMU CL6gnGK33fFNsv4TsY0b0Pv6YDZoi6cav5T2YvVKOyooBeKEiY6XvWC4xIWSC9m642/BioejWbo xQXbykQ== X-Google-Smtp-Source: AGHT+IHRrkrhfOHz727Jq54EC9Dwhu9S0ve/jiPvYQIW2Phs3meGo3PT1Jured7gyKHKyacvfszbEe01A4Zz X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b0b5:95af:a29:375e]) (user=irogers job=sendgmr) by 2002:a05:6902:2b04:b0:de5:2694:45ba with SMTP id 3f1490d57ef6-df772051f6dmr924326276.0.1716583966720; Fri, 24 May 2024 13:52:46 -0700 (PDT) Date: Fri, 24 May 2024 13:52:25 -0700 In-Reply-To: <20240524205227.244375-1-irogers@google.com> Message-Id: <20240524205227.244375-2-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240524205227.244375-1-irogers@google.com> X-Mailer: git-send-email 2.45.1.288.g0e0cd299f1-goog Subject: [PATCH v3 1/3] perf bpf filter: Give terms their own enum From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Changbin Du , Yang Jihong , Andrii Nakryiko , John Fastabend , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Give the term types their own enum so that additional terms can be added that don't correspond to a PERF_SAMPLE_xx flag. The term values are numerically ascending rather than bit field positions, this means they need translating to a PERF_SAMPLE_xx bit field in certain places using a shift. Signed-off-by: Ian Rogers --- tools/perf/util/bpf-filter.c | 28 ++++---- tools/perf/util/bpf-filter.h | 5 +- tools/perf/util/bpf-filter.l | 64 +++++++++--------- tools/perf/util/bpf-filter.y | 7 +- tools/perf/util/bpf_skel/sample-filter.h | 37 ++++++++++- tools/perf/util/bpf_skel/sample_filter.bpf.c | 69 +++++++++++++++----- 6 files changed, 141 insertions(+), 69 deletions(-) diff --git a/tools/perf/util/bpf-filter.c b/tools/perf/util/bpf-filter.c index b51544996046..f10148623a8e 100644 --- a/tools/perf/util/bpf-filter.c +++ b/tools/perf/util/bpf-filter.c @@ -17,11 +17,11 @@ =20 #define FD(e, x, y) (*(int *)xyarray__entry(e->core.fd, x, y)) =20 -#define __PERF_SAMPLE_TYPE(st, opt) { st, #st, opt } -#define PERF_SAMPLE_TYPE(_st, opt) __PERF_SAMPLE_TYPE(PERF_SAMPLE_##_st, o= pt) +#define __PERF_SAMPLE_TYPE(tt, st, opt) { tt, #st, opt } +#define PERF_SAMPLE_TYPE(_st, opt) __PERF_SAMPLE_TYPE(PBF_TERM_##_st, PERF= _SAMPLE_##_st, opt) =20 static const struct perf_sample_info { - u64 type; + enum perf_bpf_filter_term type; const char *name; const char *option; } sample_table[] =3D { @@ -44,12 +44,12 @@ static const struct perf_sample_info { PERF_SAMPLE_TYPE(DATA_PAGE_SIZE, "--data-page-size"), }; =20 -static const struct perf_sample_info *get_sample_info(u64 flags) +static const struct perf_sample_info *get_sample_info(enum perf_bpf_filter= _term type) { size_t i; =20 for (i =3D 0; i < ARRAY_SIZE(sample_table); i++) { - if (sample_table[i].type =3D=3D flags) + if (sample_table[i].type =3D=3D type) return &sample_table[i]; } return NULL; @@ -59,7 +59,8 @@ static int check_sample_flags(struct evsel *evsel, struct= perf_bpf_filter_expr * { const struct perf_sample_info *info; =20 - if (evsel->core.attr.sample_type & expr->sample_flags) + if (expr->term >=3D PBF_TERM_SAMPLE_START && expr->term <=3D PBF_TERM_SAM= PLE_END && + (evsel->core.attr.sample_type & (1 << (expr->term - PBF_TERM_SAMPLE_S= TART)))) return 0; =20 if (expr->op =3D=3D PBF_OP_GROUP_BEGIN) { @@ -72,10 +73,10 @@ static int check_sample_flags(struct evsel *evsel, stru= ct perf_bpf_filter_expr * return 0; } =20 - info =3D get_sample_info(expr->sample_flags); + info =3D get_sample_info(expr->term); if (info =3D=3D NULL) { - pr_err("Error: %s event does not have sample flags %lx\n", - evsel__name(evsel), expr->sample_flags); + pr_err("Error: %s event does not have sample flags %d\n", + evsel__name(evsel), expr->term); return -1; } =20 @@ -105,7 +106,7 @@ int perf_bpf_filter__prepare(struct evsel *evsel) struct perf_bpf_filter_entry entry =3D { .op =3D expr->op, .part =3D expr->part, - .flags =3D expr->sample_flags, + .term =3D expr->term, .value =3D expr->val, }; =20 @@ -122,7 +123,7 @@ int perf_bpf_filter__prepare(struct evsel *evsel) struct perf_bpf_filter_entry group_entry =3D { .op =3D group->op, .part =3D group->part, - .flags =3D group->sample_flags, + .term =3D group->term, .value =3D group->val, }; bpf_map_update_elem(fd, &i, &group_entry, BPF_ANY); @@ -173,7 +174,8 @@ u64 perf_bpf_filter__lost_count(struct evsel *evsel) return skel ? skel->bss->dropped : 0; } =20 -struct perf_bpf_filter_expr *perf_bpf_filter_expr__new(unsigned long sampl= e_flags, int part, +struct perf_bpf_filter_expr *perf_bpf_filter_expr__new(enum perf_bpf_filte= r_term term, + int part, enum perf_bpf_filter_op op, unsigned long val) { @@ -181,7 +183,7 @@ struct perf_bpf_filter_expr *perf_bpf_filter_expr__new(= unsigned long sample_flag =20 expr =3D malloc(sizeof(*expr)); if (expr !=3D NULL) { - expr->sample_flags =3D sample_flags; + expr->term =3D term; expr->part =3D part; expr->op =3D op; expr->val =3D val; diff --git a/tools/perf/util/bpf-filter.h b/tools/perf/util/bpf-filter.h index 7afd159411b8..cd6764442c16 100644 --- a/tools/perf/util/bpf-filter.h +++ b/tools/perf/util/bpf-filter.h @@ -11,14 +11,15 @@ struct perf_bpf_filter_expr { struct list_head groups; enum perf_bpf_filter_op op; int part; - unsigned long sample_flags; + enum perf_bpf_filter_term term; unsigned long val; }; =20 struct evsel; =20 #ifdef HAVE_BPF_SKEL -struct perf_bpf_filter_expr *perf_bpf_filter_expr__new(unsigned long sampl= e_flags, int part, +struct perf_bpf_filter_expr *perf_bpf_filter_expr__new(enum perf_bpf_filte= r_term term, + 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 d4ff0f1345cd..62c959813466 100644 --- a/tools/perf/util/bpf-filter.l +++ b/tools/perf/util/bpf-filter.l @@ -9,16 +9,16 @@ #include "bpf-filter.h" #include "bpf-filter-bison.h" =20 -static int sample(unsigned long sample_flag) +static int sample(enum perf_bpf_filter_term term) { - perf_bpf_filter_lval.sample.type =3D sample_flag; + perf_bpf_filter_lval.sample.term =3D term; perf_bpf_filter_lval.sample.part =3D 0; return BFT_SAMPLE; } =20 -static int sample_part(unsigned long sample_flag, int part) +static int sample_part(enum perf_bpf_filter_term term, int part) { - perf_bpf_filter_lval.sample.type =3D sample_flag; + perf_bpf_filter_lval.sample.term =3D term; perf_bpf_filter_lval.sample.part =3D part; return BFT_SAMPLE; } @@ -67,34 +67,34 @@ ident [_a-zA-Z][_a-zA-Z0-9]+ {num_hex} { return value(16); } {space} { } =20 -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); } -period { return sample(PERF_SAMPLE_PERIOD); } -txn { return sample(PERF_SAMPLE_TRANSACTION); } -weight { return sample(PERF_SAMPLE_WEIGHT); } -weight1 { return sample_part(PERF_SAMPLE_WEIGHT_STRUCT, 1); } -weight2 { return sample_part(PERF_SAMPLE_WEIGHT_STRUCT, 2); } -weight3 { return sample_part(PERF_SAMPLE_WEIGHT_STRUCT, 3); } -ins_lat { return sample_part(PERF_SAMPLE_WEIGHT_STRUCT, 2); } /* alias fo= r weight2 */ -p_stage_cyc { return sample_part(PERF_SAMPLE_WEIGHT_STRUCT, 3); } /* alias= for weight3 */ -retire_lat { return sample_part(PERF_SAMPLE_WEIGHT_STRUCT, 3); } /* alias = for weight3 */ -phys_addr { return sample(PERF_SAMPLE_PHYS_ADDR); } -code_pgsz { return sample(PERF_SAMPLE_CODE_PAGE_SIZE); } -data_pgsz { return sample(PERF_SAMPLE_DATA_PAGE_SIZE); } -mem_op { return sample_part(PERF_SAMPLE_DATA_SRC, 1); } -mem_lvlnum { return sample_part(PERF_SAMPLE_DATA_SRC, 2); } -mem_lvl { return sample_part(PERF_SAMPLE_DATA_SRC, 2); } /* alias for mem= _lvlnum */ -mem_snoop { return sample_part(PERF_SAMPLE_DATA_SRC, 3); } /* include snoo= px */ -mem_remote { return sample_part(PERF_SAMPLE_DATA_SRC, 4); } -mem_lock { return sample_part(PERF_SAMPLE_DATA_SRC, 5); } -mem_dtlb { return sample_part(PERF_SAMPLE_DATA_SRC, 6); } -mem_blk { return sample_part(PERF_SAMPLE_DATA_SRC, 7); } -mem_hops { return sample_part(PERF_SAMPLE_DATA_SRC, 8); } +ip { return sample(PBF_TERM_IP); } +id { return sample(PBF_TERM_ID); } +tid { return sample(PBF_TERM_TID); } +pid { return sample_part(PBF_TERM_TID, 1); } +cpu { return sample(PBF_TERM_CPU); } +time { return sample(PBF_TERM_TIME); } +addr { return sample(PBF_TERM_ADDR); } +period { return sample(PBF_TERM_PERIOD); } +txn { return sample(PBF_TERM_TRANSACTION); } +weight { return sample(PBF_TERM_WEIGHT); } +weight1 { return sample_part(PBF_TERM_WEIGHT_STRUCT, 1); } +weight2 { return sample_part(PBF_TERM_WEIGHT_STRUCT, 2); } +weight3 { return sample_part(PBF_TERM_WEIGHT_STRUCT, 3); } +ins_lat { return sample_part(PBF_TERM_WEIGHT_STRUCT, 2); } /* alias for w= eight2 */ +p_stage_cyc { return sample_part(PBF_TERM_WEIGHT_STRUCT, 3); } /* alias fo= r weight3 */ +retire_lat { return sample_part(PBF_TERM_WEIGHT_STRUCT, 3); } /* alias for= weight3 */ +phys_addr { return sample(PBF_TERM_PHYS_ADDR); } +code_pgsz { return sample(PBF_TERM_CODE_PAGE_SIZE); } +data_pgsz { return sample(PBF_TERM_DATA_PAGE_SIZE); } +mem_op { return sample_part(PBF_TERM_DATA_SRC, 1); } +mem_lvlnum { return sample_part(PBF_TERM_DATA_SRC, 2); } +mem_lvl { return sample_part(PBF_TERM_DATA_SRC, 2); } /* alias for mem_lv= lnum */ +mem_snoop { return sample_part(PBF_TERM_DATA_SRC, 3); } /* include snoopx = */ +mem_remote { return sample_part(PBF_TERM_DATA_SRC, 4); } +mem_lock { return sample_part(PBF_TERM_DATA_SRC, 5); } +mem_dtlb { return sample_part(PBF_TERM_DATA_SRC, 6); } +mem_blk { return sample_part(PBF_TERM_DATA_SRC, 7); } +mem_hops { return sample_part(PBF_TERM_DATA_SRC, 8); } =20 "=3D=3D" { return operator(PBF_OP_EQ); } "!=3D" { return operator(PBF_OP_NEQ); } diff --git a/tools/perf/util/bpf-filter.y b/tools/perf/util/bpf-filter.y index 0e4d6de3c2ad..0c56fccb8874 100644 --- a/tools/perf/util/bpf-filter.y +++ b/tools/perf/util/bpf-filter.y @@ -27,7 +27,7 @@ static void perf_bpf_filter_error(struct list_head *expr = __maybe_unused, { unsigned long num; struct { - unsigned long type; + enum perf_bpf_filter_term term; int part; } sample; enum perf_bpf_filter_op op; @@ -62,7 +62,8 @@ filter_term BFT_LOGICAL_OR filter_expr if ($1->op =3D=3D PBF_OP_GROUP_BEGIN) { expr =3D $1; } else { - expr =3D perf_bpf_filter_expr__new(0, 0, PBF_OP_GROUP_BEGIN, 1); + expr =3D perf_bpf_filter_expr__new(PBF_TERM_NONE, /*part=3D*/0, + PBF_OP_GROUP_BEGIN, /*val=3D*/1); list_add_tail(&$1->list, &expr->groups); } expr->val++; @@ -78,7 +79,7 @@ filter_expr filter_expr: BFT_SAMPLE BFT_OP BFT_NUM { - $$ =3D perf_bpf_filter_expr__new($1.type, $1.part, $2, $3); + $$ =3D perf_bpf_filter_expr__new($1.term, $1.part, $2, $3); } =20 %% diff --git a/tools/perf/util/bpf_skel/sample-filter.h b/tools/perf/util/bpf= _skel/sample-filter.h index 2e96e1ab084a..25f780022951 100644 --- a/tools/perf/util/bpf_skel/sample-filter.h +++ b/tools/perf/util/bpf_skel/sample-filter.h @@ -16,12 +16,45 @@ enum perf_bpf_filter_op { PBF_OP_GROUP_END, }; =20 +enum perf_bpf_filter_term { + /* No term is in use. */ + PBF_TERM_NONE =3D 0, + /* Terms that correspond to PERF_SAMPLE_xx values. */ + PBF_TERM_SAMPLE_START =3D PBF_TERM_NONE + 1, + PBF_TERM_IP =3D PBF_TERM_SAMPLE_START + 0, /* SAMPLE_IP =3D 1U << 0 */ + PBF_TERM_TID =3D PBF_TERM_SAMPLE_START + 1, /* SAMPLE_TID =3D 1U << 1 */ + PBF_TERM_TIME =3D PBF_TERM_SAMPLE_START + 2, /* SAMPLE_TIME =3D 1U << 2 = */ + PBF_TERM_ADDR =3D PBF_TERM_SAMPLE_START + 3, /* SAMPLE_ADDR =3D 1U << 3 = */ + __PBF_UNUSED_TERM4 =3D PBF_TERM_SAMPLE_START + 4, /* SAMPLE_READ =3D 1U <= < 4 */ + __PBF_UNUSED_TERM5 =3D PBF_TERM_SAMPLE_START + 5, /* SAMPLE_CALLCHAIN =3D= 1U << 5 */ + PBF_TERM_ID =3D PBF_TERM_SAMPLE_START + 6, /* SAMPLE_ID =3D 1U << 6 */ + PBF_TERM_CPU =3D PBF_TERM_SAMPLE_START + 7, /* SAMPLE_CPU =3D 1U << 7 */ + PBF_TERM_PERIOD =3D PBF_TERM_SAMPLE_START + 8, /* SAMPLE_PERIOD =3D 1U <= < 8 */ + __PBF_UNUSED_TERM9 =3D PBF_TERM_SAMPLE_START + 9, /* SAMPLE_STREAM_ID =3D= 1U << 9 */ + __PBF_UNUSED_TERM10 =3D PBF_TERM_SAMPLE_START + 10, /* SAMPLE_RAW =3D 1U = << 10 */ + __PBF_UNUSED_TERM11 =3D PBF_TERM_SAMPLE_START + 11, /* SAMPLE_BRANCH_STAC= K =3D 1U << 11 */ + __PBF_UNUSED_TERM12 =3D PBF_TERM_SAMPLE_START + 12, /* SAMPLE_REGS_USER = =3D 1U << 12 */ + __PBF_UNUSED_TERM13 =3D PBF_TERM_SAMPLE_START + 13, /* SAMPLE_STACK_USER = =3D 1U << 13 */ + PBF_TERM_WEIGHT =3D PBF_TERM_SAMPLE_START + 14, /* SAMPLE_WEIGHT =3D 1U = << 14 */ + PBF_TERM_DATA_SRC =3D PBF_TERM_SAMPLE_START + 15, /* SAMPLE_DATA_SRC =3D = 1U << 15 */ + __PBF_UNUSED_TERM16 =3D PBF_TERM_SAMPLE_START + 16, /* SAMPLE_IDENTIFIER = =3D 1U << 16 */ + PBF_TERM_TRANSACTION =3D PBF_TERM_SAMPLE_START + 17, /* SAMPLE_TRANSACTIO= N =3D 1U << 17 */ + __PBF_UNUSED_TERM18 =3D PBF_TERM_SAMPLE_START + 18, /* SAMPLE_REGS_INTR = =3D 1U << 18 */ + PBF_TERM_PHYS_ADDR =3D PBF_TERM_SAMPLE_START + 19, /* SAMPLE_PHYS_ADDR = =3D 1U << 19 */ + __PBF_UNUSED_TERM20 =3D PBF_TERM_SAMPLE_START + 20, /* SAMPLE_AUX =3D 1U = << 20 */ + __PBF_UNUSED_TERM21 =3D PBF_TERM_SAMPLE_START + 21, /* SAMPLE_CGROUP =3D = 1U << 21 */ + PBF_TERM_DATA_PAGE_SIZE =3D PBF_TERM_SAMPLE_START + 22, /* SAMPLE_DATA_PA= GE_SIZE =3D 1U << 22 */ + PBF_TERM_CODE_PAGE_SIZE =3D PBF_TERM_SAMPLE_START + 23, /* SAMPLE_CODE_PA= GE_SIZE =3D 1U << 23 */ + PBF_TERM_WEIGHT_STRUCT =3D PBF_TERM_SAMPLE_START + 24, /* SAMPLE_WEIGHT_S= TRUCT =3D 1U << 24 */ + PBF_TERM_SAMPLE_END =3D PBF_TERM_WEIGHT_STRUCT, +}; + /* BPF map entry for filtering */ struct perf_bpf_filter_entry { enum perf_bpf_filter_op op; __u32 part; /* sub-sample type info when it has multiple values */ - __u64 flags; /* perf sample type flags */ + enum perf_bpf_filter_term term; __u64 value; }; =20 -#endif /* PERF_UTIL_BPF_SKEL_SAMPLE_FILTER_H */ \ No newline at end of file +#endif /* PERF_UTIL_BPF_SKEL_SAMPLE_FILTER_H */ diff --git a/tools/perf/util/bpf_skel/sample_filter.bpf.c b/tools/perf/util= /bpf_skel/sample_filter.bpf.c index fb94f5280626..5ac1778ff66e 100644 --- a/tools/perf/util/bpf_skel/sample_filter.bpf.c +++ b/tools/perf/util/bpf_skel/sample_filter.bpf.c @@ -48,31 +48,54 @@ static inline __u64 perf_get_sample(struct bpf_perf_eve= nt_data_kern *kctx, { struct perf_sample_data___new *data =3D (void *)kctx->data; =20 - if (!bpf_core_field_exists(data->sample_flags) || - (data->sample_flags & entry->flags) =3D=3D 0) + if (!bpf_core_field_exists(data->sample_flags)) return 0; =20 - switch (entry->flags) { - case PERF_SAMPLE_IP: +#define BUILD_CHECK_SAMPLE(x) \ + _Static_assert((1 << (PBF_TERM_##x - PBF_TERM_SAMPLE_START)) =3D=3D PERF_= SAMPLE_##x, \ + "Mismatched PBF term to sample bit " #x) + BUILD_CHECK_SAMPLE(IP); + BUILD_CHECK_SAMPLE(TID); + BUILD_CHECK_SAMPLE(TIME); + BUILD_CHECK_SAMPLE(ADDR); + BUILD_CHECK_SAMPLE(ID); + BUILD_CHECK_SAMPLE(CPU); + BUILD_CHECK_SAMPLE(PERIOD); + BUILD_CHECK_SAMPLE(WEIGHT); + BUILD_CHECK_SAMPLE(DATA_SRC); + BUILD_CHECK_SAMPLE(TRANSACTION); + BUILD_CHECK_SAMPLE(PHYS_ADDR); + BUILD_CHECK_SAMPLE(DATA_PAGE_SIZE); + BUILD_CHECK_SAMPLE(CODE_PAGE_SIZE); + BUILD_CHECK_SAMPLE(WEIGHT_STRUCT); +#undef BUILD_CHECK_SAMPLE + + /* For sample terms check the sample bit is set. */ + if (entry->term >=3D PBF_TERM_SAMPLE_START && entry->term <=3D PBF_TERM_S= AMPLE_END && + (data->sample_flags & (1 << (entry->term - PBF_TERM_SAMPLE_START))) = =3D=3D 0) + return 0; + + switch (entry->term) { + case PBF_TERM_IP: return kctx->data->ip; - case PERF_SAMPLE_ID: + case PBF_TERM_ID: return kctx->data->id; - case PERF_SAMPLE_TID: + case PBF_TERM_TID: if (entry->part) return kctx->data->tid_entry.pid; else return kctx->data->tid_entry.tid; - case PERF_SAMPLE_CPU: + case PBF_TERM_CPU: return kctx->data->cpu_entry.cpu; - case PERF_SAMPLE_TIME: + case PBF_TERM_TIME: return kctx->data->time; - case PERF_SAMPLE_ADDR: + case PBF_TERM_ADDR: return kctx->data->addr; - case PERF_SAMPLE_PERIOD: + case PBF_TERM_PERIOD: return kctx->data->period; - case PERF_SAMPLE_TRANSACTION: + case PBF_TERM_TRANSACTION: return kctx->data->txn; - case PERF_SAMPLE_WEIGHT_STRUCT: + case PBF_TERM_WEIGHT_STRUCT: if (entry->part =3D=3D 1) return kctx->data->weight.var1_dw; if (entry->part =3D=3D 2) @@ -80,15 +103,15 @@ static inline __u64 perf_get_sample(struct bpf_perf_ev= ent_data_kern *kctx, if (entry->part =3D=3D 3) return kctx->data->weight.var3_w; /* fall through */ - case PERF_SAMPLE_WEIGHT: + case PBF_TERM_WEIGHT: return kctx->data->weight.full; - case PERF_SAMPLE_PHYS_ADDR: + case PBF_TERM_PHYS_ADDR: return kctx->data->phys_addr; - case PERF_SAMPLE_CODE_PAGE_SIZE: + case PBF_TERM_CODE_PAGE_SIZE: return kctx->data->code_page_size; - case PERF_SAMPLE_DATA_PAGE_SIZE: + case PBF_TERM_DATA_PAGE_SIZE: return kctx->data->data_page_size; - case PERF_SAMPLE_DATA_SRC: + case PBF_TERM_DATA_SRC: if (entry->part =3D=3D 1) return kctx->data->data_src.mem_op; if (entry->part =3D=3D 2) @@ -117,6 +140,18 @@ static inline __u64 perf_get_sample(struct bpf_perf_ev= ent_data_kern *kctx, } /* return the whole word */ return kctx->data->data_src.val; + case PBF_TERM_NONE: + case __PBF_UNUSED_TERM4: + case __PBF_UNUSED_TERM5: + case __PBF_UNUSED_TERM9: + case __PBF_UNUSED_TERM10: + case __PBF_UNUSED_TERM11: + case __PBF_UNUSED_TERM12: + case __PBF_UNUSED_TERM13: + case __PBF_UNUSED_TERM16: + case __PBF_UNUSED_TERM18: + case __PBF_UNUSED_TERM20: + case __PBF_UNUSED_TERM21: default: break; } --=20 2.45.1.288.g0e0cd299f1-goog