Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 30 Jul 2025 21:27:19 GMT
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 2e3fa9395fc6 - main - swapongeom: destroy consumer/close vnode in case swaponsomething failed
Message-ID:  <202507302127.56ULRJgG024779@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=2e3fa9395fc67e7369fda8d8b5c6613142d2a57d

commit 2e3fa9395fc67e7369fda8d8b5c6613142d2a57d
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2025-07-30 15:00:06 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2025-07-30 21:27:12 +0000

    swapongeom: destroy consumer/close vnode in case swaponsomething failed
    
    Fixes:  aa42e4984997c9d3aa5d30534bdaf760e613e97b
    Reported and tested by: olivier
    Reviewed by:    alc, markj
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D51636
---
 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 327cac661044..c01b9e45a32b 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -3278,6 +3278,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:
@@ -3285,15 +3286,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);
 }
 
@@ -3385,6 +3390,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);
 }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202507302127.56ULRJgG024779>