From nobody Tue Apr 15 02:25:36 2025 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 4Zc7L952tLz5sjTL; Tue, 15 Apr 2025 02:25:37 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zc7L85PnCz3LyQ; Tue, 15 Apr 2025 02:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744683936; 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=yppcTl5edpmh0oPVMkDLhvqEuknWbCz6FtAwfdQYBA0=; b=lzs911vbVCoPhLZceO2gsVinX9pSQWcScjY4RjY8yttsAgdQUYNcCZzZSGOtJWN/eJ6nYV bqM61dSMQUcVBqHmpoPbztu7QNPHmRGj9oPYo/ogVK/prh/k8ijYvkXdsCdoaDjnIZDoIs 7YhW7VYF09KMzi9nsvRyMRbRaTINzn5jqeYTngbm6m9M+FuNGTMMTf3JSeBRr0U9jKWtGG lkjDN2ROFta98a/mjgQtleAuEx3/ya/PE1N+SrgvX959pVHloQPeTpsgjEhUcdsj/mYF/c jXN+MNbL9IVMXZtjT9ujn3EuZkZJJnOSIEVB7EZnQ9+oul/GrqGmFwB0R4mOyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744683936; a=rsa-sha256; cv=none; b=RKhUObOvuyMTSqMkeJr+0fBnR80z8n1M5Je07OZ6Rs+aPcrel0x+s8UZW27FysdMijfNpi ulafI/K3/aMCleAPGDNjhv7U5vmdXJeUKPwzUtHiy80zE25crxeCVSMvmttVsSm0qCWtso 3/4AVumVUl9yCmOIca7KrWMLcDhf/KFNzGjIXhwRanJ/bFqVfJwlU6cIKSUpFC1BniO69C l7IdSLQ+6dyAgT679Fq2v85EXDzqd9ddRos27D1cGlntbfuqgQONbea5r1V/m4pVoXwhn5 KzD/Q9Fb8QloPBv8A8sT1zhDlOVbxB8cH7/ft9QohCrIxw3SOA2z7Zy+B9vFGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744683936; 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=yppcTl5edpmh0oPVMkDLhvqEuknWbCz6FtAwfdQYBA0=; b=LQkrE5IL7JQqKXn/b+WiXIj+zpBBQhr2nzQOMF7RP31lt08E0FngsRXSm8E40xwWEXyv8I u0bGoZhBF4BzuFOpgRmeDIZMPLcwz9VeqmzRVTsRmA17TYuSLjnywv4iSia54mqvJR6wjt WS2pcaP/qXo8m1tlOi7kzNuy0Al7URrbqUCdt59by+XeHAU4a5Iyb/q8ZkhLxPV7TTGQmu FPjg9+toPFBAqrqNIT8sKKVeht3yZ8iyU7Lq4MLZkHPXmtnM02m/o8fDukgMUt3PCD8f1m rW21hQXAaLgFFy6qYJ+ANoTQdjN4cz2N6mHSxMvX0QRwBsqNej6AHWFsa4R+vQ== 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 4Zc7L84yWXz8J; Tue, 15 Apr 2025 02:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53F2Pakf014593; Tue, 15 Apr 2025 02:25:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53F2PaGe014590; Tue, 15 Apr 2025 02:25:36 GMT (envelope-from git) Date: Tue, 15 Apr 2025 02:25:36 GMT Message-Id: <202504150225.53F2PaGe014590@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c1aa97cf79a6 - stable/14 - file: Add foffset_lock_pair() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c1aa97cf79a6fd40eb89bcbd4faebdc5656a6279 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c1aa97cf79a6fd40eb89bcbd4faebdc5656a6279 commit c1aa97cf79a6fd40eb89bcbd4faebdc5656a6279 Author: Mark Johnston AuthorDate: 2025-03-31 01:25:16 +0000 Commit: Mark Johnston CommitDate: 2025-04-15 02:25:24 +0000 file: Add foffset_lock_pair() This will be used in kern_copy_file_range(), which needs to lock two offsets. Reviewed by: kib, rmacklem MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49440 (cherry picked from commit 12ecb0fe0afda8c051605045e446371ddd34741f) --- sys/kern/vfs_vnops.c | 20 ++++++++++++++++++++ sys/sys/file.h | 2 ++ 2 files changed, 22 insertions(+) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index c28d6e66853f..c447ceea1634 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -894,6 +894,26 @@ foffset_read(struct file *fp) } #endif +void +foffset_lock_pair(struct file *fp1, off_t *off1p, struct file *fp2, off_t *off2p, + int flags) +{ + KASSERT(fp1 != fp2, ("foffset_lock_pair: fp1 == fp2")); + + /* Lock in a consistent order to avoid deadlock. */ + if ((uintptr_t)fp1 > (uintptr_t)fp2) { + struct file *tmpfp; + off_t *tmpoffp; + + tmpfp = fp1, fp1 = fp2, fp2 = tmpfp; + tmpoffp = off1p, off1p = off2p, off2p = tmpoffp; + } + if (fp1 != NULL) + *off1p = foffset_lock(fp1, flags); + if (fp2 != NULL) + *off2p = foffset_lock(fp2, flags); +} + void foffset_lock_uio(struct file *fp, struct uio *uio, int flags) { diff --git a/sys/sys/file.h b/sys/sys/file.h index bef21d39e641..07f6bbd5bcae 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -85,6 +85,8 @@ struct ucred; #define FOF_NEXTOFF_W 0x08 /* Also update f_nextoff[UIO_WRITE] */ #define FOF_NOUPDATE 0x10 /* Do not update f_offset */ off_t foffset_lock(struct file *fp, int flags); +void foffset_lock_pair(struct file *fp1, off_t *off1p, struct file *fp2, + off_t *off2p, int flags); void foffset_lock_uio(struct file *fp, struct uio *uio, int flags); void foffset_unlock(struct file *fp, off_t val, int flags); void foffset_unlock_uio(struct file *fp, struct uio *uio, int flags);