From nobody Mon Mar 31 09:06:37 2025 X-Original-To: dev-commits-src-main@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 4ZR4xp18Rpz5rhmR; Mon, 31 Mar 2025 09:06:38 +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 4ZR4xn5SbNz3YWC; Mon, 31 Mar 2025 09:06:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743411997; 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=Bl0ip/sWFSJd7spGxMO3Y8F8EIzqWDc/Qd45tFNWqEs=; b=CEC6YBDjvsd2kzakrPiRMRAQCyDJSaBUN9jRJwuEcSmAzE1+LTRHU879BDW/q5l6+2lpGl nuPIdqnCZGt9R5HmkWQsfn9sOSnwkIWqpPrGnlsa7JCoRbiQR9OMWOUTKIgJlE26kPzZbX wlrv9/6aUpKRccy03GzKrMv0mBM6bXSfwDFTh55SDaG8uUlXfFqnunU5QTcdCkLaAKxJvk isbXuLo2n+8gAWQXW9xBIEeHc/Q9CNSf7F8OHubRL/NSa0R5+C5tr6e1tQ6Llr9QN6KQNF wwQ4oEFOXQixZSck7FHXJmsgLkfot0KMMoiEnNgsRNrceQ7+pTM4BUn10wr/wA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743411997; a=rsa-sha256; cv=none; b=r2YSWaAUPHWybHq2u9OeGzlN90SF5mnelBdBWj/O/Lk3EugVZCfdUKP4BklaNuMVLW6szR 5F+vH+WY6j+BKjZX5JBtik3JagARujqUj3pcdLHF1MYdcoykanFY3vUq+aqPIsEuhO86gr JyHhebeKFQem91bQ/WpRIpFCQg8QOBDbh74puCJQYuNygwl0M22aXHuqwxpBx/WS35XlLE wwHf+W+YYGZ8nsa/1b7uU5yiQsVEHxQsTqbmlNhJdIG9u7xNiY3JniSh3Ao3fPwBeNfLgr QpGcQM410Km0KmUUsgaOpFwE6g7LCLLnPbz7iidMt6L1icU91MpP8cSnpoRNoA== 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=1743411997; 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=Bl0ip/sWFSJd7spGxMO3Y8F8EIzqWDc/Qd45tFNWqEs=; b=Qnm/qf/2bFrBMyZKfCsow4l6RHjzHkqlXrloUUh9hfW1+q/dLolmpketPtydjFcYHWOmI2 9ix+vUVHksNxN3T+C8Z2Z5JBXQqPCl5RS7j1GvqhZKRu7kvniquWURAIEPPmdB4JXvKrWE 4ImEn5C57TZbTFtwfV1TEcdPgaUTrrkn18fVV8JpeiD3uSOB5L27KL6AtV+aMtAFyGPK8V 4RMtm/6yl8AJP9qneJRLisYGuaLXF3nMruPQB35Bd1IczMD1cwIijUMuQf3H97yWcV/k5t RS8jqyRBIAKppNXzxj25F4DOM/aUJ29eRo32dkJXFPXYve4tH7Do3N7qeg1nsA== 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 4ZR4xn531Nzfdg; Mon, 31 Mar 2025 09:06:37 +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 52V96bXZ078915; Mon, 31 Mar 2025 09:06:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52V96bGo078912; Mon, 31 Mar 2025 09:06:37 GMT (envelope-from git) Date: Mon, 31 Mar 2025 09:06:37 GMT Message-Id: <202503310906.52V96bGo078912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 12ecb0fe0afd - main - file: Add foffset_lock_pair() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 12ecb0fe0afda8c051605045e446371ddd34741f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=12ecb0fe0afda8c051605045e446371ddd34741f commit 12ecb0fe0afda8c051605045e446371ddd34741f Author: Mark Johnston AuthorDate: 2025-03-31 01:25:16 +0000 Commit: Mark Johnston CommitDate: 2025-03-31 09:01:09 +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 --- 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 0d96bdb3acba..69d8ffcdd5ad 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -892,6 +892,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 d0b53196151e..0c025fde475c 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -86,6 +86,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);