From nobody Wed Feb 11 05:17:35 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 4f9msC4PQ0z6RtnW for ; Wed, 11 Feb 2026 05:17:35 +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 4f9msC2WPCz3ScV for ; Wed, 11 Feb 2026 05:17:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770787055; 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=+oQvICro2B9W52My/6X18G+Bwn44qRxugWiBQer1LIY=; b=R3pYPI5zq2bhBAKmLbeFFy6zfn6pwg2T19oW1X+8mVew6/P+6VvC58BudMSMtHEJ3T7y6T PdilDyTDC37hkrvm8nqdx29Mc3Q5s+mVDeYesWf2/VEXHl5OC7ZtGXdvegwETfWen1wrzn yfs2nAY36UAZmK3neu/v28LUY3KyfIF2w7CzwkJu3CRREAdx8sBVXQPlhTPs35MWRXaOvT bQTI/nrotG0TEIDhJRPPRbhQFpIyYj/09NRS2Wimc2cGglSosStrm1I8d5YO1ApLZ9d+GS MeCxpPP7c/MXoR/eevhwrTsL1FLVPKesuR1C4VJAFoWV7/3tq1QT5aHngtugTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770787055; a=rsa-sha256; cv=none; b=cxwqXTFC6nAY65A1z8W6NZehPXY7IMi1vALnHYN+xniLI8jMsSVzy6h8q70ipkshhtxShr bQleNwg02PyJDEURu3hHjJ5Gp3wGwzLjKO3B6MCybz0ns6H+WxddHafGUG1w4C8xHWfK8C KdNQXly0i4jWJ8E22BrJigk7Muvu35A/QUCR8z64h3+4jYN1E/fu4ZBQnKTN+B+QTdRlqb zEF6QRG5fl4Ud9WK5JVmcZRvDRPVNm5LakjqlHTXVgifSsEmvvGEvg3e2p1tSRNH2DIWx7 NuRH6e9mW8ymXMR0mFlpCiFnS7DlynlOArUpNZSD3n1WAJDLBviLOMxU/YGW9Q== 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=1770787055; 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=+oQvICro2B9W52My/6X18G+Bwn44qRxugWiBQer1LIY=; b=rzoSDWcZEJht8HDZDm9IyFsT/PD88JsMpY9+yHYbiQ9j6T2YsKvqWHNXIX+AkQHL8JA5HR TO89E9vKV3ud4hxjULdciyjETOL/fXS/K8YG8MpiSw0I3QeepA/sPjGmxnH9juYW1sUUCr fegPYh61XMbQpJUNqVKCA43tWF/3JUPP/k8pqEOY4s6KgZDzbOfeOXYL+lmvtz+mdpqtXe ctO3Ro0z4iy0Q6C1ZUWUodKY2W0BekOA/JmOHqqtYRXlPf65JOIDv41B8V/HuF2l1n1un8 V6tYKxiLIk3i9u3AuFa5bYNCwCSamTRXwngb62KQDgGmAtmZ43I0hKUQHg6OKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9msC23TSzc6B for ; Wed, 11 Feb 2026 05:17:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 258e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 05:17:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a3fb3d08872b - stable/15 - kern/sched: deduplicate sdt probes 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: a3fb3d08872b72b41f69839ab30db05c24db666f Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 05:17:35 +0000 Message-Id: <698c10ef.258e3.2a05b977@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a3fb3d08872b72b41f69839ab30db05c24db666f commit a3fb3d08872b72b41f69839ab30db05c24db666f Author: Konstantin Belousov AuthorDate: 2026-01-24 06:16:42 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-11 05:12:37 +0000 kern/sched: deduplicate sdt probes (cherry picked from commit 9409e86980302cd495376861de3475b78734bc37) --- sys/kern/sched_4bsd.c | 18 ------------------ sys/kern/sched_shim.c | 18 ++++++++++++++++++ sys/kern/sched_ule.c | 18 ------------------ sys/sys/sched.h | 11 +++++++++++ 4 files changed, 29 insertions(+), 36 deletions(-) diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index 55a70885ee28..57d6f87a4dce 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -263,24 +263,6 @@ SYSCTL_INT(_kern_sched_4bsd, OID_AUTO, followon, CTLFLAG_RW, "allow threads to share a quantum"); #endif -SDT_PROVIDER_DEFINE(sched); - -SDT_PROBE_DEFINE3(sched, , , change__pri, "struct thread *", - "struct proc *", "uint8_t"); -SDT_PROBE_DEFINE3(sched, , , dequeue, "struct thread *", - "struct proc *", "void *"); -SDT_PROBE_DEFINE4(sched, , , enqueue, "struct thread *", - "struct proc *", "void *", "int"); -SDT_PROBE_DEFINE4(sched, , , lend__pri, "struct thread *", - "struct proc *", "uint8_t", "struct thread *"); -SDT_PROBE_DEFINE2(sched, , , load__change, "int", "int"); -SDT_PROBE_DEFINE2(sched, , , off__cpu, "struct thread *", - "struct proc *"); -SDT_PROBE_DEFINE(sched, , , on__cpu); -SDT_PROBE_DEFINE(sched, , , remain__cpu); -SDT_PROBE_DEFINE2(sched, , , surrender, "struct thread *", - "struct proc *"); - static __inline void sched_load_add(void) { diff --git a/sys/kern/sched_shim.c b/sys/kern/sched_shim.c index 9d96c1a2d550..4f000d8ace0c 100644 --- a/sys/kern/sched_shim.c +++ b/sys/kern/sched_shim.c @@ -102,6 +102,24 @@ SCHED_STAT_DEFINE(ithread_demotions, "Interrupt thread priority demotions"); SCHED_STAT_DEFINE(ithread_preemptions, "Interrupt thread preemptions due to time-sharing"); +SDT_PROVIDER_DEFINE(sched); + +SDT_PROBE_DEFINE3(sched, , , change__pri, "struct thread *", + "struct proc *", "uint8_t"); +SDT_PROBE_DEFINE3(sched, , , dequeue, "struct thread *", + "struct proc *", "void *"); +SDT_PROBE_DEFINE4(sched, , , enqueue, "struct thread *", + "struct proc *", "void *", "int"); +SDT_PROBE_DEFINE4(sched, , , lend__pri, "struct thread *", + "struct proc *", "uint8_t", "struct thread *"); +SDT_PROBE_DEFINE2(sched, , , load__change, "int", "int"); +SDT_PROBE_DEFINE2(sched, , , off__cpu, "struct thread *", + "struct proc *"); +SDT_PROBE_DEFINE(sched, , , on__cpu); +SDT_PROBE_DEFINE(sched, , , remain__cpu); +SDT_PROBE_DEFINE2(sched, , , surrender, "struct thread *", + "struct proc *"); + 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 201d9c33dda7..33a578814e0e 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -409,24 +409,6 @@ static int sysctl_kern_sched_ule_topology_spec_internal(struct sbuf *sb, struct cpu_group *cg, int indent); #endif -SDT_PROVIDER_DEFINE(sched); - -SDT_PROBE_DEFINE3(sched, , , change__pri, "struct thread *", - "struct proc *", "uint8_t"); -SDT_PROBE_DEFINE3(sched, , , dequeue, "struct thread *", - "struct proc *", "void *"); -SDT_PROBE_DEFINE4(sched, , , enqueue, "struct thread *", - "struct proc *", "void *", "int"); -SDT_PROBE_DEFINE4(sched, , , lend__pri, "struct thread *", - "struct proc *", "uint8_t", "struct thread *"); -SDT_PROBE_DEFINE2(sched, , , load__change, "int", "int"); -SDT_PROBE_DEFINE2(sched, , , off__cpu, "struct thread *", - "struct proc *"); -SDT_PROBE_DEFINE(sched, , , on__cpu); -SDT_PROBE_DEFINE(sched, , , remain__cpu); -SDT_PROBE_DEFINE2(sched, , , surrender, "struct thread *", - "struct proc *"); - /* * Print the threads waiting on a run-queue. */ diff --git a/sys/sys/sched.h b/sys/sys/sched.h index bc8022084de3..e4bd5211c1ae 100644 --- a/sys/sys/sched.h +++ b/sys/sys/sched.h @@ -69,6 +69,7 @@ #include #endif #include +#include struct proc; struct thread; @@ -234,6 +235,16 @@ SYSINIT(name, SI_SUB_LAST, SI_ORDER_MIDDLE, name ## _add_proc, NULL); SCHED_STAT_DECLARE(ithread_demotions); SCHED_STAT_DECLARE(ithread_preemptions); +SDT_PROBE_DECLARE(sched, , , change__pri); +SDT_PROBE_DECLARE(sched, , , dequeue); +SDT_PROBE_DECLARE(sched, , , enqueue); +SDT_PROBE_DECLARE(sched, , , lend__pri); +SDT_PROBE_DECLARE(sched, , , load__change); +SDT_PROBE_DECLARE(sched, , , off__cpu); +SDT_PROBE_DECLARE(sched, , , on__cpu); +SDT_PROBE_DECLARE(sched, , , remain__cpu); +SDT_PROBE_DECLARE(sched, , , surrender); + /* * Fixup scheduler state for proc0 and thread0 */