From nobody Sat Feb 11 00:36:01 2023 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 4PDBV96Sgkz3nbvq; Sat, 11 Feb 2023 00:36:01 +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 4PDBV95y2dz4KXR; Sat, 11 Feb 2023 00:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676075761; 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=0SrEhyOxNZAVgwjXnvmk3G2V7Q+sbd9NniRinouzf34=; b=N3S6N5vnFeArwb6qm6w7bKpcdXdMPt5gm2PF/rD3cs7f8ZaFyrTh0I+bKtljskcB28YmQu EsbndYTyNeEeaSYC7nPdbeXc0/hiR/oBx2ppYipxdgAfnIkWoTcf+Zqv9b93Oj5Ft0HgRs Dtl8cX13e0lePMA9G9ChPhWfmtY2lxMT4JHmYEGm8/SBubOaiYU6aZgkeeeQ4dyPlzMn3a Z9Nj8gzlHRacR4C4FxAaiJWiKz7dLzLwMb+bjccbaStWBWZFMiXp9t8m7rUF5al0d/hQ2x cpLMLhu7C7JdKPXZnODlAAy+eHGs0gED2sBFDoVe8sy1ucB88GfBgIsMvcDw8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676075761; 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=0SrEhyOxNZAVgwjXnvmk3G2V7Q+sbd9NniRinouzf34=; b=b8xGGhxCx3h4r+f3esog+G//jwtn8rnLsBn6vClbW8nXv3T4tR1Y6ju/dqYV1pbL9QiD1v hqN7v5s55Bg3+woI6G1NM+ZydX9pxM7H2x9qVqJP1ZTcerFOpZ1a+RFPgM6q+PEBRoJdRI MNJ6X8ljxIvhxzg0CSahHlZnn1hG6rpO3GxfNlQmAqbCtjCLcJejE/c4qt1eaQ+5/SB5CX xaDkCxSY976u0o36T+knCanFDfiIgNNGQKUtF4P7u+DqefxvyJywoZC9J2Adgq3UTkbf3d EIkabA1PPk2HSTWvXrQrQTV9vD1xrv/lsRCB4Q4J+2AhHu2UtOxcDqDMZEa5GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676075761; a=rsa-sha256; cv=none; b=OM8IzoIUmOsrPBT1eR6+x0ZmZmf0suf5Mj6QrM+0zqV3+gfsQAGc9gIlcS0eT9OW1h2o2A 1S+tUJhnF5v/2U/qey4G9l6cDH0Wsl1mJ/BM/r12iQTZhYzcRB5P1wvM+Dhvy61pfgovKA y0jprcerKx/CUdf/MKehjOZiSJHRvpio/xXAxdfNJiAH/TSLpEVj6AuXcg35SG8z17oUpG I5+AVZUtArbq9dHppnyj5vhn/WhO/t527hs1wIzwwuBphTKcrd/yRIqqm/sW5MUIqIxrTQ P7XEt4y+OZ9pfTVgXP111j0btPpmIc78wKd7dYNJCytmVboA0TGDpRx7mg5juA== 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 4PDBV951ZMzfKY; Sat, 11 Feb 2023 00:36:01 +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 31B0a1aP088263; Sat, 11 Feb 2023 00:36:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31B0a1hO088262; Sat, 11 Feb 2023 00:36:01 GMT (envelope-from git) Date: Sat, 11 Feb 2023 00:36:01 GMT Message-Id: <202302110036.31B0a1hO088262@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: 51485f81b01a - stable/13 - FIOSEEKHOLE/FIOSEEKDATA: correct consistency for bmap-based implementation 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: 51485f81b01a03752ffaf530abfb570ae4593fae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=51485f81b01a03752ffaf530abfb570ae4593fae commit 51485f81b01a03752ffaf530abfb570ae4593fae Author: Konstantin Belousov AuthorDate: 2023-02-04 01:20:19 +0000 Commit: Konstantin Belousov CommitDate: 2023-02-11 00:25:02 +0000 FIOSEEKHOLE/FIOSEEKDATA: correct consistency for bmap-based implementation PR: 269261 (cherry picked from commit 3b6056204dd80cc866b7998ef0776247ebc42ce4) --- sys/kern/vfs_vnops.c | 12 +++++++++++- sys/ufs/ufs/ufs_bmap.c | 18 ++++++++++++++++++ sys/ufs/ufs/ufs_vnops.c | 2 +- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index f4274ee38689..566b781098ad 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -2546,6 +2546,7 @@ vn_pages_remove_valid(struct vnode *vp, vm_pindex_t start, vm_pindex_t end) int vn_bmap_seekhole(struct vnode *vp, u_long cmd, off_t *off, struct ucred *cred) { + vm_object_t obj; struct vattr va; daddr_t bn, bnp; uint64_t bsize; @@ -2555,7 +2556,7 @@ vn_bmap_seekhole(struct vnode *vp, u_long cmd, off_t *off, struct ucred *cred) KASSERT(cmd == FIOSEEKHOLE || cmd == FIOSEEKDATA, ("Wrong command %lu", cmd)); - if (vn_lock(vp, LK_SHARED) != 0) + if (vn_lock(vp, LK_EXCLUSIVE) != 0) return (EBADF); if (vp->v_type != VREG) { error = ENOTTY; @@ -2569,6 +2570,15 @@ vn_bmap_seekhole(struct vnode *vp, u_long cmd, off_t *off, struct ucred *cred) error = ENXIO; goto unlock; } + + /* See the comment in ufs_bmap_seekdata(). */ + obj = vp->v_object; + if (obj != NULL) { + VM_OBJECT_WLOCK(obj); + vm_object_page_clean(obj, 0, 0, OBJPC_SYNC); + VM_OBJECT_WUNLOCK(obj); + } + bsize = vp->v_mount->mnt_stat.f_iosize; for (bn = noff / bsize; noff < va.va_size; bn++, noff += bsize - noff % bsize) { diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index 4ac8ca149279..acdd334f6c7b 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -44,12 +44,16 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include #include #include +#include +#include + #include #include #include @@ -348,6 +352,7 @@ ufs_bmap_seekdata(struct vnode *vp, off_t *offp) struct inode *ip; struct mount *mp; struct ufsmount *ump; + vm_object_t obj; ufs2_daddr_t bn, daddr, nextbn; uint64_t bsize; off_t numblks; @@ -364,6 +369,19 @@ ufs_bmap_seekdata(struct vnode *vp, off_t *offp) if (*offp < 0 || *offp >= ip->i_size) return (ENXIO); + /* + * We could have pages on the vnode' object queue which still + * do not have the data blocks allocated. Convert all dirty + * pages into buffer writes to ensure that we see all + * allocated data. + */ + obj = vp->v_object; + if (obj != NULL) { + VM_OBJECT_WLOCK(obj); + vm_object_page_clean(obj, 0, 0, OBJPC_SYNC); + VM_OBJECT_WUNLOCK(obj); + } + bsize = mp->mnt_stat.f_iosize; for (bn = *offp / bsize, numblks = howmany(ip->i_size, bsize); bn < numblks; bn = nextbn) { diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 57560efffbbf..1ebb3597b925 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -2971,7 +2971,7 @@ ufs_ioctl(struct vop_ioctl_args *ap) vp = ap->a_vp; switch (ap->a_command) { case FIOSEEKDATA: - error = vn_lock(vp, LK_SHARED); + error = vn_lock(vp, LK_EXCLUSIVE); if (error == 0) { error = ufs_bmap_seekdata(vp, (off_t *)ap->a_data); VOP_UNLOCK(vp);