From: Mykyta Yatsenko <mykyta.yatsenko5@gmail.com>
To: Puranjay Mohan <puranjay@kernel.org>, bpf@vger.kernel.org
Cc: Puranjay Mohan <puranjay@kernel.org>,
Puranjay Mohan <puranjay12@gmail.com>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <martin.lau@kernel.org>,
Eduard Zingerman <eddyz87@gmail.com>,
Kumar Kartikeya Dwivedi <memxor@gmail.com>,
kernel-team@meta.com
Subject: Re: [PATCH bpf-next 1/2] bpf: Consolidate sleepable checks in check_helper_call()
Date: Wed, 25 Feb 2026 18:30:15 +0000 [thread overview]
Message-ID: <877bs0llqg.fsf@gmail.com> (raw)
In-Reply-To: <20260225134950.2781351-1-puranjay@kernel.org>
Puranjay Mohan <puranjay@kernel.org> writes:
> check_helper_call() prints the error message for every
> env->cur_state->active* element when calling a sleepable helper.
> Consolidate all of them into a single print statement.
>
> The check for env->cur_state->active_locks was not part of the removed
> print statements and will not be triggered with the consolidated print
> as well because it is checked in do_check() before check_helper_call()
> is even reached.
>
> Signed-off-by: Puranjay Mohan <puranjay@kernel.org>
> ---
Acked-by: Mykyta Yatsenko <yatsenko@meta.com>
> kernel/bpf/verifier.c | 40 ++++++++++++++++++----------------------
> 1 file changed, 18 insertions(+), 22 deletions(-)
>
> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> index 1153a828ce8d..e8c4a5f8520d 100644
> --- a/kernel/bpf/verifier.c
> +++ b/kernel/bpf/verifier.c
> @@ -11549,6 +11549,19 @@ static inline bool in_sleepable_context(struct bpf_verifier_env *env)
> in_sleepable(env);
> }
>
> +static const char *non_sleepable_context_description(struct bpf_verifier_env *env)
> +{
> + if (env->cur_state->active_rcu_locks)
> + return "rcu_read_lock region";
> + if (env->cur_state->active_preempt_locks)
> + return "non-preemptible region";
> + if (env->cur_state->active_irq_id)
> + return "IRQ-disabled region";
> + if (env->cur_state->active_locks)
> + return "lock region";
> + return "non-sleepable context";
> +}
> +
> static int check_helper_call(struct bpf_verifier_env *env, struct bpf_insn *insn,
> int *insn_idx_p)
> {
> @@ -11609,28 +11622,11 @@ static int check_helper_call(struct bpf_verifier_env *env, struct bpf_insn *insn
> return err;
> }
>
> - if (env->cur_state->active_rcu_locks) {
> - if (fn->might_sleep) {
> - verbose(env, "sleepable helper %s#%d in rcu_read_lock region\n",
> - func_id_name(func_id), func_id);
> - return -EINVAL;
> - }
> - }
> -
> - if (env->cur_state->active_preempt_locks) {
> - if (fn->might_sleep) {
> - verbose(env, "sleepable helper %s#%d in non-preemptible region\n",
> - func_id_name(func_id), func_id);
> - return -EINVAL;
> - }
> - }
> -
> - if (env->cur_state->active_irq_id) {
> - if (fn->might_sleep) {
> - verbose(env, "sleepable helper %s#%d in IRQ-disabled region\n",
> - func_id_name(func_id), func_id);
> - return -EINVAL;
> - }
> + if (fn->might_sleep && !in_sleepable_context(env)) {
> + verbose(env, "sleepable helper %s#%d in %s\n",
> + func_id_name(func_id), func_id,
> + non_sleepable_context_description(env));
> + return -EINVAL;
> }
>
> /* Track non-sleepable context for helpers. */
>
> base-commit: f620af11c27b8ec9994a39fe968aa778112d1566
> --
> 2.47.3
next prev parent reply other threads:[~2026-02-25 18:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-25 13:49 [PATCH bpf-next 1/2] bpf: Consolidate sleepable checks in check_helper_call() Puranjay Mohan
2026-02-25 13:49 ` [PATCH bpf-next 2/2] bpf: Consolidate sleepable checks in check_kfunc_call() Puranjay Mohan
2026-02-25 18:54 ` Mykyta Yatsenko
2026-02-26 9:18 ` Eduard Zingerman
2026-02-25 18:30 ` Mykyta Yatsenko [this message]
2026-02-26 9:12 ` [PATCH bpf-next 1/2] bpf: Consolidate sleepable checks in check_helper_call() Eduard Zingerman
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=877bs0llqg.fsf@gmail.com \
--to=mykyta.yatsenko5@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=kernel-team@meta.com \
--cc=martin.lau@kernel.org \
--cc=memxor@gmail.com \
--cc=puranjay12@gmail.com \
--cc=puranjay@kernel.org \
/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