From nobody Fri Jan 20 03:23:25 2023 X-Original-To: dev-commits-src-branches@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 4NylFV1xwNz30vSq; Fri, 20 Jan 2023 03:23:26 +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 4NylFV0WSYz3mps; Fri, 20 Jan 2023 03:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185006; 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=T0ozILaBICe3043rcVvyYomSAJngI/O2KdscrmWGi5s=; b=gkl0jAlmqHrgEs0T2Lhu5uAyqC9Tcw3dRrnr/PJTwzKIXE6e+VUsRsM8IDZBnSqlmsdeZY 0XhPt0FUZ8YHwBVMNPsLRYZn21YpI6aHDoc4z8NfpPl0YbgSZjVxgxl75FSvz3BawHrcub b20Vw3d6mafRYDdZyGxprTTfEtdd++INHcvx/GyOmwdcPWr1/CHJDLJOgNs3pU6tiPVT36 fxpOqcfF2wCVlRLlG9ci8r1yWKzw+ff74gaTUUwwYGsZiv9yc1a6ryB5rSs4FSdsFux5Ar fYZoW2OT9SgVmmWXTlKEqWhqskjgHIQlvokfeeXaM03ncgSTROC+G3vGmxygIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185006; 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=T0ozILaBICe3043rcVvyYomSAJngI/O2KdscrmWGi5s=; b=IwL3WcFVN9k5KPKbkCDV+UDgs2mhhn1H/rz138v3BoQC8IRZit0cPvgrOL40/+6jrGjm3B 0kMp8WGjtw6NhAt93HvDMfmEDuLOWAcWc9ejoHRk/OOXFku8uSQKvuUZa9gMiLvYSxvWPs k1Yt5kS5hKtoOzN7nOlturb7d9LP14fLM5BTX0rtayWXPLkBX+c5/sZd3lqQ8+ew9B39Ho Db6lGHgRSLLZXAVjoFwMLqU7DNQSf9YknFNQuHvCwO5YT9mzRz++FIjqA+PNqUoFYKyd2g 3cuYtrjgmfmAnnfN+NND59SAFbuwu5GdkoLebhR8J56IVxxAQuKbDiaK3ruPRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674185006; a=rsa-sha256; cv=none; b=Z84t0hdQ6jqSpfU4tAEqUcmZmO86vbxdZgAV3zMOWc9TdIxgZO1SID0LBHHw+M+Uz/7zMa RoMtFS2jk/djbaQqIpTsMwAvS5v4cvLUI7J+hce4GOqUVBig+biHsyWzb1O5JKHglAxmB6 /btG8mgiYVyxLjXlyI/+Pu5Y2fwVuDcocvv8NR4zw8i6x7yipYEPai40Lp5DROhoq3ba3W 7pcaUT8YIjcxdQE8bk/iUCT6sNh7R6oB9U76FZnjF1OXevkmx/jXZiFXMu8ykXQCiO+DTZ a7F1y+TA/oe3A2Lr/gWtzSBTG1jgAjQ22hLgak0QPtdCQnf7fAM4VV1yESO0Mg== 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 4NylFT6NX9zFyp; Fri, 20 Jan 2023 03:23:25 +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 30K3NPga042140; Fri, 20 Jan 2023 03:23:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30K3NP1m042139; Fri, 20 Jan 2023 03:23:25 GMT (envelope-from git) Date: Fri, 20 Jan 2023 03:23:25 GMT Message-Id: <202301200323.30K3NP1m042139@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: 86ea175ec2ed - stable/13 - Make swap_pager_freespace() global List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 86ea175ec2ed58e43020c64d82b35605ab425ec2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=86ea175ec2ed58e43020c64d82b35605ab425ec2 commit 86ea175ec2ed58e43020c64d82b35605ab425ec2 Author: Konstantin Belousov AuthorDate: 2022-10-26 22:13:27 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-20 03:19:07 +0000 Make swap_pager_freespace() global Tested by: pho (cherry picked from commit baa1ccceefdf4954a88e54ca18c6ab1762faa326) --- sys/vm/swap_pager.c | 54 +++++++++++++++++++++++++++++++++++++++++------------ sys/vm/swap_pager.h | 2 ++ 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 0cd8b498dc4f..407ef1473760 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -436,7 +436,7 @@ static void swap_pager_update_writecount(vm_object_t object, vm_offset_t start, vm_offset_t end); static void swap_pager_release_writecount(vm_object_t object, vm_offset_t start, vm_offset_t end); -static void swap_pager_freespace(vm_object_t object, vm_pindex_t start, +static void swap_pager_freespace_pgo(vm_object_t object, vm_pindex_t start, vm_size_t size); const struct pagerops swappagerops = { @@ -451,7 +451,7 @@ const struct pagerops swappagerops = { .pgo_pageunswapped = swap_pager_unswapped, /* remove swap related to page */ .pgo_update_writecount = swap_pager_update_writecount, .pgo_release_writecount = swap_pager_release_writecount, - .pgo_freespace = swap_pager_freespace, + .pgo_freespace = swap_pager_freespace_pgo, }; /* @@ -483,9 +483,10 @@ static daddr_t swp_pager_getswapspace(int *npages); * Metadata functions */ static daddr_t swp_pager_meta_build(vm_object_t, vm_pindex_t, daddr_t); -static void swp_pager_meta_free(vm_object_t, vm_pindex_t, vm_pindex_t); +static void swp_pager_meta_free(vm_object_t, vm_pindex_t, vm_size_t, + vm_size_t *); static void swp_pager_meta_transfer(vm_object_t src, vm_object_t dst, - vm_pindex_t pindex, vm_pindex_t count); + vm_pindex_t pindex, vm_pindex_t count, vm_size_t *freed); static void swp_pager_meta_free_all(vm_object_t); static daddr_t swp_pager_meta_lookup(vm_object_t, vm_pindex_t); @@ -960,11 +961,21 @@ sysctl_swap_fragmentation(SYSCTL_HANDLER_ARGS) * * The object must be locked. */ +void +swap_pager_freespace(vm_object_t object, vm_pindex_t start, vm_size_t size, + vm_size_t *freed) +{ + MPASS((object->flags & OBJ_SWAP) != 0); + + swp_pager_meta_free(object, start, size, freed); +} + static void -swap_pager_freespace(vm_object_t object, vm_pindex_t start, vm_size_t size) +swap_pager_freespace_pgo(vm_object_t object, vm_pindex_t start, vm_size_t size) { + MPASS((object->flags & OBJ_SWAP) != 0); - swp_pager_meta_free(object, start, size); + swp_pager_meta_free(object, start, size, NULL); } /* @@ -988,7 +999,7 @@ swap_pager_reserve(vm_object_t object, vm_pindex_t start, vm_pindex_t size) n = MIN(size - i, INT_MAX); blk = swp_pager_getswapspace(&n); if (blk == SWAPBLK_NONE) { - swp_pager_meta_free(object, start, i); + swp_pager_meta_free(object, start, i, NULL); VM_OBJECT_WUNLOCK(object); return (-1); } @@ -1077,7 +1088,8 @@ swap_pager_copy(vm_object_t srcobject, vm_object_t dstobject, /* * Transfer source to destination. */ - swp_pager_meta_transfer(srcobject, dstobject, offset, dstobject->size); + swp_pager_meta_transfer(srcobject, dstobject, offset, dstobject->size, + NULL); /* * Free left over swap blocks in source. @@ -2150,16 +2162,22 @@ allocated: */ static void swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, - vm_pindex_t pindex, vm_pindex_t count) + vm_pindex_t pindex, vm_pindex_t count, vm_size_t *moved) { struct swblk *sb; + vm_page_t m; daddr_t n_free, s_free; vm_pindex_t offset, last; + vm_size_t mc; int i, limit, start; VM_OBJECT_ASSERT_WLOCKED(srcobject); + MPASS(moved == NULL || dstobject == NULL); + + mc = 0; + m = NULL; if ((srcobject->flags & OBJ_SWAP) == 0 || count == 0) - return; + goto out; swp_pager_init_freerange(&s_free, &n_free); offset = pindex; @@ -2181,6 +2199,14 @@ swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, swp_pager_update_freerange(&s_free, &n_free, sb->d[i]); } + if (moved != NULL) { + if (m != NULL && m->pindex != pindex + i - 1) + m = NULL; + m = m != NULL ? vm_page_next(m) : + vm_page_lookup(srcobject, pindex + i); + if (m == NULL || vm_page_none_valid(m)) + mc++; + } sb->d[i] = SWAPBLK_NONE; } pindex = sb->p + SWAP_META_PAGES; @@ -2192,6 +2218,9 @@ swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, } } swp_pager_freeswapspace(s_free, n_free); +out: + if (moved != NULL) + *moved = mc; } /* @@ -2205,9 +2234,10 @@ swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, * with resident pages. */ static void -swp_pager_meta_free(vm_object_t object, vm_pindex_t pindex, vm_pindex_t count) +swp_pager_meta_free(vm_object_t object, vm_pindex_t pindex, vm_pindex_t count, + vm_size_t *freed) { - swp_pager_meta_transfer(object, NULL, pindex, count); + swp_pager_meta_transfer(object, NULL, pindex, count, freed); } /* diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h index 6761d4f99ee4..616f6c46164a 100644 --- a/sys/vm/swap_pager.h +++ b/sys/vm/swap_pager.h @@ -76,6 +76,8 @@ struct xswdev; int swap_dev_info(int name, struct xswdev *xs, char *devname, size_t len); void swap_pager_copy(vm_object_t, vm_object_t, vm_pindex_t, int); vm_pindex_t swap_pager_find_least(vm_object_t object, vm_pindex_t pindex); +void swap_pager_freespace(vm_object_t object, vm_pindex_t start, + vm_size_t size, vm_size_t *freed); void swap_pager_swap_init(void); int swap_pager_nswapdev(void); int swap_pager_reserve(vm_object_t, vm_pindex_t, vm_pindex_t);