From nobody Fri Jan 20 03:23:29 2023 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 4NylFY3PkLz30vc2; Fri, 20 Jan 2023 03:23:29 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NylFY2FJ8z3nHb; Fri, 20 Jan 2023 03:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185009; 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=DaD1tEOtcb8e+gw5AwI/aG5xU4dLkGXliOkCq6vMJA4=; b=uCeOo5gkeDVEI5ZM23jThVGZphzJpnxKXT7L16h2ZxxEAKejo7RM+JHNudvgU0MBlgSz8G s1JOXN/Ia5Wwkbebq0FVKH+HLUpQ8acdp0WeFWBDH8VIhxIdAOw2o2lrjxn2YRHYRfl2N0 Nk6Xs6fl3lYQST8L0Qfee3NRLEYlVrNcUa+bMTl5bp41tGnS9IKSo8aiLgUsrujptZe1yF yQDx2p0Sk1Z6HzmuM431SlMWS+k3KerFfzG5P48zjfTQR07ODf4HYtXyMdYy+a6XQ8mfKZ jT6sN02iZ5Fzzgictb+CWf8/iwdmG3P1QqTGuqtpV1Qy7zUxI2EU3T4B2dn9qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185009; 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=DaD1tEOtcb8e+gw5AwI/aG5xU4dLkGXliOkCq6vMJA4=; b=fRU3AyEq+BZfllHKeQopMtzofQqv4z1K7GQRxuDhusECsYWikIR15Zymb7Gz0RbU+kNJuj T9i3ydwtkvQZzeQ9QnuoI6THMP6X8O1v7FHxOXBza5jLz/rTliiXnE561Aej9PYnmo41ka 56gPlSFMt+ymCgz1r1H3EtUfWyXPxkcBNrA1sCr/2nXH7mrggj5xuNvqknX+h22eYJWKXb Td6v8evdM5PngdId1ePfLixFrK3Q5h/imunQFmIJLJ3+78LMwQUJwdaXOMxHNer9YXUe3c hGsToL90mr1t2F0GMewoBaQJfwPAqcQNQpXdEx3OavABBDNouwfE2pEC3mJuvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674185009; a=rsa-sha256; cv=none; b=r3TMavoMimZwEFsahNjjFXfeKCMXxF1vqEbNw4ZRZmKTU3P0kY3ae+csrR7IyJYJ9QL0AI 5e10Nfcl5klV/Xwuc55z5Y4bUVgFrX9dpcJvMzF0IT2N3Yf4o/k0/+lSzAOAPCMdY/a7Qc NV4KPjK+NsymItzRnJhV8afJATWpFFnBD0VwQKxR89cihamPGt3pGCy/Nw7JXVBza+53Go +cUJ3ADQ6cFzWVFhP+50JmfWj+kjNtjNnGyNfrSAgW10afcHlAzpmGXclvFDb+GeIL54iV qD2pwMHe+5pIbmAY4LPLGVoDnDly9Rko4L3bi+RLqJSyTPFqGaPVR7ZLMK5Owg== 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 4NylFY1L4wzFtm; Fri, 20 Jan 2023 03:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30K3NTsY042215; Fri, 20 Jan 2023 03:23:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30K3NTCo042214; Fri, 20 Jan 2023 03:23:29 GMT (envelope-from git) Date: Fri, 20 Jan 2023 03:23:29 GMT Message-Id: <202301200323.30K3NTCo042214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6219bd0436b8 - stable/13 - vm_pager: add methods for page insertion and removal notifications 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6219bd0436b88ba75ab062046fc3cd174ba03d08 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6219bd0436b88ba75ab062046fc3cd174ba03d08 commit 6219bd0436b88ba75ab062046fc3cd174ba03d08 Author: Konstantin Belousov AuthorDate: 2022-10-20 12:55:38 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-20 03:19:22 +0000 vm_pager: add methods for page insertion and removal notifications Tested by: pho (cherry picked from commit d537d1f12e8829faccd395115193b03b578f1176) --- sys/vm/vm_page.c | 4 ++++ sys/vm/vm_pager.c | 2 ++ sys/vm/vm_pager.h | 24 ++++++++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 5d94962c312b..0030bf47c814 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -1483,6 +1483,7 @@ vm_page_insert_after(vm_page_t m, vm_object_t object, vm_pindex_t pindex, return (1); } vm_page_insert_radixdone(m, object, mpred); + vm_pager_page_inserted(object, m); return (0); } @@ -1557,6 +1558,8 @@ vm_page_object_remove(vm_page_t m) if ((m->a.flags & PGA_SWAP_FREE) != 0) vm_pager_page_unswapped(m); + vm_pager_page_removed(object, m); + m->object = NULL; mrem = vm_radix_remove(&object->rtree, m->pindex); KASSERT(mrem == m, ("removed page %p, expected page %p", mrem, m)); @@ -1879,6 +1882,7 @@ vm_page_rename(vm_page_t m, vm_object_t new_object, vm_pindex_t new_pindex) vm_page_insert_radixdone(m, new_object, mpred); vm_page_dirty(m); + vm_pager_page_inserted(new_object, m); return (0); } diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index d81e5ec8692d..5ba37189a273 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -422,6 +422,8 @@ vm_pager_alloc_dyn_type(struct pagerops *ops, int base_type) FIX(mightbedirty); FIX(getvp); FIX(freespace); + FIX(page_inserted); + FIX(page_removed); #undef FIX } pagertab[res] = ops; /* XXXKIB should be rel, but acq is too much */ diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h index e332231a77c6..5917bf651760 100644 --- a/sys/vm/vm_pager.h +++ b/sys/vm/vm_pager.h @@ -69,6 +69,8 @@ typedef void pgo_getvp_t(vm_object_t object, struct vnode **vpp, bool *vp_heldp); typedef void pgo_freespace_t(vm_object_t object, vm_pindex_t start, vm_size_t size); +typedef void pgo_page_inserted_t(vm_object_t object, vm_page_t m); +typedef void pgo_page_removed_t(vm_object_t object, vm_page_t m); struct pagerops { int pgo_kvme_type; @@ -87,6 +89,8 @@ struct pagerops { pgo_mightbedirty_t *pgo_mightbedirty; pgo_getvp_t *pgo_getvp; pgo_freespace_t *pgo_freespace; + pgo_page_inserted_t *pgo_page_inserted; + pgo_page_removed_t *pgo_page_removed; }; extern const struct pagerops defaultpagerops; @@ -249,6 +253,26 @@ vm_pager_freespace(vm_object_t object, vm_pindex_t start, method(object, start, size); } +static __inline void +vm_pager_page_inserted(vm_object_t object, vm_page_t m) +{ + pgo_page_inserted_t *method; + + method = pagertab[object->type]->pgo_page_inserted; + if (method != NULL) + method(object, m); +} + +static __inline void +vm_pager_page_removed(vm_object_t object, vm_page_t m) +{ + pgo_page_removed_t *method; + + method = pagertab[object->type]->pgo_page_removed; + if (method != NULL) + method(object, m); +} + int vm_pager_alloc_dyn_type(struct pagerops *ops, int base_type); void vm_pager_free_dyn_type(objtype_t type);