From nobody Wed Jul 30 21:27:19 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 4bslfb6Lq2z633Zk; Wed, 30 Jul 2025 21:27:19 +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 4bslfb5L60z3bNm; Wed, 30 Jul 2025 21:27:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753910839; 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=DSkValREaAmuoGKB0f3gzj4FGkw5NguQnMqnjbIc/BM=; b=dx2OR3SN7z8cjjGUHOX94TCXZleOqiJEfdJPyB0LscDuCneNBTK8f5Myb5tM6AjtLEp1uW YjUJ6i/aAwWMQBPFbAPiaOiO4JWT3JFD9ePFo+yMb5P0NP+35QKe5AmuRcHZ8+QPc3BamD icTh1sPF64NW3pIH0HJWvQ2aAwGMEOcmVEp5XGzAnI1OaxBR2Jjl3u8hx4f/uoBp/z+yBt pdcaaTcAZ5WzWXTBqiFAJ5LrHAvUbbI8soWvGimJLB8h+KKw4m/6inuwByw5y94n/XS9dl oeDpzuyWwwD4KM69qoakK1Dk/UH7J7rvpqYJi/YgDLPKp08prZQW4buw0SZNFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753910839; 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=DSkValREaAmuoGKB0f3gzj4FGkw5NguQnMqnjbIc/BM=; b=bLilNLpXOcYSisN/Zf245sABc3bllu+Cc1YsvXWEeaY7YK+cE4bD7ZayD/dd7eOmzcdsyL LEoAkat2E6qApkOrVdoSTMMkY/bvTboKaK6hRcqg/WQKNT2LyObvmJENIyfkeojDobobCC VO0C41uStg2YKHvh9KWxmOwWsvkTC7SYKbunniqLOjDUvvR4Y9VIxg1TOxB3d6w7C+QA8u tyFlkzXPLulaupKk+ZW9Lmr5En/CClQb/eeLk7f20P69NLph8QuP00RpUD4BgKNByW0Y6P 0l8VljEcYxe2p2otSXQfEMjgHYq2wHJsJDpoD/krVa9opzjqKBNounnaVah9CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753910839; a=rsa-sha256; cv=none; b=T4ZpbGWpOFhQssZY5/eJdp7lMworV/wsp2EmChXtmZkTwQPbKzq3G6BcOej3yQe3alRggW BST5hXdySwEeeqWBPTiy4hq6lj3nMT5h/hscfLzEh0cYg1DQ/uXHTxTkOZBactq5yWYCsj qgttBYbZHVlFDZEcG8dtjx1p/uhehYNaVv6dR+VU/plCt/wiwQ6U0ihHGzU6UviUWrnK8k vgm6e702g4LxDd/gmavNMMHO+UqCFiFzyLJtVblXYLu1kFA9EWzrQs50ErgNQIRMUn6ryN sWttC58XIUtuzjG4YjkFFdrJepmrDD0+QQHx9W8pYfJwWXmPQxCeVv/sly1zyw== 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 4bslfb4D99zYkv; Wed, 30 Jul 2025 21:27:19 +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 56ULRJgl024782; Wed, 30 Jul 2025 21:27:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56ULRJgG024779; Wed, 30 Jul 2025 21:27:19 GMT (envelope-from git) Date: Wed, 30 Jul 2025 21:27:19 GMT Message-Id: <202507302127.56ULRJgG024779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2e3fa9395fc6 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 2e3fa9395fc67e7369fda8d8b5c6613142d2a57d Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2e3fa9395fc67e7369fda8d8b5c6613142d2a57d commit 2e3fa9395fc67e7369fda8d8b5c6613142d2a57d Author: Konstantin Belousov AuthorDate: 2025-07-30 15:00:06 +0000 Commit: Konstantin Belousov 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); }