From nobody Sat May 3 15:20:00 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 4ZqWgP1KsRz5vSnd; Sat, 03 May 2025 15:20:01 +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 4ZqWgP0Cpcz3Kdf; Sat, 03 May 2025 15:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746285601; 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=g+DcexTMq1U2D/MSZM/fyPTIMoSk9COITbuWj6QMxaA=; b=ZqCSh11qgqYkb9C3vKNsKsq7Xj8eYv4uYRXMRpOMnZBZVBuc+1wgPHZfIIDpB1K16o4PbA Nv2D9KkIisEe7sWR5EDoY1NvWtPUUspJL5JPAr+BAiqxjX7hv8ybe+RVEfGwTRXwp7PQRj 2brh2uy9hOJ+cPR/xHTh9vu+G26ojVqA5LpxLoOc8vruwqorjaCqyqb1L7YYcwur4ASHTC jExpFt8453kr1TLckcomgq9HnhRJ3GFET/RBKilBd7VGNl/P7Nd82FZK6h9amulkY2lLwk Qwmko5hRnd3XjSXCe60GGxgoLD7MJszBQ+vn6eUFmK30BY1MY64j7VO4mr8k3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746285601; 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=g+DcexTMq1U2D/MSZM/fyPTIMoSk9COITbuWj6QMxaA=; b=NWiV5G+iNuRQxRBixxoa853tnrZIp3q86d1IQmQEZi4qtAkm7A2wqfDLoyB4cTJbzOY5/X VoRqLWKLtCIAwU6MHiR726A3iN9oKsb5cXGbh36Rtx+aLJVs9uCXxXqM0P3pT9oZt5ZGbI EbxgRyEJeO7arN4pXXEnuCkkexYc9Y2bjRi9dkotSahUGxB+QDE5Eq1rajazYYCqr9jnKz TyzWG17qLz3CSH7LJxlTdCjJc1jdXkiAZewEiWR8XQtxSVp4tf1pg4gdd5OfuNEMIqar0j nEPwjknEe0dHYecdnRoyfK5Pw66sJ/XCCr7p+ETxzTCOOSXqYRr+M+MYYeqdbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746285601; a=rsa-sha256; cv=none; b=P/u867NKDlX/GKuvzIs80r+PUfSzZ2fVm5nhZ2KORViBeMtUzpB7r6LtyIm/v9fdekHOVx Ctk1HfZyYEtRWMo+2HEceiAap/RuqMoJTL9Ds0b18Q7rhjbWvjGJn3QA7gwDAv4oxvoeJD DAmIS2qMNeuc6AFZMFCerN8gtrDPqHe0/GQlZWCy3Tr/+6Qr6g4cpU95bRphx4jZABFbIj sNzHhkKQXsJrCE9gQ+Uqj85lKqu+hwWKwGDjP+kr2BuI91tXYmtiHXmpKbPKrBxuU3bx5B k/jVaT1nOTuAcywiaAIEpIQmRIvhqByeL/RrSg7GlOU6TqKswFVRwli8+lJeLg== 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 4ZqWgN6t0Tzp50; Sat, 03 May 2025 15:20:00 +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 543FK0SM047700; Sat, 3 May 2025 15:20:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 543FK0rf047695; Sat, 3 May 2025 15:20:00 GMT (envelope-from git) Date: Sat, 3 May 2025 15:20:00 GMT Message-Id: <202505031520.543FK0rf047695@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: 18e0f9ec54e8 - stable/14 - PT_ATTACH: do not interrupt interruptible sleeps 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: 18e0f9ec54e83fae684d51fe08f8b2b7390da006 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=18e0f9ec54e83fae684d51fe08f8b2b7390da006 commit 18e0f9ec54e83fae684d51fe08f8b2b7390da006 Author: Konstantin Belousov AuthorDate: 2025-04-16 00:09:44 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-03 15:19:41 +0000 PT_ATTACH: do not interrupt interruptible sleeps (cherry picked from commit ecc662c749b11434c63a0d3578fc40df6b4798ec) --- sys/kern/kern_sig.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index a81ae86965f3..4df052629828 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -2361,6 +2361,15 @@ tdsendsignal(struct proc *p, struct thread *td, int sig, ksiginfo_t *ksi) if (prop & SIGPROP_CONT) sigqueue_delete_stopmask_proc(p); else if (prop & SIGPROP_STOP) { + if ((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); + PROC_SUNLOCK(p); + return (0); + } + /* * If sending a tty stop signal to a member of an orphaned * process group, discard the signal here if the action @@ -3355,7 +3364,8 @@ issignal(struct thread *td) } } - if ((p->p_flag & (P_TRACED | P_PPTRACE)) == P_TRACED && + if (false && + (p->p_flag & (P_TRACED | P_PPTRACE)) == P_TRACED && (p->p_flag2 & P2_PTRACE_FSTP) != 0 && SIGISMEMBER(sigpending, SIGSTOP)) { /*