From nobody Thu Feb 10 14:56:33 2022 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 B831319B7318; Thu, 10 Feb 2022 14:56:33 +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 4Jvfw14fYjz3KsG; Thu, 10 Feb 2022 14:56:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644504993; 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=xhr7x79a0PJ35fbFaDta4rEMJhBWxQ5NeeDF+ggk+jQ=; b=LGG7Kcfw9M0s8pnZfEDslPmfG7EKKiGn6TIsVcNb0KXnSO3rPlHzPrZuJ9lSTTbWIFx7Uf HQQ9ESN6job3W71JELVXJmfh2chjEViXKktmxeijplFfc9rgCSBz33zAM9YQ7zXUxIDZts CwPoVcr6lOigytf/+hGEnuGtIuxTrSSp5BC0QhgIW+ZL5NeGJmPUia8J7vwd3YJWlvDEjp bdc2qIYsrwghU1PMHS3MDYRg1qC85ANM8a35iUFOkGkvyKgeJ16oIW6eYIw6ebtqeVN+3L qxSXaVUVpgfkdNL+5KSR6isczQX7XpT6nz5aTH3E0V/FyRo5aa+l4FdFpTH2nA== 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 703142246B; Thu, 10 Feb 2022 14:56:33 +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 21AEuXjh043955; Thu, 10 Feb 2022 14:56:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21AEuXrq043954; Thu, 10 Feb 2022 14:56:33 GMT (envelope-from git) Date: Thu, 10 Feb 2022 14:56:33 GMT Message-Id: <202202101456.21AEuXrq043954@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: 3261dea72c24 - stable/13 - Revert "vm_pageout_scans: correct detection of active object" 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: 3261dea72c24aa7b33eb90aeae95d82078cfc5e4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644504993; 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=xhr7x79a0PJ35fbFaDta4rEMJhBWxQ5NeeDF+ggk+jQ=; b=tWiMyuA6wWT9YGuci9y7JCB+lSfZDrvmOKChFikYOUhKfMP2f2GzZ6qp+zvk27CUq8GeZC i+XAxripRorSvSMjUrQh8KQtUAYdIZt/2PexsWkepltRvnzE1zKGstJcX2a6AvHKt3vCoF Rd77mTXejFMk3sMyRwYSp5ZPmTfGYQXSPin7qT/cGMyV2mAkjgZGQa1HMTkV/5xVOi9AFH yGA0luLrtB0haVZU616e/rTGfv0dQwenwL3Flfzf76FkHVHRYsjxN40Kq9cB6wW3atDYD0 gHGFFB5OoLnqsiezmv1cJ6sNdl3q++gkmtS0cRU9wNY4JpZb6WE7YIvZ48H7Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644504993; a=rsa-sha256; cv=none; b=bK0IDxvGNBVb7RAhVIxHnUObAg10u15vM/xyQiAcWmFHde5xC+bDcAtyfO8X+j2x97hGCe H+zZ8mUe5J/3VdzCx63cl1q5BKiXyTmRZHr8+JjhG1qs7um/gA0R/PaOgLroshJ76gCokL 5IosgiFqifux9a8uvbrQ/IkLPY191yearwSEAzSiT6ZJbFENN5TtcA/L/gOnYQ8MuQJpz/ Kiz24T7j8Ff83zi6WxeSopIpcjgQPqP9p31aE2OCS2FswbARtxTFLUh/QLkKPDouudwjei ezlQjvTH9IQUTnsMZeAdeHndt0+/tux66WZ6B9L4tQR4MozyN72R8ipkSA8PWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3261dea72c24aa7b33eb90aeae95d82078cfc5e4 commit 3261dea72c24aa7b33eb90aeae95d82078cfc5e4 Author: Konstantin Belousov AuthorDate: 2022-02-10 14:50:42 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-10 14:56:15 +0000 Revert "vm_pageout_scans: correct detection of active object" This reverts commit 3de96d664aaaf8e3fb1ca4fc4bd864d2cf734b24. PR: 261707 (cherry picked from commit b51927b7b018d268c91b2127d82786caf68254de) --- sys/vm/vm_pageout.c | 56 +++++++++++++++++------------------------------------ 1 file changed, 18 insertions(+), 38 deletions(-) diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index 64a06dd7d55b..899d35cd43b6 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -712,38 +712,6 @@ unlock_mp: return (error); } -/* - * Check if the object is active. Non-anonymous swap objects are - * always referenced by the owner, for them require ref_count > 1 in - * order to ignore the ownership ref. - * - * Perform an unsynchronized object ref count check. While - * the page lock ensures that the page is not reallocated to - * another object, in particular, one with unmanaged mappings - * that cannot support pmap_ts_referenced(), two races are, - * nonetheless, possible: - * 1) The count was transitioning to zero, but we saw a non- - * zero value. pmap_ts_referenced() will return zero - * because the page is not mapped. - * 2) The count was transitioning to one, but we saw zero. - * This race delays the detection of a new reference. At - * worst, we will deactivate and reactivate the page. - */ -static bool -vm_pageout_object_act(vm_object_t object) -{ - return (object->ref_count > - ((object->flags & (OBJ_SWAP | OBJ_ANON)) == OBJ_SWAP ? 1 : 0)); -} - -static int -vm_pageout_page_ts_referenced(vm_object_t object, vm_page_t m) -{ - if (!vm_pageout_object_act(object)) - return (0); - return (pmap_ts_referenced(m)); -} - /* * Attempt to launder the specified number of pages. * @@ -838,7 +806,7 @@ scan: if (vm_page_none_valid(m)) goto free_page; - refs = vm_pageout_page_ts_referenced(object, m); + refs = object->ref_count != 0 ? pmap_ts_referenced(m) : 0; for (old = vm_page_astate_load(m);;) { /* @@ -858,7 +826,7 @@ scan: } if (act_delta == 0) { ; - } else if (vm_pageout_object_act(object)) { + } else if (object->ref_count != 0) { /* * Increase the activation count if the page was * referenced while in the laundry queue. This @@ -1295,8 +1263,20 @@ act_scan: * Test PGA_REFERENCED after calling pmap_ts_referenced() so * that a reference from a concurrently destroyed mapping is * observed here and now. + * + * Perform an unsynchronized object ref count check. While + * the page lock ensures that the page is not reallocated to + * another object, in particular, one with unmanaged mappings + * that cannot support pmap_ts_referenced(), two races are, + * nonetheless, possible: + * 1) The count was transitioning to zero, but we saw a non- + * zero value. pmap_ts_referenced() will return zero + * because the page is not mapped. + * 2) The count was transitioning to one, but we saw zero. + * This race delays the detection of a new reference. At + * worst, we will deactivate and reactivate the page. */ - refs = vm_pageout_page_ts_referenced(object, m); + refs = object->ref_count != 0 ? pmap_ts_referenced(m) : 0; old = vm_page_astate_load(m); do { @@ -1546,7 +1526,7 @@ vm_pageout_scan_inactive(struct vm_domain *vmd, int page_shortage) if (vm_page_none_valid(m)) goto free_page; - refs = vm_pageout_page_ts_referenced(object, m); + refs = object->ref_count != 0 ? pmap_ts_referenced(m) : 0; for (old = vm_page_astate_load(m);;) { /* @@ -1566,7 +1546,7 @@ vm_pageout_scan_inactive(struct vm_domain *vmd, int page_shortage) } if (act_delta == 0) { ; - } else if (vm_pageout_object_act(object)) { + } else if (object->ref_count != 0) { /* * Increase the activation count if the * page was referenced while in the @@ -1604,7 +1584,7 @@ vm_pageout_scan_inactive(struct vm_domain *vmd, int page_shortage) * mappings allow write access, then the page may still be * modified until the last of those mappings are removed. */ - if (vm_pageout_object_act(object)) { + if (object->ref_count != 0) { vm_page_test_dirty(m); if (m->dirty == 0 && !vm_page_try_remove_all(m)) goto skip_page;