JakeHillion/scx
1
0
Fork 0
mirror of https://github.com/JakeHillion/scx.git synced 2024-11-25 02:50:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #803 from dschatzberg/mitosis_fallback_dsq

Browse Source 
scx_mitosis: Handle pinned tasks
This commit is contained in:
Dan Schatzberg 2024-10-16 13:26:23 +00:00 committed by GitHub
commit 730052a0c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scheds/rust/scx_mitosis/src/bpf/intf.h
View File

@ -24,6 +24,9 @@ enum consts {
MAX_CPUS_U8 = MAX_CPUS / 8,
MAX_CELLS = 16,
USAGE_HALF_LIFE = 100000000, /* 100ms */
HI_FALLBACK_DSQ = MAX_CELLS,
LO_FALLBACK_DSQ = MAX_CELLS + 1,
};
/* Statistics */

25
scheds/rust/scx_mitosis/src/bpf/mitosis.bpf.c
View File

@ -674,7 +674,14 @@ void BPF_STRUCT_OPS(mitosis_enqueue, struct task_struct *p, u64 enq_flags)
if (vtime_before(vtime, cell->vtime_now - slice_ns))
vtime = cell->vtime_now - slice_ns;
scx_bpf_dispatch_vtime(p, tctx->cell, slice_ns, vtime, enq_flags);
if (p->flags & PF_KTHREAD && p->nr_cpus_allowed == 1) {
scx_bpf_dispatch(p, HI_FALLBACK_DSQ, slice_ns, 0);
} else if (!tctx->all_cpus_allowed) {
scx_bpf_dispatch(p, LO_FALLBACK_DSQ, slice_ns, 0);
} else {
scx_bpf_dispatch_vtime(p, tctx->cell, slice_ns, vtime,
enq_flags);
}
/*
* If we aren't in the wakeup path, layered_select_cpu() hasn't run and thus
@ -695,6 +702,9 @@ void BPF_STRUCT_OPS(mitosis_dispatch, s32 cpu, struct task_struct *prev)
prev_cell = *(volatile u32 *)&cctx->prev_cell;
cell = *(volatile u32 *)&cctx->cell;
if (scx_bpf_consume(HI_FALLBACK_DSQ))
return;
/*
* cpu <=> cell assignment can change dynamically. In order to deal with
* scheduling racing with assignment change, we schedule from the previous
@ -703,7 +713,10 @@ void BPF_STRUCT_OPS(mitosis_dispatch, s32 cpu, struct task_struct *prev)
if (prev_cell != cell && scx_bpf_consume(prev_cell))
return;
scx_bpf_consume(cell);
if (scx_bpf_consume(cell))
return;
scx_bpf_consume(LO_FALLBACK_DSQ);
}
static inline void runnable(struct task_struct *p, struct task_ctx *tctx,
@ -920,6 +933,14 @@ s32 BPF_STRUCT_OPS_SLEEPABLE(mitosis_init)
u32 i;
s32 ret;
ret = scx_bpf_create_dsq(HI_FALLBACK_DSQ, -1);
if (ret < 0)
return ret;
ret = scx_bpf_create_dsq(LO_FALLBACK_DSQ, -1);
if (ret < 0)
return ret;
cpumask = bpf_cpumask_create();
if (!cpumask)
return -ENOMEM;