From nobody Thu Oct 22 17:32:12 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 4j9YB51dwbz6xP9c for ; Thu, 22 Oct 2026 17:32:13 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j9YB50Lf4z3HLt for ; Thu, 22 Oct 2026 17:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690333; 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=2Vz3TBepPYR+kiuxOgK0BpDkpHP42mdLMsiOJqWbQ6w=; b=yh7eXLUNfJBycU9vE7eIp+gQMVn2hVAwVwS+M4hpkU//FPP+dgN4pFOu5Db1BDFxn/XfYg 5PIkOrI4jBIHxA5RGiv/b8IFycXl0S1FtTftJh0+iagZdLD0j9CENuhxR69v9k8SkVwTbu 4/rHY198Un42RTYLuHtB5qC2cBb7JvvpafPlscHLUcbnep6o43o/PXIr3DrAZTesjRiNxm K/nCchdEVAJf2q1mAYeGQsf5vnMh9HiDTS/AcfiuVW+D7WNwBaCvfPLE+lB0AH3/PBXkSN M3pRkiI7HhLKmpq9x0YwT1MFLB5a6oMo07ef7/D0ccRUHjkhDkZYiLrRtgdasw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792690333; b=T9vdLRhVNEqDuTtpzVhPMeG8ac6HIJDGG7Bzco6S/KYvTGqJjRSTEyOGYU0MPmQuUs0W7K E4xsb6ELcGpraK4MIfZo+UbG3gzNw3L0P3gtRWu0qHijK28vNrV7sR9tAeX8YeGPc7MHVV IUnMNa0QLhrbNzKNOfic2+Y4SVGPz/Jv6zuMPq516E/P3nagQs7z9U2IYIWq5ldftTWc14 1w4rbGoSVyUfo/QDKF5wfFQW4ljgUmjO9h8aCVYrBLV/q1w/KaHcGmBkMS/qCt/NFKutl6 yoJ/5ZzUXQLlXmKkWoK+53inPbQhKRhTc71IhhXM0NElY21u99bdVRDxKEAHzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690333; 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=2Vz3TBepPYR+kiuxOgK0BpDkpHP42mdLMsiOJqWbQ6w=; b=tdV9KHimyhsHulhbrprrZ1wZwAigtdJ83nB/dZ2V9Dxjp42LdEA6eN7OwEPyUZwx7Xj9CI +CnUTKmOMgSFJu10MzKQ0V4CKd/qrH5OWJeY5Yibf7lg4efMihiWTlE9ZrUzgAhRyD0BXA mMZ4JffDLJEB0+KoyW0ft3RZx3q3pP62vOI0m4aWXcW6Bi/ZsfOac954wU0sAsKKb+7qrq d2A+eZorpubzltdw8aG4cnYUbbYaXK6S6aS8XJi2z42vfgZFH+8JjS1XZUM7XJQj/xtcr/ GhYST0QiY17mCG1SXSPiFQOiEuBeB0FQPIQeR9WEXCXQCVbQxYjHnVD1kEgA2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j9YB46qtwzs5T for ; Thu, 22 Oct 2026 17:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ddcd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Oct 2026 17:32:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: deceef2d12b1 - stable/15 - vm_swapout: Fix the build without options RACCT List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: deceef2d12b12bb9e7de10f9c0859886407087f8 Auto-Submitted: auto-generated Date: Thu, 22 Oct 2026 17:32:12 +0000 Message-Id: <6ada489c.3ddcd.7491b570@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=deceef2d12b12bb9e7de10f9c0859886407087f8 commit deceef2d12b12bb9e7de10f9c0859886407087f8 Author: Mark Johnston AuthorDate: 2026-09-29 21:08:17 +0000 Commit: Mark Johnston CommitDate: 2026-10-22 15:45:41 +0000 vm_swapout: Fix the build without options RACCT Reported by: Jenkins Fixes: da0764f23554 ("vm_swapout: Restore handling of RLIMIT_RSS") (cherry picked from commit 767cd9bb420008a3ebeef65fe1d31eab60d61028) --- sys/amd64/conf/GENERIC | 6 +++--- sys/vm/vm_swapout.c | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index e06c585318b6..106f171a93dc 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -89,9 +89,9 @@ options KDTRACE_FRAME # Ensure frames are compiled in options KDTRACE_HOOKS # Kernel DTrace hooks options DDB_CTF # Kernel ELF linker loads CTF data options INCLUDE_CONFIG_FILE # Include this file in kernel -options RACCT # Resource accounting framework -options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default -options RCTL # Resource limits +#options RACCT # Resource accounting framework +#ptions RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default +#options RCTL # Resource limits # Debugging support. Always need this: options KDB # Enable kernel debugger support. diff --git a/sys/vm/vm_swapout.c b/sys/vm/vm_swapout.c index a0c61c33fa5a..6f6b7de2fce9 100644 --- a/sys/vm/vm_swapout.c +++ b/sys/vm/vm_swapout.c @@ -295,10 +295,11 @@ vm_daemon(void) struct thread *td; struct vmspace *vm; int breakout, tryagain, attempts; - uint64_t rsize, ravailable; +#ifdef RACCT if (racct_enable && vm_daemon_timeout == 0) vm_daemon_timeout = hz; +#endif while (true) { mtx_lock(&vm_daemon_mtx); @@ -370,7 +371,10 @@ again: &vm->vm_map, limit); size = vmspace_resident_count(vm); } +#ifdef RACCT if (racct_enable) { + uint64_t ravailable, rsize; + rsize = IDX_TO_OFF(size); PROC_LOCK(p); if (p->p_state == PRS_NORMAL) @@ -407,6 +411,7 @@ again: tryagain = 1; } } +#endif vmspace_free(vm); sx_slock(&allproc_lock); PRELE(p);