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

layered: bpf: add layer kind to layer

Browse Source 
Currently we have an approximation of LayerKind in the BPF code with `open` on
the layer, but it is difficult/impossible to tell the difference between an
Open and a Grouped layer. Add a `kind` field to the BPF `layer` and plumb
through an enum from the Rust side.
This commit is contained in:
Jake Hillion 2024-10-21 11:29:14 +01:00
parent fb3f1d0b43
commit 55c9636f78
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,12 @@ enum consts {
MAX_CGRP_PREFIXES = 32
};
enum layer_kind {
LAYER_KIND_OPEN,
LAYER_KIND_GROUPED,
LAYER_KIND_CONFINED,
};
/* Statistics */
enum global_stat_idx {
GSTAT_EXCL_IDLE,
@ -174,6 +180,8 @@ struct layer {
u64 yield_step_ns;
u64 slice_ns;
u32 weight;
int kind;
bool open;
bool preempt;
bool preempt_first;

11
scheds/rust/scx_layered/src/config.rs
View File

@ -9,6 +9,7 @@ use anyhow::Result;
use serde::Deserialize;
use serde::Serialize;
use crate::bpf_intf;
use crate::LayerGrowthAlgo;
#[derive(Clone, Debug, Serialize, Deserialize)]
@ -159,3 +160,13 @@ pub enum LayerKind {
llcs: Vec<usize>,
},
}
impl LayerKind {
pub fn as_bpf_enum(&self) -> i32 {
match self {
LayerKind::Confined { .. } => bpf_intf::layer_kind_LAYER_KIND_CONFINED as i32,
LayerKind::Grouped { .. } => bpf_intf::layer_kind_LAYER_KIND_GROUPED as i32,
LayerKind::Open { .. } => bpf_intf::layer_kind_LAYER_KIND_OPEN as i32,
}
}
}

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

@ -1268,6 +1268,7 @@ impl<'a> Scheduler<'a> {
}
layer.nr_match_ors = spec.matches.len() as u32;
layer.kind = spec.kind.as_bpf_enum();
match &spec.kind {
LayerKind::Confined {