From nobody Mon Nov 20 01:40: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 4SYVZH1R8Kz51fpr; Mon, 20 Nov 2023 01:40:23 +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 4SYVZH0z3Qz4Dm4; Mon, 20 Nov 2023 01:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700444423; 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=CpUEnFj5dWbLXUePvgpUJR0iVRQa1imiYoz2X5DIPXM=; b=Kod7dWKi01H1fzqw0g6XKoNZKd+au4S4BYDXLbjC6T6XuaU4QgTFH8xcNzPFnC8cHbR40b alSoRkVJnrwPOK/tNk4zjuLxfqb83N/mnCs7SkVhZrqrKbV9vqtBvgWY/zZ/ec769kCz5M zL1gbNnaFYdwvJie7f2GeJeJXpysC9+YXTaOAkUa8g26pcMo4BYuRLGwz61DZILz1fNTu1 GtOM+1UxXPb9ymVGy6AJxBM1AJncF58I/mffuv3G5uFhrS5y6vr9ZnH29dMBNCieQANQbb HBeK+T8qTKM4UWVf7r7zmrQUSVRGiMZpocnb9cUQFkmRAcM9hKhi0EET0+yNuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700444423; 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=CpUEnFj5dWbLXUePvgpUJR0iVRQa1imiYoz2X5DIPXM=; b=KgJp3Q2PMcotJzPZrxtk1nwN7cAfX7jtwlAi0rLOPMXDbU1VOvurj0M+5k/Jsv4AbKMmLX /OCY3a/EAKL4E2/2bhMB3zoWd++Ni++pcrRCo5kZejlr5mHzin1oIRnIz+sk6TuPeERAKs wA0VsQAjQfveVOfmaRjNxcL9Ed7QsudCiB856bbRgjMaa8rhzhrjtaRaaMFADUVx7kZj9n LEMdGSclqkiSD1nWfwNaUGfhlcPocY5WkCj0ru5aHVCflEZKCi2zQ8dfmEOJuak8ZKh5Rn 6HQbfzuF4X0teW1W6nKt+lu7JsCRsK1YMhiSMJnbS+K1Um+GcF0zislyn67HCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700444423; a=rsa-sha256; cv=none; b=sLGzrK1HAw59mNi3rTprKaoeeuggZDqdpvzY+u/kh75r4yQ1vd/8R+cWvAQr0al0y6xNLK pNxzzSH3s+5Dpeafarawe5q56rNX9GiCeJYybh/vC+CO6I89s18nY9NhylqNdeMlQTf1DL rpk0QBKx8iVFsC+SBqLQHKQ+mrkqbkv3gKywpH6JWUgonG2lQ5mP/Ex2ZJVAVDBDIErVG4 N1hN5f2KIdkkXGWSXG79RL2Df3FlFNpEUlIXJJXslA0H6s+1Z5B4jtEWJ+uRRbU9eESQWu 38VsC7MTUdbuXv13hrNxHGH0zj7UcFivF7SaiLzPuIz4VuLUWeeJVvOwvFka5w== 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 4SYVZH04J8zYKw; Mon, 20 Nov 2023 01:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AK1eMuK044467; Mon, 20 Nov 2023 01:40:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AK1eMbl044464; Mon, 20 Nov 2023 01:40:22 GMT (envelope-from git) Date: Mon, 20 Nov 2023 01:40:22 GMT Message-Id: <202311200140.3AK1eMbl044464@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: 0784b5768e00 - stable/14 - vn_copy_file_range(): busy both in and out mp around call to VOP_COPY_FILE_RANGE() 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/14 X-Git-Reftype: branch X-Git-Commit: 0784b5768e003bbf5677327d1a68f13d2ea2c230 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0784b5768e003bbf5677327d1a68f13d2ea2c230 commit 0784b5768e003bbf5677327d1a68f13d2ea2c230 Author: Konstantin Belousov AuthorDate: 2023-11-12 18:37:29 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-20 01:39:22 +0000 vn_copy_file_range(): busy both in and out mp around call to VOP_COPY_FILE_RANGE() (cherry picked from commit 23210f538a008788b2e16b9eddafa4f598a21663) --- sys/kern/vfs_vnops.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index e2227537dde1..27ce5401f15f 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3078,6 +3078,29 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, inmp = invp->v_mount; outmp = outvp->v_mount; + if (inmp == NULL || outmp == NULL) { + error = EBADF; + goto out; + } + + for (;;) { + error = vfs_busy(inmp, 0); + if (error != 0) + goto out; + if (inmp == outmp) + break; + error = vfs_busy(outmp, MBF_NOWAIT); + if (error != 0) { + vfs_unbusy(inmp); + error = vfs_busy(outmp, 0); + if (error == 0) { + vfs_unbusy(outmp); + continue; + } + goto out; + } + break; + } /* * If the two vnodes are for the same file system type, call @@ -3092,6 +3115,9 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, else error = vn_generic_copy_file_range(invp, inoffp, outvp, outoffp, lenp, flags, incred, outcred, fsize_td); + vfs_unbusy(outmp); + if (inmp != outmp) + vfs_unbusy(inmp); out: return (error); }