From nobody Thu Apr 17 20:45:03 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 4Zdqdr23vHz5slHn; Thu, 17 Apr 2025 20:45: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zdqdr15J6z49Zf; Thu, 17 Apr 2025 20:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744922704; 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=J8QMTlBg9nPH2MXtaoPEXwSn5qzTQWKwXh+0G3W6AOU=; b=WOFLVVg2LC3sWHwtOAFIf6wACzgmD+suRQ9wczIePCjUn7EYKxQ3ckfbLxGb5hcmFUztyp mnSGwIfNPbDRwQ476Zf7zvh2+Kl69yFmjfn6Z6Iaz7ZsX1A7hIEkYB2cbD1J5cl3bCO+N3 YjboP/vjnytUAZ8flXusrvbfT1A5stcxMRxYNOgPdLlAXy+C85ZcgafIKCSSuGc/pltJzj 01bf6/13+fWULa5vwBxzWzNckWfvb9D3dvXooYTuELBe7vbtmMEDQJ6eUFZ+7uSN9x+m75 gEeMJL87DACmJAYHrUwi1Zems55tbdCOIXRcIjaS0sTHndZ04xH6GTdUqJQpFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744922704; a=rsa-sha256; cv=none; b=VhLpgIyFjgQrIWu8GTtegF5M5dHvYv7Semho1Df+Iuak8oH9YchRUL1lJ2+iFdWgCjHcuu c95SC6Y80Pj3/2aBPHBhGgh3C/xF/uy6weislS8zlc7YBssBXm8oBBsCYVGg9hcJmvZs7L bm56I2vRw1NNfSBubExnOK/nQAhQwyr1ULZy1qTrbt3Usn9dHSdQDBM6kWpp/xJF/d/7dx 5ihxwnAWTfTFYRp6AeEpQ559lOkL6YXmjtNDVuIN2LuBAYF7tYxc/0Zh6svf3NEu8HWT8o 4rScbLDstR9DomYQq2yPKztA2E2MyzES6+yQC6FFpWgFcU1ML/3n7uOe3ieQ/w== 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=1744922704; 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=J8QMTlBg9nPH2MXtaoPEXwSn5qzTQWKwXh+0G3W6AOU=; b=bxMsCyUaAVyc2rLBCq5UWahcGPMDZ61XWE5Sz4J5cOt080MgZ/sBbB8bXE5VhW8GWQlE9H dceK0lAeD2WIvihPtS3BwLB8V5rNFO5BhtYB4C6UMektb/Znx6OzX8cDAQjTuSjhmOeN6J gcYTwvtNGfnrCfMBPr8+OlLqsBWRnCyLtCimEh5sr+Hp/ZWTnFdbD58tF4HG96bB76Z+V7 kZEHY9L/YBXV5C73U+y5upiwdZITld4NgzWQMn2yedG+yUu5Cjos1/7sxz/VgC0Oyw2bKr p6nFbbSoOyX/GdzQCEPG+eUTNvqzOh3urcGVbNCkdNaGORkBrRGTVcz5oVS+7A== 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 4Zdqdr0Kz2z13Tt; Thu, 17 Apr 2025 20:45: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 53HKj3QT071172; Thu, 17 Apr 2025 20:45:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53HKj3tZ071169; Thu, 17 Apr 2025 20:45:03 GMT (envelope-from git) Date: Thu, 17 Apr 2025 20:45:03 GMT Message-Id: <202504172045.53HKj3tZ071169@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: 4048ccc6ae37 - main - kern_sig.c: extract the first stop handling into a helper 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: 4048ccc6ae374c015c31f7b35221d5da8fe7d63f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4048ccc6ae374c015c31f7b35221d5da8fe7d63f commit 4048ccc6ae374c015c31f7b35221d5da8fe7d63f Author: Konstantin Belousov AuthorDate: 2025-04-17 11:44:51 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-17 20:33:47 +0000 kern_sig.c: extract the first stop handling into a helper Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D49678 --- sys/kern/kern_sig.c | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 0ee58af7fbe4..520577961c3a 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -115,6 +115,8 @@ static int filt_signal(struct knote *kn, long hint); 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); static uma_zone_t ksiginfo_zone = NULL; const struct filterops sig_filtops = { @@ -2820,6 +2822,29 @@ 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) +{ + if ((td->td_dbgflags & TDB_FSTP) == 0 && + ((p->p_flag2 & P2_PTRACE_FSTP) != 0 || + p->p_xthread != NULL)) + return; + + p->p_xsig = sig; + p->p_xthread = td; + + /* + * If we are on sleepqueue already, let sleepqueue + * code decide if it needs to go sleep after attach. + */ + if (ext || td->td_wchan == NULL) + td->td_dbgflags &= ~TDB_FSTP; + + p->p_flag2 &= ~P2_PTRACE_FSTP; + p->p_flag |= P_STOPPED_SIG | P_STOPPED_TRACE; + sig_suspend_threads(td, p); +} + /* * Stop the process for an event deemed interesting to the debugger. If si is * non-NULL, this is a signal exchange; the new signal requested by the @@ -2880,24 +2905,8 @@ 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. */ - if ((td->td_dbgflags & TDB_FSTP) != 0 || - ((p->p_flag2 & P2_PTRACE_FSTP) == 0 && - p->p_xthread == NULL)) { - p->p_xsig = sig; - p->p_xthread = td; + sig_handle_first_stop(td, p, sig, false); - /* - * If we are on sleepqueue already, - * let sleepqueue code decide if it - * needs to go sleep after attach. - */ - if (td->td_wchan == NULL) - td->td_dbgflags &= ~TDB_FSTP; - - p->p_flag2 &= ~P2_PTRACE_FSTP; - p->p_flag |= P_STOPPED_SIG | P_STOPPED_TRACE; - sig_suspend_threads(td, p); - } if ((td->td_dbgflags & TDB_STOPATFORK) != 0) { td->td_dbgflags &= ~TDB_STOPATFORK; }