From nobody Mon Jul 28 13:31:37 2025 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 4brKBd54jmz634tW; Mon, 28 Jul 2025 13:31:37 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4brKBd2T3Xz3vCZ; Mon, 28 Jul 2025 13:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753709497; 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=5gqMLXgc6/ZYYe1kva//6WBrQ3a7Oq/CSgNgn5Eu4AE=; b=alc2upukvwzINyhlxnd++4qHc4WG20y9kQCu38ERWGQSZjHjDM6biWL2TYmwiUQhIPmY3i 2JS3pRcd11MEdx49FftFkMlU4e3XvzUhzZzBmwSON2fvDaKD9RBZgtwJSd+SEbGfPREGZH rixF8AeDOW/pOH/J3p//pupNz913Gsv5x4OAnE/MOZJGb43VmWmseOJYeTpOy1sY2D2EaP IhRQnLnFxyi0IvKeers8zJQisECZm0eubGRZNdGMvTiqIuELkwCkb1V7lz4zT3+Fmh8PVU kW7LWkKbS23FdcbRFVADyCi7LnPxRIJXRENBtqZIGqTsJM99NEMb6zfd5hJmng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753709497; 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=5gqMLXgc6/ZYYe1kva//6WBrQ3a7Oq/CSgNgn5Eu4AE=; b=d2nKZa4I810ywOYXRXG78V8yq/crEpjVKvQ7xoc/5VFjQjy+oOMVzkjxUbae+KqUOPDDUo R4gOB8VPyRun/fxK4MmQf3GxgB/7X/ByfiiglfncS5UjQL0L7PBknymEqSHS04Dca3Skvf j/qC66I77HpjEk1SYcvUghwLSEHVKnfqDqdXDkQWiKZUpSN8MKF88IKdhrxEK/QN6URdWK wUHOTwWuSH12xwmlFRTCNGq8EuekQ7PWSRoRC2itlg3XsnavV21CpY3nqfvJ+vXEfPJPft zO7jM2hE39kUl6WXFx9IaBddwLfKu0HUG88+5CKToM9dRCf4JQbuLFii2siX0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753709497; a=rsa-sha256; cv=none; b=DtAMpMa5j9K6F6IVuP8aBCBvcMeVyqRHqxoC7hxYDEZYgNtgOuEdE8dMA1aEbTY8tZiWo1 0wKQvd5LTBM7QOdSn2QtA8iTHpK03ivKWgaIRgA3W+/cjXzsoWvCyse+ia51Qptb5xHMmF ZWlB7kVQzJK94zlLRHocbyGOZokPPSylG0boHFszJJxDpCHCxv4REeJ7Ac5XWKinWYv3fo WGEoF3aLR5MzmQEz9F2RKEdnoLpcAW9h7GDVr6ev4DFFI3SXA0n5rBPFlBjOvqnB3Id79q byQMp8HG4lK3Gv/cPNTEukpzef81hzhN5PlOpP5JYWb4UucXgrpFzyp0dx59hg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4brKBd241mzns0; Mon, 28 Jul 2025 13:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56SDVbSc082084; Mon, 28 Jul 2025 13:31:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56SDVb9j082081; Mon, 28 Jul 2025 13:31:37 GMT (envelope-from git) Date: Mon, 28 Jul 2025 13:31:37 GMT Message-Id: <202507281331.56SDVb9j082081@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 32766dde5bc3 - stable/14 - sched_4bsd: Move ESTCPULIM() after its macro dependencies 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 32766dde5bc35b4fd47550fb6cdf2ff745528773 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=32766dde5bc35b4fd47550fb6cdf2ff745528773 commit 32766dde5bc35b4fd47550fb6cdf2ff745528773 Author: Olivier Certner AuthorDate: 2024-05-21 11:59:40 +0000 Commit: Olivier Certner CommitDate: 2025-07-28 13:28:41 +0000 sched_4bsd: Move ESTCPULIM() after its macro dependencies No functional change (intended). Also makes the comment about INVERSE_ESTCPU_WEIGHT() adjacent to its definition. MFC after: 1 month Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45392 (cherry picked from commit a454ff6b0440ec1a8e6b5c8154ad22c32df13c51) --- sys/kern/sched_4bsd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index c204e4a5676e..4cf5ec054d1c 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -73,15 +73,15 @@ dtrace_vtime_switch_func_t dtrace_vtime_switch_func; * INVERSE_ESTCPU_WEIGHT is only suitable for statclock() frequencies in * the range 100-256 Hz (approximately). */ -#define ESTCPULIM(e) \ - min((e), INVERSE_ESTCPU_WEIGHT * (NICE_WEIGHT * (PRIO_MAX - PRIO_MIN) - \ - RQ_PPQ) + INVERSE_ESTCPU_WEIGHT - 1) #ifdef SMP #define INVERSE_ESTCPU_WEIGHT (8 * smp_cpus) #else #define INVERSE_ESTCPU_WEIGHT 8 /* 1 / (priorities per estcpu level). */ #endif #define NICE_WEIGHT 1 /* Priorities per nice level. */ +#define ESTCPULIM(e) \ + min((e), INVERSE_ESTCPU_WEIGHT * (NICE_WEIGHT * (PRIO_MAX - PRIO_MIN) - \ + RQ_PPQ) + INVERSE_ESTCPU_WEIGHT - 1) #define TS_NAME_LEN (MAXCOMLEN + sizeof(" td ") + sizeof(__XSTRING(UINT_MAX)))