From nobody Fri Jun 24 14:48:06 2022 X-Original-To: dev-commits-src-main@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 D9DE7878E30; Fri, 24 Jun 2022 14:48:06 +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 4LV0NQ5fZwz4q8j; Fri, 24 Jun 2022 14:48:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656082086; 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=rUHh1nlik65cQI1Ob1JOjyLPaKlwCPmz+dNKFKF6jZk=; b=dgD4J79Wdf+1CimPoYVJBop6Zk/eIEptxmrLUAkeqSZn7x9iKeiTB1L/Be82N54XvMYgHp Qt/yvS6yEY2eiopXgwnU/mZ9zu4+SJLVwdliVmX+vIdXqp4Rka52fn6Qd3tC9ClPt4oOT1 0qwpJKux0ACqzMkZT14jQUcntbeDD6aiD9GZFNoYFWm8xXpbzUjLQ2ZXT/FlZ6scqIVgiH 8azb3eIF3Ro7qW/AiLpLtEk+qEyg15hAwBeFECGYWqiDP/YQfqO4E/PaAP6/7yiU1IPnfR MTaETopBdnX5nIXW7ydrTIXY4O5jO5fbo4XTJ5XLAgGb5hSaUxDdXZ5NU93mJg== 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 A36FC11F5F; Fri, 24 Jun 2022 14:48:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25OEm61d088165; Fri, 24 Jun 2022 14:48:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OEm6FZ088164; Fri, 24 Jun 2022 14:48:06 GMT (envelope-from git) Date: Fri, 24 Jun 2022 14:48:06 GMT Message-Id: <202206241448.25OEm6FZ088164@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: bc6d0d72f4f4 - main - UFS rename: make it reliable when using SU and reaching nlink limit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: bc6d0d72f4f4e96b24d0ad558b271cb6f483801e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656082086; 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=rUHh1nlik65cQI1Ob1JOjyLPaKlwCPmz+dNKFKF6jZk=; b=sDgUVdNgXKIs9rqCnhQnI0Wor4nG711ysbaBHM4GOZPsngEZy30Vdk1xEg1LKUTrOVJ3jR t5N9iVNIb3cyvdqxoqB1fVKWCrBGpRERpFdct8DrAAAkF7uPwMi5JVd2Y7owzoZSrQo3Bi o0NZ7BXGEYwiWqA7onMOHUCvLl902c8eRxX/A3+EaWAqcNwDftNYBFJIEgJsuv1IaIHH3A FZyc2sN9WFzUwHsyp3/EAywUfMd8x5bVj4x99AcjFm0Df05WP41krYkUTMOEkQBxYxX/AL 3+3jJQ9yYYq9IZnNZqktBGbqZCFaJO0Wkhh2FyL173rm606UX2hy4Ed0h96Ytg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656082086; a=rsa-sha256; cv=none; b=ouqMio6Df9W2N36Fp5Jm2V7cXd1GdLq6hGKYwnvkhMPOy/OhPm66NKsheBbIOIj/8ZRxdH i7vss9cD46wPw/Rz6nX35iLhnlUokv7CLnlSkHJ1baagWiZV/uvYbUvrvr/yF8nedVr5dB te8MZBDjaVZLlrQ0QgCYGe4xzAo0KcilmsI2lEigsBvyT0f5341pExEgLTQpM8cP/vQtyj BaC5h1E1sPM1DDM8em3shNGiyZVoIpBWUvTtnmjOf5/QMWXErnp8kW4A5MCodI07gDVVmE tID0Qwg3hSA+8Mo4RSvK6qLA+oXRyaAJaeszUXrzfTdqSHi4fQMOQfavORC5vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bc6d0d72f4f4e96b24d0ad558b271cb6f483801e commit bc6d0d72f4f4e96b24d0ad558b271cb6f483801e Author: Konstantin Belousov AuthorDate: 2022-06-22 13:54:01 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-24 14:46:26 +0000 UFS rename: make it reliable when using SU and reaching nlink limit PR: 165392 Reviewed by: mckusick Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D35577 --- sys/ufs/ufs/ufs_vnops.c | 95 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 84 insertions(+), 11 deletions(-) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 0a7e6a7875ec..7e54cf3916c8 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -196,6 +196,21 @@ ufs_itimes(struct vnode *vp) VI_UNLOCK(vp); } +static int +ufs_sync_nlink1(struct mount *mp) +{ + int error; + + error = vfs_busy(mp, 0); + if (error == 0) { + VFS_SYNC(mp, MNT_WAIT); + vfs_unbusy(mp); + error = ERELOOKUP; + } + vfs_rel(mp); + return (error); +} + static int ufs_sync_nlink(struct vnode *vp, struct vnode *vp1) { @@ -214,13 +229,7 @@ ufs_sync_nlink(struct vnode *vp, struct vnode *vp1) VOP_UNLOCK(vp); if (vp1 != NULL) VOP_UNLOCK(vp1); - error = vfs_busy(mp, 0); - if (error == 0) { - VFS_SYNC(mp, MNT_WAIT); - vfs_unbusy(mp); - error = ERELOOKUP; - } - vfs_rel(mp); + error = ufs_sync_nlink1(mp); vn_lock_pair(vp, false, vp1, false); return (error); } @@ -1441,8 +1450,34 @@ relock: newparent = 0; ino = fip->i_number; if (fip->i_nlink >= UFS_LINK_MAX) { - error = EMLINK; - goto unlockout; + if (!DOINGSOFTDEP(fvp) || fip->i_effnlink >= UFS_LINK_MAX) { + error = EMLINK; + goto unlockout; + } + vfs_ref(mp); + MPASS(!want_seqc_end); + if (checkpath_locked) { + sx_xunlock(&VFSTOUFS(mp)->um_checkpath_lock); + checkpath_locked = false; + } + VOP_UNLOCK(fdvp); + VOP_UNLOCK(fvp); + vref(tdvp); + if (tvp != NULL) + vref(tvp); + VOP_VPUT_PAIR(tdvp, &tvp, true); + error = ufs_sync_nlink1(mp); + if (error == ERELOOKUP) { + error = 0; + atomic_add_int(&rename_restarts, 1); + goto relock; + } + vrele(fdvp); + vrele(fvp); + vrele(tdvp); + if (tvp != NULL) + vrele(tvp); + return (error); } if ((fip->i_flags & (NOUNLINK | IMMUTABLE | APPEND)) || (fdp->i_flags & APPEND)) { @@ -1556,8 +1591,46 @@ relock: * .. is rewritten below. */ if (tdp->i_nlink >= UFS_LINK_MAX) { - error = EMLINK; - goto bad; + if (!DOINGSOFTDEP(tdvp) || + tdp->i_effnlink >= UFS_LINK_MAX) { + error = EMLINK; + goto unlockout; + } + fip->i_effnlink--; + fip->i_nlink--; + DIP_SET(fip, i_nlink, fip->i_nlink); + UFS_INODE_SET_FLAG(fip, IN_CHANGE); + if (DOINGSOFTDEP(fvp)) + softdep_revert_link(tdp, fip); + MPASS(want_seqc_end); + if (tvp != NULL) + vn_seqc_write_end(tvp); + vn_seqc_write_end(tdvp); + vn_seqc_write_end(fvp); + vn_seqc_write_end(fdvp); + want_seqc_end = false; + vfs_ref(mp); + MPASS(checkpath_locked); + sx_xunlock(&VFSTOUFS(mp)->um_checkpath_lock); + checkpath_locked = false; + VOP_UNLOCK(fdvp); + VOP_UNLOCK(fvp); + vref(tdvp); + if (tvp != NULL) + vref(tvp); + VOP_VPUT_PAIR(tdvp, &tvp, true); + error = ufs_sync_nlink1(mp); + if (error == ERELOOKUP) { + error = 0; + atomic_add_int(&rename_restarts, 1); + goto relock; + } + vrele(fdvp); + vrele(fvp); + vrele(tdvp); + if (tvp != NULL) + vrele(tvp); + return (error); } } ufs_makedirentry(fip, tcnp, &newdir);