From nobody Sat May 03 15:20:04 2025 X-Original-To: dev-commits-src-all@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 4ZqWgS6Xw9z5vSqb; Sat, 03 May 2025 15:20:04 +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 4ZqWgS25Fjz3L0g; Sat, 03 May 2025 15:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746285604; 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=lPZBJDE5AKxB216WzkSAaGUXwXfHY/SSpyJZ8O6gUOI=; b=xwOsCChPzbrJuExwXxMDtu67MMXyFsUd3udxs/zkF5Tikb0x/H5YxngzcrYk7kgmKeyaGE /vDJcExKFhqxjYF0gDLXQULMhMK+xNWlT5qZRM6KQn6b1ezdWygq6wbA6go+RA/UcWIfo3 pGRQbo+9ma2L3HBLCJFLR2T/crpQE6rfnh+hNFd3OLxqg5a1rt4XuCQbNwpdLA3pvnDskI mxFcojLkjZfzfEelAolu8qxSg1S4hwQxhixkjK3po8BD5a8tNIG3uiA3I/EZhxkkwhH/Ja IoaD3NpBCdPs/2p2pZbqX/gOqHHObapdga49b3cQNJumK/Emwf3cMe/c9q7aeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746285604; 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=lPZBJDE5AKxB216WzkSAaGUXwXfHY/SSpyJZ8O6gUOI=; b=JkHAjGg/A0fW7cuukwZEG9IkQicyfyb6ii8QU46CZEs8XmWEgf1tYdGMej0PAPOn+HSLzm pqH/3wFX99vzB4i27hz7x4NSmZ7Ms7VZ132zI7zp1JK8wkMu7xb/+dyWg9ZErlWXKw6UBC WaVS60Sh8IgwTVVvtv799lc8ckBq//MBQ2Zhy6aNlbGaM832mjoIEh7oIK++Dm1oi8gODh 7hn3JMtuT17E9KEuzgZPMVf9YSxIdf9/8A8J7TW5Vm6KuP9fPaWcjF0/nwwIdKJrIQ6vXQ MWCTK9p5atmSawy0SonxwO/In6ZuJ7dQnDhcHzgCB/jKZyJnfbZv2aSGvLvbGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746285604; a=rsa-sha256; cv=none; b=HZlWhV1VOjvCjOKIWGNuLViQCHtLME3lJZ3der8mIy0/v/bhe6F2FKLJShUadnRu/VX5tO NXk94NregAje0XGxCsEUClyFijyIwBfmiAcIIUTzKZjmuapLNnmJ0ehZ4rxRDJrDbraeRt yVJG0/BAdwr7qeNcXZ7ELB3K6+EKPfmaY/AdCJTl0coW7RReH8Tnztf/5P0+aNSByusuya NveUDVTvG1x8+KN+uHdSduiWUk/hb/MlgI4jApeX2216EYl2chnE8lL3G1+gYsblVH94kd YJzrZmrgOAkJGrXmHSJD5HR+uzsce8wA/0KswYLeAEUermzjMbNd4TVWLNCNrA== 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 4ZqWgS1XVGzp2m; Sat, 03 May 2025 15:20:04 +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 543FK4rD048501; Sat, 3 May 2025 15:20:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 543FK4Zc048497; Sat, 3 May 2025 15:20:04 GMT (envelope-from git) Date: Sat, 3 May 2025 15:20:04 GMT Message-Id: <202505031520.543FK4Zc048497@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: 75c6434b1719 - stable/14 - sig_handle_first_stop(): allow NULL leader thread List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 75c6434b17198116553685f56e0979176f6337da Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=75c6434b17198116553685f56e0979176f6337da commit 75c6434b17198116553685f56e0979176f6337da Author: Konstantin Belousov AuthorDate: 2025-04-21 12:54:32 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-03 15:19:41 +0000 sig_handle_first_stop(): allow NULL leader thread (cherry picked from commit f87811ca3bc110af29e3a0e341d241c292dc8424) --- sys/kern/kern_sig.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 06da39b8cb33..0f87b8db9244 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -118,7 +118,7 @@ static struct thread *sigtd(struct proc *p, int sig, bool fast_sigblock); static void sigqueue_start(void); static void sigfastblock_setpend(struct thread *td, bool resched); static void sig_handle_first_stop(struct thread *td, struct proc *p, - int sig, bool ext); + int sig); static uma_zone_t ksiginfo_zone = NULL; const struct filterops sig_filtops = { @@ -2369,9 +2369,8 @@ tdsendsignal(struct proc *p, struct thread *td, int sig, ksiginfo_t *ksi) if (pt_attach_transparent && (p->p_flag & P_TRACED) != 0 && (p->p_flag2 & P2_PTRACE_FSTP) != 0) { - td->td_dbgflags |= TDB_FSTP; PROC_SLOCK(p); - sig_handle_first_stop(td, p, sig, true); + sig_handle_first_stop(NULL, p, sig); PROC_SUNLOCK(p); return (0); } @@ -2848,11 +2847,10 @@ sig_suspend_threads(struct thread *td, struct proc *p) } static void -sig_handle_first_stop(struct thread *td, struct proc *p, int sig, bool ext) +sig_handle_first_stop(struct thread *td, struct proc *p, int sig) { - if ((td->td_dbgflags & TDB_FSTP) == 0 && - ((p->p_flag2 & P2_PTRACE_FSTP) != 0 || - p->p_xthread != NULL)) + if (td != NULL && (td->td_dbgflags & TDB_FSTP) == 0 && + ((p->p_flag2 & P2_PTRACE_FSTP) != 0 || p->p_xthread != NULL)) return; p->p_xsig = sig; @@ -2862,7 +2860,7 @@ sig_handle_first_stop(struct thread *td, struct proc *p, int sig, bool ext) * If we are on sleepqueue already, let sleepqueue * code decide if it needs to go sleep after attach. */ - if (ext || td->td_wchan == NULL) + if (td != NULL && td->td_wchan == NULL) td->td_dbgflags &= ~TDB_FSTP; p->p_flag2 &= ~P2_PTRACE_FSTP; @@ -2930,7 +2928,7 @@ ptracestop(struct thread *td, int sig, ksiginfo_t *si) * already set p_xthread, the current thread will get * a chance to report itself upon the next iteration. */ - sig_handle_first_stop(td, p, sig, false); + sig_handle_first_stop(td, p, sig); if ((td->td_dbgflags & TDB_STOPATFORK) != 0) { td->td_dbgflags &= ~TDB_STOPATFORK;