The branch stable/14 has been updated by mchoo: URL: https://cgit.FreeBSD.org/src/commit/?id=c087ee05b525c7dfc0a2370e5770c89651d56588
commit c087ee05b525c7dfc0a2370e5770c89651d56588 Author: Minsoo Choo <[email protected]> AuthorDate: 2026-08-24 02:25:35 +0000 Commit: Minsoo Choo <[email protected]> CommitDate: 2026-10-02 15:44:50 +0000 sched: fix kern.sched.{4bsd,ule}.slice Fix three problems with kern.sched.{4bsd,ule}.slice: * Guarantee minimum slice is 1. * Recalculate hogticks on sysctl write. * For ULE, recalculate sched_slice_min on sysctl write. Reviewed by: olce Approved by: olce (mentor) MFC after: 2 weeks Sponsored by: FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59401 (cherry picked from commit 179f5b2bfedccc762352f06057f4e389bfabb2ea) --- sys/kern/sched_4bsd.c | 21 ++++++++++++++++++++- sys/kern/sched_ule.c | 22 +++++++++++++++++++++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index 9147b4418b8d..6c204d62b213 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -214,6 +214,23 @@ sysctl_kern_quantum(SYSCTL_HANDLER_ARGS) return (0); } +static int +sysctl_kern_slice(SYSCTL_HANDLER_ARGS) +{ + int error, new_val; + + new_val = sched_slice; + error = sysctl_handle_int(oidp, &new_val, 0, req); + if (error != 0 || req->newptr == NULL) + return (error); + if (new_val <= 0) + return (EINVAL); + sched_slice = new_val; + hogticks = imax(1, (2 * hz * sched_slice + realstathz / 2) / + realstathz); + return (0); +} + SYSCTL_NODE(_kern, OID_AUTO, sched, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "Scheduler"); @@ -223,7 +240,9 @@ SYSCTL_PROC(_kern_sched, OID_AUTO, quantum, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, 0, sysctl_kern_quantum, "I", "Quantum for timeshare threads in microseconds"); -SYSCTL_INT(_kern_sched, OID_AUTO, slice, CTLFLAG_RW, &sched_slice, 0, +SYSCTL_PROC(_kern_sched, OID_AUTO, slice, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, 0, + sysctl_kern_slice, "I", "Quantum for timeshare threads in stathz ticks"); #ifdef SMP /* Enable forwarding of wakeups to all other cpus */ diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index 44425fa97770..f5d01e85b0a5 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -3441,6 +3441,24 @@ sysctl_kern_quantum(SYSCTL_HANDLER_ARGS) return (0); } +static int +sysctl_kern_slice(SYSCTL_HANDLER_ARGS) +{ + int error, new_val; + + new_val = sched_slice; + error = sysctl_handle_int(oidp, &new_val, 0, req); + if (error != 0 || req->newptr == NULL) + return (error); + if (new_val <= 0) + return (EINVAL); + sched_slice = new_val; + sched_slice_min = imax(1, sched_slice / SCHED_SLICE_MIN_DIVISOR); + hogticks = imax(1, (2 * hz * sched_slice + realstathz / 2) / + realstathz); + return (0); +} + SYSCTL_NODE(_kern, OID_AUTO, sched, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "Scheduler"); SYSCTL_STRING(_kern_sched, OID_AUTO, name, CTLFLAG_RD, "ULE", 0, @@ -3449,7 +3467,9 @@ SYSCTL_PROC(_kern_sched, OID_AUTO, quantum, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, 0, sysctl_kern_quantum, "I", "Quantum for timeshare threads in microseconds"); -SYSCTL_INT(_kern_sched, OID_AUTO, slice, CTLFLAG_RW, &sched_slice, 0, +SYSCTL_PROC(_kern_sched, OID_AUTO, slice, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, 0, + sysctl_kern_slice, "I", "Quantum for timeshare threads in stathz ticks"); SYSCTL_UINT(_kern_sched, OID_AUTO, interact, CTLFLAG_RWTUN, &sched_interact, 0, "Interactivity score threshold");
