From nobody Tue Sep 29 22:06:21 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 4hvXM974lmz6spV0 for ; Tue, 29 Sep 2026 22:06:29 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic.asd.mail.yahoo.com (sonic-usea5-0027.asd.mail.yahoo.com [34.2.70.26]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4hvXM762Xbz3Bxn for ; Tue, 29 Sep 2026 22:06:27 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=X7u4TMwW; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 34.2.70.26 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1790719586; bh=JyHZPYo2+pFwrN3FQd9QQn9BGr2Y+wdQXyNWpSsGqv4=; h=Date:Subject:To:References:From:In-Reply-To:From:Subject:Reply-To; b=X7u4TMwWFIVkQYXnOAn0dKs7w72X6hUAp1EKQdNespH/jQXSSl/u6Axzp8J5bPXbtzcjcYk7DT1zk/QjMyobMwpCf47wfYHo/xLvLBOGtsoJ6fxxuyavlkft4x/VPkATpY0vII+7N46TaB6oVpsNLfgQy9jIkB6AdyHxXwj5zNVkL4xQTxt9RnE2ZWag3sZNPqCMA4Mg5mnWx1KfpTwcagZL8aAJVC8IJf2bf+/TuT/1ccD3OdzAosRCvb139f4+nsLmeRTIOEcKokzjSrj9uNrNubzCXR0EhEojw2wb4s4F8oqNlOiO6RWG9TPXvkSvliJf8R9gaDVP9aMJUfSChA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1790719586; bh=c/W7azYy6P9fD9JBMkfv0QIWju7IB/aFsaMNt1RF7Je=; h=X-Sonic-MF:Date:Subject:To:From:From:Subject; b=rPOD7dFO+8/3jq+ns0NoMKwGhBfN/O9Mt55vBDvlcIiO5mMYxlrAFiaQ6NzUEzcx5eDu5pJwUtw5QwsPWpHHeEaZ+zVk6BTvUxsOKJRJ0044LQnwONvBekdaPnr0bwMXPpbqWFHqJFMXA+l4eWwTM2h7k4yBfw+O/oheR1n8vTfEz6GiMC2cgMDyMiBL0a8nk8r4+ITcvodWA5ck5Cm8ccGFt4Dam7UIa8RR/ct9cFIE5o1J4FbO+c4gkCO+T8Tqm4cfiy83jCH/4JS0RyFaXRRxX+j8L0YFqVsP1soKBzRsDy2J7pDYX7VnSJJDBAspNbpsd2lHWbwTwdXb7HKifg== X-YMail-OSG: fy1311cVM1nCWVBN62sR6yG4PWqCRV.YLR9Q5PrS6jVWtBTYjQffN_wqO3LKSui 8OtAFhPYMMuc4VjeGo66fi2Gqs6OMe9F10FlG7FYC1u7UEw2rbKT4iHya4nNsI1hzT9hyrKKLFjW v_wH1qO49_jxMT1mKAFZUcCqt_8By.li7NcVITg.sHT_kj77rM91M22adX7Xw_Y6HxrGA98HEUbn cVoo4B47VUtajPHXSMhwu4MSsLgwZ565P86Iu96CT6StZPzuxzgctO5wfoRNDa9P9YCNgQ4zEYYj wrwVIktucYtm.gHPOx6EwlvZjuNvdtQV10mpyd_EB44ebukPg2ow6UTyweWuopS2JiNAwUFERdPU RroaPwvkW2ZP.BTcOlsgKlry2T3OizqKLWJyJsN3gjGHgnYDUkRK9RyAcFtRZPHOfgND4UvTHFxh mJ1LzHy2yCuCysJJsLF4HMJqUqkPsIL_AyPwUTytdOWjOxrgkFwbXj1YYqmTM4mhKfHSH33n8Urt TXFoU3qFEmcP_ueTYB9TATZELELYzNOkXo1gRhqQg0_5gsM8FrtBTDW51A8YbHAJiwZxzjYEuHzK amUD056jwBYgwhPJXMW3eN4aRsheEmOBDKb8owI6shq3kJFO0foqsnmUMd.X4v0Reie06LMwWqys yTmDg5HtElDh9LmESFnZF_zL2ijHgZV9bXfgPtUPE3l5RSWh9hL1hZ_wwy6phI9QXFls02jfaWXB FP0kVgEVyvQZUBJUrv4m0jCon6DCH0KX.1YnJoenp8p1Gv.C02RSN0awLxI1RvH5sLed4.GhhaeK 0PEMtvKfprgLzCIZmAXc1vWo7QQfyI943DsYhVyBa3yEl5uY8Dmao4J9K6fwBSZnUGJZskPW7Vax iuo.f14RZJYxIpLFe0qEMeklb8TlzWpurG0RRIZIxcYzkNLuUp7os4p4GE0On4ExIFNzTYKjZ.Wi RQcFMFddT9HzRSQc9.gPmP0mLtiMixc691XsRVDHw9nosOUSGd0wHTvoR.dKLFAFN10UTC1IxEhh uQS4DT0k.Spp9fLTH.hEMW2PrfOZUDQpakvkifQ0sXn_25aQI61F26JL5mB9sZwTBiPAxAtqfw64 doJtKdLrafFkOMOlXhEg6M8YZkz_oXpTkWDgVVEyhyCWkKQRVx8dw4K_wA4ZNUKhMWKzluxa3eW3 _I_mocspTWbrasmjhMNamjVXCetnr5ENvQTsGXQLVhqZWEqDpc.hY8MJ0syogPj5D7MO3qx5JHBF PfsKi8X0YXm_7itATzHHdJLLeNH8kNgYeHX9bu_jTRL9XGOdSilEwrZpShn5h9bHuu6BNtHUJZui bmKE007Od_TvF0StHTBBSaoeVOixyef75lu7jvrTbTFPt73X5uE4PoNlHWw8hmEE36U8BsqzJPh_ NcKF71.UOPef8fn5Bflk4C5y0OizmLR9B8kzglHO7nbBC957sfr4YS9e1EV7UUhLGsHMgi6UfdiP 5wvFDQ.PXvjvqr5YDWe7UlpNbbt0OwzMeZZGOlfS03aC7icxRAAelEVYp7fP8qZDIsNj5oefWU32 ugtqTra9byOo8Y7U1eec_VWdzxgabiPL0o.o3xt5zkldT3X2Ab6vv020EUMn0NNAewPts1zVQ1vx jaPOkQPnrHbSKEL0SbgPMcEopurahUx.Zkhx6WEt8YeN0PvuvUBpzbuu9SCLI5hvtIdNxWbya6_1 YVfe68PlyKWCnYi2IH3GR.LtXSMeRI3LAaN5gckVDS1mZX4BB7xsEZG8bnPa2k9yMKk6NYROz9kn JXwkxqdecBEncuDd4GFhHDlAjfZFpNqzL0napBPDq3hfxP8i.yy3xJGvC84MkBuo01.eUgHMR9nQ facN536sDwwHQmf4HIIugiOhJZ8_audC36mkUmvPnXtFjduBe8d6FjxgK8xwCS2PH7Hc8L72tlqF 7n0wYaXYZgF_PgvfQPOVWQDoInPQIOzFl15LBriJUnP.__6CDxJWBEGBUenBJLkzj6C1sJ43LUnc pZSLaln5R8vk93niuBoBfFWT3K_ec8Mym3xqY08Gr0b6HKE8uk8T1XqmN0A-- X-Sonic-MF: X-Sonic-ID: 5b544049-bfee-4d66-a2de-f52fb548600d Received: from sonic.gate.mail.ne1.yahoo.com by mail-asdoutdeli-p-cin-usea5-prod-sonicconsumer-svc-107 with HTTP; Tue, 29 Sep 2026 22:06:26 +0000 Received: from dip1.lsn.gq1.yahoo.com ([67.195.161.10]) by hello (SMTP) with SMTP ID d5be5bcca4f0e43f261473b991e3507f; Tue, 29 Sep 2026 22:06:22 +0000 (UTC) Message-ID: Date: Tue, 29 Sep 2026 15:06:21 -0700 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 767cd9bb4200 - main - vm_swapout: Fix the build without options RACCT To: Mark Johnston , dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <6abc28e0.1f76c.2c4863a9@gitrepo.freebsd.org> Content-Language: en-US From: Mark Millard In-Reply-To: <6abc28e0.1f76c.2c4863a9@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Mailer: WebService/1.1.26577 mail.core.serving.mcws.prd.acl:role.token.mcws.jsmtp.yahoo X-Spamd-Bar: - X-Spamd-Result: default: False [-1.20 / 15.00]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ip4:34.2.64.0/19]; RWL_MAILSPIKE_VERYGOOD(-0.20)[34.2.70.26:from]; MIME_GOOD(-0.10)[text/plain]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:15169, ipnet:34.2.70.0/23, country:US]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[34.2.70.26:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[yahoo.com:+] X-Rspamd-Queue-Id: 4hvXM762Xbz3Bxn On 9/29/26 14:08, Mark Johnston wrote: > 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 Missing leading o before ptions (but in a comment). > +#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); > > -- === Mark Millard marklmi at yahoo.com