JakeHillion/scx-upstream
1
0
Fork 0
mirror of https://github.com/sched-ext/scx.git synced 2024-11-28 05:30:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

layered/timers: support verifying on older kernels and fix logic

Browse Source 
Some of the new timer code doesn't verify on older kernels like 6.9. Modify the
code a little to get it verifying again.

Also applies some small fixes to the logic. Error handling was a little off
before and we were using the wrong key in lookups.

Test plan:
- CI
This commit is contained in:
Jake Hillion 2024-10-25 11:30:43 +01:00
parent ea600d2f3b
commit 0f9c1a0a73
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
scheds/rust/scx_layered/src/bpf/timer.bpf.c
View File

@ -16,6 +16,7 @@
struct timer_wrapper { struct timer_wrapper {
struct bpf_timer timer; struct bpf_timer timer;
int key;
}; };
struct { struct {
@ -28,16 +29,23 @@ struct {
static int layered_timer_cb(void *map, int key, struct timer_wrapper *timerw) static int layered_timer_cb(void *map, int key, struct timer_wrapper *timerw)
{ {
struct layered_timer *cb_timer = MEMBER_VPTR(layered_timers, [key]); if (timerw->key < 0 || timerw->key > MAX_TIMERS) {
bool resched = run_timer_cb(key);
if (!resched || cb_timer->interval_ns == 0) {
return 0; return 0;
} }
return bpf_timer_start(&timerw->timer, struct layered_timer *cb_timer = &layered_timers[timerw->key];
cb_timer->interval_ns, bool resched = run_timer_cb(timerw->key);
cb_timer->start_flags);
if (!resched || !cb_timer || cb_timer->interval_ns == 0) {
trace("TIMER timer %d stopped", timerw->key);
return 0;
}
bpf_timer_start(&timerw->timer,
cb_timer->interval_ns,
cb_timer->start_flags);
return 0;
} }
static int start_layered_timers(void) static int start_layered_timers(void)
@ -51,22 +59,28 @@ static int start_layered_timers(void)
scx_bpf_error("Failed to lookup layered timer"); scx_bpf_error("Failed to lookup layered timer");
return -ENOENT; return -ENOENT;
} }
if (timer_id < 0 || timer_id > MAX_TIMERS) {
scx_bpf_error("Failed to lookup layered timer");
return -ENOENT;
}
struct layered_timer *new_timer = MEMBER_VPTR(layered_timers, [timer_id]); struct layered_timer *new_timer = &layered_timers[timer_id];
if (!new_timer) { if (!new_timer) {
scx_bpf_error("can't happen"); scx_bpf_error("can't happen");
return -ENOENT; return -ENOENT;
} }
timerw->key = timer_id;
err = bpf_timer_init(&timerw->timer, err = bpf_timer_init(&timerw->timer,
&layered_timer_data, new_timer->init_flags); &layered_timer_data,
if (err) { new_timer->init_flags);
if (err < 0) {
scx_bpf_error("can't happen"); scx_bpf_error("can't happen");
return -ENOENT; return -ENOENT;
} }
err = bpf_timer_set_callback(&timerw->timer, &layered_timer_cb); err = bpf_timer_set_callback(&timerw->timer, &layered_timer_cb);
if (err) { if (err < 0) {
scx_bpf_error("can't happen"); scx_bpf_error("can't happen");
return -ENOENT; return -ENOENT;
} }
@ -74,7 +88,7 @@ static int start_layered_timers(void)
err = bpf_timer_start(&timerw->timer, err = bpf_timer_start(&timerw->timer,
new_timer->interval_ns, new_timer->interval_ns,
new_timer->start_flags); new_timer->start_flags);
if (err) { if (err < 0) {
scx_bpf_error("can't happen"); scx_bpf_error("can't happen");
return -ENOENT; return -ENOENT;
} }