From nobody Tue Aug 5 00:32:04 2025 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 4bwvWT0Dk4z63kDk; Tue, 05 Aug 2025 00:32: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bwvWS5mbTz3h6V; Tue, 05 Aug 2025 00:32:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754353924; 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=kWvqGfSRHEosrXZrmiD3m5PtKCowrpjQti2o1Fih1s8=; b=RIpt/vOnf4GPeTQELq8oKrZiQKkejElUlBdB8mfGEf9U7cP2vGTg1fzQLPBOlOOOER3TzL sLI4Kuhyjh7fdv7RJfeZbeVJE00QuLbxivv5NBnjskJTXG0OkM2Iy+vL++4rvS08u28v8B zZ++6W43mRxn14W4cKx6mmHrtT6oStvJmgFVzV/A2eM3xNMikSwqsmark9hXVq2oGzBgJN KbbAB3pV65Akr4NbYywHpmkjyRtxkH3KnUVn+OqAodCdpL+ww8yq7oIHaasyFjbWQYoLlk kQS67D0XeweB63iu4LiiR/HmQvpNVIvKyTRsnQdkDuC7+jv8abas4lUtYcw0wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754353924; 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=kWvqGfSRHEosrXZrmiD3m5PtKCowrpjQti2o1Fih1s8=; b=fSWb60wvu7X5qzThe0m20iFdYGi1gLiOGpqi9O9Zo8CYnpljg/IgYbpHJcBQbDwQSsKGbe yI3eEnDCCFYPgcxNJIWnVvnglUNrbhZSBXVWWQsKq3RutOlPFYTgoXPOTOxHs+1Xz4pTZI 5ULLc+xJdCGh1vhGBbklQuxyrB0lUpfXCaSnZI/ebx722YNL2SQ83ZnZBHzhcsq3kWiHMI 63yn/ULR7dbHAiFfWarbTL/NpLyIbRPMciPUnMlMmfyoCprtXrM+VwKqbqppVp5Gx0SUtv 1lUfsLtMFVpw0yl2s1u0483BNVnaFVtPxRKf1wzAW1eQydZH0ggfwiP1EYfBkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754353924; a=rsa-sha256; cv=none; b=vS3EjcjEKK6OSLM+Dnn5aK8vMnDm2K4d9YN4mQJsSQJhtNv1Lxq8th13P8EVU791HuPmmS C/MPLeG06bq0qWIm6RFFrR0tfVW5B2KX8v7prM8UImXDXkF0h79WhYO9mBU57tm5N7GlO1 Lw0lOIstVsvOL3/3z3SmWXwavvazVKGZMdSlYOExqn4MPfs+eAHZLWlxTzZaO88AQ7/AVa +B+2VOo4ADlYqXszlLqRc/p28sukk556wQFHyWZMWjCRSw/RLY6k7p/PP+WC0iPITE9f7H 0fGEkfQ+suZy/3kl8CLIBkm1sgLgmZdGzIPnFGKym2iiuuefCzIsYeg4lv4hBw== 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 4bwvWS5Mxhz1BVS; Tue, 05 Aug 2025 00:32: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 5750W4g2044241; Tue, 5 Aug 2025 00:32:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5750W4d3044238; Tue, 5 Aug 2025 00:32:04 GMT (envelope-from git) Date: Tue, 5 Aug 2025 00:32:04 GMT Message-Id: <202508050032.5750W4d3044238@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: 246f5b4136c3 - stable/14 - swapongeom: destroy consumer/close vnode in case swaponsomething failed 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 246f5b4136c39a26898e97b85d243d9b89f5d13f Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=246f5b4136c39a26898e97b85d243d9b89f5d13f commit 246f5b4136c39a26898e97b85d243d9b89f5d13f Author: Konstantin Belousov AuthorDate: 2025-07-30 15:00:06 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-05 00:30:28 +0000 swapongeom: destroy consumer/close vnode in case swaponsomething failed (cherry picked from commit 2e3fa9395fc67e7369fda8d8b5c6613142d2a57d) --- sys/vm/swap_pager.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index ee810ad1c9d5..f5815d615e16 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2995,6 +2995,7 @@ swapongeom_locked(struct cdev *dev, struct vnode *vp) cp->index = 1; /* Number of active I/Os, plus one for being active. */ cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE; g_attach(cp, pp); + /* * XXX: Every time you think you can improve the margin for * footshooting, somebody depends on the ability to do so: @@ -3002,15 +3003,19 @@ swapongeom_locked(struct cdev *dev, struct vnode *vp) * set an exclusive count :-( */ error = g_access(cp, 1, 1, 0); + + if (error == 0) { + nblks = pp->mediasize / DEV_BSIZE; + error = swaponsomething(vp, cp, nblks, swapgeom_strategy, + swapgeom_close, dev2udev(dev), + (pp->flags & G_PF_ACCEPT_UNMAPPED) != 0 ? SW_UNMAPPED : 0); + if (error != 0) + g_access(cp, -1, -1, 0); + } if (error != 0) { g_detach(cp); g_destroy_consumer(cp); - return (error); } - nblks = pp->mediasize / DEV_BSIZE; - error = swaponsomething(vp, cp, nblks, swapgeom_strategy, - swapgeom_close, dev2udev(dev), - (pp->flags & G_PF_ACCEPT_UNMAPPED) != 0 ? SW_UNMAPPED : 0); return (error); } @@ -3102,6 +3107,8 @@ swaponvp(struct thread *td, struct vnode *vp, u_long nblks) error = swaponsomething(vp, vp, nblks, swapdev_strategy, swapdev_close, NODEV, 0); + if (error != 0) + VOP_CLOSE(vp, FREAD | FWRITE, td->td_ucred, td); return (error); }