From nobody Tue Nov 18 03:38:50 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 4d9VhW0jcRz6HWTJ; Tue, 18 Nov 2025 03:38:51 +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 4d9VhV6s67z3Zlf; Tue, 18 Nov 2025 03:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763437131; 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=0uBYQqc1QQmd+b+S6jYzi4SzgLH+jTs9P8qVMulw+T8=; b=YhlcDoLkU2Tnq85ZD+KwpX4PIuBMm5oycrmJOY+03OXVXyyFu9lUE0iOkaReQ0WVAL+zR+ 55EIYVNs/hL3uqiskfzxaoF3JYq+ef7/ZKD18nEJF12fiqdUvqSljy1uF+9TNpg11N9DXl +IqSOprVCqDrtl544aj3aH2qb10cguzzisp1v3rlIN4gfdeJFT/r3io1FD8vtYNR/7GCYp PrDI5p0sAw2uoWQVNANHU5XeZt0bP5J7rbr+ZzYa3Sx1yRo1bW+okPpw6nGUAPt2m84d75 N1t/jv4OxlhfY0CdV4tpE0U3+d9MK9SROuSUi+rhNd76WaZ0hWyztL2OYZgu5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763437131; 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=0uBYQqc1QQmd+b+S6jYzi4SzgLH+jTs9P8qVMulw+T8=; b=xEs2x6ItW6SIk3X3ZPYlK5Dy2iCpDNImgvQ35D19d5Sa4OFTugz0pmKtw+tW+CPAF7c/GQ FUb5FJNmjy1AuUabO6AGHBzZkqdU9Rlh04Uota2oPrlPWe/pF6VWZA9EyGBmJ77O+G0tb1 z1b+oRk31/+1EglP9hMLweusmzRquPh9FAXV1aJZ0dPyI4iKQXZ21iCyBZ1AAxf2emFIfE bjfPLaqixV/967Pog99NP5nBz1+De9nle7Pw1erntsXU0EqMKThqYnsAyXvFeC6vKEvmcA bRtnQ2CSdgEzr7hwAntAb5hnzCZr9LkURNrCsBZsAloo8D5pHa/IsbWVhx5swQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763437131; a=rsa-sha256; cv=none; b=mA34q0tcV09YhBwbSM9oKDo8WjGeTvoUQWTuorNqyAAbI7QxnraDj2wbmJ8SZdSzh4YBhD cYidVC1AqD5jKTtjE2sS0jQMU1sPMW4d9tJxtBH79PX3iAkCkB9bUTU0Gpn7IkTocVDIgg tPicIBsF6a4Ryq6zqhbkJZCRL+e3LPVpB4cjaP2XX3Qe0RCMEiEn6nukScnGJA3/zfN6/1 ExSzEEVu3GuiLwXZEC74xWgSWDJDNcKufrHzMMZGra8HWl/AHR8/IxzMXJ/qpvX+mq+bQ9 HserV02mnB0gx5IYuze4FGSeffL8KTTiJq0ppSQDOLW5ID6GYP6g+8WnhioWXg== 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 4d9VhV6RSVzd5f; Tue, 18 Nov 2025 03:38:50 +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 5AI3co1c055825; Tue, 18 Nov 2025 03:38:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI3conO055822; Tue, 18 Nov 2025 03:38:50 GMT (envelope-from git) Date: Tue, 18 Nov 2025 03:38:50 GMT Message-Id: <202511180338.5AI3conO055822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f363f4a8fa8b - stable/14 - kern_thread: thread_suspend_check(1) must never suspend 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f363f4a8fa8b7d7beb79d2f6f70479aad30e7d6f Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f363f4a8fa8b7d7beb79d2f6f70479aad30e7d6f commit f363f4a8fa8b7d7beb79d2f6f70479aad30e7d6f Author: Konstantin Belousov AuthorDate: 2025-11-06 19:25:23 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-18 03:38:29 +0000 kern_thread: thread_suspend_check(1) must never suspend PR: 290843 (cherry picked from commit e1c6f4cb9bd29358c2b2fe249af9a2f9626b0670) --- sys/kern/kern_thread.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index a41e74e1533e..bd81b7472579 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -1451,6 +1451,14 @@ thread_suspend_check(int return_instead) return (TD_SBDRY_INTR(td) ? TD_SBDRY_ERRNO(td) : 0); } + /* + * We might get here with return_instead == 1 if + * other checks missed it. Then we must not suspend + * regardless of P_SHOULDSTOP() or debugger request. + */ + if (return_instead) + return (EINTR); + /* * If the process is waiting for us to exit, * this thread should just suicide. @@ -1488,10 +1496,9 @@ thread_suspend_check(int return_instead) * gets taken off all queues. */ thread_suspend_one(td); - if (return_instead == 0) { - p->p_boundary_count++; - td->td_flags |= TDF_BOUNDARY; - } + MPASS(!return_instead); + p->p_boundary_count++; + td->td_flags |= TDF_BOUNDARY; PROC_SUNLOCK(p); mi_switch(SW_INVOL | SWT_SUSPEND); PROC_LOCK(p);