From nobody Sat Aug 29 09:43:45 2026 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 4hX9LV0W2Wz6qlVS for ; Sat, 29 Aug 2026 09:43:46 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hX9LT3jKgz3gSg for ; Sat, 29 Aug 2026 09:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787996625; 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=mHNTQNS9wHYZTrx7Q5BH9PLdrerq64yQhV4Zxme0aCU=; b=fQZ+H+71khU1k6ySwBcNjWc+nBNsYiw5Tq2MCjtt4qGdnGBxOPADM/sJ7ZosijTFssWGMr Oy+TxFxnuGvMUYM/rgoreQERHeI4uCYTddn3Rcq9WRIcAo81ZwnJu6zptZ36xS7qohXhB2 Wlhx1TdbwfNER7nAYDuRIQWFM8fSAlNHFzfpC14Qvw0ox7q2WP+KPHoJcMWKr88023wykH pH1YkI8gzH7n8zetr6bZY48AjuuDNtjgb7fSWrO35dh9gH1IdfatJ0oP/gwDTNeteC/Zsg ywWopTFwnW7+pzJqkOvKV1ByjYYhT88BU960d+d5yFt0x+TcYN94v5lg3JVz+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787996625; a=rsa-sha256; cv=none; b=Rrq98zmKTTs/ozVRZi1DBoLqMQW5qsgatzNAB3cY+QcbD2/Sql/pJekhFB1TWIpZh+U4LS +hsEyjlAWThKZJLZ+7CSF3mDwnxyFQQXGkTpKaxqNWdjP/kcvhKh2DcqrWs0BSIFkBibby F7P0cpiHda4vbxdv8CKUEYBMAL6ur66QfDG2xJ8MYdh0zmGIOGdjD8Jj3YLM6m0LSAbd/f OAA+YwBRB+bDNZ5b35FM9T3ottSDoJtv96osn3jm6ArLT5g6sZJd7w1Asa9CqkeDmx11s0 IViBuDCkhKgLCSYqfWOr461wKBlE5xnwYFHiTEKQig66lS5kLwtxrbpoRQnglA== 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=1787996625; 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=mHNTQNS9wHYZTrx7Q5BH9PLdrerq64yQhV4Zxme0aCU=; b=qbKMp33s+FAlb3/hugxpvXZK9jTOtqS+fuxHnH/1GRG+gCeuIJ9clrcn66qKFtSSDf6uUt t0/Q+wg+6N7soehuq//J3pmCeFxugueWX8oIgDWAgBdAZy83ncm7/Ogk0p/zjZLrJTX+eF Tn2V6hI8s5D2FTb7a62S7zPqnSHr+hwD54rFeAWTYmhqM3ptF88wwQFwGBy8MgQir+mvRv ebvOL2xNjPpU3h2BGrPwJvHFof5jQzyFyyUi9ltPdeXiVcAGyPQi5V1bXsUoO++kXEa8t1 3ZlArnB78vNdeik7g88rSWLML6y68nHtUZ18+JMMQnuaFWM91fcOT4brV6cNBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hX9LT2myYzbjl for ; Sat, 29 Aug 2026 09:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46a51 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 29 Aug 2026 09:43:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 824f934bf9d5 - main - tty: make tty_wait_background() aware of proctree_lock ownership 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: 824f934bf9d5fcb34dd6c97d650a26823158abf1 Auto-Submitted: auto-generated Date: Sat, 29 Aug 2026 09:43:45 +0000 Message-Id: <6a92a9d1.46a51.15cd8825@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=824f934bf9d5fcb34dd6c97d650a26823158abf1 commit 824f934bf9d5fcb34dd6c97d650a26823158abf1 Author: Konstantin Belousov AuthorDate: 2026-08-24 14:18:35 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-29 09:43:00 +0000 tty: make tty_wait_background() aware of proctree_lock ownership Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D59132 --- sys/kern/tty.c | 16 +++++++++++----- sys/kern/tty_ttydisc.c | 12 ++++++++---- sys/sys/tty.h | 3 ++- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index ae624227bc3a..e1e9989cee09 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -434,7 +434,8 @@ tty_is_ctty(struct tty *tp, struct proc *p) } int -tty_wait_background(struct tty *tp, struct thread *td, int sig) +tty_wait_background(struct tty *tp, struct thread *td, int sig, + int proctree_lock_mode) { struct proc *p; struct pgrp *pg; @@ -443,6 +444,9 @@ tty_wait_background(struct tty *tp, struct thread *td, int sig) MPASS(sig == SIGTTIN || sig == SIGTTOU); tty_assert_locked(tp); + MPASS(proctree_lock_mode == LA_UNLOCKED || + proctree_lock_mode == LA_SLOCKED || + proctree_lock_mode == LA_XLOCKED); p = td->td_proc; for (;;) { @@ -507,8 +511,8 @@ tty_wait_background(struct tty *tp, struct thread *td, int sig) pgsignal(pg, ksi.ksi_signo, 1, &ksi); PGRP_UNLOCK(pg); - error = tty_wait(tp, &tp->t_bgwait); - if (error) + error = tty_wait_proctree(tp, &tp->t_bgwait, proctree_lock_mode); + if (error != 0) return (error); } } @@ -545,7 +549,8 @@ ttydev_write(struct cdev *dev, struct uio *uio, int ioflag) return (error); if (tp->t_termios.c_lflag & TOSTOP) { - error = tty_wait_background(tp, curthread, SIGTTOU); + error = tty_wait_background(tp, curthread, SIGTTOU, + LA_UNLOCKED); if (error) goto done; } @@ -620,7 +625,8 @@ ttydev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, * If the ioctl() causes the TTY to be modified, let it * wait in the background. */ - error = tty_wait_background(tp, curthread, SIGTTOU); + error = tty_wait_background(tp, curthread, SIGTTOU, + LA_UNLOCKED); if (error) goto done; } diff --git a/sys/kern/tty_ttydisc.c b/sys/kern/tty_ttydisc.c index 2be6b560d4f4..9ad379b3c60d 100644 --- a/sys/kern/tty_ttydisc.c +++ b/sys/kern/tty_ttydisc.c @@ -199,7 +199,8 @@ ttydisc_read_canonical(struct tty *tp, struct uio *uio, int ioflag) ttydisc_read_break(tp, &breakc[0], sizeof(breakc)); do { - error = tty_wait_background(tp, curthread, SIGTTIN); + error = tty_wait_background(tp, curthread, SIGTTIN, + LA_UNLOCKED); if (error) return (error); @@ -279,7 +280,8 @@ ttydisc_read_raw_no_timer(struct tty *tp, struct uio *uio, int ioflag) */ for (;;) { - error = tty_wait_background(tp, curthread, SIGTTIN); + error = tty_wait_background(tp, curthread, SIGTTIN, + LA_UNLOCKED); if (error) return (error); @@ -320,7 +322,8 @@ ttydisc_read_raw_read_timer(struct tty *tp, struct uio *uio, int ioflag, timevaladd(&end, &now); for (;;) { - error = tty_wait_background(tp, curthread, SIGTTIN); + error = tty_wait_background(tp, curthread, SIGTTIN, + LA_UNLOCKED); if (error) return (error); @@ -373,7 +376,8 @@ ttydisc_read_raw_interbyte_timer(struct tty *tp, struct uio *uio, int ioflag) */ for (;;) { - error = tty_wait_background(tp, curthread, SIGTTIN); + error = tty_wait_background(tp, curthread, SIGTTIN, + LA_UNLOCKED); if (error) return (error); diff --git a/sys/sys/tty.h b/sys/sys/tty.h index 6a58908d97a4..65cc88f861c2 100644 --- a/sys/sys/tty.h +++ b/sys/sys/tty.h @@ -192,7 +192,8 @@ void tty_signal_sessleader(struct tty *tp, int signal); void tty_signal_pgrp(struct tty *tp, int signal); /* Waking up readers/writers. */ int tty_wait(struct tty *tp, struct cv *cv); -int tty_wait_background(struct tty *tp, struct thread *td, int sig); +int tty_wait_background(struct tty *tp, struct thread *td, int sig, + int proctree_lock_mode); int tty_timedwait(struct tty *tp, struct cv *cv, int timo); void tty_wakeup(struct tty *tp, int flags);