From nobody Wed Feb 11 05:17:32 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f9ms838mdz6Rtqp for ; Wed, 11 Feb 2026 05:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9ms819txz3Shj for ; Wed, 11 Feb 2026 05:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770787052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X7Hl2Jpgkg4TnNqcY75oKoXKY6ZerCfn6FUUQJUPJgU=; b=wXcxhLmNh/x67WVI39ueOeTFAQSKCEp1XhUgAHqYxeCrmfGfUhi16a8XjYOwrhYJL4bZOD kqDPxMKiD5n5kSoo7OgnbEDs6TW2ny3J9/eminksp9NfyhTnFRQpZI4asU749oACfabvNP G6PU2WmgRbcVvqYhCL2IMUtSz7MYtR6hDkVD6Usu6cVD6SK8V2LWfWvr+H2Vd6+ao2nPsW m9vaB/8HBjHNl0tAJJG5lvAv1C8VOBKn/7n8AObWX1saHSsOp6zWlJ3B0rg4t7HIF4QqOz 2+6APaU9ZW4TfmDdvp2KF/VQEWNUmRTQq5yR6TBOBPyy9xfa9FbOxlUlWgo7xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770787052; a=rsa-sha256; cv=none; b=xuRelc2yalto3zRcPtRjZuT+EhBrIad3jSMYDPfv6NAWh5mrb8XL1WVUN9avVSm0ABJYL1 SrLqQeJdxYjHwIwWIakbio8ERnMKcwEUNZpDRUxJ3doWMdvhpFMFn4WZZSBrT7FF/+0pJA nO9rPjoVlluQOYKO+ta6eBhlbYv+vNrkGeqtTXLD6N1mZ4bRin8jmrbLIL1fLSz82d2lXX H0nkOMVVyXl8QOGbdIBiWVgtzwYyAUVleDPJbds/W1FtRKyYOezN94TUYYVUsL9UT+19oW AF2DzI9X6fIcdtfQyOcfXe4/juDcLLqULMlzbdLBtkd5faUVrH9/I1OnmDY/8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770787052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X7Hl2Jpgkg4TnNqcY75oKoXKY6ZerCfn6FUUQJUPJgU=; b=trMisZXNCpVgcpTHR9O6MWUtr44dk2nvwc7C/L3DgXbe0apHdTF5AzPCVUhGcWBa36TDX3 88NipEqIszG57MXn9IN295Y0tGTLkctP2sCZEpRd+VsytZzNKrwvV+YsvDfkRQlkN3uibz Hpqc7h871s7Bh4HCFGsFi1w+MCRhWgKmTvdV8OfaedKbf2TK2EWnmRHBqrHejG4BwuRKIw mam+ulEjIpNtR07hTVEygpkNqEAYKYwuux2wW2ABfL6m9L/RsmeZbpEQUhwC+VOQ1BCoiP IArzHpicZhIFscOaNIEAvZkaXrz7gNBG1OpXdiDzxPgJyDc+Xd7I/qbu/hlOVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9ms80N3DzbtT for ; Wed, 11 Feb 2026 05:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2587e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 05:17:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: bd74830ba874 - stable/15 - sched_shim: restore kern.ccpu sysctl List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bd74830ba874956a2d0cfe6691da379d084d8e9e Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 05:17:32 +0000 Message-Id: <698c10ec.2587e.4a0f04c5@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bd74830ba874956a2d0cfe6691da379d084d8e9e commit bd74830ba874956a2d0cfe6691da379d084d8e9e Author: Konstantin Belousov AuthorDate: 2026-01-23 15:15:43 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-11 05:12:37 +0000 sched_shim: restore kern.ccpu sysctl (cherry picked from commit ff870b783f098cafd8b938379eada6b8cfe9a4fb) --- sys/kern/sched_4bsd.c | 10 ++++++---- sys/kern/sched_shim.c | 4 ++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index 11baf9d2bdfa..4c24d98173f3 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -436,10 +436,7 @@ maybe_preempt(struct thread *td) #define loadfactor(loadav) (2 * (loadav)) #define decay_cpu(loadfac, cpu) (((loadfac) * (cpu)) / ((loadfac) + FSCALE)) -/* decay 95% of `ts_pctcpu' in 60 seconds; see CCPU_SHIFT before changing */ -static fixpt_t ccpu = 0.95122942450071400909 * FSCALE; /* exp(-1/20) */ -SYSCTL_UINT(_kern_sched_4bsd, OID_AUTO, ccpu, CTLFLAG_RD, &ccpu, 0, - "Decay factor used for updating %CPU"); +extern fixpt_t ccpu; /* * If `ccpu' is not equal to `exp(-1/20)' and you still want to use the @@ -638,6 +635,11 @@ resetpriority_thread(struct thread *td) static void sched_4bsd_setup(void) { + /* + * Decay 95% of `ts_pctcpu' in 60 seconds; see CCPU_SHIFT + * before changing. + */ + ccpu = 0.95122942450071400909 * FSCALE; /* exp(-1/20) */ setup_runqs(); diff --git a/sys/kern/sched_shim.c b/sys/kern/sched_shim.c index 816d0b44bb52..f6b1285830fd 100644 --- a/sys/kern/sched_shim.c +++ b/sys/kern/sched_shim.c @@ -199,3 +199,7 @@ SYSCTL_PROC(_kern_sched, OID_AUTO, available, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, sysctl_kern_sched_available, "A", "List of available schedulers"); + +fixpt_t ccpu; +SYSCTL_UINT(_kern, OID_AUTO, ccpu, CTLFLAG_RD, &ccpu, 0, + "Decay factor used for updating %CPU");