From nobody Sun Apr 27 21:52:49 2025 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 4Zm0gQ4h2kz5vNGd; Sun, 27 Apr 2025 21:52:50 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zm0gQ15CZz3RYY; Sun, 27 Apr 2025 21:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745790770; 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=GRangW5+wHC9iaGeRCprm5vxjP/3RKZQ//K7mxyjNYU=; b=XTE2pJKyOaOvO1uGmTHJVWlFHiRpVKIU0YvfOWvEpmyZjKN7bsbWOuFv/VL0ocOSsja7tR iV7hey0wDyZCsj2Y2wIwa8QKVPBV0OSWjEeF4PsTk2V2UU+An0W2NPvVNy2Ad7pTAxN+d8 XA8kG0gqJ0HmkJ8tWUjJNGXJ9nedaJEvQDxg8ErV7GB3W+9UzLHJ5pQB276ByqlbX5i1D9 wykt1ZERLdVsuHrybyI8z76Yh2IOBE/VSoTo/KvPWq6ZkKpjVgGHUrml5RjEXuM71dXrQy d+kxkyiUXqEBy/DxONEuIFUKiDagnQvJRFyGpNnJXLUz55es7WSAE+aatRiAMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745790770; a=rsa-sha256; cv=none; b=ch8VTt9ltHdlLVEUzvzbF+jNUvmuvFJnZFOvs5R1VSWR7Y5rtnNlVE2f3G1/PCn0XgJAhB iNaCZAEf1ZrNfI6QvTBQ4WYmU4Pg4sEVkykarCe2Kmb9czS7cF2+TykkMW/yvLYznwXWKi jiXq1guB2nrXLyA4UmtNh/tsqTgDYo+UYf5oqzzSDt/djgH1GcfxigFmDET6KOFj5YmZeh n0YNwapneFnfaHha+4Svbg4OtYPIgeIZDZa+2nJBDb55nUnhmEhhvgUE7rSnODxTGyBZeq SiG/mXRg82ytnkMA4Ub0hrPxC7ggfeqOQqMozWE21zHcu623zVDzUC1ubogZjw== 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=1745790770; 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=GRangW5+wHC9iaGeRCprm5vxjP/3RKZQ//K7mxyjNYU=; b=GZqaIE4R0CnQt6ycwkpQgqumoE4Kvp7TWf/FNINgO4fmrVOdiMFEeRxeah/57Xug/th6x+ /g/cd27OBNKz90LeV+iK2pB25Dkf6PNXunEbns7Zn+AVzW7wpp/5rOuwTB3GU0OpTXLrsQ 9esHuu4YYSBPj7kE5AVhVVQIjRuJJhiLrS72FqIRXdrucGGynRUC2AGhYrDtBsn9J7JVec uLLgeQBjL1UkKe1L7MzI3KoxoLmOhKbevqM76B0QvoJe5ToMqovXipjd1iaVsfOXt3Tq0j EiIYRekd76AR6Dr4/kZU4ou/JvHZ+45zBdth48Kc4BgVLDFdWyC9LOJoHd8RdQ== 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 4Zm0gQ0YSDz1MHn; Sun, 27 Apr 2025 21:52: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 53RLqn63093967; Sun, 27 Apr 2025 21:52:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53RLqnGb093964; Sun, 27 Apr 2025 21:52:49 GMT (envelope-from git) Date: Sun, 27 Apr 2025 21:52:49 GMT Message-Id: <202504272152.53RLqnGb093964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2f8744574743 - main - sig_suspend_thread(): return info about the way the process was suspended 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 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: 2f87445747430b4ca2e1d344550d9befb54226e7 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2f87445747430b4ca2e1d344550d9befb54226e7 commit 2f87445747430b4ca2e1d344550d9befb54226e7 Author: Konstantin Belousov AuthorDate: 2025-04-23 16:51:12 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-27 21:52:29 +0000 sig_suspend_thread(): return info about the way the process was suspended so that caller can infer whether the thread_stopped() is to be called by the AST handler. Tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D49984 --- sys/kern/kern_sig.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 2724944bb7a2..dd2d4d3ab401 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -108,7 +108,7 @@ static int issignal(struct thread *td); static void reschedule_signals(struct proc *p, sigset_t block, int flags); static int sigprop(int sig); static void tdsigwakeup(struct thread *, int, sig_t, int); -static void sig_suspend_threads(struct thread *, struct proc *); +static bool sig_suspend_threads(struct thread *, struct proc *); static int filt_sigattach(struct knote *kn); static void filt_sigdetach(struct knote *kn); static int filt_signal(struct knote *kn, long hint); @@ -2799,14 +2799,24 @@ ptrace_remotereq(struct thread *td, int flag) wakeup(p); } -static void +/* + * Suspend threads of the process p, either by directly setting the + * inhibitor for the thread sleeping interruptibly, or by making the + * thread suspend at the userspace boundary by scheduling a suspend AST. + * + * Returns true if some threads were suspended directly from the + * sleeping state, and false if all threads are forced to process AST. + */ +static bool sig_suspend_threads(struct thread *td, struct proc *p) { struct thread *td2; + bool res; PROC_LOCK_ASSERT(p, MA_OWNED); PROC_SLOCK_ASSERT(p, MA_OWNED); + res = false; FOREACH_THREAD_IN_PROC(p, td2) { thread_lock(td2); ast_sched_locked(td2, TDA_SUSPEND); @@ -2824,8 +2834,10 @@ sig_suspend_threads(struct thread *td, struct proc *p) sleepq_abort(td2, TD_SBDRY_ERRNO(td2)); continue; } - } else if (!TD_IS_SUSPENDED(td2)) + } else if (!TD_IS_SUSPENDED(td2)) { thread_suspend_one(td2); + res = true; + } } else if (!TD_IS_SUSPENDED(td2)) { #ifdef SMP if (TD_IS_RUNNING(td2) && td2 != td) @@ -2834,6 +2846,7 @@ sig_suspend_threads(struct thread *td, struct proc *p) } thread_unlock(td2); } + return (res); } static void