mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-09-18 23:09:29 +02:00
Liang Luo
e655c1f1bd
In prog_run's run(), the bpf_link is attached early but only destroyed
on the success path. The three SCX_EQ assertions between attach and
destroy expand to a direct 'return SCX_TEST_FAIL', so if any of them
triggers, bpf_link__destroy() is never reached and the BPF scheduler
stays loaded. All subsequent tests then fail to attach because SCX is
not in the DISABLED state.
Convert those assertions to explicit checks that jump to a unified
'out' label which always runs the cleanup, matching the pattern used
in cyclic_kick_wait.c.
Fixes: a5db7817af ("sched_ext: Add selftests")
Signed-off-by: Liang Luo <luoliang@kylinos.cn>
Reviewed-by: Andrea Righi <arighi@nvidia.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
97 lines
2.1 KiB
C
97 lines
2.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright (c) 2024 Meta Platforms, Inc. and affiliates.
|
|
* Copyright (c) 2024 David Vernet <dvernet@meta.com>
|
|
*/
|
|
#include <bpf/bpf.h>
|
|
#include <sched.h>
|
|
#include <scx/common.h>
|
|
#include <sys/wait.h>
|
|
#include <unistd.h>
|
|
#include "prog_run.bpf.skel.h"
|
|
#include "scx_test.h"
|
|
|
|
static enum scx_test_status setup(void **ctx)
|
|
{
|
|
struct prog_run *skel;
|
|
|
|
skel = prog_run__open();
|
|
SCX_FAIL_IF(!skel, "Failed to open");
|
|
SCX_ENUM_INIT(skel);
|
|
SCX_FAIL_IF(prog_run__load(skel), "Failed to load skel");
|
|
|
|
*ctx = skel;
|
|
|
|
return SCX_TEST_PASS;
|
|
}
|
|
|
|
static enum scx_test_status run(void *ctx)
|
|
{
|
|
struct prog_run *skel = ctx;
|
|
struct bpf_link *link = NULL;
|
|
enum scx_test_status status = SCX_TEST_PASS;
|
|
int prog_fd, err = 0;
|
|
|
|
prog_fd = bpf_program__fd(skel->progs.prog_run_syscall);
|
|
if (prog_fd < 0) {
|
|
SCX_ERR("Failed to get BPF_PROG_RUN prog");
|
|
return SCX_TEST_FAIL;
|
|
}
|
|
|
|
LIBBPF_OPTS(bpf_test_run_opts, topts);
|
|
|
|
link = bpf_map__attach_struct_ops(skel->maps.prog_run_ops);
|
|
if (!link) {
|
|
SCX_ERR("Failed to attach scheduler");
|
|
status = SCX_TEST_FAIL;
|
|
goto out;
|
|
}
|
|
|
|
err = bpf_prog_test_run_opts(prog_fd, &topts);
|
|
if (err) {
|
|
SCX_ERR("BPF_PROG_RUN failed (%d)", err);
|
|
status = SCX_TEST_FAIL;
|
|
goto out;
|
|
}
|
|
|
|
/* Assumes uei.kind is written last */
|
|
while (skel->data->uei.kind == EXIT_KIND(SCX_EXIT_NONE))
|
|
sched_yield();
|
|
|
|
if (skel->data->uei.kind != EXIT_KIND(SCX_EXIT_UNREG_BPF)) {
|
|
SCX_ERR("Unexpected exit kind: %llu",
|
|
(unsigned long long)skel->data->uei.kind);
|
|
status = SCX_TEST_FAIL;
|
|
goto out;
|
|
}
|
|
if (skel->data->uei.exit_code != 0xdeadbeef) {
|
|
SCX_ERR("Unexpected exit code: %lld",
|
|
(long long)skel->data->uei.exit_code);
|
|
status = SCX_TEST_FAIL;
|
|
goto out;
|
|
}
|
|
|
|
out:
|
|
close(prog_fd);
|
|
if (link)
|
|
bpf_link__destroy(link);
|
|
|
|
return status;
|
|
}
|
|
|
|
static void cleanup(void *ctx)
|
|
{
|
|
struct prog_run *skel = ctx;
|
|
|
|
prog_run__destroy(skel);
|
|
}
|
|
|
|
struct scx_test prog_run = {
|
|
.name = "prog_run",
|
|
.description = "Verify we can call into a scheduler with BPF_PROG_RUN, and invoke kfuncs",
|
|
.setup = setup,
|
|
.run = run,
|
|
.cleanup = cleanup,
|
|
};
|
|
REGISTER_SCX_TEST(&prog_run)
|