From nobody Fri Sep 19 19:23:02 2025 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 4cT2Tf2lD3z67ShW; Fri, 19 Sep 2025 19:23:02 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cT2Tf21RYz3LDp; Fri, 19 Sep 2025 19:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758309782; 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=OvEEJkDSir0I5gbJXrIoWJ9t196dh6L8FPfq54q9s1o=; b=D4pIm+lTUM6V0Aqt48Q9IfulnP/3MqgN6YDiIN+acCRIXNgE+xJ8E2lVALRDuVeZrLT2A+ pEgJ3xwqniQnjqO0SgNyCMdrloJmTwHzPPD54Oq+6CJofzrhYikvgV9Ssjq8o49mJwwfNX TqQsyXqtzq7MjQ21bQpc0FbPFFWcDmqWMeGZPTBnEwsXVu0ZFtZd9G0BqT3Mi9yn/0NORe gdgJ2xttTeW1mOe70TidmNS3+5+DiAqNpyBPkz681PqxSSjEvaGzWj5YEDGgsmtfCQcIXJ QW66msgH4u6KhNf01c1BL4vC2aMn+VXLBqJUqvZvK5a116aI39dfGM0f4uA+8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758309782; 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=OvEEJkDSir0I5gbJXrIoWJ9t196dh6L8FPfq54q9s1o=; b=Rwbph1vjL3qcqnL7vbwm2Gb9VK09Hp+H58UTgvwV+Sr2CgPOM234LJozQOiH4Ep/ikTCm3 4dqQpxfI6DhycqeqlbZ5XnWqf+TDfvgr3CqqUwQSQiAvK7SqHBtAY2WN+iU1ST2wyFIrJt IA5s1B4t4t8/gh3elzekQGgmD4XhO+T+MUMFzKyF0zQSjtOcPT819ip2DAXD0vCIeZgKcZ wx3gYpdph1CcGs36i9oEyIAtk1eUs5aOPM/SlUkeogMbYdex7Ct8sGaEamP9N5AoAc5++5 8Aj6kTQJi6ta9jJSMttVwDVhq1xN42owFGANPgK5DcUbgj1s23AloHictz5+WQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758309782; a=rsa-sha256; cv=none; b=Xex6R5DsDenxaa78Zl5KSEkEjKkZit8iyGBO7L0zYy1WiCFehTUfHYzjhAzyI85u8SwOJX b9eBk4kNLVFU3OmEnL0C+pptQ7jKy0lw+BAeaBxZ4zUHjuXe/MQcNhLDeluo8gT+bkKHHu 8qz8SOM+Gmo3vq8fiYvrF7OJF1zQ/wSTgJzCnPuSt9yIum19g23+tYG3tvYEa1sD1XMUve nCQBkOEAW3D0hjz97FMtJrF6PKweP52Shw4l8iCj09ltQAqrXBO9qPzJekAcIjBZmWgGgL T98ZBDCo0lxEsVCCC4pNgxpZH+d14Zu8AcDmKX/8sA91hrDsiBumr+rSjPY54A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cT2Tf1SsWz18rn; Fri, 19 Sep 2025 19:23:02 +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 58JJN2mq013833; Fri, 19 Sep 2025 19:23:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58JJN250013830; Fri, 19 Sep 2025 19:23:02 GMT (envelope-from git) Date: Fri, 19 Sep 2025 19:23:02 GMT Message-Id: <202509191923.58JJN250013830@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 8f268240ee60 - main - Revert "fcntl(F_SETFL): only allow one thread to perform F_SETFL" 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f268240ee60b55f29910c89f546dbecf412c94c Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8f268240ee60b55f29910c89f546dbecf412c94c commit 8f268240ee60b55f29910c89f546dbecf412c94c Author: Colin Percival AuthorDate: 2025-09-19 19:14:19 +0000 Commit: Colin Percival CommitDate: 2025-09-19 19:22:44 +0000 Revert "fcntl(F_SETFL): only allow one thread to perform F_SETFL" Temporarily back this out to fix the tree while I try 16.0 snapshot builds. It will come back once D52626 lands. This reverts commit 40a42785dbba93cc5196178fc49d340c1a89cabe. Discussed with: kib --- sys/kern/kern_descrip.c | 3 --- sys/kern/vfs_vnops.c | 36 ------------------------------------ sys/sys/file.h | 4 ---- 3 files changed, 43 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 19118eb7f275..2a833d2eafbe 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -658,7 +658,6 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg) error = EBADF; break; } - fsetfl_lock(fp); do { tmp = flg = fp->f_flag; tmp &= ~FCNTLFLAGS; @@ -678,7 +677,6 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg) if (error != 0) goto revert_nonblock; } - fsetfl_unlock(fp); fdrop(fp, td); break; revert_nonblock: @@ -693,7 +691,6 @@ revert_flags: tmp |= got_cleared; tmp &= ~got_set; } while (atomic_cmpset_int(&fp->f_flag, flg, tmp) == 0); - fsetfl_unlock(fp); fdrop(fp, td); break; diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 3d4567b6ab1e..f81c2033d95e 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -896,18 +896,6 @@ foffset_read(struct file *fp) return (atomic_load_long(&fp->f_offset)); } -void -fsetfl_lock(struct file *fp) -{ - file_v_lock(fp, FILE_V_SETFL_LOCKED, FILE_V_SETFL_LOCK_WAITING); -} - -void -fsetfl_unlock(struct file *fp) -{ - file_v_unlock(fp, FILE_V_SETFL_LOCKED, FILE_V_SETFL_LOCK_WAITING); -} - #else /* OFF_MAX <= LONG_MAX */ static void @@ -983,30 +971,6 @@ foffset_read(struct file *fp) return (foffset_lock(fp, FOF_NOLOCK)); } - -void -fsetfl_lock(struct file *fp) -{ - struct mtx *mtxp; - - mtxp = mtx_pool_find(mtxpool_sleep, fp); - mtx_lock(mtxp); - file_v_lock_mtxp(fp, mtxp, FILE_V_SETFL_LOCKED, - FILE_V_SETFL_LOCK_WAITING); - mtx_unlock(mtxp); -} - -void -fsetfl_unlock(struct file *fp) -{ - struct mtx *mtxp; - - mtxp = mtx_pool_find(mtxpool_sleep, fp); - mtx_lock(mtxp); - file_v_unlock_mtxp(fp, mtxp, FILE_V_SETFL_LOCKED, - FILE_V_SETFL_LOCK_WAITING); - mtx_unlock(mtxp); -} #endif void diff --git a/sys/sys/file.h b/sys/sys/file.h index c44fd0f28929..9a072121e25f 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -93,8 +93,6 @@ void foffset_lock_pair(struct file *fp1, off_t *off1p, struct file *fp2, 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); -void fsetfl_lock(struct file *fp); -void fsetfl_unlock(struct file *fp); static inline off_t foffset_get(struct file *fp) @@ -224,8 +222,6 @@ struct file { #define FILE_V_FOFFSET_LOCKED 0x0001 #define FILE_V_FOFFSET_LOCK_WAITING 0x0002 -#define FILE_V_SETFL_LOCKED 0x0004 -#define FILE_V_SETFL_LOCK_WAITING 0x0008 #endif /* __BSD_VISIBLE */ #endif /* _KERNEL || _WANT_FILE */