From nobody Mon Feb 07 09:50:58 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 BFEC019C1AA0; Mon, 7 Feb 2022 09:51:07 +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 4JshGs6zJJz3sW9; Mon, 7 Feb 2022 09:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644227466; 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=S2eMumdVuxKuoQlGCGfPqxo45zQFpf0NECgoztxfq3M=; b=s8CNsFHgZhxGAEgns5qIzRhgz7CbRvBg7pEtJfw0AOjF2TWuTa23246lqXf1rRXR8oP3Ln VfsW3MxgqqMJQVgUnjLARc4E4I7NKede2zHZ4h9Z3taQWFx3oMypKvxnuHeYY8PouWkF0W alrWGmf6h1oHARCihmzbbbmYGOHC0zKGXIsjEnO3E6w+HJXsKOX84Y45F9ym+ySC7un8wM pXRf41KIriOlihTaeMPKvNPZuMANpbGHEqn4AEFHqCMJ+bXKBvWwsl/pA38EUVbYsubYBB 9zJHfFIC0aORBf41Xm+x8Gcn2vOPiQuB0tua9UibwP3HWRzaiJwSu+DArs1GZA== 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 17EF82392C; Mon, 7 Feb 2022 09:50:59 +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 2179owJ2059158; Mon, 7 Feb 2022 09:50:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2179owUD059157; Mon, 7 Feb 2022 09:50:58 GMT (envelope-from git) Date: Mon, 7 Feb 2022 09:50:58 GMT Message-Id: <202202070950.2179owUD059157@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: 83d203e3d7f4 - stable/13 - ffs: lock buffers after snaplk with LK_NOWITNESS 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: 83d203e3d7f4103526bb68d0b0b5d470ea31061b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644227463; 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=S2eMumdVuxKuoQlGCGfPqxo45zQFpf0NECgoztxfq3M=; b=EwtkLQVpA8rwt8PFGpnSaf3GoMncnj/UTeqbrpjrFJns7Qs9couSe0vpZykhptwxUr/P6H subEM8Pgq41nvjWqpCXdhkogUFhXgQfk6hHsE5uvqFZe07p7NSKwtnF8aoA902dmdU8rWB ta8/g7YVNVxg+IlQr0vtnsI1WaN3U5NTQiUlfBTWyK55PtOghiHKbbE29Qhs4C1X31Optw S+ZMuodwbx24WZewJz7iof5AxSGlGzPJ8FydosM2eLF5OTpwBhK+2mCjd5gHw78vQCYVpF UXOdzW7C5f4hTbCcgokwBoU7iCekcp+GphEQ3yr6W0XNA0oq7k5CJzeHuBM62g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644227463; a=rsa-sha256; cv=none; b=gkZOlU1aU8VVgYfl7uGv3/RjjVKXcnWz3093plLsFmDBOdgXM1GjyZ2o/aGk8HtNcxyftL qsl/YWmCF4JwzkUuMHAjGGIRA0OihYgcJWkV+7Ol76msYrI/7f+uc9BhbJzSfz8rTaO7I2 nrCqWb6RoVB0l5btXVjBpA1eiIEnurEWMGnSpFBbMqLrXJ2q8QJWtsS1mz18hhiwiXW7eP 2TrVrq8tIKyVOqIlgCV/Wq9GP7CHBIMqg0rBL3ZGZBxVX02olfKPeqbeFIxgb9xGgjqiVe a0Ps+P32XObSVD0UneS53z0h7P833VxIwm4krqroMlk7DmifkJnutER6DRMyfw== 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=83d203e3d7f4103526bb68d0b0b5d470ea31061b commit 83d203e3d7f4103526bb68d0b0b5d470ea31061b Author: Konstantin Belousov AuthorDate: 2022-01-28 04:42:33 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-07 09:38:50 +0000 ffs: lock buffers after snaplk with LK_NOWITNESS (cherry picked from commit 99aa3b731caa252e94d92add8cb02d077a24a256) --- sys/ufs/ffs/ffs_alloc.c | 4 ++++ sys/ufs/ffs/ffs_balloc.c | 23 +++++++++++++++-------- sys/ufs/ffs/ffs_vnops.c | 12 ++++++++---- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 13c508fde646..50b176b262f4 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -80,6 +80,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -270,6 +271,9 @@ ffs_realloccg(ip, lbprev, bprev, bpref, osize, nsize, flags, cred, bpp) fs = ump->um_fs; bp = NULL; gbflags = (flags & BA_UNMAPPED) != 0 ? GB_UNMAPPED : 0; +#ifdef WITNESS + gbflags |= IS_SNAPSHOT(ip) ? GB_NOWITNESS : 0; +#endif mtx_assert(UFS_MTX(ump), MA_OWNED); #ifdef INVARIANTS diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c index d7718e56dd87..af20258081d5 100644 --- a/sys/ufs/ffs/ffs_balloc.c +++ b/sys/ufs/ffs/ffs_balloc.c @@ -70,6 +70,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -612,7 +613,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, int size, int deallocated, osize, nsize, num, i, error; int unwindidx = -1; int saved_inbdflush; - int gbflags, reclaimed; + int gbflags, gbwflag, reclaimed; ip = VTOI(vp); dp = ip->i_din2; @@ -628,6 +629,12 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, int size, if (lbn < 0) return (EFBIG); gbflags = (flags & BA_UNMAPPED) != 0 ? GB_UNMAPPED : 0; +#ifdef WITNESS + gbwflag = IS_SNAPSHOT(ip) ? GB_NOWITNESS : 0; + gbflags |= gbwflag; +#else + gbwflag = 0; +#endif vn_seqc_write_begin(vp); @@ -889,7 +896,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, int size, *allocblk++ = nb; *lbns_remfree++ = indirs[1].in_lbn; bp = getblk(vp, indirs[1].in_lbn, fs->fs_bsize, 0, 0, - GB_UNMAPPED); + GB_UNMAPPED | gbwflag); bp->b_blkno = fsbtodb(fs, nb); vfs_bio_clrbuf(bp); if (DOINGSOFTDEP(vp)) { @@ -914,8 +921,8 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, int size, */ retry: for (i = 1;;) { - error = bread(vp, - indirs[i].in_lbn, (int)fs->fs_bsize, NOCRED, &bp); + error = bread_gb(vp, indirs[i].in_lbn, (int)fs->fs_bsize, + NOCRED, gbwflag, &bp); if (error) { goto fail; } @@ -1138,7 +1145,7 @@ fail: * buffer object lists. */ bp = getblk(vp, *lbns_remfree, fs->fs_bsize, 0, 0, - GB_NOCREAT | GB_UNMAPPED); + GB_NOCREAT | GB_UNMAPPED | gbwflag); if (bp != NULL) { KASSERT(bp->b_blkno == fsbtodb(fs, *blkp), ("mismatch2 l %jd %jd b %ju %ju", @@ -1156,8 +1163,8 @@ fail: } else if (unwindidx >= 0) { int r; - r = bread(vp, indirs[unwindidx].in_lbn, - (int)fs->fs_bsize, NOCRED, &bp); + r = bread_gb(vp, indirs[unwindidx].in_lbn, + (int)fs->fs_bsize, NOCRED, gbwflag, &bp); if (r) { panic("Could not unwind indirect block, error %d", r); brelse(bp); @@ -1193,7 +1200,7 @@ fail: if (blkp == allociblk) lbns_remfree = lbns; bp = getblk(vp, *lbns_remfree, fs->fs_bsize, 0, 0, - GB_NOCREAT | GB_UNMAPPED); + GB_NOCREAT | GB_UNMAPPED | gbwflag); if (bp != NULL) { panic("zombie2 %jd %ju %ju", (intmax_t)bp->b_lblkno, (uintmax_t)bp->b_blkno, diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index a33699515bc2..c2d6948dd140 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -261,12 +261,17 @@ ffs_syncvnode(struct vnode *vp, int waitfor, int flags) struct ufsmount *ump; struct buf *bp, *nbp; ufs_lbn_t lbn; - int error, passes; + int error, passes, wflag; bool still_dirty, unlocked, wait; ip = VTOI(vp); bo = &vp->v_bufobj; ump = VFSTOUFS(vp->v_mount); +#ifdef WITNESS + wflag = IS_SNAPSHOT(ip) ? LK_NOWITNESS : 0; +#else + wflag = 0; +#endif /* * When doing MNT_WAIT we must first flush all dependencies @@ -318,9 +323,8 @@ loop: if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_NOWAIT, NULL) == 0) { BO_UNLOCK(bo); } else if (wait) { - if (BUF_LOCK(bp, - LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK, - BO_LOCKPTR(bo)) != 0) { + if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_SLEEPFAIL | + LK_INTERLOCK | wflag, BO_LOCKPTR(bo)) != 0) { BO_LOCK(bo); bp->b_vflags &= ~BV_SCANNED; goto next_locked;