From nobody Sun Jan 22 09:19:22 2023 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 4P073G3Hvvz315Vx; Sun, 22 Jan 2023 09:19:22 +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 4P073G2rHzz3QH0; Sun, 22 Jan 2023 09:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674379162; 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=zcyqplcklfDQaElq5bSC86ukC51nLKF/IxofP+syHso=; b=ywDt4BvPwx5Ovhy7manRWNP8F2gIpZMBIvfNngetjPPuvFepigIqBsIu7WzJ7pQeHpgkAn +OFYZrLk25yNbIfFyfp7IyYJzgZq6jLpNVDcRqUfBGjGaF3UL8RxPWvBn1qsgoueXADyDJ 9dYhJpXI3DkogFeJZUI7d4VT0ehe8/SpP7Y+oetCxwrxi9h4kMxHOA3/OgUG8z/pnE2uEa wKVBbaCqcJKDXZ9+jQHCy4PM0o5GOSI497k0A23wSAUofrXHapHrdhLnL7AR09W1+RwZlW KJfY90fQTvG+TtP1h9IW9IeWQP2B7i3f7EYB2jS3qGW1iEskQoldq8DFEo0GIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674379162; 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=zcyqplcklfDQaElq5bSC86ukC51nLKF/IxofP+syHso=; b=MqJK26qJ+mUjrIrlBkBBe00yvtFbOQtQxvfnZCmXNuY5rnsN+PwJqfjGZDZ681mVrGjlHf 9hLXU55exPh6b5AOWBiJuxAVlV/j+xnhYEdsx5J378WRyWjLnw7kEbt6VRjT0mrHFsqJj9 WbmHjBQQsPt2j96p7qTjDDi66swQr8nQ/KTwCZrQsPzSkmtiiQ0QLqNCIUpryHFek4W8S5 iiqIcDdob04OJqDcOnIyUmjsRxMUIAYVE+Arf/YntoirZzrYMeeOokaHit+kr6cvmqYgJG UMpM1nUgwxv+7ufHZ9yi9HhmZmsNGyNdxcBhf7hEXpXmNw4WNYfKMuRPDGHhjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674379162; a=rsa-sha256; cv=none; b=npTsZHR3BXY+ElXiqNk+QhDkzQp8HkIaDIswRiPuMVUZuttWrAE085usu9+I1fjR4rZn27 lLkMkZphe5CycVFkLbmyNKUfozuoPlqcmO54111Rfb0b4AQvGPFOpzAEx7ME+4yCvihBrR FBNJ5oheC8eQPy05BG7nqSCUoxxi1I2LLqpuXeKReC/g9DBNI5Am1Onny+kiLwj7+DWAJU bexgml+pc0MOkYkCL7ZJIFQlwRWEjzbhxLSjo4tM1ijFtFiDJHl1X5+NpVB7NACbs/hA69 y3v4vNdAiINTocKdFGOcpkgSSUXE9jzzRcruqoRsadd29c72YIaN49fq2iIu2w== 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 4P073G1dL4zkV8; Sun, 22 Jan 2023 09:19:22 +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 30M9JMxF044330; Sun, 22 Jan 2023 09:19:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30M9JMQN044329; Sun, 22 Jan 2023 09:19:22 GMT (envelope-from git) Date: Sun, 22 Jan 2023 09:19:22 GMT Message-Id: <202301220919.30M9JMQN044329@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: 7c09d62011bb - stable/13 - Handle ERELOOKUP from VOP_FSYNC() in several other places 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 7c09d62011bb084d3f7127edf2942bf6c9c3a6e2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7c09d62011bb084d3f7127edf2942bf6c9c3a6e2 commit 7c09d62011bb084d3f7127edf2942bf6c9c3a6e2 Author: Konstantin Belousov AuthorDate: 2023-01-18 21:09:10 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-22 09:18:09 +0000 Handle ERELOOKUP from VOP_FSYNC() in several other places (cherry picked from commit 6189672e600814fec4cc165d25ae050fb2f3a999) --- sys/dev/md/md.c | 12 +++++++----- sys/vm/vm_object.c | 19 +++++++++++++++++-- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index f44a2e940faa..243ac2be72d9 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -911,11 +911,13 @@ mdstart_vnode(struct md_s *sc, struct bio *bp) */ if (bp->bio_cmd == BIO_FLUSH) { - (void) vn_start_write(vp, &mp, V_WAIT); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); - error = VOP_FSYNC(vp, MNT_WAIT, td); - VOP_UNLOCK(vp); - vn_finished_write(mp); + do { + (void) vn_start_write(vp, &mp, V_WAIT); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + error = VOP_FSYNC(vp, MNT_WAIT, td); + VOP_UNLOCK(vp); + vn_finished_write(mp); + } while (error == ERELOOKUP); return (error); } diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 97803afc40fe..e7097be7b115 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1254,8 +1254,23 @@ vm_object_sync(vm_object_t object, vm_ooffset_t offset, vm_size_t size, res = vm_object_page_clean(object, offset, offset + size, flags); VM_OBJECT_WUNLOCK(object); - if (fsync_after) - error = VOP_FSYNC(vp, MNT_WAIT, curthread); + if (fsync_after) { + for (;;) { + error = VOP_FSYNC(vp, MNT_WAIT, curthread); + if (error != ERELOOKUP) + break; + + /* + * Allow SU/bufdaemon to handle more + * dependencies in the meantime. + */ + VOP_UNLOCK(vp); + vn_finished_write(mp); + + (void)vn_start_write(vp, &mp, V_WAIT); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + } + } VOP_UNLOCK(vp); vn_finished_write(mp); if (error != 0)