From nobody Fri Jan 20 01:55:24 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 4NyjHw3QTZz2v3C7; Fri, 20 Jan 2023 01:55:24 +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 4NyjHw2yNGz3QgK; Fri, 20 Jan 2023 01:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674179724; 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=7647YPsQmPeQOTs2URXEgmQSPqmJ7/yO5tfN4V7IDBs=; b=Vg/6bsBGnvaU3LiuMNy8vsrGYVZsYg1SPM7lFO9tzRDRAi+9GkechmfZDJ0iRJl94ZQZ75 bQzRHHUUd2seZcSmT7KV62rlBHF3L+IB7RvvA5UBodbQg7D1b89XXRdKrvx9K05+ZdyKmp kAKoxO/Q2K2p7bFpIqI8ij6O+cKPcnmrR1jZlx8RX7851vKPj9G2c9ZV0gdt8jiJYfvVva emYWXNOTFghlJY4OVhj17ENdV1h1/XBvCVaPrEn4XCwQtlrutNPCf4uXnDsRzkc/aielbV kwopLdJTy3Ve6ZIwV5IXK8xvuH8NU9xj/rtK8wDWkaVUfoxtrCgtDW1y1EpIFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674179724; 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=7647YPsQmPeQOTs2URXEgmQSPqmJ7/yO5tfN4V7IDBs=; b=wZqePfDPVUtjZhL72zYF050kRARL76Z60udpfc2VkeH4hIUGKKQlYij6udbSzDsmwmqVyV NRs+lF0bDMOyGVmZaid+9xPIa31qUqjQTfAdS0EBfK9G2m6bXVbqlGg+HHZI5t+tN4fox6 iSjA01VGdVenj6sVnoaDFnwMtri5NHx52Q4m4pz4CtmtwWgL+i6EEFdQFGUg8060m+he4z O/ZnIQ2iB5Y+54n5gZGFI03TOa+x+smiOZqSOP9tjT4Veo212ZlEpc0VWELS7z836m5Xzh xpSvWI/6xA1SHUqk7POvWueQK7herVU3XESHZdDQ47ZzBUOZnITwPUhwxOPTwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674179724; a=rsa-sha256; cv=none; b=sNvfhTMpPxa9kCRUXBkSANylGQ5LcfiC1sRztnaNI5pOSzN0tuN1MafghJyHRxc3T2LKBS aZMFY8PZ0F9IyG+XcaWOSmwDScAuCk5Po63PYW1KlBGOBF2Vfk/Kkc8ynFn3eALkSgs4mk x3XSSdd4Z1jNo9gfK7tOeBCYdL88w6kqyXFHfA07cwDeALpUys14la7Pe/yJ3Yfu9tg0f0 LBCQ1upQL4qEWdLwDHZmccgRncmbeNeNLqj19mrinlPRjzoNww1Iim4zbciVYheTO8uAwH QJXswP5O1R7GIcCQBysyr3oQM18blE4niJrgOfftsoBqtN3/fXIMuXragX2t+Q== 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 4NyjHw1kCDz1CbP; Fri, 20 Jan 2023 01:55:24 +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 30K1tOIo011578; Fri, 20 Jan 2023 01:55:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30K1tO9Q011577; Fri, 20 Jan 2023 01:55:24 GMT (envelope-from git) Date: Fri, 20 Jan 2023 01:55:24 GMT Message-Id: <202301200155.30K1tO9Q011577@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: 6189672e6008 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 6189672e600814fec4cc165d25ae050fb2f3a999 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6189672e600814fec4cc165d25ae050fb2f3a999 commit 6189672e600814fec4cc165d25ae050fb2f3a999 Author: Konstantin Belousov AuthorDate: 2023-01-18 21:09:10 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-20 01:54:56 +0000 Handle ERELOOKUP from VOP_FSYNC() in several other places We need to repeat the operation if the vnode was relocked. Reported and reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D38114 --- 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 9b8773fc3c91..44358278a237 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -917,11 +917,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); } else if (bp->bio_cmd == BIO_DELETE) { error = vn_deallocate(vp, &off, &len, 0, diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 8e146318f0dc..341c8aaec01a 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1233,8 +1233,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)