From: Yonghong Song <yhs@fb.com>
To: Yafang Shao <laoar.shao@gmail.com>,
ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
kafai@fb.com, songliubraving@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
Subject: Re: [PATCH bpf-next v3 2/2] bpf: Warn on non-preallocated case for missed trace types
Date: Sun, 10 Jul 2022 10:51:24 -0700 [thread overview]
Message-ID: <05e5931e-98a7-d7b4-4775-7c17fad57450@fb.com> (raw)
In-Reply-To: <20220709154457.57379-3-laoar.shao@gmail.com>
On 7/9/22 8:44 AM, Yafang Shao wrote:
> The raw tracepoint may cause unexpected memory allocation if we set
> BPF_F_NO_PREALLOC. So let's warn on it.
Please extend raw_tracepoint to other attach types which
may cause runtime map allocations.
>
> 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;
As Alexei mentioned earlier, here we should have
if (attach_type != BPF_TRACE_ITER)
return true;
For attach types with BPF_PROG_TYPE_TRACING programs,
BPF_TRACE_ITER attach type can only appear in process context.
All other attach types may appear in non-process context.
> + 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);
> +
[...]
next prev parent reply other threads:[~2022-07-10 17:51 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 ` [PATCH bpf-next v3 2/2] bpf: Warn on non-preallocated case for missed trace types Yafang Shao
2022-07-10 17:51 ` Yonghong Song [this message]
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=05e5931e-98a7-d7b4-4775-7c17fad57450@fb.com \
--to=yhs@fb.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=laoar.shao@gmail.com \
--cc=linux-mm@kvack.org \
--cc=quentin@isovalent.com \
--cc=roman.gushchin@linux.dev \
--cc=shakeelb@google.com \
--cc=songliubraving@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