From nobody Thu Dec 22 22:10:52 2022 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 4NdPdm5qDlz1J207; Thu, 22 Dec 2022 22:10:52 +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 4NdPdm5GZwz3jTq; Thu, 22 Dec 2022 22:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671747052; 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=9QmXaDQO7hb31Iw6Mf97NCUlXMeAeAd9Hgv/r86JR+w=; b=vFW6FgID9ggIHhRfQsWugDX9WhULBjTmutoRZqFzG7bti1YwiL7QvftEVkPKNCoLiqN2kY kY1z5UpP5WAiuI9LKZ3B4pHXiZhQV7JldEAr1FBINofSMRTbNcoVu2SbEFhrRN6aaz8BU1 0UlPoIcWB8cYXnikI7b8st41fiG2Aez9BMspCl71F0OPNzJpYlrTJc80DzuwRCJJ913K81 hqbz4PfRKH/P4JyncI/fc6MkwdtP6S60lMg5wcuYnT5D+UYvSYVv6vK3/X8Vxc+v/lUPg9 MZABBeX5tTNrrtspjYy5TEi5nQispQHtgna95ZFTdTwI0l5IXM+VmASNRmaEWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671747052; 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=9QmXaDQO7hb31Iw6Mf97NCUlXMeAeAd9Hgv/r86JR+w=; b=TEwdioTRN1uYbLZrWbfjRDTsW1v1Z9LhczI/hw1QpS1mMRa8SdfME/8SqmVWheMaj4KV7n L0rC7CzybR9bnPm5ehbKTM34tIi/zDj7rYMDlnuDV3PPrDGm6NnyoAdOdxEbluwnmUXcyr B2MyKrvY23jUQ7CfCg2YsJ2KP3LjV5BQBVJjq3MAT7AtUBNryHCqb1tIoo7JowFXxp+B0w fqHqSwQbln3r+dXFeevwBnxLRhFNqfjF7VZMhxatRuCJXmH9tgNcr1QigSlPcALXc0OFC1 3veUHbWKPuqEKyyqcW4nvoJjKLaprHM+l9XYBbvYpcxIeN33566XM5RNKt68YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671747052; a=rsa-sha256; cv=none; b=bs6pv91qOJTWhZTxIeWHG67Ls2xCE+3RGWicLtx08I+UN0CF4uiBqPKPiwDI2dgtDFnITU LIRWY3EWduQG5JHvJvYP+bi/As/4ixciz3prfbS3GVaHM9S1IIip3+v+VQ72bOIO39Q9dw 7FCPtk1L+kzcprtcel2B4C4UucqG9yVmChBaUyKUjXPFMQHw9mhlnGBF7+vKIqSAHkpCM7 qyT3m4T3BzMzNY5QCDFjwIzd6GKCTSPAXv85HJqZDGoHiFRfHnd8NmMLpClP5+4NZii/Kp d7xYt60u1plU1PGhHqTEl5xQ/VMTiOYX/Cg6O+jS82L4fnJMg6Z2YuARgJf/9Q== 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 4NdPdm4LkYz19Sp; Thu, 22 Dec 2022 22:10:52 +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 2BMMAqDn038105; Thu, 22 Dec 2022 22:10:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BMMAq29038104; Thu, 22 Dec 2022 22:10:52 GMT (envelope-from git) Date: Thu, 22 Dec 2022 22:10:52 GMT Message-Id: <202212222210.2BMMAq29038104@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: e6feeae2f915 - main - sys: rename td_coredump to td_remotereq 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: e6feeae2f915c76275b83b7365ae966a8f8dd016 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e6feeae2f915c76275b83b7365ae966a8f8dd016 commit e6feeae2f915c76275b83b7365ae966a8f8dd016 Author: Konstantin Belousov AuthorDate: 2022-11-30 08:48:24 +0000 Commit: Konstantin Belousov CommitDate: 2022-12-22 21:11:35 +0000 sys: rename td_coredump to td_remotereq and TDB_COREDUMPRQ to TDB_COREDUMPREQ Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D37590 --- sys/kern/kern_sig.c | 12 ++++++------ sys/kern/sys_process.c | 8 ++++---- sys/sys/proc.h | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index c50a37de07e6..11c0334181e1 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -2639,12 +2639,12 @@ ptrace_coredump(struct thread *td) MPASS(td == curthread); p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); - if ((td->td_dbgflags & TDB_COREDUMPRQ) == 0) + if ((td->td_dbgflags & TDB_COREDUMPREQ) == 0) return; KASSERT((p->p_flag & P_STOPPED_TRACE) != 0, ("not stopped")); - tcq = td->td_coredump; - KASSERT(tcq != NULL, ("td_coredump is NULL")); + tcq = td->td_remotereq; + KASSERT(tcq != NULL, ("td_remotereq is NULL")); if (p->p_sysent->sv_coredump == NULL) { tcq->tc_error = ENOSYS; @@ -2660,8 +2660,8 @@ ptrace_coredump(struct thread *td) vn_rangelock_unlock(tcq->tc_vp, rl_cookie); PROC_LOCK(p); wake: - td->td_dbgflags &= ~TDB_COREDUMPRQ; - td->td_coredump = NULL; + td->td_dbgflags &= ~TDB_COREDUMPREQ; + td->td_remotereq = NULL; wakeup(p); } @@ -2792,7 +2792,7 @@ stopme: td->td_dbgflags |= TDB_SSWITCH; thread_suspend_switch(td, p); td->td_dbgflags &= ~TDB_SSWITCH; - if ((td->td_dbgflags & TDB_COREDUMPRQ) != 0) { + if ((td->td_dbgflags & TDB_COREDUMPREQ) != 0) { PROC_SUNLOCK(p); ptrace_coredump(td); PROC_SLOCK(p); diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index c61234e726b9..15b93cee0f5a 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1559,7 +1559,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) error = EBUSY; goto coredump_cleanup_locked; } - KASSERT((td2->td_dbgflags & TDB_COREDUMPRQ) == 0, + KASSERT((td2->td_dbgflags & TDB_COREDUMPREQ) == 0, ("proc %d tid %d req coredump", p->p_pid, td2->td_tid)); tcq->tc_vp = fp->f_vnode; @@ -1569,10 +1569,10 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) tcq->tc_flags |= SVC_NOCOMPRESS; if ((pc->pc_flags & PC_ALL) != 0) tcq->tc_flags |= SVC_ALL; - td2->td_coredump = tcq; - td2->td_dbgflags |= TDB_COREDUMPRQ; + td2->td_remotereq = tcq; + td2->td_dbgflags |= TDB_COREDUMPREQ; thread_run_flash(td2); - while ((td2->td_dbgflags & TDB_COREDUMPRQ) != 0) + while ((td2->td_dbgflags & TDB_COREDUMPREQ) != 0) msleep(p, &p->p_mtx, PPAUSE, "crdmp", 0); error = tcq->tc_error; coredump_cleanup_locked: diff --git a/sys/sys/proc.h b/sys/sys/proc.h index f9e905bb22d2..1552da628b11 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -384,7 +384,7 @@ struct thread { int td_oncpu; /* (t) Which cpu we are on. */ void *td_lkpi_task; /* LinuxKPI task struct pointer */ int td_pmcpend; - void *td_coredump; /* (c) coredump request. */ + void *td_remotereq; /* (c) dbg remote request. */ off_t td_ktr_io_lim; /* (k) limit for ktrace file size */ #ifdef EPOCH_TRACE SLIST_HEAD(, epoch_tracker) td_epochs; @@ -522,7 +522,7 @@ 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_COREDUMPRQ 0x00008000 /* Coredump request */ +#define TDB_COREDUMPREQ 0x00008000 /* Coredump request */ /* * "Private" flags kept in td_pflags: