From nobody Mon Apr 15 14:05:39 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 4VJ88M3H2Rz5Gfk4; Mon, 15 Apr 2024 14:05:39 +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 4VJ88M1lH7z4WVP; Mon, 15 Apr 2024 14:05:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713189939; 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=nmi08Sr7rrPzZJOfSdN7m0HWOJnD1YscZOpr9gmYec8=; b=oNCprz15lZlWlfvooBbvwgQUnZArR1nryfGEQQfF8EttOSClaVavcffZVROQSfwYtmXreM gZRy/30GBvXOiN1dk38pJd7mKUWrD+Zk67E4NI5G0CdO8QFz0Kmsc7p2omejLYqMR6jSx6 JzvRQc9f9IHYIcyDZL4g/RjyZxSQYTXZVqUixvUWivxIX8STt75ler2BFMlzNAlgryLvlH 3aw9EsQwOSs5/zEg4sv43ZQibJFII9KeSREuNeoTwr0O/MDn/1ymgk7p1aU3o0LaYBZh4g HfUz/zPktrq87lERfIR/zOZ5ihp++6aJ7gmGVD3FQfmtXsYt6FrpYLTYwpz1Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713189939; a=rsa-sha256; cv=none; b=AMZjgpQ+Kh8e0S//exRcm3Vnne+M8RpNcA8sd48cqIN5pF4Rwi2fvVLDnCHdFT8wbNQH5u PRp6raHnH5uSHGTpnbFI0us7Q70p60BgTxfj5m3NXzoL4lRkFhbCeoudfkz0Tjq6fOsSbX vcGd6TFxSKUTKJCtwSyL/4jx807wpIr8bW+s//t8It8PQDNbVGN7fUqoj8yp5PI1HR/LFm IDH1Y4lI2ov/UQVgWwriq+KJQwlOmJ8rssGQrPa6Yqe3cwVTJe0nRO+AAvinByk4yxvyNe L65BmpJPHH8uIplYlh+hlG5o4roCyRkXtpzC4DfF2XoAXmvKNgFSl9smo4T5RA== 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=1713189939; 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=nmi08Sr7rrPzZJOfSdN7m0HWOJnD1YscZOpr9gmYec8=; b=azddM5I2guml985YUTPCK4vflz6oFStqrdiVeNqjE8eF3YO4J0gQ16hD+G0wV7ciBNWR2U LkLodiI4820KljgGLZoZi7jlOfPBSkLkM3RqLYT8ssuloNB4k5/BgLdo4cG8BoZBatUlEa Gb/M8lk5onA4TkIWOYkPjXkLDzr2UxFnEYFH+H+0qMXQudaK75KXuIA1choRBULL5+x7ko lHZYu+ZlFfA54lj3+UIkeSQkRdBedEc50QMND4NoaQUm12wDHOnKQUmYCU1vwWHzAnqtz7 Dcs+qm7HajN75ZhDBJstbTGbNgOspxy0RHlHQ1LNuLXgvVfyIiiWIr8x1Sykpg== 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 4VJ88M1MJnz12JL; Mon, 15 Apr 2024 14:05:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43FE5d0I070353; Mon, 15 Apr 2024 14:05:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43FE5dev070350; Mon, 15 Apr 2024 14:05:39 GMT (envelope-from git) Date: Mon, 15 Apr 2024 14:05:39 GMT Message-Id: <202404151405.43FE5dev070350@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: 5128c8948b4e - stable/14 - swap_pager: Unbusy readahead pages after an I/O error 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: 5128c8948b4e56d20dfd623aeb030fb39c8f95b0 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5128c8948b4e56d20dfd623aeb030fb39c8f95b0 commit 5128c8948b4e56d20dfd623aeb030fb39c8f95b0 Author: Mark Johnston AuthorDate: 2024-04-08 13:02:48 +0000 Commit: Mark Johnston CommitDate: 2024-04-15 14:05:13 +0000 swap_pager: Unbusy readahead pages after an I/O error The swap pager itself allocates readahead pages, so should take care to unbusy them after a read error, just as it does in the non-error case. PR: 277538 Reviewed by: olce, dougm, alc, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44646 (cherry picked from commit 4696650782e2e5cf7ae5823f1de04550c05b5b75) --- sys/vm/swap_pager.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 38151b3be96f..c8b08e0e8315 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -1686,6 +1686,9 @@ swp_pager_async_iodone(struct buf *bp) * getpages so don't play cute tricks here. */ vm_page_invalid(m); + if (i < bp->b_pgbefore || + i >= bp->b_npages - bp->b_pgafter) + vm_page_free_invalid(m); } else { /* * If a write error occurs, reactivate page