From nobody Tue Oct 22 12:50:40 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 4XXsV85MQsz5PQhJ; Tue, 22 Oct 2024 12:50:40 +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 4XXsV84rxHz41QN; Tue, 22 Oct 2024 12:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729601440; 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=19aoPCpMtHJmrHVBBBhLUl/kXWUuz1pXH2BBM9vT9R8=; b=KSiQxezVAwQAWh6pPLuSeoMO34n/4yKBEx92q0gs1USK3y2D5u0nhhLIHv4J6sjZhvKBpa rVrLW2QNCHXdEC6H7rjMFz3fO4wXsr4Ar0Qcop0CJolIXg9VyBAoL1KhwEEQBW6B037/0N kbTTLOvfRxxMoMLNwWY2sjs2wxgMg9aFq7XlVOgljTE7yRCNGAqNmfpJE1Q05ycs7i013W irMQ3btX7DXWAMj7rDBPPPoZeQ9r8urswPxE8ZNJe9ByguHjgEHNI3phpgNrQmGmP15FN4 yUJ5lFiAMm9j+b0Rvw8Es+2mRDAfUxnrWu37Nd6SJn4OHJJeFf4+MnheQDfuFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729601440; 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=19aoPCpMtHJmrHVBBBhLUl/kXWUuz1pXH2BBM9vT9R8=; b=MCsjcLRgw6k79McsqE0t4NpWti6NACuUrb1+9CXLdiRUday1GJYFkTtt0BVrq8lFjjThHH 7PTliflM3Y1WIVZDxHLHEACgEWtQ0KdLczqOx8KwiPmiPnXLWqz8iHpED+Q0nOgCaWIzL2 qY7B3/7rajAK46VnSvANc+vEFRFu+MlfTFLpL333x2TWKYmDONz5QEN5dJ9pcfo3vBJdPY bXOmXh64dyRd4rv/8GvR8gAEDqYfUdB5rfYssxWdKUfE3iUKk5FfAsmgp1TScuj1b1Moy8 QF+nD8SFRErZCyMdeyHvrJAvcKHREjEQ8TkmF+Rw+fW1vLzGebdmP584SXN+yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729601440; a=rsa-sha256; cv=none; b=Pl/kZGrIfz+VG5kQrwsmNYZ//9wGl8mTGUJcWdVu8GPm7zwXijcUDWZxa1BcJ53AyYkuG6 pHBj6Hx7x40DU9BaOR4uDBCMNJP5tD9PtUM1zLHEHA9yCdMN/OGIVy/NrWkijRieISOFBA j/6ao5ouCjEnYCpUn8iP8WiZGlFtt6ex5ioF5sLbInQ6dXEjeRLsV62o6/qlxmfM27Mi1a NfqrdhR7v8v+7Dy1zywWKxos2RX2Io7/H1webTCZyzOlVmw9trpqud80pj8sTiJXdAK+sK f1SvYs842OQQynVo02lq1QpnYh0E8RfCeg0qdsgvtvnH6o60UzmaIHjSDf8URQ== 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 4XXsV84S9RzDyN; Tue, 22 Oct 2024 12:50:40 +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 49MCoeXl068188; Tue, 22 Oct 2024 12:50:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49MCoeZT068185; Tue, 22 Oct 2024 12:50:40 GMT (envelope-from git) Date: Tue, 22 Oct 2024 12:50:40 GMT Message-Id: <202410221250.49MCoeZT068185@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: a86373bc93ee - main - 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/main X-Git-Reftype: branch X-Git-Commit: a86373bc93ee1c850943e8585d0d426479378145 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a86373bc93ee1c850943e8585d0d426479378145 commit a86373bc93ee1c850943e8585d0d426479378145 Author: Mark Johnston AuthorDate: 2024-10-22 12:47:52 +0000 Commit: Mark Johnston CommitDate: 2024-10-22 12:47:52 +0000 vm_object: Report laundry pages in kinfo_vmobject Reviewed by: bnovkov, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47214 --- 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 8f42cfa36476..02ca69968541 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -605,7 +605,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_flags; uint32_t _kvo_ispare[6]; diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 5ce21a683541..9fbc489a8eed 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2575,10 +2575,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++; } }