From nobody Wed Jul 13 08:48:35 2022 X-Original-To: dev-commits-src-branches@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 19EF917FCBCC; Wed, 13 Jul 2022 08:48:36 +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 4LjWVr0BCWz3SQT; Wed, 13 Jul 2022 08:48:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657702116; 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=oAHgf/g1gleoen8GA1WEx2g+eunxMeEHYYe3E7P2cl4=; b=BorVWwLiwPi1p5BDah25KXx376pq1KEPQATp2erbr+fc/cp7KjL0C4tiHzvf97rJNbRHQ8 ggnfsR6Z2FgBpLClmoqbw7K8yXxuyRLOe5VB0J0U79NrTpOyBjly6w9bS/RGHREf0dSajT UgeQR36IwShtSQC8/SWHML7EpH/yKVycJlbMXfxEDPlN11vY5CDmpfucamf/BiQswLLJ13 Shlbk6MJZMEFpKokAAgXleR5Omx45MOEpyufHzhSxyEMISba6EXdFEccv60HOvxwxfRnBX IDS16ZefJbKMAwHLWYtq1Y18xvfiopYDQXpm5mM6FuFs535VRHOaawN1WlDCLw== 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 4LjWVq65StzHS1; Wed, 13 Jul 2022 08:48:35 +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 26D8mZcm001424; Wed, 13 Jul 2022 08:48:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26D8mZDN001423; Wed, 13 Jul 2022 08:48:35 GMT (envelope-from git) Date: Wed, 13 Jul 2022 08:48:35 GMT Message-Id: <202207130848.26D8mZDN001423@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: 0aa68d5fbedb - stable/13 - UFS rename: make it reliable when using SU and reaching nlink limit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 0aa68d5fbedbd191bd00f07f3ce9dd5ec4679ff6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657702116; 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=oAHgf/g1gleoen8GA1WEx2g+eunxMeEHYYe3E7P2cl4=; b=Bb9YZJZwviwF3qHVJLryAYKNm6P63M4yuy+U0e52Ef04QFipROa4ICz35K5fsiEEKCVpcl putQaRKIJljMJ08SkqxTR8uhs1YVkoszitmCMLtIesQHTt4PLvq2nU4rd5Wa9JVKdmlEZK YOOWbt/89RMQG5EzZDH2xam2EPyo6zQ0iSOr6af+MWo9eDoFVNRNi0PspjkOW4yO8iD99H DcYXDXac5lKcog1akmRFcfGsZ1xxtzo2tJLKkLKShqcvmQcJ75N7nzOWWu+gx9ynu0O1TZ 5Q/sDJwNfhc72BwO3cfbZh14dRaScgVtwR+tDXogp/IOB0+9501BeRfgMeLR2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657702116; a=rsa-sha256; cv=none; b=p1WbnnoTbDBzZA9R1QBjx2CX0SeLCCTktXWQV8HlUCraHJPpzziZ4Gxp/8p0OSyFQ68VsV FiAdB1ntakAZ0Jeloe5N+hxjmDQC+t4WKql+DTVYfGl5RQ563wk+MYBBJC4GGDuvFzEQoW U/2yG6ICqUU4q3V/cDte0WSvXH8Gxzx8UCz+UkTzBLDLRmMkGU9iON+1E9mlhxLWgRfNEY mNftxo5Y1eUCHWP74WDzlrVTaypBhrRKfSpFoHowOWcQEnFcZIVIJ9kaSwChgqNOrYu6Bm sQt09Ccf8vZS+r+QqQWGTfkzDLOhXiaDWxTAsPteXIOqjri9hN0ombcej92fTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0aa68d5fbedbd191bd00f07f3ce9dd5ec4679ff6 commit 0aa68d5fbedbd191bd00f07f3ce9dd5ec4679ff6 Author: Konstantin Belousov AuthorDate: 2022-06-22 13:54:01 +0000 Commit: Konstantin Belousov CommitDate: 2022-07-13 08:38:01 +0000 UFS rename: make it reliable when using SU and reaching nlink limit PR: 165392 (cherry picked from commit bc6d0d72f4f4e96b24d0ad558b271cb6f483801e) --- 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 4353c51afcbe..7938902676ca 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); } @@ -1440,8 +1449,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)) { @@ -1555,8 +1590,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);