This patch adds filter for scx_kfunc_ids_dispatch.
The kfuncs in the scx_kfunc_ids_dispatch set can be used in dispatch
and other rq-locked operations.
Signed-off-by: Juntong Deng <juntong.deng@xxxxxxxxxxx>
---
kernel/sched/ext.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
index d782ee618d54..caddcf41e5f1 100644
--- a/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@ -6943,9 +6943,25 @@ BTF_ID_FLAGS(func, scx_bpf_dispatch_from_dsq, KF_RCU)
BTF_ID_FLAGS(func, scx_bpf_dispatch_vtime_from_dsq, KF_RCU)
BTF_KFUNCS_END(scx_kfunc_ids_dispatch)
+static int scx_kfunc_ids_dispatch_filter(const struct bpf_prog *prog, u32 kfunc_id)
+{
+ u32 moff;
+
+ if (!btf_id_set8_contains(&scx_kfunc_ids_dispatch, kfunc_id) ||
+ prog->aux->st_ops != &bpf_sched_ext_ops)
+ return 0;
+
+ moff = prog->aux->attach_st_ops_member_off;
+ if (moff == offsetof(struct sched_ext_ops, dispatch))
+ return 0;
+
+ return scx_kfunc_ids_other_rqlocked_filter(prog, kfunc_id);
+}
+
static const struct btf_kfunc_id_set scx_kfunc_set_dispatch = {
.owner = THIS_MODULE,
.set = &scx_kfunc_ids_dispatch,
+ .filter = scx_kfunc_ids_dispatch_filter,
};
__bpf_kfunc_start_defs();
--
2.39.5
