From nobody Tue Sep 29 21:08:48 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 4hvW4k0M5Bz6vC7X for ; Tue, 29 Sep 2026 21:08:54 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hvW4j5H5Kz4y8h for ; Tue, 29 Sep 2026 21:08:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790716133; 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=EuTxF/epO+CLhmhim3TfN9opv8bQDtNeSp2RVm2ixts=; b=MweuOzbct9V8bZHaTdhFBIiNMz4zfn9vCStlJMMJ2PkZ1ohQ4guDDqZ2a9lUHLv0Whbj9o qqaYIigfISJWSp1mf5O5zi1Ed46g3J0fHT3pmyEPkOLJqEXKqrGznEJVlmTwNsCoUuKyVk lw3JCPCQc/qoDT6X1EpI28Z0P6078biKPj2NhzXr6RCetfHDh5V2Dyg3MowX9voqRmXDjS eu73MnLKb8RWkSQZKet/b1TIQdTn/eDkc6GwRI/XBmHPOoQelRESzCKw25vdemebS0KroO Qilc63+atOgGNelGysWTwWb887BFPpI5Bwa4lKZCjAgzJ+p7g/sBGKt8HcV1OQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790716133; b=StXOZqkbDgZK8LPEnKEQ0jdagsNxCE5k7tz+gfDD13LKVhV1hXDR1q6oP05ccxDzu/IwaA COpeVn76m+6vJhiQZpjWCesq9KzJHL9+ewsY68CyAgbwo9htynnsDlQIkvUBBx6WbMRL8n Ly8NXNF6UCFDWPoOh4u5O37D3U+rUVgvUwdksKjoaY3PqibCf9UFypL+NrVChsZyKCl4mq FHyNTiZoh+FQ6Hzk3XHWtVpPCqSPdLttSzwZMmDItiu1g1S8OMqKkAGVtR6Gdv/su7DUdA ka479MOTuzSaiW1nCzjGwUm0tx7yX9k9SrhYb2/qi642ZUqPgBRynhRi+jvMYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790716133; 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=EuTxF/epO+CLhmhim3TfN9opv8bQDtNeSp2RVm2ixts=; b=kjDvJpMO/zWOM1H7Gdiml+18opAY/7wis0LL3HsWeb7pZV3Z9lEpcVHW8BGZIoYaYvPNup L7N3eqmP41+cOVTMXJJxLLXDjx48ghukKZVfecH1bHGiUtV37pRUjCqqT/FtZk/l71LRL9 v30TN2ndX9Ypp0SEnZ4o6BjkWT6ceoE7xt4FttOcw9ZzGNbwW4n6O/nsnma1Po2qNhSccD C5wQMHgQHW6+cGpIK/yda+ZXYT9SX79qEFUk8+0IYjbtAXXTw6II36HFRVF1myiQn6TgQa jkrGleFYrGNiZOb8h4v1Z0RDqbRebAtOwvJhnu+z/nNohXpHxchWx5d/OZ1U0A== 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 4hvW4j444SzFwr for ; Tue, 29 Sep 2026 21:08:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f76c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 21:08:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 767cd9bb4200 - main - vm_swapout: Fix the build without options RACCT 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 List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: 767cd9bb420008a3ebeef65fe1d31eab60d61028 Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 21:08:48 +0000 Message-Id: <6abc28e0.1f76c.2c4863a9@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=767cd9bb420008a3ebeef65fe1d31eab60d61028 commit 767cd9bb420008a3ebeef65fe1d31eab60d61028 Author: Mark Johnston AuthorDate: 2026-09-29 21:08:17 +0000 Commit: Mark Johnston CommitDate: 2026-09-29 21:08:17 +0000 vm_swapout: Fix the build without options RACCT Reported by: Jenkins Fixes: da0764f23554 ("vm_swapout: Restore handling of RLIMIT_RSS") --- 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 61533394a3d0..ed0b854d1766 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);