From nobody Thu Jan 29 18:12:40 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 4f26gX663sz6PfPB for ; Thu, 29 Jan 2026 18:12:40 +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 4f26gX3MWGz3ZFP for ; Thu, 29 Jan 2026 18:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769710360; 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=U4axuFh73L5RdcHMZpyMTTJDcJM39/HYnov1hJN/syc=; b=cnClyfHsp0bNtsQXMy6ZUEAXy2292RdtEhEb9wHEeqSa4yDjgGZdUARgLt0xC5HEzXK0aq 3XJOCju3yIq6tNM+pUDA1AUQ0iN+4UVX1U2j8na4Psgv7nEjidWOR5vaptHi+2unE8h9Vx M6RWofEYD7LrdxIIKOWPkqv4s17rwZyF1sTagPQSzvM1rzNAXLJdwI9zPpHMjzkvqlIWsE cx0j3ix9dVECV7IZtVwJ54sGqm3DmGNKLn7dMsleFDTdV332xCUbgDd+0syan4W+10O3IY KOdLhPRSfBr9V/1HZEt1hrZq6yHSXl79aRSec7HH7dNPeJKE+cCx7/C2K3cLqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769710360; a=rsa-sha256; cv=none; b=t8jYcJn2dS4H+0vqvij5h7noW6Ivaho2vubWukWyrThinIYXn99k53iaokTNBul+1oX/I5 rjceoHVzgQLeDzrTf07eoukEHKiCZF36bOKnqNNoClQ3cf1r/YFE891ThWb9iXtocNyYSv svZDDEjhehDeidqLIUV63uDpXJcU4wqQ1jSIeYeGBToufWF4EN+9qVU65Q5ttpdacDmaA9 oSCewsinAf0KiF6zV9g13kiLVe37kXqusanmcYSyn2w/RQs3hvcUJa2b1m5Fp8WwF1m5AG WP1KObdoVqrMEDvze5oNYb9wbxEfrvOMUU3H2KkdBNzkiOhAMgl+pVacdd7WlA== 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=1769710360; 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=U4axuFh73L5RdcHMZpyMTTJDcJM39/HYnov1hJN/syc=; b=SoaTsu+4yGCPQKpRPyjA5NjrvEaLBQSpqqtMNDCUdzbCIeTQrQTuhj9pjBWvMK8qjl+LLh AKfoAG/Q1Hfoo9lLkfzr38ePTyUO0Q5ilKhkiT1F4mc7AsyI2MZDoXcX1mGZpVuOeWToyt N9ND0ru28evLN0/Zpnl9ONR+XkKgImiCniDB43rdMly0P2a1ToLYzP7hnDTBT375cetUfc vy+r78LnIK/tzoRSmgX+zOTYa1O/bPozTyq5vDqoE7JjvrGk2iU/VpkK2xUM690gkIS6Vx 20y9vnC3HD6vUJnzGdmalQT2m9x34wpnvZbF85TpOblXeunxFkHosO5suFlfLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f26gX2hNVzq5s for ; Thu, 29 Jan 2026 18:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47f48 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Jan 2026 18:12:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: a84a39dfe5d1 - main - kern/sched: move duplicate preemption stat vars into sched_shim.c 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: a84a39dfe5d1fd98afdf29a74017fce29441b730 Auto-Submitted: auto-generated Date: Thu, 29 Jan 2026 18:12:40 +0000 Message-Id: <697ba318.47f48.6bdef82c@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a84a39dfe5d1fd98afdf29a74017fce29441b730 commit a84a39dfe5d1fd98afdf29a74017fce29441b730 Author: Konstantin Belousov AuthorDate: 2026-01-24 06:01:48 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-29 18:11:56 +0000 kern/sched: move duplicate preemption stat vars into sched_shim.c Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54831 --- sys/kern/sched_4bsd.c | 4 ---- sys/kern/sched_shim.c | 5 +++++ sys/kern/sched_ule.c | 4 ---- sys/sys/sched.h | 3 +++ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index 4c24d98173f3..55a70885ee28 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -706,10 +706,6 @@ sched_4bsd_rr_interval(void) return (imax(1, (sched_slice * hz + realstathz / 2) / realstathz)); } -SCHED_STAT_DEFINE(ithread_demotions, "Interrupt thread priority demotions"); -SCHED_STAT_DEFINE(ithread_preemptions, - "Interrupt thread preemptions due to time-sharing"); - /* * We adjust the priority of the current process. The priority of a * process gets worse as it accumulates CPU time. The cpu usage diff --git a/sys/kern/sched_shim.c b/sys/kern/sched_shim.c index f6b1285830fd..9d96c1a2d550 100644 --- a/sys/kern/sched_shim.c +++ b/sys/kern/sched_shim.c @@ -97,6 +97,11 @@ DEFINE_SHIM0(do_timer_accounting, bool, sched_do_timer_accounting) DEFINE_SHIM1(find_l2_neighbor, int, sched_find_l2_neighbor, int, cpu) DEFINE_SHIM0(init_ap, void, schedinit_ap) + +SCHED_STAT_DEFINE(ithread_demotions, "Interrupt thread priority demotions"); +SCHED_STAT_DEFINE(ithread_preemptions, + "Interrupt thread preemptions due to time-sharing"); + static char sched_name[32] = "ULE"; SET_DECLARE(sched_instance_set, struct sched_selection); diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index 334b3c0f1de3..201d9c33dda7 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -2693,10 +2693,6 @@ sched_ule_userret_slowpath(struct thread *td) thread_unlock(td); } -SCHED_STAT_DEFINE(ithread_demotions, "Interrupt thread priority demotions"); -SCHED_STAT_DEFINE(ithread_preemptions, - "Interrupt thread preemptions due to time-sharing"); - /* * Return time slice for a given thread. For ithreads this is * sched_slice. For other threads it is tdq_slice(tdq). diff --git a/sys/sys/sched.h b/sys/sys/sched.h index 3ba40fb191d3..bc8022084de3 100644 --- a/sys/sys/sched.h +++ b/sys/sys/sched.h @@ -231,6 +231,9 @@ SYSINIT(name, SI_SUB_LAST, SI_ORDER_MIDDLE, name ## _add_proc, NULL); #define SCHED_STAT_INC(var) (void)0 #endif +SCHED_STAT_DECLARE(ithread_demotions); +SCHED_STAT_DECLARE(ithread_preemptions); + /* * Fixup scheduler state for proc0 and thread0 */