From nobody Thu Jan 29 18:12:38 2026 X-Original-To: dev-commits-src-all@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 4f26gV6QhRz6PfD6 for ; Thu, 29 Jan 2026 18:12:38 +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 4f26gV3lRJz3ZL1 for ; Thu, 29 Jan 2026 18:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769710358; 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=0MpTvvSmiBIwYbZwAmc9/WCQ27UzLu0WKM+TDyXWh+o=; b=HmpOOZ1UOeTg5p/W9iPFoDZ/6ZPO9ZbhowwqBgnoUtqrFm1M36lCwkOHg+raC3Jr83dQhK QO/EJFBEJse2DPjjx0WMCJ+amF1nKJRHJVX0MczW1ORkDFqpzPLQmlHrLKQsZ3C4VNnHRf 1jXseOkSFzvA0A0Yxc0P4ukm8Y8M2JegYxB77RLlYj2vob30RlwEJVT9LeJPU3IyywZAEZ fWImKBDiDTTD2YthJ+7tIoTGreEDY9Y5f8SRvUdWSqdnQI6qod6aRxZZoeLk8AG69Cdc4C ND03ClTJgM2HoFay+WEArvtlAj1uNHSs9YObA41jyexHKocFFMuXe9LKc27Lkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769710358; a=rsa-sha256; cv=none; b=WVKpIKvj2EvFn1AQlJOD6ZHP4yVodLw9Hc4fnE9h44zxB1G9lFlW9tIEYoPVzw5LpzWVQ4 5UNnexulYaWe44IarrieZ+NfqRSTUUUlv0J+mRH8usi85148cQbLruA2fPiPTcQbyfDFvh mud6M/WWfj3emubBTWlu+1qPXDKBx9sNmIXDd538Z/VA4a+ftSSjawkqrUCSEnxvCL8j5R rC5xpjn7cKaKdbokxJJAxkpOzr1TxtUT5WyZibtGDg+bjLunTaAbol+L7XvkMzMBLuaT5s WvU/HMeO0EyblVp3dFKK9N1GAAhUAU7e/QeFSPRIOsprbnhSWqArlAXbvzTw1A== 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=1769710358; 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=0MpTvvSmiBIwYbZwAmc9/WCQ27UzLu0WKM+TDyXWh+o=; b=olv+o/ZnNEJg9z1LKCLRmC76PCvyQvCD8JtYC1orDyV0XDo3fiyhYjYdGKrbyrrtDHfHd2 dmuokwtdV/mmYFEC3OSphPQMyIVQDDHHbeGmcZOkXqrCbViC/hueWbxA2YLkHhwzQKogHk Al3ShWG82J5hXziDV3WaU71nQtIW+CgmAmWbfES33mxVGK8Hnl0HWDdzVt4cnj3HDFn15h XgIq1giQKh1TOmnPXbdfWHSm/grwyTdRIS5xFsv23fl5qR5B0Hc+xY5nsBWPV9Fb8qrpII pGj847NJdrJCEcGABpVMOwJdH3rSHDagI9Dp+C8GZqUEj3qdh+CNGRtL+1J1zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f26gV0THdzpvx for ; Thu, 29 Jan 2026 18:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4706d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Jan 2026 18:12:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ff870b783f09 - main - sched_shim: restore kern.ccpu sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: ff870b783f098cafd8b938379eada6b8cfe9a4fb Auto-Submitted: auto-generated Date: Thu, 29 Jan 2026 18:12:38 +0000 Message-Id: <697ba316.4706d.248b6488@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ff870b783f098cafd8b938379eada6b8cfe9a4fb commit ff870b783f098cafd8b938379eada6b8cfe9a4fb Author: Konstantin Belousov AuthorDate: 2026-01-23 15:15:43 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-29 18:11:56 +0000 sched_shim: restore kern.ccpu sysctl It is apparently should be considered part of the ABI, and is used by the base top(1). But do not declare the ccpu variable in headers, it is needed only by 4bsd. So put the variable definition into sched_shim.c to make the kernel buildable without SCHED_4BSD. Reviewed by: olce Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54831 --- 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");