From nobody Thu Jan 29 18:12:33 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 4f26gQ0Ql5z6PfJP for ; Thu, 29 Jan 2026 18:12: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 4f26gP4x7nz3ZK7 for ; Thu, 29 Jan 2026 18:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769710353; 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=u/ZpGQRri8YzP4cZlfdqUBrm79eIYHCoUAzqzc4e25E=; b=PXSVodCPwxLkEFdiUTkLvE08t/sevfzNEuBOxWqPKPln3CsMuzL6p2JHnGbxaEoVoNJTZT BZ0XnEAXmjx2N9RhsimmRF3NpzHudgiQu5LeL0TNPzddlAm1ksCGBOYI4f30MuYDHB2eGY Y+zezSqAdjEKMNLw61roc7ef1RsUhjrfcv0xc2tzf37oWp/wIvz5O5FKE3ACoQxDqqezZz xfDPldYJfn3NPbNQRM24nt+v0iwZV4EqC/zWgbZJWuDrIFD/L+jhnXTJJxqxJfbIM8fy1p 79xPleGPyu71y4v4187ZGuTigZb2CY/8U21pQYqn9lSlg2h69BuxmYQnWcDl6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769710353; a=rsa-sha256; cv=none; b=dISbfihifFinSzcI7Il9aE4OQ2PIG64GpjCcGrY2GUbwkQk3lI41hek8kR8hSDX+tivqn6 H/nDHHEKsl9ekL7sAVrrXSTTy3OrNtFQap/WGQ3JovMDZSHYlaRI6YQPphuRbU2EIoc17n XkxpG7Jj4JB6eE3GwsNXUsk8BQKOhJXZ7b7NOG1GJtBnnKnQuMq53nWMeUhx1X8V7j/9Dp L89XbPSFdUz6zkbhNnLrxljlC0fWHct9ozZeRaNK4kj+WveDaCntiOb/qn1Mfl3menWdQu OhFg7J/5Cx/aapcTvO5nVK7yD28UUkqsdN30XtOeqwohrjCr0TvzGqlUzvnIqg== 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=1769710353; 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=u/ZpGQRri8YzP4cZlfdqUBrm79eIYHCoUAzqzc4e25E=; b=F+pgjuDAZILi05MyrVDQTLnJvIgUAeqapDayraiRt9oDyBvq3ZwlvoDTpOX+BChJECxtr9 PARR6hRiJH0f5sNaEr4OUOFPSwRu+lZLQuCOg1fNKLaYa0Wlr32Q0+9p/UquQNrYDB9hbJ DEcTP7693wJpDVX+OyjKC2ynXQM+vE8qhQrXMOwGc4tSDUzY2skmo7MNdcJhBd3XbOf1fr aDfiEIB6v6TVG6Z6UKwpY7TqQpYUyG8Gp3giGEU3Tffgoak5HqaOAClJTPlHz4L4gojjNg P0Uppr3Vehf3KE79ZEeE4JWqlb+SZE3cBDgAK27JlBx47+x9s+IfumMO2UgD4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f26gP49hQzpvt for ; Thu, 29 Jan 2026 18:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9052 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Jan 2026 18:12:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c384b35e42ee - main - x86/local_apic.c: remove direct SCHED_ULE use 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: c384b35e42ee5712dda6360ffa287c0350055580 Auto-Submitted: auto-generated Date: Thu, 29 Jan 2026 18:12:33 +0000 Message-Id: <697ba311.9052.7d577bd@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c384b35e42ee5712dda6360ffa287c0350055580 commit c384b35e42ee5712dda6360ffa287c0350055580 Author: Konstantin Belousov AuthorDate: 2026-01-22 13:24:37 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-29 18:11:56 +0000 x86/local_apic.c: remove direct SCHED_ULE use Move the code to decide on the timer accounting into the scheduler hook. Since there were no inclusion of opt_sched.h, it is probably done unconditionally anyway. 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 | 22 ++++++++++++++++++++++ sys/kern/sched_shim.c | 1 + sys/kern/sched_ule.c | 7 +++++++ sys/sys/sched.h | 3 +++ sys/x86/x86/local_apic.c | 15 +-------------- 5 files changed, 34 insertions(+), 14 deletions(-) diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index dae084aabcba..03e7b71d3fe6 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -1833,6 +1833,27 @@ sched_4bsd_affinity(struct thread *td) #endif } +static bool +sched_4bsd_do_timer_accounting(void) +{ +#ifdef SMP + /* + * Don't do any accounting for the disabled HTT cores, since it + * will provide misleading numbers for the userland. + * + * No locking is necessary here, since even if we lose the race + * when hlt_cpus_mask changes it is not a big deal, really. + * + * Don't do that for ULE, since ULE doesn't consider hlt_cpus_mask + * and unlike other schedulers it actually schedules threads to + * those CPUs. + */ + return (!CPU_ISSET(PCPU_GET(cpuid), &hlt_cpus_mask)); +#else + return (true); +#endif +} + struct sched_instance sched_4bsd_instance = { #define SLOT(name) .name = sched_4bsd_##name SLOT(load), @@ -1875,6 +1896,7 @@ struct sched_instance sched_4bsd_instance = { SLOT(sizeof_thread), SLOT(tdname), SLOT(clear_tdname), + SLOT(do_timer_accounting), SLOT(init), SLOT(init_ap), SLOT(setup), diff --git a/sys/kern/sched_shim.c b/sys/kern/sched_shim.c index f25b803bae82..d2f0b5749752 100644 --- a/sys/kern/sched_shim.c +++ b/sys/kern/sched_shim.c @@ -93,6 +93,7 @@ DEFINE_SHIM0(sizeof_proc, int, sched_sizeof_proc) DEFINE_SHIM0(sizeof_thread, int, sched_sizeof_thread) DEFINE_SHIM1(tdname, char *, sched_tdname, struct thread *, td) DEFINE_SHIM1(clear_tdname, void, sched_clear_tdname, struct thread *, td) +DEFINE_SHIM0(do_timer_accounting, bool, sched_do_timer_accounting) DEFINE_SHIM0(init_ap, void, schedinit_ap) static char sched_name[32] = "ULE"; diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index a285c62a4525..22257b2c0d7a 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -3354,6 +3354,12 @@ sched_ule_schedcpu(void) { } +static bool +sched_ule_do_timer_accounting(void) +{ + return (true); +} + struct sched_instance sched_ule_instance = { #define SLOT(name) .name = sched_ule_##name SLOT(load), @@ -3396,6 +3402,7 @@ struct sched_instance sched_ule_instance = { SLOT(sizeof_thread), SLOT(tdname), SLOT(clear_tdname), + SLOT(do_timer_accounting), SLOT(init), SLOT(init_ap), SLOT(setup), diff --git a/sys/sys/sched.h b/sys/sys/sched.h index c8491ede01a0..9c78452432b4 100644 --- a/sys/sys/sched.h +++ b/sys/sys/sched.h @@ -241,6 +241,8 @@ void schedinit(void); */ void schedinit_ap(void); +bool sched_do_timer_accounting(void); + struct sched_instance { int (*load)(void); int (*rr_interval)(void); @@ -282,6 +284,7 @@ struct sched_instance { int (*sizeof_thread)(void); char *(*tdname)(struct thread *td); void (*clear_tdname)(struct thread *td); + bool (*do_timer_accounting)(void); void (*init)(void); void (*init_ap)(void); void (*setup)(void); diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index c5399984c896..54026f83dc15 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -1443,21 +1443,8 @@ lapic_handle_timer(struct trapframe *frame) kmsan_mark(frame, sizeof(*frame), KMSAN_STATE_INITED); trap_check_kstack(); -#if defined(SMP) && !defined(SCHED_ULE) - /* - * Don't do any accounting for the disabled HTT cores, since it - * will provide misleading numbers for the userland. - * - * No locking is necessary here, since even if we lose the race - * when hlt_cpus_mask changes it is not a big deal, really. - * - * Don't do that for ULE, since ULE doesn't consider hlt_cpus_mask - * and unlike other schedulers it actually schedules threads to - * those CPUs. - */ - if (CPU_ISSET(PCPU_GET(cpuid), &hlt_cpus_mask)) + if (!sched_do_timer_accounting()) return; -#endif /* Look up our local APIC structure for the tick counters. */ la = &lapics[PCPU_GET(apic_id)];