mirror of
https://github.com/torvalds/linux.git
synced 2026-09-23 22:14:03 +02:00
sched_ext: Build the set_cmask scratch from trusted geometry
scx_call_op_set_cpumask() builds a per-cpu cmask in the set_cmask scratch, which lives in BPF-writable arena. A scheduler can corrupt the scratch's inline header (base, nr_cids, alloc_words) from another cpu, so sizing and indexing the write from it risks an out-of-bounds write. Drive the build from kernel-known geometry instead. scx_cmask_ref_init_kern() imposes base and nr_cids rather than reading them, and scx_cmask_ref_from_cpumask() fills the scratch from the ref. Neither reads the header back. Signed-off-by: Tejun Heo <tj@kernel.org> Reviewed-by: Andrea Righi <arighi@nvidia.com>
This commit is contained in:
parent
cc7c254c8f
commit
33ffb56e85
|
|
@ -951,6 +951,38 @@ int scx_cmask_ref_init(struct scx_sched *sch, const struct scx_cmask *src,
|
|||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* scx_cmask_ref_init_kern - Bind a scx_cmask_ref to a kernel-owned cmask
|
||||
* @sch: scheduler the cmask belongs to
|
||||
* @m: kernel address of the target cmask, storage sized for @nr_cids at @base
|
||||
* @base: first cid of the active range
|
||||
* @nr_cids: active range length
|
||||
* @ref: output ref
|
||||
*
|
||||
* Like scx_cmask_ref_init() but the geometry is supplied by the caller, not
|
||||
* read from @m's header, so a concurrent BPF write to the header can't steer
|
||||
* later sizing or offsets. Rewrite the header from the trusted geometry and
|
||||
* bind @ref to it.
|
||||
*/
|
||||
void scx_cmask_ref_init_kern(struct scx_sched *sch, struct scx_cmask *m,
|
||||
u32 base, u32 nr_cids, struct scx_cmask_ref *ref)
|
||||
{
|
||||
WRITE_ONCE(m->base, base);
|
||||
WRITE_ONCE(m->nr_cids, nr_cids);
|
||||
WRITE_ONCE(m->alloc_words, SCX_CMASK_NR_WORDS(nr_cids));
|
||||
|
||||
ref->sch = sch;
|
||||
ref->src = m;
|
||||
ref->base = base;
|
||||
ref->nr_cids = nr_cids;
|
||||
|
||||
ref->shard_first = scx_cid_to_shard[base];
|
||||
if (likely(nr_cids))
|
||||
ref->shard_end = scx_cid_to_shard[base + nr_cids - 1] + 1;
|
||||
else
|
||||
ref->shard_end = ref->shard_first;
|
||||
}
|
||||
|
||||
/**
|
||||
* scx_cmask_ref_shard - Read one shard from @ref into @out
|
||||
* @ref: validated ref
|
||||
|
|
@ -1032,6 +1064,44 @@ void scx_cmask_ref_copy(const struct scx_cmask_ref *ref, const struct scx_cmask
|
|||
src->bits, src->base, src->nr_cids, CMASK_OP2_REF_COPY);
|
||||
}
|
||||
|
||||
/**
|
||||
* scx_cmask_ref_from_cpumask - Populate @ref's arena cmask from a cpumask
|
||||
* @ref: kern-bound ref, see scx_cmask_ref_init_kern()
|
||||
* @cpumask: cpus to translate into cids
|
||||
*
|
||||
* Write @ref's active range one word at a time, setting each cid's bit when
|
||||
* its cpu is in @cpumask. Offsets and length come from @ref's trusted geometry
|
||||
* and stores use WRITE_ONCE since BPF may read concurrently, so the arena
|
||||
* header is never read.
|
||||
*/
|
||||
void scx_cmask_ref_from_cpumask(const struct scx_cmask_ref *ref,
|
||||
const struct cpumask *cpumask)
|
||||
{
|
||||
struct scx_cmask *m = ref->src;
|
||||
u32 base = ref->base, nr_cids = ref->nr_cids;
|
||||
u32 wi, nr_words;
|
||||
|
||||
if (!nr_cids)
|
||||
return;
|
||||
|
||||
nr_words = (base + nr_cids - 1) / 64 - base / 64 + 1;
|
||||
for (wi = 0; wi < nr_words; wi++) {
|
||||
u32 word_first_cid = (base / 64 + wi) * 64;
|
||||
u64 word = 0;
|
||||
u32 bit;
|
||||
|
||||
for (bit = 0; bit < 64; bit++) {
|
||||
u32 cid = word_first_cid + bit;
|
||||
|
||||
if (cid < base || cid >= base + nr_cids)
|
||||
continue;
|
||||
if (cpumask_test_cpu(__scx_cid_to_cpu(cid), cpumask))
|
||||
word |= BIT_U64(bit);
|
||||
}
|
||||
WRITE_ONCE(m->bits[wi], word);
|
||||
}
|
||||
}
|
||||
|
||||
int scx_cid_kfunc_init(void)
|
||||
{
|
||||
return register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS, &scx_kfunc_set_init_cids) ?:
|
||||
|
|
|
|||
|
|
@ -295,8 +295,12 @@ static inline s32 scx_cpu_ret(struct scx_sched *sch, s32 cpu_or_cid)
|
|||
|
||||
int scx_cmask_ref_init(struct scx_sched *sch, const struct scx_cmask *src,
|
||||
struct scx_cmask_ref *ref);
|
||||
void scx_cmask_ref_init_kern(struct scx_sched *sch, struct scx_cmask *m,
|
||||
u32 base, u32 nr_cids, struct scx_cmask_ref *ref);
|
||||
void scx_cmask_ref_shard(const struct scx_cmask_ref *ref, s32 shard_idx,
|
||||
struct scx_cmask *out);
|
||||
void scx_cmask_ref_from_cpumask(const struct scx_cmask_ref *ref,
|
||||
const struct cpumask *cpumask);
|
||||
void scx_cmask_ref_or(const struct scx_cmask_ref *ref, const struct scx_cmask *src);
|
||||
void scx_cmask_ref_copy(const struct scx_cmask_ref *ref, const struct scx_cmask *src);
|
||||
|
||||
|
|
|
|||
|
|
@ -424,12 +424,15 @@ static inline void scx_call_op_set_cpumask(struct scx_sched *sch, struct rq *rq,
|
|||
{
|
||||
if (scx_is_cid_type()) {
|
||||
struct scx_cmask *kern_va = *this_cpu_ptr(sch->set_cmask_scratch);
|
||||
struct scx_cmask_ref ref;
|
||||
|
||||
/*
|
||||
* Build the per-CPU arena cmask and hand BPF its arena address.
|
||||
* Caller holds the rq lock with IRQs disabled, which makes us
|
||||
* the sole user of the scratch area.
|
||||
* Build the per-cpu arena cmask from kernel geometry via @ref,
|
||||
* never reading its BPF-writable header, and hand BPF the arena
|
||||
* address. The rq lock makes this cpu the sole kernel writer.
|
||||
*/
|
||||
scx_cpumask_to_cmask(cpumask, kern_va);
|
||||
scx_cmask_ref_init_kern(sch, kern_va, 0, num_possible_cpus(), &ref);
|
||||
scx_cmask_ref_from_cpumask(&ref, cpumask);
|
||||
SCX_CALL_CID_OP_TASK(sch, set_cmask, rq, task,
|
||||
scx_kaddr_to_arena(sch, kern_va));
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user