mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-14 22:10:14 +00:00
The selftests are falining to build on current tip of bpf-next and sched_ext [1]. This has broken BPF CI [2] after merge from upstream. Use appropriate function names in the selftests according to the recent changes in the sched_ext API [3]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/commit/?id=fc39fb56917bb3cb53e99560ca3612a84456ada2 [2] https://github.com/kernel-patches/bpf/actions/runs/11959327258/job/33340923745 [3] https://lore.kernel.org/all/20241109194853.580310-1-tj@kernel.org/ Signed-off-by: Ihor Solodrai <ihor.solodrai@pm.me> Acked-by: Andrea Righi <arighi@nvidia.com> Acked-by: David Vernet <void@manifault.com> Signed-off-by: Tejun Heo <tj@kernel.org>
44 lines
1.2 KiB
C
44 lines
1.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright (c) 2023 Meta Platforms, Inc. and affiliates.
|
|
* Copyright (c) 2023 David Vernet <dvernet@meta.com>
|
|
* Copyright (c) 2023 Tejun Heo <tj@kernel.org>
|
|
*/
|
|
|
|
#include <scx/common.bpf.h>
|
|
|
|
char _license[] SEC("license") = "GPL";
|
|
|
|
/* Manually specify the signature until the kfunc is added to the scx repo. */
|
|
s32 scx_bpf_select_cpu_dfl(struct task_struct *p, s32 prev_cpu, u64 wake_flags,
|
|
bool *found) __ksym;
|
|
|
|
s32 BPF_STRUCT_OPS(enq_select_cpu_fails_select_cpu, struct task_struct *p,
|
|
s32 prev_cpu, u64 wake_flags)
|
|
{
|
|
return prev_cpu;
|
|
}
|
|
|
|
void BPF_STRUCT_OPS(enq_select_cpu_fails_enqueue, struct task_struct *p,
|
|
u64 enq_flags)
|
|
{
|
|
/*
|
|
* Need to initialize the variable or the verifier will fail to load.
|
|
* Improving these semantics is actively being worked on.
|
|
*/
|
|
bool found = false;
|
|
|
|
/* Can only call from ops.select_cpu() */
|
|
scx_bpf_select_cpu_dfl(p, 0, 0, &found);
|
|
|
|
scx_bpf_dsq_insert(p, SCX_DSQ_GLOBAL, SCX_SLICE_DFL, enq_flags);
|
|
}
|
|
|
|
SEC(".struct_ops.link")
|
|
struct sched_ext_ops enq_select_cpu_fails_ops = {
|
|
.select_cpu = (void *) enq_select_cpu_fails_select_cpu,
|
|
.enqueue = (void *) enq_select_cpu_fails_enqueue,
|
|
.name = "enq_select_cpu_fails",
|
|
.timeout_ms = 1000U,
|
|
};
|