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

scx_layered: Cleanup topology preempt path

Browse Source 
Signed-off-by: Daniel Hodges <hodges.daniel.scott@gmail.com>
This commit is contained in:
Daniel Hodges 2024-10-10 09:56:42 -07:00
parent 59cfd4060c
commit b22e83d4d5
1 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
scheds/rust/scx_layered/src/bpf/main.bpf.c
View File

@ -700,14 +700,14 @@ s32 pick_idle_cpu(struct task_struct *p, s32 prev_cpu,
return -1; return -1;
} }
pref_idle_cpumask = bpf_cpumask_create();
if (layer->idle_smt) { if (layer->idle_smt) {
idle_cpumask = scx_bpf_get_idle_smtmask(); idle_cpumask = scx_bpf_get_idle_smtmask();
} else { } else {
idle_cpumask = scx_bpf_get_idle_cpumask(); idle_cpumask = scx_bpf_get_idle_cpumask();
} }
pref_idle_cpumask = bpf_cpumask_create();
if (!pref_idle_cpumask || !idle_cpumask) { if (!pref_idle_cpumask || !idle_cpumask) {
cpu = -1; cpu = -1;
goto out_put; goto out_put;
@ -749,7 +749,6 @@ s32 pick_idle_cpu(struct task_struct *p, s32 prev_cpu,
goto out_put; goto out_put;
} }
/* /*
* Next try a CPU in the current node * Next try a CPU in the current node
*/ */
@ -987,24 +986,21 @@ void try_preempt(s32 task_cpu, struct task_struct *p, struct task_ctx *tctx,
} }
if (!(cachec = lookup_cache_ctx(cctx->cache_idx)) || if (!(cachec = lookup_cache_ctx(cctx->cache_idx)) ||
!(nodec = lookup_node_ctx(cctx->node_idx))) !(nodec = lookup_node_ctx(cctx->node_idx)) ||
!cachec->cpumask) {
scx_bpf_error("can't happen");
return; return;
}
attempted = bpf_cpumask_create(); attempted = bpf_cpumask_create();
if (!attempted) if (!attempted) {
goto preempt_fail; lstat_inc(LSTAT_PREEMPT_FAIL, layer, cctx);
return;
}
topo_cpus = bpf_cpumask_create(); topo_cpus = bpf_cpumask_create();
if (!topo_cpus) { if (!topo_cpus || !cachec->cpumask)
bpf_cpumask_release(attempted);
goto preempt_fail; goto preempt_fail;
}
if (!cachec->cpumask) {
bpf_cpumask_release(attempted);
bpf_cpumask_release(topo_cpus);
goto preempt_fail;
}
bpf_cpumask_copy(topo_cpus, cast_mask(cachec->cpumask)); bpf_cpumask_copy(topo_cpus, cast_mask(cachec->cpumask));
bpf_cpumask_and(topo_cpus, cast_mask(topo_cpus), layer_cpumask); bpf_cpumask_and(topo_cpus, cast_mask(topo_cpus), layer_cpumask);
@ -1029,11 +1025,8 @@ void try_preempt(s32 task_cpu, struct task_struct *p, struct task_ctx *tctx,
/* /*
* Next try node local LLCs in the layer cpumask * Next try node local LLCs in the layer cpumask
*/ */
if (!nodec->cpumask) { if (!nodec->cpumask)
bpf_cpumask_release(attempted);
bpf_cpumask_release(topo_cpus);
goto preempt_fail; goto preempt_fail;
}
bpf_cpumask_copy(topo_cpus, cast_mask(nodec->cpumask)); bpf_cpumask_copy(topo_cpus, cast_mask(nodec->cpumask));
bpf_cpumask_xor(topo_cpus, cast_mask(attempted), cast_mask(topo_cpus)); bpf_cpumask_xor(topo_cpus, cast_mask(attempted), cast_mask(topo_cpus));
@ -1058,8 +1051,6 @@ void try_preempt(s32 task_cpu, struct task_struct *p, struct task_ctx *tctx,
*/ */
if (xnuma_preemption) { if (xnuma_preemption) {
if (!all_cpumask) { if (!all_cpumask) {
bpf_cpumask_release(attempted);
bpf_cpumask_release(topo_cpus);
goto preempt_fail; goto preempt_fail;
} }
bpf_cpumask_copy(topo_cpus, cast_mask(all_cpumask)); bpf_cpumask_copy(topo_cpus, cast_mask(all_cpumask));
@ -1080,12 +1071,13 @@ void try_preempt(s32 task_cpu, struct task_struct *p, struct task_ctx *tctx,
break; break;
} }
} }
bpf_cpumask_release(attempted);
bpf_cpumask_release(topo_cpus);
lstat_inc(LSTAT_PREEMPT_FAIL, layer, cctx);
preempt_fail: preempt_fail:
if (attempted)
bpf_cpumask_release(attempted);
if (topo_cpus)
bpf_cpumask_release(topo_cpus);
lstat_inc(LSTAT_PREEMPT_FAIL, layer, cctx); lstat_inc(LSTAT_PREEMPT_FAIL, layer, cctx);
} }