From: Joe Burton <jevburton.kernel@gmail.com> To: Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, Andrii Nakryiko <andrii@kernel.org>, Martin KaFai Lau <kafai@fb.com> Cc: Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>, John Fastabend <john.fastabend@gmail.com>, KP Singh <kpsingh@kernel.org>, Petar Penkov <ppenkov@google.com>, Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>, netdev@vger.kernel.org, bpf@vger.kernel.org, Joe Burton <jevburton@google.com> Subject: [RFC PATCH v2 10/13] Add bpf_map_trace_{update,delete}_elem() helper functions Date: Wed, 29 Sep 2021 23:59:07 +0000 [thread overview] Message-ID: <20210929235910.1765396-11-jevburton.kernel@gmail.com> (raw) In-Reply-To: <20210929235910.1765396-1-jevburton.kernel@gmail.com> From: Joe Burton <jevburton@google.com> These helpers invoke tracing programs attached to a given map. Signed-off-by: Joe Burton <jevburton@google.com> --- include/linux/bpf.h | 2 ++ kernel/bpf/helpers.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 73f4524c1c29..847501a69012 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -2148,6 +2148,8 @@ extern const struct bpf_func_proto bpf_for_each_map_elem_proto; extern const struct bpf_func_proto bpf_btf_find_by_name_kind_proto; extern const struct bpf_func_proto bpf_sk_setsockopt_proto; extern const struct bpf_func_proto bpf_sk_getsockopt_proto; +extern const struct bpf_func_proto bpf_map_trace_update_elem_proto; +extern const struct bpf_func_proto bpf_map_trace_delete_elem_proto; const struct bpf_func_proto *tracing_prog_func_proto( enum bpf_func_id func_id, const struct bpf_prog *prog); diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index 1ffd469c217f..f6ebc519334a 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -1328,6 +1328,35 @@ void bpf_timer_cancel_and_free(void *val) kfree(t); } +BPF_CALL_4(bpf_map_trace_update_elem, struct bpf_map *, map, + void *, key, void *, value, u64, flags) +{ + bpf_trace_map_update_elem(map, key, value, flags); + return 0; +} + +const struct bpf_func_proto bpf_map_trace_update_elem_proto = { + .func = bpf_map_trace_update_elem, + .ret_type = RET_VOID, + .arg1_type = ARG_CONST_MAP_PTR, + .arg2_type = ARG_PTR_TO_MAP_KEY, + .arg3_type = ARG_PTR_TO_MAP_VALUE, + .arg4_type = ARG_ANYTHING, +}; + +BPF_CALL_2(bpf_map_trace_delete_elem, struct bpf_map *, map, void *, key) +{ + bpf_trace_map_delete_elem(map, key); + return 0; +} + +const struct bpf_func_proto bpf_map_trace_delete_elem_proto = { + .func = bpf_map_trace_delete_elem, + .ret_type = RET_VOID, + .arg1_type = ARG_CONST_MAP_PTR, + .arg2_type = ARG_PTR_TO_MAP_KEY, +}; + const struct bpf_func_proto bpf_get_current_task_proto __weak; const struct bpf_func_proto bpf_get_current_task_btf_proto __weak; const struct bpf_func_proto bpf_probe_read_user_proto __weak; -- 2.33.0.685.g46640cef36-goog
next prev parent reply other threads:[~2021-09-29 23:59 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-29 23:58 [RFC PATCH v2 00/13] Introduce BPF map tracing capability Joe Burton 2021-09-29 23:58 ` [RFC PATCH v2 01/13] bpf: Add machinery to register map tracing hooks Joe Burton 2021-09-29 23:58 ` [RFC PATCH v2 02/13] bpf: Allow loading BPF_TRACE_MAP programs Joe Burton 2021-09-29 23:59 ` [RFC PATCH v2 03/13] bpf: Add list of tracing programs to struct bpf_map Joe Burton 2021-09-29 23:59 ` [RFC PATCH v2 04/13] bpf: Define a few bpf_link_ops for BPF_TRACE_MAP Joe Burton 2021-09-30 0:26 ` Eric Dumazet 2021-09-30 1:09 ` Joe Burton 2021-09-29 23:59 ` [RFC PATCH v2 05/13] bpf: Enable creation of BPF_LINK_TYPE_MAP_TRACE Joe Burton 2021-09-29 23:59 ` [RFC PATCH v2 06/13] bpf: Add APIs to invoke tracing programs Joe Burton 2021-09-29 23:59 ` [RFC PATCH v2 07/13] bpf: Register BPF_MAP_TRACE_{UPDATE,DELETE}_ELEM hooks Joe Burton 2021-09-29 23:59 ` [RFC PATCH v2 08/13] libbpf: Support BPF_TRACE_MAP Joe Burton 2021-09-29 23:59 ` [RFC PATCH v2 09/13] bpf: Add infinite loop check on map tracers Joe Burton 2021-09-29 23:59 ` Joe Burton [this message] 2021-09-29 23:59 ` [RFC PATCH v2 11/13] bpf: verifier inserts map tracing helper call Joe Burton 2021-09-29 23:59 ` [RFC PATCH v2 12/13] bpf: Add selftests for map tracing Joe Burton 2021-09-29 23:59 ` [RFC PATCH v2 13/13] bpf: Add real world example " Joe Burton 2021-10-05 5:13 ` [RFC PATCH v2 00/13] Introduce BPF map tracing capability Alexei Starovoitov 2021-10-05 21:47 ` Joe Burton 2021-10-06 16:41 ` Alexei Starovoitov 2021-10-06 21:05 ` Joe Burton 2021-10-18 23:15 ` Alexei Starovoitov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210929235910.1765396-11-jevburton.kernel@gmail.com \ --to=jevburton.kernel@gmail.com \ --cc=andrii@kernel.org \ --cc=ast@kernel.org \ --cc=bpf@vger.kernel.org \ --cc=daniel@iogearbox.net \ --cc=haoluo@google.com \ --cc=jevburton@google.com \ --cc=john.fastabend@gmail.com \ --cc=kafai@fb.com \ --cc=kpsingh@kernel.org \ --cc=netdev@vger.kernel.org \ --cc=ppenkov@google.com \ --cc=sdf@google.com \ --cc=songliubraving@fb.com \ --cc=yhs@fb.com \ --subject='Re: [RFC PATCH v2 10/13] Add bpf_map_trace_{update,delete}_elem() helper functions' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).