From nobody Tue Nov 18 03:37:32 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 4d9Vg05MBHz6HWW3; Tue, 18 Nov 2025 03:37:32 +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 4d9Vg04Zpwz3ZRW; Tue, 18 Nov 2025 03:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763437052; 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=FyTqL0USKBoz7Hkvxljp7nGRxx+vJ2zMSh3qlYbwe3c=; b=pKCGDtbt9s7mtpFc//bAArXywGCcCFE6sc2+FtQE10rdB5KCtk6RjkQBWbotffyMZLl8nA 5C+cB7mWgQ09TruRgQvP/MYDExr2x0h0beIu8Yf8yxEMmsMjLTqgYf+IvvAZbXHQfV0xvI OH8HtcfGXRGu0zlSeVtlxupUrYq7MdwRB+l0uHG+sOl5mGEn2HwF7nCa+a4taRwutpGU01 JsoApinKBmH3oE2JJMZHTvlFPVYpyZQmttdNgtH+XZErQURpfX1h7bD/9XFxBwZrCmKui+ esTczWReJCLF1XMr/+X8tlr5xBNmHNAfp5Z49uLAR3U7T/OywZNn4uZawTk8/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763437052; 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=FyTqL0USKBoz7Hkvxljp7nGRxx+vJ2zMSh3qlYbwe3c=; b=sOpWa+8Q8CmrqXxSTnk8LG4Bf1C+UwYKrmGBxa3lCyM65mnUTC2e2TlsJPllJPyE9tMA7F Fh5RpYP3gcZxYHOTuvd79XGDEmn3Vyfma2PopS1sE3osrh9ov10yunDyQset5WMhbOrXP+ rRJza06pbRhEwsUJukRro8G6etBeFDKDePGmKUyga58v76uvgf4jHAUo5PBdEbs6c3ekMH 3Zo+JVHgORNaSOgqEV4NEAHchty19Oi0JqoPeQjGnl5CvhPTrUJZwfxpPIQO9o4CeJ3NfD UiSSV5732a5RRMChIIO5dRePjT47bEO7H3XYh3/xfhmmUT7qiKCQ9fpBTrF48g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763437052; a=rsa-sha256; cv=none; b=BHlN0onoji5lGQphIXUjwXhK4NYeaih7jP7xOzrL2mXX2fWEdChacSekUUfGBdseaXaIZm cINT0/tmHsF5j3wabjANHM83uOo+nm16N1/tk7c0mC5qvBXoitEhjI6Jb2UB6fqDOd/t+e f/3Bg7xnnS/4GXj43Xz/c4gjFrRC2fJEpd42bEC3ObS6OKU36bNNyDxHPJG43jai7R7AUW uotgpwRYyv99vnq9XIm5ePN9vEqCooaZAlnYFitRJ8jEodJLICpShbNjFyH0d0tuAdfhaB bf7gketvLxTaOFNSomsbV2F+5v5awgNficRW8rmcNIoGnxiXB3LfBdrsaclOdw== 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 4d9Vg03lf9zdZP; Tue, 18 Nov 2025 03:37:32 +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 5AI3bWrX055306; Tue, 18 Nov 2025 03:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI3bW3x055304; Tue, 18 Nov 2025 03:37:32 GMT (envelope-from git) Date: Tue, 18 Nov 2025 03:37:32 GMT Message-Id: <202511180337.5AI3bW3x055304@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: 48c288443822 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 48c28844382229a7af24941541e89e663b38f75c Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=48c28844382229a7af24941541e89e663b38f75c commit 48c28844382229a7af24941541e89e663b38f75c Author: Konstantin Belousov AuthorDate: 2025-11-06 19:25:23 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-18 03:37:05 +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 3180c66cb42b..4f9053460455 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -1446,6 +1446,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. @@ -1481,10 +1489,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);