From nobody Mon Sep 23 17:13:04 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 4XC8hK08g0z5WFRT; Mon, 23 Sep 2024 17:13:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XC8hJ6dhwz4RRs; Mon, 23 Sep 2024 17:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727111584; 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=Db6830U6CxEqgorR85LYvVXUg3Qo8Ls1KC+I/+nNH2g=; b=gSbD0ffxY/v7AfIHnigpDv2mtCuNRr7gupRAxxNUxjw8C+D8Ddyyc5+Bl9gLrRS5pOhHLZ jaP05GYUgPu5L4yUijjzNiqWOaZH70Vs/3l33guT13AWuXl8JRwzv/crS0ougGjHhk6vuk EwJM69nbRVAc21rkVPLXyYjcILKT8N90Ad7y0Ry5MlzDwViVMR910DihSTGjiFYDIueCNh oPtJjdxELSUgtwrEc3bRXf5P2gpIcJLX0vY8dGjKkL97OI1RMpTaHXjAa+1JV8udmNHWDn MB7by3rDePL+x20dTPV0U4iDjJ6mWLNHMrmLyZGA1p/AzLqZ+NL1aThVbWMygg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727111584; a=rsa-sha256; cv=none; b=uA6jnXjiScsvBI9csLdFmcAZO+XA+zjf0uGJ8B+w+NzzThso+B+3oIl5/vT3MXkcNxnQ9R QcRxrs8CGQb8JSrSAlOkepu0rjz6qGSOSFQDCOiLCkdBxCsSMhFnIP1ZOJvURHcI6wWcWJ n3xos9dBIsmjTVzuz558hord3p78vwta76kbBAN5TRNsFw0QCnB6LaavHauOkUm+uUOaAt RD9cgFzrHVkLPZxQUovB6Tk4N9mH6sNo1afzZbK8E0axyroxPWehC8XncXSsRBdHqkNlPb HE7Dg5Z0ivBsXMUMKfA8ySOm48D7t02JsIuM+inHz6mnROGIhe+abQ5SbAfEhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727111584; 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=Db6830U6CxEqgorR85LYvVXUg3Qo8Ls1KC+I/+nNH2g=; b=aRaWjSK1SdO4W9PN2bA4Wx0vurMMuJA7oK90GHObXfhC7IQwTNfKLTFF1yzzqp87tJJU3X VNFpkNPCLir44G7DslG0LCwQJepDiGkPsAZxMI2bihcdCnIsedvbAu8ntHk6E/k90canKG VYxk/tgIB/2nzmes63l5oPFn5sJ24VOcczBzUMEd3ibflKTMWsFKZIcx6T63WkCL215IN/ TXmHMpE00SLs/AWOcG+jrIhcJ4qSNJ+CkzLYRMSRbj20WH6V7vHi1/0GprSBt7hG8Gz3Yr ZHnTH7sjljNWXNr+HwvJ24Y0+Yk0Tz4f4rf7L6H/YK5GRyg2tWlZY/5B6dDQ6w== 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 4XC8hJ66Dnztt1; Mon, 23 Sep 2024 17:13:04 +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 48NHD41l033692; Mon, 23 Sep 2024 17:13:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48NHD45j033689; Mon, 23 Sep 2024 17:13:04 GMT (envelope-from git) Date: Mon, 23 Sep 2024 17:13:04 GMT Message-Id: <202409231713.48NHD45j033689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 940fec94b5fc - main - swap_pager: deoptimize swapoff_object 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 940fec94b5fc001333d87c2935de97a4566a0289 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=940fec94b5fc001333d87c2935de97a4566a0289 commit 940fec94b5fc001333d87c2935de97a4566a0289 Author: Doug Moore AuthorDate: 2024-09-23 17:11:55 +0000 Commit: Doug Moore CommitDate: 2024-09-23 17:11:55 +0000 swap_pager: deoptimize swapoff_object Undo a change in swap_pager_swapoff_object that assumed a swap block would be valid after reacquiring a lock, when that validity cannot be assumed. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46753 --- sys/vm/swap_pager.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 44fe4f34bb39..954228dfaaf0 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -1954,7 +1954,6 @@ swap_pager_swapoff_object(struct swdevt *sp, vm_object_t object) vm_object_pip_wakeupn(object, 1); KASSERT(vm_page_all_valid(m), ("%s: Page %p not all valid", __func__, m)); - swp_pager_force_dirty(&range, m, &sb->d[i]); vm_page_xunbusy(m); i = 0; /* Restart scan after object lock dropped. */ }