From nobody Fri Dec 09 12:17:37 2022 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 4NT95F6Jnxz4kPnQ; Fri, 9 Dec 2022 12:17:37 +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 4NT95F5cxgz3qlm; Fri, 9 Dec 2022 12:17:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670588257; 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=Hjmy4g0BUEdAV4jgx0tBZOqDpI0vMB9t104AE7IfR5Q=; b=giA2cOWa70QuALGEJ7qr09pMao5r4ojNRJd33O/KvxkOIA2Q86gwxugGwb+8fhbs0C/VNF 4Z6lR5mg1ZgzGzD9coQG7rENpDSzCs4KWZpPLhUbuqQCdrYj/yJGGIgvrXE8ZY19C7PrRR ZvibcWatgo3L/p0KWHOHWDPgNOkBSZCUHQu3sjtwrOFGKYcibD3Be7aEDn4A7ZUaKXBS/i 5jz7wQxW+IBqTH7lFQa6PPQMx2otX6SOSvPkuZg42Hqf5GudijlzCAgK8rwoG+pWucqYF/ tLk4ZPXzhzsVMqjMtJE4wZdqMs7P/DIavXW5hB2TtnzOq/MIP8rs1WbSFoJZ8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670588257; 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=Hjmy4g0BUEdAV4jgx0tBZOqDpI0vMB9t104AE7IfR5Q=; b=FQECMFgYUyX9TdSVUexL8+SMeoo3dfHVzZlIjC0VIJdwtd0qpM8Whh/S3Y4fHw0EsKM1rJ UHiQlafe2cSe4IWj1Jcopxo8X30TDHE2nySAM3orMmXq/b+NvmURjU/YPhm3+IO2NHlzaV SnpyRZfNK9GEs9qBGJcUbf+UIzKns3LEhBVkxwbSy4kTYFgPTa/WH72ZvfvrB9ZZb4wkeh VOsuSNMhiXI1ANs62ZQy1n0sNei/9F1NDdcdeTAFL7VtypOFPvKnXzthYkDbeROsZhhXD4 wjV8UQnDn/Rth9+g2Ox41PadRTJne87lB8F7my5iDKFaTaUHqCVf/bGY2dZ1wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670588257; a=rsa-sha256; cv=none; b=s9ATKAQvMHD9IKmrXiru/CVjlWO/eC7Jv50/QWc4OfqrtQYc/FrccvACfppKbrTqBhDJfU WPOoGybhsS6hbrh8XlvQEGbyvv1QxTWUOZgMi0RpTUW1j6dJUhdKXSnHLnkNLhHkeqMwxa ooDV8wQR6jrkp9KygADONK11pQdm9lvDUEN7BAQ3bjuf5X4WFrDnWxrMR0LEPtxUOPz/NJ QHhr2fQBvsXNq/ZCub5eJEW/n3FMpOY+eOYCOhMbVuuP4VPvofZeVodzcmrq2ZtscqpMwH j10TbUL8iM+s82agECHlLEI+xmEBukGLm+/OJ9kI+8FPgFgLuweTJBbVA3Hcxw== 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 4NT95F4jwKzbTK; Fri, 9 Dec 2022 12:17:37 +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 2B9CHbbK086401; Fri, 9 Dec 2022 12:17:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B9CHbeW086400; Fri, 9 Dec 2022 12:17:37 GMT (envelope-from git) Date: Fri, 9 Dec 2022 12:17:37 GMT Message-Id: <202212091217.2B9CHbeW086400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d537d1f12e88 - main - vm_pager: add methods for page insertion and removal notifications 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d537d1f12e8829faccd395115193b03b578f1176 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d537d1f12e8829faccd395115193b03b578f1176 commit d537d1f12e8829faccd395115193b03b578f1176 Author: Konstantin Belousov AuthorDate: 2022-10-20 12:55:38 +0000 Commit: Konstantin Belousov CommitDate: 2022-12-09 12:15:37 +0000 vm_pager: add methods for page insertion and removal notifications Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D37097 --- 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 4f97b84ee205..20238e0ad807 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 cc0be174987d..36ce380dedbc 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -430,6 +430,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);