The Linux Kernel Mailing List
 help / color / mirror / Atom feed
* [PATCH v2] sched_ext: reject oversized dispatch_max_batch
@ 2026-11-20  6:55 Sechang Lim
  2026-11-20  8:12 ` Andrea Righi
  0 siblings, 1 reply; 2+ messages in thread
From: Sechang Lim @ 2026-11-20  6:55 UTC (permalink / raw)
  To: sched-ext
  Cc: tj, void, arighi, changwoo, mingo, peterz, juri.lelli,
	vincent.guittot, dietmar.eggemann, rostedt, bsegall, mgorman,
	vschneid, kprateek.nayak, haoluo, brho, joshdon, linux-kernel,
	bpf

bpf_scx_init_member() accepts dispatch_max_batch values up to INT_MAX.
The value determines the size of the per-CPU dispatch buffer, but
__alloc_percpu() rejects allocations larger than PCPU_MIN_UNIT_SIZE.
With BPF_F_LINK, an oversized value passes the struct_ops map update
and triggers an illegal-size warning during link creation before the
allocation fails with -ENOMEM.

Calculate the buffer size using the effective batch count, including
the default used when dispatch_max_batch is zero. Reject values above
the per-CPU allocation limit with -E2BIG during the map update, before
the allocator is called. This also covers registration without a link.

Fixes: f0e1a0643a59 ("sched_ext: Implement BPF extensible scheduler class")
Signed-off-by: Sechang Lim <rhkrqnwk98@gmail.com>
---
v2:
 - add braces (Andrea Righi)

v1:
 - https://lore.kernel.org/sched-ext/20261120054913.3795562-1-rhkrqnwk98@gmail.com/T/#u


 kernel/sched/ext/ext.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/kernel/sched/ext/ext.c b/kernel/sched/ext/ext.c
index 10de6bd865e8..56d75d179822 100644
--- a/kernel/sched/ext/ext.c
+++ b/kernel/sched/ext/ext.c
@@ -9196,11 +9196,17 @@ static int bpf_scx_init_member(const struct btf_type *t,
 	int ret;
 
 	switch (moff) {
-	case offsetof(struct sched_ext_ops, dispatch_max_batch):
-		if (*(u32 *)(udata + moff) > INT_MAX)
+	case offsetof(struct sched_ext_ops, dispatch_max_batch): {
+		u32 batch = *(u32 *)(udata + moff);
+		u32 nr = batch ?: SCX_DSP_DFL_MAX_BATCH;
+
+		if (struct_size_t(struct scx_sched_pcpu, dsp_ctx.buf, nr) >
+				PCPU_MIN_UNIT_SIZE)
 			return -E2BIG;
-		ops->dispatch_max_batch = *(u32 *)(udata + moff);
+
+		ops->dispatch_max_batch = batch;
 		return 1;
+	}
 	case offsetof(struct sched_ext_ops, flags):
 		if (*(u64 *)(udata + moff) & ~SCX_OPS_ALL_FLAGS)
 			return -EINVAL;
-- 
2.56.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] sched_ext: reject oversized dispatch_max_batch
  2026-11-20  6:55 [PATCH v2] sched_ext: reject oversized dispatch_max_batch Sechang Lim
@ 2026-11-20  8:12 ` Andrea Righi
  0 siblings, 0 replies; 2+ messages in thread
From: Andrea Righi @ 2026-11-20  8:12 UTC (permalink / raw)
  To: Sechang Lim
  Cc: sched-ext, tj, void, changwoo, mingo, peterz, juri.lelli,
	vincent.guittot, dietmar.eggemann, rostedt, bsegall, mgorman,
	vschneid, kprateek.nayak, haoluo, brho, joshdon, linux-kernel,
	bpf

On Fri, Nov 20, 2026 at 06:55:54AM +0000, Sechang Lim wrote:
> bpf_scx_init_member() accepts dispatch_max_batch values up to INT_MAX.
> The value determines the size of the per-CPU dispatch buffer, but
> __alloc_percpu() rejects allocations larger than PCPU_MIN_UNIT_SIZE.
> With BPF_F_LINK, an oversized value passes the struct_ops map update
> and triggers an illegal-size warning during link creation before the
> allocation fails with -ENOMEM.
> 
> Calculate the buffer size using the effective batch count, including
> the default used when dispatch_max_batch is zero. Reject values above
> the per-CPU allocation limit with -E2BIG during the map update, before
> the allocator is called. This also covers registration without a link.
> 
> Fixes: f0e1a0643a59 ("sched_ext: Implement BPF extensible scheduler class")
> Signed-off-by: Sechang Lim <rhkrqnwk98@gmail.com>

Reviewed-by: Andrea Righi <arighi@nvidia.com>

Thanks,
-Andrea

> ---
> v2:
>  - add braces (Andrea Righi)
> 
> v1:
>  - https://lore.kernel.org/sched-ext/20261120054913.3795562-1-rhkrqnwk98@gmail.com/T/#u
> 
> 
>  kernel/sched/ext/ext.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/kernel/sched/ext/ext.c b/kernel/sched/ext/ext.c
> index 10de6bd865e8..56d75d179822 100644
> --- a/kernel/sched/ext/ext.c
> +++ b/kernel/sched/ext/ext.c
> @@ -9196,11 +9196,17 @@ static int bpf_scx_init_member(const struct btf_type *t,
>  	int ret;
>  
>  	switch (moff) {
> -	case offsetof(struct sched_ext_ops, dispatch_max_batch):
> -		if (*(u32 *)(udata + moff) > INT_MAX)
> +	case offsetof(struct sched_ext_ops, dispatch_max_batch): {
> +		u32 batch = *(u32 *)(udata + moff);
> +		u32 nr = batch ?: SCX_DSP_DFL_MAX_BATCH;
> +
> +		if (struct_size_t(struct scx_sched_pcpu, dsp_ctx.buf, nr) >
> +				PCPU_MIN_UNIT_SIZE)
>  			return -E2BIG;
> -		ops->dispatch_max_batch = *(u32 *)(udata + moff);
> +
> +		ops->dispatch_max_batch = batch;
>  		return 1;
> +	}
>  	case offsetof(struct sched_ext_ops, flags):
>  		if (*(u64 *)(udata + moff) & ~SCX_OPS_ALL_FLAGS)
>  			return -EINVAL;
> -- 
> 2.56.1
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-20  8:12 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-20  6:55 [PATCH v2] sched_ext: reject oversized dispatch_max_batch Sechang Lim
2026-11-20  8:12 ` Andrea Righi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox