From nobody Thu Dec 22 22:10:53 2022 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 4NdPdp0jGzz1J1tw; Thu, 22 Dec 2022 22:10:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NdPdn6Tj4z3jVD; Thu, 22 Dec 2022 22:10:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671747053; 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=03gsJT/4+JBIpz9uis5LowR8DwMasSFqFwEV2kequ+8=; b=XEh+Dt8I9pYvFlnIVY6jFZ9c7FGDfTvVHAOEEs6PsPwaouuyM2TRz9PfrIRkHl5w6RoBOK kxQzWjTmQ1VbXHnwCHc17gqxZ+plb+3f9vwdp7fp6zWk22ZTV40ADkM3PV9aNJ1eF3Cg0p cUyHVRnJuzXmwQ3mSfsxNnTXYEpHZ0HnsDCF8HLC3XJAdO1F8pzj55/IFto5ylJNockjAu E+HRC5OBkGBAGcFqUEmKzScue0owB1GsUg4i/fnQy3Gu5Ns+SvGLjXVpcZIFe5rw5rBtI9 Cueb5wGXmAeqXjioiaxt9PZ1VLY+QV6rGTGWkJqRVmLWrEE7LFIz/sDRUCOp9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671747053; 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=03gsJT/4+JBIpz9uis5LowR8DwMasSFqFwEV2kequ+8=; b=Gw25KUCk7PGFP/+SHD1TbrFP0ZruPTtHKIiKg/6bmaEw0SuculIYoHv/x2ozY1fgokHM6x HUqZUjCul0GrpC4+e/aIg+dttCy0bui6kC3gS2j1OiDEqQh9MPPyexrn+oUPGlldHbBHDn iC0dRpTj9GbWDh/OXC8S4F/6FRq3+jFjYSf97hlQk9qC8tQhYDGp3ctARaGDZuB5IxQiL3 uUmLUt3hVsoYsWyVgha1cJ10N9gu4srsgAvlS0hOV2J7+V4+hvYG1lfFg0euDz2ZWCTo86 7AJre+GLaCFv771CLa1zqVTL0TMD2gAX92p/vLWGekes6lea3KoyHlvyzTM+XQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671747053; a=rsa-sha256; cv=none; b=W00+owMPC+0ikUGyfXJnYuAZlsx5oX2kd0bHo9bqrqe3IZq9NKRUL4rwwBD8DAWYeFDC1x b53gir/PW5T8l8oF4waltVeoX94xn9gu+DxO5+kllgubuuEZBtTl29CO5ZjFv055btBEJD vbinwuSlwvl1mbwyuG4dHStYF8mLkgZZ0SN9hpPXCHaBLQB4/laF8+MKf55/2q0auqcEqA /RLi+d4mH+JPVJrlMNaAKGAYT+PpTQgvXL6RtkaIgELQ/e5Mvi8egOgxw9Vo23ZRpbaFbi LKNUHwOx6zBkU55RL5k4FKUQ6ULJN165nt/aeym8Xx7Le5csU4iu3EkNbDhtRQ== 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 4NdPdn5LfRz196n; Thu, 22 Dec 2022 22:10:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BMMAruM038132; Thu, 22 Dec 2022 22:10:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BMMArXE038131; Thu, 22 Dec 2022 22:10:53 GMT (envelope-from git) Date: Thu, 22 Dec 2022 22:10:53 GMT Message-Id: <202212222210.2BMMArXE038131@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: f0592b3c8dd8 - main - Add a thread debugging flag TDB_BOUNDARY 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: f0592b3c8dd8e172f0e7165c11371108d4d8838d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f0592b3c8dd8e172f0e7165c11371108d4d8838d commit f0592b3c8dd8e172f0e7165c11371108d4d8838d Author: Konstantin Belousov AuthorDate: 2022-12-01 00:29:35 +0000 Commit: Konstantin Belousov CommitDate: 2022-12-22 21:11:35 +0000 Add a thread debugging flag TDB_BOUNDARY It indicates to a debugger that the thread is stopped at the kernel->user exit path. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D37590 --- sys/kern/kern_sig.c | 5 ++++- sys/kern/subr_syscall.c | 11 ++++++++--- sys/sys/proc.h | 3 ++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 11c0334181e1..eea624019fff 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -279,7 +279,7 @@ static void ast_sig(struct thread *td, int tda) { struct proc *p; - int sig; + int old_boundary, sig; bool resched_sigs; p = td->td_proc; @@ -321,12 +321,15 @@ ast_sig(struct thread *td, int tda) !SIGISEMPTY(p->p_siglist)) { sigfastblock_fetch(td); PROC_LOCK(p); + old_boundary = ~TDB_BOUNDARY | (td->td_dbgflags & TDB_BOUNDARY); + td->td_dbgflags |= TDB_BOUNDARY; mtx_lock(&p->p_sigacts->ps_mtx); while ((sig = cursig(td)) != 0) { KASSERT(sig >= 0, ("sig %d", sig)); postsig(sig); } mtx_unlock(&p->p_sigacts->ps_mtx); + td->td_dbgflags &= old_boundary; PROC_UNLOCK(p); resched_sigs = true; } else { diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c index 33dd50d3d50a..36830a13e596 100644 --- a/sys/kern/subr_syscall.c +++ b/sys/kern/subr_syscall.c @@ -73,6 +73,7 @@ syscallenter(struct thread *td) traced = (p->p_flag & P_TRACED) != 0; if (__predict_false(traced || td->td_dbgflags & TDB_USERWR)) { PROC_LOCK(p); + MPASS((td->td_dbgflags & TDB_BOUNDARY) == 0); td->td_dbgflags &= ~TDB_USERWR; if (traced) td->td_dbgflags |= TDB_SCE; @@ -201,7 +202,7 @@ syscallenter(struct thread *td) td->td_retval[1]); if (__predict_false(traced)) { PROC_LOCK(p); - td->td_dbgflags &= ~TDB_SCE; + td->td_dbgflags &= ~(TDB_SCE | TDB_BOUNDARY); PROC_UNLOCK(p); } (p->p_sysent->sv_set_syscall_retval)(td, error); @@ -280,9 +281,13 @@ syscallret(struct thread *td) */ if (traced && ((td->td_dbgflags & (TDB_FORK | TDB_EXEC)) != 0 || - (p->p_ptevents & PTRACE_SCX) != 0)) + (p->p_ptevents & PTRACE_SCX) != 0)) { + MPASS((td->td_dbgflags & TDB_BOUNDARY) == 0); + td->td_dbgflags |= TDB_BOUNDARY; ptracestop(td, SIGTRAP, NULL); - td->td_dbgflags &= ~(TDB_SCX | TDB_EXEC | TDB_FORK); + } + td->td_dbgflags &= ~(TDB_SCX | TDB_EXEC | TDB_FORK | + TDB_BOUNDARY); PROC_UNLOCK(p); } } diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 1552da628b11..f17207d741c1 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -522,7 +522,8 @@ enum { #define TDB_FSTP 0x00001000 /* The thread is PT_ATTACH leader */ #define TDB_STEP 0x00002000 /* (x86) PSL_T set for PT_STEP */ #define TDB_SSWITCH 0x00004000 /* Suspended in ptracestop */ -#define TDB_COREDUMPREQ 0x00008000 /* Coredump request */ +#define TDB_BOUNDARY 0x00008000 /* ptracestop() at boundary */ +#define TDB_COREDUMPREQ 0x00010000 /* Coredump request */ /* * "Private" flags kept in td_pflags: