From nobody Thu Nov 28 14:38:58 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 4Xzf832WH8z5dnDH; Thu, 28 Nov 2024 14:38:59 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xzf830XvLz44Dc; Thu, 28 Nov 2024 14:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732804739; 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=bB014JFOlVd3R89eDh+hYaHkcKgMR9+AexlTiZPxX6c=; b=ycK8taVGU10mXyzSib2VOU61gacqbUeFkD1TKUGl97q3PEdO7KxAWQcOiXkfwTOOHDMyuA WWddHO9DwvUMme5lRWWEKDFmdHrFOg01Xmn3iuha/RvCzt1ojWM8rpHjw4c0aTAepeMnii bY240z5OhC+1N8ImZqTDSSTYWJDR9GJfp9cNu9QaqAGo0zeHDFl66GCBXxC+5bPRp3b0BS R6FGLAPpM8/HUpjUF4dqO7sw9V7USPF6MGcx5G7RnGJbkk+9Hxi/ydv4Z6Y5gyoWyEs4u/ Vw6RzuIxsNuBoodqCg26w/FpP0e+WwJ6c7rZYXPOz7cqetfOecDevUmquQ3obA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732804739; 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=bB014JFOlVd3R89eDh+hYaHkcKgMR9+AexlTiZPxX6c=; b=uSWQ8gDR2CxtYcboPAoXWDlXTJskWoODDWd8KLeL8islpqTYskaFf69ubSgVJmdb0gaBcQ 4eCHh8j1y8jndgt/3eSOTrVCO3whwqwzxBIGhtRTiO0aWi7YGJvQAaeLKXbg8nbuGuKUPl d0mzc+er2aqSSqrNnHd557U7gp13t2i7SwteRwSalafSloAc+S1VLNql4MgWK5UegP2r0k ttB69WR5h29gRPj/f/a/buSitq/6LifQBV2yrW+tQJjiaSjBThZbLLUlFy9hMTiwqWDguh KndMZvPU7vvSJ7a0ubiLLdYI2R70O8dVilA8zr98PWz11AqFzEqP8miP0GwKIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732804739; a=rsa-sha256; cv=none; b=WfMIjy9BqzQY7HEdcqeBEB0An+99cM6um4hzQ+P6B1kyyDAx0Dc2z4xBBLYDFoHk1SkX5R /41bIeT69uqzFVMTNUHFsZCMSwcj80cINI2j5i+HPO9SW0cQB1BblXqUtimjon/GVk8YGh AUyFRTaW5ho3Hvcc01Px76HWr8HLsJol3DzmcGldwMswNphe/m6m1aSnWAa7+IRylJSl6E KT2o8WEPc2yxxRBJq3Zcv/cMn6KjMsO7wSbDgAum+C5yt2qZFNV8bwT9jVfp1yiUwdkSf9 cc3sH4bXrKNSc8dJyAWujK2mi56EtvfpxKFJwmsQBpc3I/hlqkMLarYPdtpF8A== 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 4Xzf8270lgzjgJ; Thu, 28 Nov 2024 14:38:58 +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 4ASEcwqh035679; Thu, 28 Nov 2024 14:38:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ASEcweI035676; Thu, 28 Nov 2024 14:38:58 GMT (envelope-from git) Date: Thu, 28 Nov 2024 14:38:58 GMT Message-Id: <202411281438.4ASEcweI035676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 34182e597b2a - stable/14 - swap_pager: Ensure that swapoff puts swapped-in pages in page queues 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 34182e597b2aee9c82744d70aca5b410f85e3219 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=34182e597b2aee9c82744d70aca5b410f85e3219 commit 34182e597b2aee9c82744d70aca5b410f85e3219 Author: Mark Johnston AuthorDate: 2024-11-13 14:02:20 +0000 Commit: Mark Johnston CommitDate: 2024-11-28 14:38:17 +0000 swap_pager: Ensure that swapoff puts swapped-in pages in page queues Readahead/behind pages are handled by the swap pager, but the get_pages caller is responsible for putting fetched pages into queues (or wiring them beforehand). Note that the VM object lock prevents the newly queued page from being immediately reclaimed in the window before it is marked dirty by swap_pager_swapoff_object(). Reported by: pho Tested by: pho Reviewed by: dougm, alc, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47526 (cherry picked from commit d11d407aee4835fd50811a5980125bb46748fa0b) --- sys/vm/swap_pager.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index ce578cc4fd8b..53cd8294e299 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -1895,6 +1895,7 @@ swap_pager_swapoff_object(struct swdevt *sp, vm_object_t object) __func__, rv); VM_OBJECT_WLOCK(object); vm_object_pip_wakeupn(object, 1); + vm_page_deactivate_noreuse(m); vm_page_xunbusy(m); /*