JakeHillion/scx
1
0
Fork 0
mirror of https://github.com/JakeHillion/scx.git synced 2024-12-01 21:37:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #865 from hodgesds/layered-dump-cleanup

Browse Source 
scx_layered: Add layer name to bpf
This commit is contained in:
Daniel Hodges 2024-10-31 09:59:20 -04:00 committed by GitHub
commit ea4013e2d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scheds/rust/scx_layered/src/bpf/intf.h
View File

@ -37,6 +37,7 @@ enum consts {
MAX_LLCS = 64,
MAX_COMM = 16,
MAX_LAYER_MATCH_ORS = 32,
MAX_LAYER_NAME = 64,
MAX_LAYERS = 16,
MAX_LAYER_WEIGHT = 10000,
MIN_LAYER_WEIGHT = 1,
@ -207,6 +208,7 @@ struct layer {
unsigned char cpus[MAX_CPUS_U8];
unsigned int nr_cpus; // managed from BPF side
unsigned int perf;
char name[MAX_LAYER_NAME];
};
#endif /* __INTF_H */

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

@ -2093,8 +2093,9 @@ void BPF_STRUCT_OPS(layered_dump, struct scx_dump_ctx *dctx)
}
if (disable_topology) {
scx_bpf_dump("LAYER[%d] nr_cpus=%u nr_queued=%d -%llums cpus=",
i, layers[i].nr_cpus, scx_bpf_dsq_nr_queued(i),
scx_bpf_dump("LAYER[%d][%s] nr_cpus=%u nr_queued=%d -%llums cpus=",
i, layer->name, layer->nr_cpus,
scx_bpf_dsq_nr_queued(i),
dsq_first_runnable_for_ms(i, now));
} else {
bpf_for(j, 0, nr_llcs) {
@ -2102,8 +2103,9 @@ void BPF_STRUCT_OPS(layered_dump, struct scx_dump_ctx *dctx)
continue;
idx = layer_dsq_id(layer->idx, j);
scx_bpf_dump("LAYER[%d]DSQ[%d] nr_cpus=%u nr_queued=%d -%llums cpus=",
i, idx, layers[i].nr_cpus, scx_bpf_dsq_nr_queued(idx),
scx_bpf_dump("LAYER[%d][%s]DSQ[%d] nr_cpus=%u nr_queued=%d -%llums cpus=",
i, idx, layer->name, layer->nr_cpus,
scx_bpf_dsq_nr_queued(idx),
dsq_first_runnable_for_ms(idx, now));
scx_bpf_dump("\n");
}
@ -2231,8 +2233,8 @@ s32 BPF_STRUCT_OPS_SLEEPABLE(layered_init)
bpf_for(i, 0, nr_layers) {
struct layer *layer = &layers[i];
dbg("CFG LAYER[%d] min_exec_ns=%lu open=%d preempt=%d exclusive=%d",
i, layer->min_exec_ns, layer->open, layer->preempt,
dbg("CFG LAYER[%d][%s] min_exec_ns=%lu open=%d preempt=%d exclusive=%d",
i, layer->name, layer->min_exec_ns, layer->open, layer->preempt,
layer->exclusive);
if (layer->nr_match_ors > MAX_LAYER_MATCH_ORS) {
@ -2317,6 +2319,7 @@ s32 BPF_STRUCT_OPS_SLEEPABLE(layered_init)
struct layer_cpumask_wrapper *cpumaskw;
layers[i].idx = i;
struct layer *layer = &layers[i];
if (!(cpumaskw = bpf_map_lookup_elem(&layer_cpumasks, &i)))
return -ENOENT;
@ -2344,8 +2347,8 @@ s32 BPF_STRUCT_OPS_SLEEPABLE(layered_init)
} else {
bpf_for(j, 0, nr_llcs) {
int node_id = llc_node_id(i);
dbg("CFG creating dsq %llu for layer %d on node %d in llc %d",
llc_dsq_id, i, node_id, j);
dbg("CFG creating dsq %llu for layer %d %s on node %d in llc %d",
llc_dsq_id, i, layer->name, node_id, j);
ret = scx_bpf_create_dsq(llc_dsq_id, node_id);
if (ret < 0)
return ret;

4
scheds/rust/scx_layered/src/main.rs
View File

@ -70,6 +70,7 @@ const USAGE_HALF_LIFE_F64: f64 = USAGE_HALF_LIFE as f64 / 1_000_000_000.0;
const NR_GSTATS: usize = bpf_intf::global_stat_idx_NR_GSTATS as usize;
const NR_LSTATS: usize = bpf_intf::layer_stat_idx_NR_LSTATS as usize;
const NR_LAYER_MATCH_KINDS: usize = bpf_intf::layer_match_kind_NR_LAYER_MATCH_KINDS as usize;
const MAX_LAYER_NAME: usize = bpf_intf::consts_MAX_LAYER_NAME as usize;
#[rustfmt::skip]
lazy_static::lazy_static! {
@ -1330,6 +1331,9 @@ impl<'a> Scheduler<'a> {
} else {
(layer.slice_ns as f64 * (1.0 - *yield_ignore)) as u64
};
let mut layer_name: String = spec.name.clone();
layer_name.truncate(MAX_LAYER_NAME);
copy_into_cstr(&mut layer.name, layer_name.as_str());
layer.preempt.write(*preempt);
layer.preempt_first.write(*preempt_first);
layer.exclusive.write(*exclusive);