From nobody Sat Sep 05 00:35:42 2026 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 4hcDrt5Mmcz6qZfb for ; Sat, 05 Sep 2026 00:35:42 +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 4hcDrt2d3cz44NM for ; Sat, 05 Sep 2026 00:35:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788568542; 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=fgwAOOB99jpHfPr5fYIJ75oI03RyH6T5L1rGUVVUOoc=; b=bdvqtcVNS5rmT3gjarEXx1G0zK6AaIvqAWLLbTSdv/rEHwMEMczIukEfJ+kXbpomjZma4Z kdaclTsq+AjTQ/5xdke9Z/up70yE5t9KRHcUXYG1oqI9ANYxJBQIZq61tYTtK3aoi594ui auaGhFiXvNCfd79DCGPedWJ2pQL61bZ4NaVT6dNuyLwhw/H6thOD9wT4Dbwd4fb2at1Z4X uIiDWtjovhoCKTelPZ0f/kXrTb7Y+Cx2BDxuAKxL5kuCd/1Q2q0nbYhPpGT4/2WkfM8/c8 V3Ci/9uec2cKF4TW33bpoq67x56HL+rvPAOFFDKLXqw5LsyxccKKsRkdEhS36g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788568542; a=rsa-sha256; cv=none; b=wOHsznt0LQpedh5usfgaVplCJbPwuAPQgLuWy0JHU5uI25zg9x8t9sw3ZWVpV9ZHqRCwVQ CB3t14O/cLg+sB+RmdwCXcwYoTspneEj/12UHbgX0x1HFUxsYvMZmEQjXm5pTf1xH2LJf3 hQH+BLHq9NExOTcLkgpn67KlhwQsTPJDIO9L09m330m92PYBEwpnaXhSFAXooQBpAytfLd +MVsYEKFboXgR5EUr8gOgBRcZgY0wmAEcQVOeD/e85tahXEZouqgE9TDW83gWglJDcz666 ZDSvp4w3fFQmW74pWSPOT6lp/ED34sRUEBFR0wVvcrymbDOPVyoOxe52DAj8eQ== 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=1788568542; 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=fgwAOOB99jpHfPr5fYIJ75oI03RyH6T5L1rGUVVUOoc=; b=fGUDTi04WKQZXD31Hm79c6b/OdqJ+MdE0wk2t3/1cYo7yY7fO3tmlTpGo6gL2cttZ92zvq vzDXaln3PoI+MiPA65pZbB9nSroniIFlRqbbG6EcpaSC6A3S1nCu526UCPYkhxOcsjs2Og ovuID7CXGRPo7uu6UiV9nBxoQr1G42iWmETHcP7iom+WYUM/Q5R5mLcX+j+uffKEU0J7uF zcBQ+Ygvzo+IY0D8yOHN5AM0e60mwqc3sg+QCHHfqSRIXW9z3rxcBSag9wLWccENBqoT9O Kevk8FboBjDHcuF0j+jzYikaNqZjlKfdfK1zuYqqjZXV0+9mGnCA740wgDJz1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hcDrt1gLpz7vZ for ; Sat, 05 Sep 2026 00:35:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fb18 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 05 Sep 2026 00:35:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5362192f9df3 - stable/15 - tty: make tty_wait_background() aware of proctree_lock ownership 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 5362192f9df36eafa45d889a237778f1045707e6 Auto-Submitted: auto-generated Date: Sat, 05 Sep 2026 00:35:42 +0000 Message-Id: <6a9b63de.1fb18.4514b46@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5362192f9df36eafa45d889a237778f1045707e6 commit 5362192f9df36eafa45d889a237778f1045707e6 Author: Konstantin Belousov AuthorDate: 2026-08-24 14:18:35 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-05 00:33:46 +0000 tty: make tty_wait_background() aware of proctree_lock ownership (cherry picked from commit 824f934bf9d5fcb34dd6c97d650a26823158abf1) --- 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 41ce5ecdb455..7a401695be97 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -432,7 +432,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; @@ -441,6 +442,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 (;;) { @@ -505,8 +509,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); } } @@ -543,7 +547,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; } @@ -618,7 +623,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);