From nobody Fri Dec 19 17:17:31 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83ADC16DEBB; Fri, 21 Jun 2024 22:23:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719008639; cv=none; b=X0nJXCRGsaXfY2GvWnz5wLWlc35tuCIUqV6Mdo2wmkVVFnZGUCfkzAZRgHer173ZgrxhvjBo9bLSzCeR6n2cGruI8gvh6sNx7pwshTCqWYUy2TCp9GODjgHkftfbqwCokO+eO0l/z+BOqpBbTjBmSfS0TYFs9U+296FGElI5MAc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719008639; c=relaxed/simple; bh=zHc83XrbJTNe36n7sL4yUh7EnP4zcww8T8v44+CNjPg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ioa1a+7cfyWgc7ayh7sNHmi6WOu3gwK8BG13hqIHG1X2+gfkgQIw6TmIm1HMoQ13TF9zDeZNlOb9vjSwe+b39Tm8jprhAsrN6ZKZpUVUFVJRLd5rEJ/3ryRD3g567Tsuxx5CtGu5ea8zZa6kREb7LSiTA4zVFHZ/9UdmjBEKb4c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=npLgbE8J; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="npLgbE8J" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC5ABC4AF0C; Fri, 21 Jun 2024 22:23:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719008639; bh=zHc83XrbJTNe36n7sL4yUh7EnP4zcww8T8v44+CNjPg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=npLgbE8JUMm5uphArcqmOuAaG6566W/93P3wPAxwqze5cxlIIoBiHR4J4Y8+/m0yE IiKirw8srkGf4rBRjGWvkv0edm7xhZroyJwnkdooQLQHKP0MI35gmByGLH6+pS/T+z DgMZYxHR7WHN/QppVoRTpOFjwIhpKJM2G7daaxAEXBNdUsaNwDJ97ulDOSRyFRm4+2 aH2jDupGKIxrghqQgIbPzVOkcxvyjm3IVPDjO2mDU0ib/Z1C89bMVIAc7UcIQYwIUI FX/iC995e3AMBHJD3I/4jj2nxOnsDIboUeO2asjPBmP6fND5z+eg+Cb6Mbv+0UxdWo KpjHwME4TsV6w== From: Namhyung Kim To: Arnaldo Carvalho de Melo , Ian Rogers , Kan Liang Cc: Jiri Olsa , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org Subject: [PATCH 1/8] perf bpf-filter: Make filters map a single entry hashmap Date: Fri, 21 Jun 2024 15:23:50 -0700 Message-ID: <20240621222357.717374-2-namhyung@kernel.org> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog In-Reply-To: <20240621222357.717374-1-namhyung@kernel.org> References: <20240621222357.717374-1-namhyung@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" And the value is now an array. This is to support multiple filter entries in the map later. No functional changes intended. Signed-off-by: Namhyung Kim --- tools/perf/util/bpf-filter.c | 81 ++++++++++++++------ tools/perf/util/bpf_skel/sample-filter.h | 1 + tools/perf/util/bpf_skel/sample_filter.bpf.c | 39 +++++----- 3 files changed, 78 insertions(+), 43 deletions(-) diff --git a/tools/perf/util/bpf-filter.c b/tools/perf/util/bpf-filter.c index 04f98b6bb291..2510832d83f9 100644 --- a/tools/perf/util/bpf-filter.c +++ b/tools/perf/util/bpf-filter.c @@ -93,71 +93,102 @@ static int check_sample_flags(struct evsel *evsel, str= uct perf_bpf_filter_expr * =20 int perf_bpf_filter__prepare(struct evsel *evsel) { - int i, x, y, fd; + int i, x, y, fd, ret; struct sample_filter_bpf *skel; struct bpf_program *prog; struct bpf_link *link; struct perf_bpf_filter_expr *expr; + struct perf_bpf_filter_entry *entry; + + entry =3D calloc(MAX_FILTERS, sizeof(*entry)); + if (entry =3D=3D NULL) + return -1; =20 skel =3D sample_filter_bpf__open_and_load(); if (!skel) { pr_err("Failed to load perf sample-filter BPF skeleton\n"); - return -1; + ret =3D -EPERM; + goto err; } =20 i =3D 0; fd =3D bpf_map__fd(skel->maps.filters); list_for_each_entry(expr, &evsel->bpf_filters, list) { - struct perf_bpf_filter_entry entry =3D { - .op =3D expr->op, - .part =3D expr->part, - .term =3D expr->term, - .value =3D expr->val, - }; + if (check_sample_flags(evsel, expr) < 0) { + ret =3D -EINVAL; + goto err; + } =20 - if (check_sample_flags(evsel, expr) < 0) - return -1; + if (i =3D=3D MAX_FILTERS) { + ret =3D -E2BIG; + goto err; + } =20 - bpf_map_update_elem(fd, &i, &entry, BPF_ANY); + entry[i].op =3D expr->op; + entry[i].part =3D expr->part; + entry[i].term =3D expr->term; + entry[i].value =3D expr->val; i++; =20 if (expr->op =3D=3D PBF_OP_GROUP_BEGIN) { struct perf_bpf_filter_expr *group; =20 list_for_each_entry(group, &expr->groups, list) { - struct perf_bpf_filter_entry group_entry =3D { - .op =3D group->op, - .part =3D group->part, - .term =3D group->term, - .value =3D group->val, - }; - bpf_map_update_elem(fd, &i, &group_entry, BPF_ANY); + if (i =3D=3D MAX_FILTERS) { + ret =3D -E2BIG; + goto err; + } + + entry[i].op =3D group->op; + entry[i].part =3D group->part; + entry[i].term =3D group->term; + entry[i].value =3D group->val; i++; } =20 - memset(&entry, 0, sizeof(entry)); - entry.op =3D PBF_OP_GROUP_END; - bpf_map_update_elem(fd, &i, &entry, BPF_ANY); + if (i =3D=3D MAX_FILTERS) { + ret =3D -E2BIG; + goto err; + } + + entry[i].op =3D PBF_OP_GROUP_END; i++; } } =20 - if (i > MAX_FILTERS) { - pr_err("Too many filters: %d (max =3D %d)\n", i, MAX_FILTERS); - return -1; + if (i < MAX_FILTERS) { + /* to terminate the loop early */ + entry[i].op =3D PBF_OP_DONE; + i++; + } + + /* The filters map has only one entry for now */ + i =3D 0; + if (bpf_map_update_elem(fd, &i, entry, BPF_ANY) < 0) { + ret =3D -errno; + pr_err("Failed to update the filter map\n"); + goto err; } + prog =3D skel->progs.perf_sample_filter; for (x =3D 0; x < xyarray__max_x(evsel->core.fd); x++) { for (y =3D 0; y < xyarray__max_y(evsel->core.fd); y++) { link =3D bpf_program__attach_perf_event(prog, FD(evsel, x, y)); if (IS_ERR(link)) { pr_err("Failed to attach perf sample-filter program\n"); - return PTR_ERR(link); + ret =3D PTR_ERR(link); + goto err; } } } + free(entry); evsel->bpf_skel =3D skel; return 0; + +err: + free(entry); + sample_filter_bpf__destroy(skel); + return ret; } =20 int perf_bpf_filter__destroy(struct evsel *evsel) diff --git a/tools/perf/util/bpf_skel/sample-filter.h b/tools/perf/util/bpf= _skel/sample-filter.h index 350efa121026..bb6a1b91f1df 100644 --- a/tools/perf/util/bpf_skel/sample-filter.h +++ b/tools/perf/util/bpf_skel/sample-filter.h @@ -14,6 +14,7 @@ enum perf_bpf_filter_op { PBF_OP_AND, PBF_OP_GROUP_BEGIN, PBF_OP_GROUP_END, + PBF_OP_DONE, }; =20 enum perf_bpf_filter_term { diff --git a/tools/perf/util/bpf_skel/sample_filter.bpf.c b/tools/perf/util= /bpf_skel/sample_filter.bpf.c index f59985101973..0d56e52b922c 100644 --- a/tools/perf/util/bpf_skel/sample_filter.bpf.c +++ b/tools/perf/util/bpf_skel/sample_filter.bpf.c @@ -9,10 +9,10 @@ =20 /* BPF map that will be filled by user space */ struct filters { - __uint(type, BPF_MAP_TYPE_ARRAY); + __uint(type, BPF_MAP_TYPE_HASH); __type(key, int); - __type(value, struct perf_bpf_filter_entry); - __uint(max_entries, MAX_FILTERS); + __type(value, struct perf_bpf_filter_entry[MAX_FILTERS]); + __uint(max_entries, 1); } filters SEC(".maps"); =20 int dropped; @@ -179,39 +179,39 @@ int perf_sample_filter(void *ctx) __u64 sample_data; int in_group =3D 0; int group_result =3D 0; - int i; + int i, k; =20 kctx =3D bpf_cast_to_kern_ctx(ctx); =20 - for (i =3D 0; i < MAX_FILTERS; i++) { - int key =3D i; /* needed for verifier :( */ + k =3D 0; + entry =3D bpf_map_lookup_elem(&filters, &k); + if (entry =3D=3D NULL) + goto drop; =20 - entry =3D bpf_map_lookup_elem(&filters, &key); - if (entry =3D=3D NULL) - break; - sample_data =3D perf_get_sample(kctx, entry); + for (i =3D 0; i < MAX_FILTERS; i++) { + sample_data =3D perf_get_sample(kctx, &entry[i]); =20 - switch (entry->op) { + switch (entry[i].op) { case PBF_OP_EQ: - CHECK_RESULT(sample_data, =3D=3D, entry->value) + CHECK_RESULT(sample_data, =3D=3D, entry[i].value) break; case PBF_OP_NEQ: - CHECK_RESULT(sample_data, !=3D, entry->value) + CHECK_RESULT(sample_data, !=3D, entry[i].value) break; case PBF_OP_GT: - CHECK_RESULT(sample_data, >, entry->value) + CHECK_RESULT(sample_data, >, entry[i].value) break; case PBF_OP_GE: - CHECK_RESULT(sample_data, >=3D, entry->value) + CHECK_RESULT(sample_data, >=3D, entry[i].value) break; case PBF_OP_LT: - CHECK_RESULT(sample_data, <, entry->value) + CHECK_RESULT(sample_data, <, entry[i].value) break; case PBF_OP_LE: - CHECK_RESULT(sample_data, <=3D, entry->value) + CHECK_RESULT(sample_data, <=3D, entry[i].value) break; case PBF_OP_AND: - CHECK_RESULT(sample_data, &, entry->value) + CHECK_RESULT(sample_data, &, entry[i].value) break; case PBF_OP_GROUP_BEGIN: in_group =3D 1; @@ -222,6 +222,9 @@ int perf_sample_filter(void *ctx) goto drop; in_group =3D 0; break; + case PBF_OP_DONE: + /* no failures so far, accept it */ + return 1; } } /* generate sample data */ --=20 2.45.2.741.gdbec12cfda-goog