From: Yosry Ahmed <yosryahmed@google.com>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>, Hao Luo <haoluo@google.com>,
Tejun Heo <tj@kernel.org>, Zefan Li <lizefan.x@bytedance.com>
Cc: "Johannes Weiner" <hannes@cmpxchg.org>,
"Shuah Khan" <shuah@kernel.org>,
"Michal Hocko" <mhocko@kernel.org>,
"KP Singh" <kpsingh@kernel.org>,
"Benjamin Tissoires" <benjamin.tissoires@redhat.com>,
"John Fastabend" <john.fastabend@gmail.com>,
"Michal Koutný" <mkoutny@suse.com>,
"Roman Gushchin" <roman.gushchin@linux.dev>,
"David Rientjes" <rientjes@google.com>,
"Stanislav Fomichev" <sdf@google.com>,
"Greg Thelen" <gthelen@google.com>,
"Shakeel Butt" <shakeelb@google.com>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
bpf@vger.kernel.org, cgroups@vger.kernel.org,
"Yosry Ahmed" <yosryahmed@google.com>
Subject: [PATCH bpf-next v4 1/8] btf: Add a new kfunc set which allows to mark a function to be sleepable
Date: Fri, 22 Jul 2022 02:13:06 +0000 [thread overview]
Message-ID: <20220722021313.3150035-2-yosryahmed@google.com> (raw)
In-Reply-To: <20220722021313.3150035-1-yosryahmed@google.com>
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
This allows to declare a kfunc as sleepable and prevents its use in
a non sleepable program.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Yosry Ahmed <yosryahmed@google.com>
---
include/linux/btf.h | 2 ++
kernel/bpf/btf.c | 13 +++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/include/linux/btf.h b/include/linux/btf.h
index 1bfed7fa0428..6e7517573d9e 100644
--- a/include/linux/btf.h
+++ b/include/linux/btf.h
@@ -18,6 +18,7 @@ enum btf_kfunc_type {
BTF_KFUNC_TYPE_RELEASE,
BTF_KFUNC_TYPE_RET_NULL,
BTF_KFUNC_TYPE_KPTR_ACQUIRE,
+ BTF_KFUNC_TYPE_SLEEPABLE,
BTF_KFUNC_TYPE_MAX,
};
@@ -37,6 +38,7 @@ struct btf_kfunc_id_set {
struct btf_id_set *release_set;
struct btf_id_set *ret_null_set;
struct btf_id_set *kptr_acquire_set;
+ struct btf_id_set *sleepable_set;
};
struct btf_id_set *sets[BTF_KFUNC_TYPE_MAX];
};
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 5869f03bcb6e..2040e440f347 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -6178,7 +6178,7 @@ static int btf_check_func_arg_match(struct bpf_verifier_env *env,
struct bpf_verifier_log *log = &env->log;
u32 i, nargs, ref_id, ref_obj_id = 0;
bool is_kfunc = btf_is_kernel(btf);
- bool rel = false, kptr_get = false;
+ bool rel = false, kptr_get = false, sleepable = false;
const char *func_name, *ref_tname;
const struct btf_type *t, *ref_t;
const struct btf_param *args;
@@ -6209,11 +6209,13 @@ static int btf_check_func_arg_match(struct bpf_verifier_env *env,
}
if (is_kfunc) {
- /* Only kfunc can be release func */
+ /* Only kfunc can be release, kptr acquire, or sleepable func */
rel = btf_kfunc_id_set_contains(btf, resolve_prog_type(env->prog),
BTF_KFUNC_TYPE_RELEASE, func_id);
kptr_get = btf_kfunc_id_set_contains(btf, resolve_prog_type(env->prog),
BTF_KFUNC_TYPE_KPTR_ACQUIRE, func_id);
+ sleepable = btf_kfunc_id_set_contains(btf, resolve_prog_type(env->prog),
+ BTF_KFUNC_TYPE_SLEEPABLE, func_id);
}
/* check that BTF function arguments match actual types that the
@@ -6411,6 +6413,13 @@ static int btf_check_func_arg_match(struct bpf_verifier_env *env,
func_name);
return -EINVAL;
}
+
+ if (sleepable && !env->prog->aux->sleepable) {
+ bpf_log(log, "kernel function %s is sleepable but the program is not\n",
+ func_name);
+ return -EINVAL;
+ }
+
/* returns argument register number > 0 in case of reference release kfunc */
return rel ? ref_regno : 0;
}
--
2.37.1.359.gd136c6c3e2-goog
next prev parent reply other threads:[~2022-07-22 2:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-22 2:13 [PATCH bpf-next v4 0/8] bpf: rstat: cgroup hierarchical stats Yosry Ahmed
2022-07-22 2:13 ` Yosry Ahmed [this message]
2022-07-22 16:20 ` [PATCH bpf-next v4 1/8] btf: Add a new kfunc set which allows to mark a function to be sleepable Alexei Starovoitov
2022-07-22 17:49 ` Yosry Ahmed
2022-07-22 2:13 ` [PATCH bpf-next v4 2/8] cgroup: enable cgroup_get_from_file() on cgroup1 Yosry Ahmed
2022-07-22 2:13 ` [PATCH bpf-next v4 3/8] bpf, iter: Fix the condition on p when calling stop Yosry Ahmed
2022-07-22 2:13 ` [PATCH bpf-next v4 4/8] bpf: Introduce cgroup iter Yosry Ahmed
2022-07-22 2:13 ` [PATCH bpf-next v4 5/8] selftests/bpf: Test cgroup_iter Yosry Ahmed
2022-07-22 2:13 ` [PATCH bpf-next v4 6/8] cgroup: bpf: enable bpf programs to integrate with rstat Yosry Ahmed
2022-07-22 2:13 ` [PATCH bpf-next v4 7/8] selftests/bpf: extend cgroup helpers Yosry Ahmed
2022-07-22 2:13 ` [PATCH bpf-next v4 8/8] bpf: add a selftest for cgroup hierarchical stats collection Yosry Ahmed
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=20220722021313.3150035-2-yosryahmed@google.com \
--to=yosryahmed@google.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=benjamin.tissoires@redhat.com \
--cc=bpf@vger.kernel.org \
--cc=cgroups@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=gthelen@google.com \
--cc=hannes@cmpxchg.org \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan.x@bytedance.com \
--cc=mhocko@kernel.org \
--cc=mkoutny@suse.com \
--cc=netdev@vger.kernel.org \
--cc=rientjes@google.com \
--cc=roman.gushchin@linux.dev \
--cc=sdf@google.com \
--cc=shakeelb@google.com \
--cc=shuah@kernel.org \
--cc=songliubraving@fb.com \
--cc=tj@kernel.org \
--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).