From nobody Tue Dec 05 00:43:59 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 4SkhcJ0XXmz532Td; Tue, 5 Dec 2023 00:44:00 +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 4SkhcH5gM2z4crq; Tue, 5 Dec 2023 00:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737039; 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=0+Kw8UFadf7dKWDj9blN4QNCXTUOqVNX6otwF/zFvuI=; b=J27p7pOYSaG9ndaEy494ZklLilxNGIg1QqyvLAH2U9LFyuE65flVmAGiuSDWGvZ5P0MAU0 Xw+swO3YBJZJ+I//dWsh34C/jgTMf5mrptR/SvSSScTYUxK87Xd8noc8Rfsxt5Z0dgfjuV WAvnKU48BWoFylF536Uc8u+XcNcxH7ufDoTuYzhdQE3hzv9tosmSkvIjGMd33elz601WzY nbhqOF8IF22dUL4CeFtkP/Oa0EStCUHCKYAL8WIvnruVDLriIhObEUWWHdB/+bKXS8m9uh Ul4t4cy5TO1eVZ9XOGUthBaEVUJufbMSZnbRvrYxWjlwu+jPc+lw3OcvD2MExw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701737039; 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=0+Kw8UFadf7dKWDj9blN4QNCXTUOqVNX6otwF/zFvuI=; b=PG4iMBTSqpi01W0GelmJc+AZLDdDygBOTf1ydq4J/7cwJQgnluLpTH6WixNAR6H/Awt3Rj +7tjpSMsV7jw7iHf4p5+IgW0rm3S9LhpknAeknH1ADiPUCYq4gr9MwldUoBTzSKrRXLgMh GisD/xgnZSPQF6tcqrrjJpg5W1+jXLTo3C72Zb9PTyABkRCefAE/NzAQurQqcWP2xg8AW4 x0PKzFGV5Rd5i6OBZwQ1V6C6TZ/8cDqjKjs4hpOX+XFaoSMLEBWOKCEbxkCpXcBbzECVm3 MYk0CwtYh5WzhfzLvbePs3s4aQN66H20VuLmabWseyW/KVEZR0mxkvGmY4Ffug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701737039; a=rsa-sha256; cv=none; b=WEfVWePjP28wqpYmkkANPoGbDhw4STL4XOoybsctSb+tQ8Dni7CSh8+xArx/dupD2pBIiY ljQkufM7xehsSUli2yZCE36MK3Cuy5WX7Mv1Z/BiQmwzTEItzdRK3WAyWiNn54Psl0v4mC iG9ATk5RALi4+3KARCURB+8SQ8akcx8j8qguNXLbZIBRb2mJtsxeAP+Jnw7tCY2VTQVx3t eoO3WZxBKjafHuaGQ7+4pNojCPhNebiNACPuU4RE1JnsWRt1mGei052i35ZAUYVVzKB1s/ DbNSQXpdKEeF6DeXkqqocqqKK79XDctTG9EMm6p67I3grSzg+2ZwoclWhf1bvQ== 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 4SkhcH46jZzp06; Tue, 5 Dec 2023 00:43:59 +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 3B50hxd6029895; Tue, 5 Dec 2023 00:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B50hx5Z029892; Tue, 5 Dec 2023 00:43:59 GMT (envelope-from git) Date: Tue, 5 Dec 2023 00:43:59 GMT Message-Id: <202312050043.3B50hx5Z029892@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: 7dc643fe15f9 - stable/14 - vn_copy_file_range(): find write vnodes on which to call the VOP 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: 7dc643fe15f9b18e6821fa17402a0a2005095742 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7dc643fe15f9b18e6821fa17402a0a2005095742 commit 7dc643fe15f9b18e6821fa17402a0a2005095742 Author: Konstantin Belousov AuthorDate: 2023-11-18 08:57:44 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-05 00:43:27 +0000 vn_copy_file_range(): find write vnodes on which to call the VOP (cherry picked from commit a9bc8637690ce29496650a41d3c25e225ed22e3d) --- sys/kern/vfs_vnops.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 4669296750e4..6e8a6b23eec6 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3072,10 +3072,12 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, struct ucred *outcred, struct thread *fsize_td) { struct mount *inmp, *outmp; + struct vnode *invpl, *outvpl; int error; size_t len; uint64_t uval; + invpl = outvpl = NULL; len = *lenp; *lenp = 0; /* For error returns. */ error = 0; @@ -3101,17 +3103,22 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, if (len == 0) goto out; - inmp = invp->v_mount; - outmp = outvp->v_mount; - if (inmp == NULL || outmp == NULL) { - error = EBADF; + error = VOP_GETLOWVNODE(invp, &invpl, FREAD); + if (error != 0) goto out; - } + error = VOP_GETLOWVNODE(outvp, &outvpl, FWRITE); + if (error != 0) + goto out1; + + inmp = invpl->v_mount; + outmp = outvpl->v_mount; + if (inmp == NULL || outmp == NULL) + goto out2; for (;;) { error = vfs_busy(inmp, 0); if (error != 0) - goto out; + goto out2; if (inmp == outmp) break; error = vfs_busy(outmp, MBF_NOWAIT); @@ -3122,7 +3129,7 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, vfs_unbusy(outmp); continue; } - goto out; + goto out2; } break; } @@ -3133,16 +3140,21 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, * which can handle copies across multiple file system types. */ *lenp = len; - if (inmp == outmp || strcmp(inmp->mnt_vfc->vfc_name, - outmp->mnt_vfc->vfc_name) == 0) - error = VOP_COPY_FILE_RANGE(invp, inoffp, outvp, outoffp, + if (inmp == outmp || inmp->mnt_vfc == outmp->mnt_vfc) + error = VOP_COPY_FILE_RANGE(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); else - error = vn_generic_copy_file_range(invp, inoffp, outvp, + error = vn_generic_copy_file_range(invpl, inoffp, outvpl, outoffp, lenp, flags, incred, outcred, fsize_td); vfs_unbusy(outmp); if (inmp != outmp) vfs_unbusy(inmp); +out2: + if (outvpl != NULL) + vrele(outvpl); +out1: + if (invpl != NULL) + vrele(invpl); out: return (error); }