From nobody Wed Feb 11 05:17:34 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 4f9msB3mVcz6RtlL for ; Wed, 11 Feb 2026 05:17:34 +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 4f9msB1rKhz3Swg for ; Wed, 11 Feb 2026 05:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770787054; 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=ZMqYJa2f8CyYzZeDZ6S2oKQK/MuJCuQoc0PowsXgBWs=; b=lgkpY+SZffON/liMvgw6pT69W9zp+gq53bE6Mh+l6YTTUIF9e0kOA7s4IF/DRwPvlRySmk Fz6W3g30npCdkC4njWrZbrYpPm+3r1538JtRj5hoOs1jO+QA278F7Wpk2fI6O1zQgRq/ve ACR+KT52MIJNUkj+00/Vmh/fNBr/OREm+wx9//GLbXt9iSQ+PH2seJ8dxFzbM4+0KOsdBt RH+frTooegmlK/ujLVK1RPEvGtIiuVWiwEsMcqXXLdHcM2dLJ+IQdE8pY2XmciHkhcJLPY QFCzS/EB1Yp5gElfnuxutPPaVwByZxrR28JAXucK3+HHwW1vB55vjA396hk22g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770787054; a=rsa-sha256; cv=none; b=xVtzMdB25eM/7JqdX5RnSWgncd2oJGTaMSypjZV6FLdfctcz3enkX2QyFv2q4FWlgF66K1 6+6qrHiVMiC6dvKplQ3sB4UJa3JE0cjVN1ISu2TtocyzApUcnsWegu1kzR/Fnic3wDrm8y 1mvnvxJ2CCwwPw4Jaeo0O7d3lNGkYaiqmJxYAkQ4bG5Dn1NE5KprewikqGq80alzSkFESd fQSGAsWPzpIpork22Ur01MF0/oycaqfkKGtXE321OmxBmushAy/rmxhxJMtEI67B9g9q0s B5PQeRnEt1IDeg7bouqKnVN0oAHqdyLNuNrkbgAT2m6gBIb4NKnstpX6XbHvcQ== 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=1770787054; 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=ZMqYJa2f8CyYzZeDZ6S2oKQK/MuJCuQoc0PowsXgBWs=; b=kUhHVTad82HbpdEW9chmyDBkhN8+a70vQFpwhILGV8HRiu4lBbifWyEXPptIG6/0hXNuQP 7Yfbi6sJdZ+Xi0UOnMJvEQyXXdnZPFzxc7X4H3L6pxvQP5dOjzG5jZKvZSx8UzehEHAyV8 G9K6yjhIMZAwdzfHDo1Qk3B0FNCvzQnk3Mnzp/hVknvc1YnIS6zN72FmSdWjue8GRauzFX BfUvyc4r0MvrH+M84nlhZiSKg2+Kzl3XGMxcr41wA2Z4vKHH73gaICbIZDInEqwpkAniGE qT5cukSdnqEEaBVDaMebNzLQYL3cM5a7k6t7nYQl9BcssCFEkNYq9ikZX8iNQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9msB1HV1zcHZ for ; Wed, 11 Feb 2026 05:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 264c5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 05:17:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 916cc3877e30 - stable/15 - kern/sched: move duplicate preemption stat vars into sched_shim.c 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: 916cc3877e30a9828d98621ca38732e43d09c251 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 05:17:34 +0000 Message-Id: <698c10ee.264c5.54b343fb@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=916cc3877e30a9828d98621ca38732e43d09c251 commit 916cc3877e30a9828d98621ca38732e43d09c251 Author: Konstantin Belousov AuthorDate: 2026-01-24 06:01:48 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-11 05:12:37 +0000 kern/sched: move duplicate preemption stat vars into sched_shim.c (cherry picked from commit a84a39dfe5d1fd98afdf29a74017fce29441b730) --- 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 */