From nobody Sat May 3 15:20:05 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 4ZqWgT4vzKz5vSj4; Sat, 03 May 2025 15:20:05 +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 4ZqWgT2n9zz3Ksc; Sat, 03 May 2025 15:20:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746285605; 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=hEi9DZnrU+pKhXptNPIrkUHf+eYVp6RomE14i7BcVAo=; b=HZAfGcyvXAKBo8iuPUe1t08cpK0UfMTbsQwwgtomQN9vyGN8mKzdDrs4DjFlYYTMhcqt3f PYpmjAOmbxNqqf88koAKHKBYFd6ieXh5ZyNj8+abqhTQD1vu5LVZeuDskE1/cEn+ozsYqu PEl5ij2bq/BCs7cmuEb7BjR7BGwFYyoGe3E01Ql+nuGCCfRdzu6A4UzKqeGTgr+rVauzZc 75hTtFfuZPcHSPKNqO9LsOEUS+vDRnai9JyqZicasRgJWmhvv4CB8Bku9JMeijgh9aRmMy WeTYvXtyZ1ARh/gQSzdNYgdHCuHcsTAdBqR+R4Vf6YcOCk/WCLS9pVQM63V4NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746285605; 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=hEi9DZnrU+pKhXptNPIrkUHf+eYVp6RomE14i7BcVAo=; b=ebMJhxIeicfH3dWqUT8NkC/ayhkeVUy6vfX4Dqzwy8LVIIglOVCQxBBt217k+Rh3sRu0On xxqfsFIQRKypaRNeKIAldu1zzUdEfoeP8IQhVr9y13rOviRKKk1soppOm8n5mCfczO+rrv IZnS4oetQhNFIJUtb0A960dOxTUwCMPeJG/PYqShMFL4ZwBiln34Ojizb8Ck55uj9i+90/ 2P3O9CGs/u68Fvh7Bzm5CartJnR+NE1gHKLq7mbjPPqsU5EchNt+LitkgudZU7OX/MSPNf Qzd0TtO7l8WM4KsGByiod2vmkAc+Sr/OOdryYM1kohPNRItnDzItLXQNZDC55g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746285605; a=rsa-sha256; cv=none; b=wDJcF8IGKPkDzhFH3qg6Cl1Fi/0Pe0HaqATFJnjN7WLanJDMv6/+KsoBMImoogwF0gESc+ lKZLUdL728a2vA9+3TUniIpoEKh+KaPyPMYcqFGc10FXuXtRqCpZZUOOPJVsV/MTMcCInZ /RB9gWC4383D5AbuBA2Dqa4o5VBsHloFZYoi2hNfcUv+YVzHMqo6r40QuNc6/zK/a718CX I8NOiMG8qhEuMsfpCTuowbaowy6dkFhMcWzD1EscQJ13ETzQFjgm51k+IrCODh1gJdui9o o7FRkZQIXYutVe+snwmTeMl5lKAC1jvbFc0gasyc7TzEshCOojQM3DwV6oBOPQ== 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 4ZqWgT267wzp2n; Sat, 03 May 2025 15:20:05 +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 543FK5pG048771; Sat, 3 May 2025 15:20:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 543FK5k6048766; Sat, 3 May 2025 15:20:05 GMT (envelope-from git) Date: Sat, 3 May 2025 15:20:05 GMT Message-Id: <202505031520.543FK5k6048766@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: f0ba6535d446 - stable/14 - sig_handle_first_stop(): notify debugger 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: f0ba6535d446ed79b628e3cd27a971131752ee44 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f0ba6535d446ed79b628e3cd27a971131752ee44 commit f0ba6535d446ed79b628e3cd27a971131752ee44 Author: Konstantin Belousov AuthorDate: 2025-04-23 16:51:12 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-03 15:19:41 +0000 sig_handle_first_stop(): notify debugger (cherry picked from commit 2f87445747430b4ca2e1d344550d9befb54226e7) (cherry picked from commit 4f32b298c679271243855083d20306563f815f17) --- sys/kern/kern_sig.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 0f87b8db9244..84bac9fc77ed 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -110,7 +110,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 int sig_suspend_threads(struct thread *, struct proc *); +static int sig_suspend_threads(struct thread *, struct proc *, bool *); static int filt_sigattach(struct knote *kn); static void filt_sigdetach(struct knote *kn); static int filt_signal(struct knote *kn, long hint); @@ -2534,12 +2534,14 @@ tdsendsignal(struct proc *p, struct thread *td, int sig, ksiginfo_t *ksi) MPASS(action == SIG_DFL); if (prop & SIGPROP_STOP) { + bool res; + if (p->p_flag & (P_PPWAIT|P_WEXIT)) goto out; p->p_flag |= P_STOPPED_SIG; p->p_xsig = sig; PROC_SLOCK(p); - wakeup_swapper = sig_suspend_threads(td, p); + wakeup_swapper = sig_suspend_threads(td, p, &res); if (p->p_numthreads == p->p_suspcount) { /* * only thread sending signal to another @@ -2804,16 +2806,26 @@ ptrace_remotereq(struct thread *td, int flag) wakeup(p); } +/* + * 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. + * + * *resp returns true if some threads were suspended directly from the + * sleeping state, and false if all threads are forced to process AST. + */ static int -sig_suspend_threads(struct thread *td, struct proc *p) +sig_suspend_threads(struct thread *td, struct proc *p, bool *resp) { struct thread *td2; int wakeup_swapper; + bool res; PROC_LOCK_ASSERT(p, MA_OWNED); PROC_SLOCK_ASSERT(p, MA_OWNED); wakeup_swapper = 0; + res = false; FOREACH_THREAD_IN_PROC(p, td2) { thread_lock(td2); ast_sched_locked(td2, TDA_SUSPEND); @@ -2833,8 +2845,10 @@ sig_suspend_threads(struct thread *td, struct proc *p) 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) @@ -2843,12 +2857,15 @@ sig_suspend_threads(struct thread *td, struct proc *p) } thread_unlock(td2); } + *resp = res; return (wakeup_swapper); } static void sig_handle_first_stop(struct thread *td, struct proc *p, int sig) { + bool res; + if (td != NULL && (td->td_dbgflags & TDB_FSTP) == 0 && ((p->p_flag2 & P2_PTRACE_FSTP) != 0 || p->p_xthread != NULL)) return; @@ -2865,7 +2882,9 @@ sig_handle_first_stop(struct thread *td, struct proc *p, int sig) p->p_flag2 &= ~P2_PTRACE_FSTP; p->p_flag |= P_STOPPED_SIG | P_STOPPED_TRACE; - sig_suspend_threads(td, p); + sig_suspend_threads(td, p, &res); + if (res && td == NULL) + thread_stopped(p); } /* @@ -3267,6 +3286,8 @@ sigprocess(struct thread *td, int sig) */ prop = sigprop(sig); if (prop & SIGPROP_STOP) { + bool res; + mtx_unlock(&ps->ps_mtx); if ((p->p_flag & (P_TRACED | P_WEXIT | P_SINGLE_EXIT)) != 0 || ((p->p_pgrp-> @@ -3288,7 +3309,7 @@ sigprocess(struct thread *td, int sig) p->p_flag |= P_STOPPED_SIG; p->p_xsig = sig; PROC_SLOCK(p); - sig_suspend_threads(td, p); + sig_suspend_threads(td, p, &res); thread_suspend_switch(td, p); PROC_SUNLOCK(p); mtx_lock(&ps->ps_mtx);