From nobody Tue Oct 29 14:20:08 2024 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 4XdC884Wx4z5bWDL; Tue, 29 Oct 2024 14:20:08 +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 4XdC884179z4LHQ; Tue, 29 Oct 2024 14:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730211608; 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=f0y1/k9XbTguP8goRNgjddNVmotyblSTf5GLUYeQRoE=; b=L3BOz+Ae5dFdk3EU4YHkPi7TkeHIxalnoGJ4ea99c1hXnKqnOy0+NsYlJVhvpnEny4yTKE qDwB1S9V5nTBEg55oFr8FP2q45XuonwTVBmz9GYTxyyOEZBHknPN51YcAGAvYItmSHOGHw FdIFRsjtP8N31DzxryHQTCyyLBmR6juOpIlu/3k5bBw/fT4TUIyB7umE0XiNgCkwXOiJgj QBmEtkbpUsk+KyZjsNNB+0e4aBS+7HngijwcUBpobliOmCQUaF5iKUBYa/8EjXFTOUYUyx HE+3PRSOz0txbcsi+K4fUdmuRU9kvE426gB9yt5KZS8ey3btUEzx06MONp2tKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730211608; 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=f0y1/k9XbTguP8goRNgjddNVmotyblSTf5GLUYeQRoE=; b=jBtBnNj5iNaF3MlHnxH3TF0YS/oQSU3m90ottFpser6B7SnYDcgAI44FGwu9dl3sy6Uonz gFMID+FLeszNeGutinzQL8nVT5pQC3lbUA9BJKyR4ugYQhDM3vtOVHO3HlG/wXlC9iFq9A 6QbeGm8sC4OQMIOpjrUKUKLsLdYr0Sq7Kh7bP7w0f3eBm8Maus4MT3il/jZquoZ35o2c1E qcJQctkXGzovKLEcuLIAVJZ2aTho8mL3nTWx/8jv+eHXSdEUUSHGKLD7Ya9HI4Hd7tDALZ jBkVroUYXId1DZeJS+AcoxnREBkX/v/JzXEnX4mAfxV1QZ/W7tJU0OCKV0OTdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730211608; a=rsa-sha256; cv=none; b=EhLQtW57xihDr+376PQqmpDB7H6xJe0wYcIHlP+0efG/CB6joKPHoccVsUiP+qlzVeJ7c2 /taOF05gJTO7CC4u4o3yxvomnm8WRPsxLv8q8BbtlaFqjHTsjh+gAME0zeAa4La31TY0O9 LzZ4j3NKQQ6Y2o8rPqjwJvFfJo4HORd8INSC4JUMjr57DnSQyXfNa4qdSVYnOhmoJjYpL4 iYylckTzyhft52RsGzy8eFm+XEtj9htYS83TDYt6NuiEOwcvT4uhgMIV/MlTaHa2oFbi+Q E4Z+SZtFdHplb7AVN5/rsgVC+fkBwMqQkicS/o/faZFRw8e6YusbM/KLi81P/w== 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 4XdC883TnJzRMr; Tue, 29 Oct 2024 14:20:08 +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 49TEK8a4014674; Tue, 29 Oct 2024 14:20:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49TEK8E9014670; Tue, 29 Oct 2024 14:20:08 GMT (envelope-from git) Date: Tue, 29 Oct 2024 14:20:08 GMT Message-Id: <202410291420.49TEK8E9014670@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9c139dd5bf40 - stable/13 - vm_object: Report laundry pages in kinfo_vmobject 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9c139dd5bf40968f1e84ef607927acee4b80e7fd Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9c139dd5bf40968f1e84ef607927acee4b80e7fd commit 9c139dd5bf40968f1e84ef607927acee4b80e7fd Author: Mark Johnston AuthorDate: 2024-10-22 12:47:52 +0000 Commit: Mark Johnston CommitDate: 2024-10-29 13:34:33 +0000 vm_object: Report laundry pages in kinfo_vmobject Reviewed by: bnovkov, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47214 (cherry picked from commit a86373bc93ee1c850943e8585d0d426479378145) --- sys/sys/user.h | 3 ++- sys/vm/vm_object.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/sys/user.h b/sys/sys/user.h index c6894c527143..13062d67a69d 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -593,7 +593,8 @@ struct kinfo_vmobject { uint64_t _kvo_backing_obj; /* Handle for the backing obj */ } kvo_type_spec; /* Type-specific union */ uint64_t kvo_me; /* Uniq handle for anon obj */ - uint64_t _kvo_qspare[6]; + uint64_t kvo_laundry; /* Number of laundry pages. */ + uint64_t _kvo_qspare[5]; uint32_t kvo_swapped; /* Number of swapped pages */ uint32_t _kvo_ispare[7]; char kvo_path[PATH_MAX]; /* Pathname, if any. */ diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 6da30800896e..8ae9fe50833d 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2618,10 +2618,12 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) * sysctl is only meant to give an * approximation of the system anyway. */ - if (m->a.queue == PQ_ACTIVE) + if (vm_page_active(m)) kvo->kvo_active++; - else if (m->a.queue == PQ_INACTIVE) + else if (vm_page_inactive(m)) kvo->kvo_inactive++; + else if (vm_page_in_laundry(m)) + kvo->kvo_laundry++; } }