From: Yafang Shao <laoar.shao@gmail.com>
To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
kafai@fb.com, songliubraving@fb.com, yhs@fb.com,
john.fastabend@gmail.com, kpsingh@kernel.org,
quentin@isovalent.com, roman.gushchin@linux.dev,
haoluo@google.com, shakeelb@google.com
Cc: bpf@vger.kernel.org, linux-mm@kvack.org,
Yafang Shao <laoar.shao@gmail.com>
Subject: [PATCH bpf-next v3 2/2] bpf: Warn on non-preallocated case for missed trace types
Date: Sat, 9 Jul 2022 15:44:57 +0000 [thread overview]
Message-ID: <20220709154457.57379-3-laoar.shao@gmail.com> (raw)
In-Reply-To: <20220709154457.57379-1-laoar.shao@gmail.com>
The raw tracepoint may cause unexpected memory allocation if we set
BPF_F_NO_PREALLOC. So let's warn on it.
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
---
kernel/bpf/verifier.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index e3cf6194c24f..3cd8260827e0 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -12574,14 +12574,20 @@ static int check_map_prealloc(struct bpf_map *map)
!(map->map_flags & BPF_F_NO_PREALLOC);
}
-static bool is_tracing_prog_type(enum bpf_prog_type type)
+static bool is_tracing_prog_type(enum bpf_prog_type prog_type,
+ enum bpf_attach_type attach_type)
{
- switch (type) {
+ switch (prog_type) {
case BPF_PROG_TYPE_KPROBE:
case BPF_PROG_TYPE_TRACEPOINT:
case BPF_PROG_TYPE_PERF_EVENT:
case BPF_PROG_TYPE_RAW_TRACEPOINT:
+ case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE:
return true;
+ case BPF_PROG_TYPE_TRACING:
+ if (attach_type == BPF_TRACE_RAW_TP)
+ return true;
+ return false;
default:
return false;
}
@@ -12601,7 +12607,9 @@ static int check_map_prog_compatibility(struct bpf_verifier_env *env,
struct bpf_prog *prog)
{
+ enum bpf_attach_type attach_type = prog->expected_attach_type;
enum bpf_prog_type prog_type = resolve_prog_type(prog);
+
/*
* Validate that trace type programs use preallocated hash maps.
*
@@ -12619,7 +12627,7 @@ static int check_map_prog_compatibility(struct bpf_verifier_env *env,
* now, but warnings are emitted so developers are made aware of
* the unsafety and can fix their programs before this is enforced.
*/
- if (is_tracing_prog_type(prog_type) && !is_preallocated_map(map)) {
+ if (is_tracing_prog_type(prog_type, attach_type) && !is_preallocated_map(map)) {
if (prog_type == BPF_PROG_TYPE_PERF_EVENT) {
verbose(env, "perf_event programs can only use preallocated hash map\n");
return -EINVAL;
@@ -12638,7 +12646,7 @@ static int check_map_prog_compatibility(struct bpf_verifier_env *env,
return -EINVAL;
}
- if (is_tracing_prog_type(prog_type)) {
+ if (is_tracing_prog_type(prog_type, attach_type)) {
verbose(env, "tracing progs cannot use bpf_spin_lock yet\n");
return -EINVAL;
}
@@ -12650,7 +12658,7 @@ static int check_map_prog_compatibility(struct bpf_verifier_env *env,
}
if (map_value_has_timer(map)) {
- if (is_tracing_prog_type(prog_type)) {
+ if (is_tracing_prog_type(prog_type, attach_type)) {
verbose(env, "tracing progs cannot use bpf_timer yet\n");
return -EINVAL;
}
--
2.17.1
next prev parent reply other threads:[~2022-07-09 15:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-09 15:44 [PATCH bpf-next v3 0/2] bpf: Minor fixes for non-preallocated memory Yafang Shao
2022-07-09 15:44 ` [PATCH bpf-next v3 1/2] bpf: Make non-preallocated allocation low priority Yafang Shao
2022-07-11 19:19 ` Shakeel Butt
2022-07-13 0:49 ` Alexei Starovoitov
2022-07-13 2:12 ` Roman Gushchin
2022-07-09 15:44 ` Yafang Shao [this message]
2022-07-10 17:51 ` [PATCH bpf-next v3 2/2] bpf: Warn on non-preallocated case for missed trace types Yonghong Song
2022-07-11 6:48 ` Yafang Shao
2022-07-11 19:04 ` Yonghong Song
2022-07-12 8:26 ` Yafang Shao
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=20220709154457.57379-3-laoar.shao@gmail.com \
--to=laoar.shao@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=linux-mm@kvack.org \
--cc=quentin@isovalent.com \
--cc=roman.gushchin@linux.dev \
--cc=shakeelb@google.com \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).