From nobody Tue Oct 22 12:50:42 2024 X-Original-To: dev-commits-src-main@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 4XXsVC0pKmz5PQYf; Tue, 22 Oct 2024 12:50:43 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXsVB6dy3z41Gq; Tue, 22 Oct 2024 12:50:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729601442; 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=jlPJwp23gjOMguBLxg4isXJXy+MBboZPeyhC4dbujso=; b=oxC2FaB1O8ynxOYMovE8GM2DQKH9yO4lvTrVa/AD4Fz3H8SDWtHl2o2YLAjRduJwyL6Iu2 eZCCRYP4NIIU0yiI6lrku4TT8AeM82IwGgt72hXSgBnjp2jD8dPo4Cl+6YdDlu6e3QdPML 4btmGD60GxQhoCaIw9hFwvW1mA73SP1CBQVC1CVToE0WaN7KtMmmVP2cCRR3BMA3o/+GIG MVNRN2DP4/ssdYHgY2itiPxvrCrYf2jltD2hdiI6wz6SqUyjE8v+YPbpiwLlpDC1v/pkFI NH6bkBwvre9r+rcp3UDJuKCmjKftCGUO2vEsTRIJLl1y0qMJaWblpbQzX4kjeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729601442; 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=jlPJwp23gjOMguBLxg4isXJXy+MBboZPeyhC4dbujso=; b=YeR9OZqip26FoSGWk4PMPTVVtC3awhsYvqRsBbEObfnYOw7hHiZNgg0zdcF4qUofiDzi1h q3sIs9qvPfT0QXtMa88JUTdJoyZ6ukbRiBMARseohyy4eDIhHypZV5SjfEhgJHHmxaqH7t T8545XASH/wOLq9vxk6V7jQUgYWKQjO96nMFSqDAIOncLmzdlPeI5i/HGQimQRC82t6J47 irqtScJujnG498k5CvnstWQq+trE7NdzOe997AsfpRsW7pHjuOGgwfgnwZfBfQN7ogiBk8 se2OHuQPxyhU815ntfxpyQsCl79cTfwDNEkYeoBlhhIAGUWSTFXdFdIMzWXhBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729601442; a=rsa-sha256; cv=none; b=VcWS0/vRTTBlhL96P24gALEx9s4pbDOFBEXLCRgPjNfSGnAifLg8qBDztJyrz4yw5NmZwr wSWxjwtBCDogqQPIGhDDaKFW3/+2a8bUL5Ds5VUnEZw6ruPqgkZqZwwnYfDC1V2/W0LIIs zCc5f/v9o1tCRx2gmFClV8nauimEL+qvM4ByPsImTlYjrj905kqgl537m7IWAr06g3icBZ srDsWainAf1Z+VyQ6MTb/1f3UPQl6Jtv6zZaK07XtoiktOcENzy0iWLPuNOJiYQztBW7SV tgEI4qtUqh33JftzqmNsxUxAQ6tScfu1nEclAohLq72H8z1BsxJZ3jkYd4ngww== 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 4XXsVB62b8zF3Z; Tue, 22 Oct 2024 12:50:42 +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 49MCogSr068301; Tue, 22 Oct 2024 12:50:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MCogNu068298; Tue, 22 Oct 2024 12:50:42 GMT (envelope-from git) Date: Tue, 22 Oct 2024 12:50:42 GMT Message-Id: <202410221250.49MCogNu068298@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6a07e67fb7a8 - main - vm_meter: Fix laundry accounting List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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: 6a07e67fb7a8b5687a492d9d70a10651d5933ff5 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6a07e67fb7a8b5687a492d9d70a10651d5933ff5 commit 6a07e67fb7a8b5687a492d9d70a10651d5933ff5 Author: Mark Johnston AuthorDate: 2024-10-22 12:48:43 +0000 Commit: Mark Johnston CommitDate: 2024-10-22 12:48:43 +0000 vm_meter: Fix laundry accounting Pages in PQ_UNSWAPPABLE should be considered part of the laundry. Otherwise, on systems with no swap, the total amount of memory visible to tools like top(1) decreases. It doesn't seem very useful to have a dedicated counter for unswappable pages, and updating applications accordingly would be painful, so just lump them in with laundry for now. PR: 280846 Reviewed by: bnovkov, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47216 --- sys/vm/vm_meter.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c index faf4074ef0c6..fef28bb883e4 100644 --- a/sys/vm/vm_meter.c +++ b/sys/vm/vm_meter.c @@ -455,7 +455,8 @@ u_int vm_laundry_count(void) { - return (vm_pagequeue_count(PQ_LAUNDRY)); + return (vm_pagequeue_count(PQ_LAUNDRY) + + vm_pagequeue_count(PQ_UNSWAPPABLE)); } static int @@ -477,6 +478,18 @@ SYSCTL_PROC(_vm_stats_vm, OID_AUTO, v_pdpages, CTLTYPE_U64 | CTLFLAG_MPSAFE | CTLFLAG_RD, NULL, 0, sysctl_vm_pdpages, "QU", "Pages analyzed by pagedaemon"); +static int +sysctl_vm_laundry_pages(SYSCTL_HANDLER_ARGS) +{ + struct vm_domain *vmd; + u_int ret; + + vmd = arg1; + ret = vmd->vmd_pagequeues[PQ_LAUNDRY].pq_cnt + + vmd->vmd_pagequeues[PQ_UNSWAPPABLE].pq_cnt; + return (SYSCTL_OUT(req, &ret, sizeof(ret))); +} + static void vm_domain_stats_init(struct vm_domain *vmd, struct sysctl_oid *parent) { @@ -503,8 +516,9 @@ vm_domain_stats_init(struct vm_domain *vmd, struct sysctl_oid *parent) "inactpdpgs", CTLFLAG_RD, &vmd->vmd_pagequeues[PQ_INACTIVE].pq_pdpages, 0, "Inactive pages scanned by the page daemon"); - SYSCTL_ADD_UINT(NULL, SYSCTL_CHILDREN(oid), OID_AUTO, - "laundry", CTLFLAG_RD, &vmd->vmd_pagequeues[PQ_LAUNDRY].pq_cnt, 0, + SYSCTL_ADD_PROC(NULL, SYSCTL_CHILDREN(oid), OID_AUTO, + "laundry", CTLFLAG_RD | CTLTYPE_UINT, vmd, 0, + sysctl_vm_laundry_pages, "IU", "laundry pages"); SYSCTL_ADD_U64(NULL, SYSCTL_CHILDREN(oid), OID_AUTO, "laundpdpgs", CTLFLAG_RD,