From nobody Wed Jun 4 11:32:38 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 4bC56G3R15z5xtNL; Wed, 04 Jun 2025 11:32:38 +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 4bC56G2P2jz4MSs; Wed, 04 Jun 2025 11:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749036758; 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=jNSzh79BPIXb8Pyci4CpyNDtAGLTHdGgfV5Vkza9AyY=; b=kJzGC2RA8b4Z69+bEyYc/bLam3AvG9OGGkC0ZJbM2qqz/xJZNjIMagOtIrt9rGs18pH6ki 0dXnggNZp5dRVw9TM/nfu54LrLN71c0WhUZHAWrwqlCZT1LYd0HCfGIcCgpWHcimtW2XHa pY3PIwBqotD1VF5mfZ/CQN6laaOvfVDR5djBpcMuXDh6wGq6rKq8E++Tvjp0wxBPbxcbA5 I069Sv7/h9/H27bAX+el56jUSqG+lQNL+F/ByZ3TiGSMFYoVbijkpXmK4pjSH0Lgu/GjpL V686Y57aiZuES5hvorgywtVtai3f07jOm4K56U4v6OYL1jawSFpjoKkHSsvcfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749036758; 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=jNSzh79BPIXb8Pyci4CpyNDtAGLTHdGgfV5Vkza9AyY=; b=W1rHWfw3dOsk7UYk1RaD1SBsU/BCAJcnZQ7FMueHzHNI3ahKCIGhvGdN7Di/mNju4/DkSS S7zHAOXhb/gE1z93yJB8vp2kmejGWcLEcWm/X9UqxtMpawJiyJdCpRklO2+Z+M/vHIorDI CTmuGRYd6/X9SyB43VpH5oxhM8HGdLwIZVUIoQm9Cpq/iWM3c766TsIriPnnzrd/vCHe7J Zn144KuyUJSGvz7yjC0lVlxJV9CrF7SKcs5jobvwzjM/GLjPWdHAc9Mj4j6YVWlCF2wfTe ixs7yIiMdFS9cEQATNxP/Tafg8bKXVKOoGDkwEaEdKQr11R+0vmD6G9v6YLxzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749036758; a=rsa-sha256; cv=none; b=VaOBpPJRRBF95XW2gdPBqlp6NL3wGyy+tOZ8QXVAyAN8CPbZFLnBb9hfh7pO6xHpgLVbka Eea/qipCXtE63T+6WQVZSafnKfK7BINabTYdpf5oBPcv6ISg9pWpGosJ9ggwlJ36T4HRXA OR4nD92YXXnclr/+7/isVFMzgBtN6MWbx2np7bFUsQ9ROja/WJp9XP17H25KEmjxuTeb38 E/K0dnr4GxVm4AXUOHovHidSF1CrlDFNFV1HUEb2OzK5IsG1LouBrPnvENLPS0qkPIzBbR 3GONz3IzD36FCCN34oGflh1OAMWiCOb0SyXuY8g6BcR1n72jxv4JZSGriBMOmA== 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 4bC56G1LS0z5qW; Wed, 04 Jun 2025 11:32:38 +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 554BWcvZ016189; Wed, 4 Jun 2025 11:32:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 554BWcTt016186; Wed, 4 Jun 2025 11:32:38 GMT (envelope-from git) Date: Wed, 4 Jun 2025 11:32:38 GMT Message-Id: <202506041132.554BWcTt016186@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: 56a4d1a4cc15 - main - ktrace: trace and decode thr_new() thr_param 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: 56a4d1a4cc151cf8356704aafd2d2ec0fd009701 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=56a4d1a4cc151cf8356704aafd2d2ec0fd009701 commit 56a4d1a4cc151cf8356704aafd2d2ec0fd009701 Author: Konstantin Belousov AuthorDate: 2025-06-04 05:41:47 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-04 11:24:20 +0000 ktrace: trace and decode thr_new() thr_param Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/kern_thr.c | 8 ++++++++ sys/sys/ktrace.h | 2 ++ usr.bin/kdump/kdump.c | 21 +++++++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c index 7863e40e73af..8ad885b42ebe 100644 --- a/sys/kern/kern_thr.c +++ b/sys/kern/kern_thr.c @@ -26,11 +26,15 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_ktrace.h" #include "opt_posix.h" #include "opt_hwpmc_hooks.h" #include #include +#ifdef KTRACE +#include +#endif #include #include #include @@ -188,6 +192,10 @@ kern_thr_new(struct thread *td, struct thr_param *param) return (error); rtpp = &rtp; } +#ifdef KTRACE + if (KTRPOINT(td, KTR_STRUCT)) + ktrthrparam(param); +#endif return (thread_create(td, rtpp, thr_new_initthr, param)); } diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h index dba650c72494..822822a6ffe7 100644 --- a/sys/sys/ktrace.h +++ b/sys/sys/ktrace.h @@ -371,6 +371,8 @@ void ktrdata(int, const void *, size_t); ktrstruct("cpuset_t", (s), l) #define ktrsplice(s) \ ktrstruct("splice", (s), sizeof(struct splice)) +#define ktrthrparam(s) \ + ktrstruct("thrparam", (s), sizeof(struct thr_param)) extern u_int ktr_geniosize; #ifdef KTRACE extern int ktr_filesize_limit_signal; diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 86df45acdf05..9cc22d382de5 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include @@ -109,6 +110,7 @@ static void ktrsockaddr(struct sockaddr *); static void ktrsplice(struct splice *); static void ktrstat(struct stat *); static void ktrstruct(char *, size_t); +static void ktrthrparam(struct thr_param *); static void ktrcapfail(struct ktr_cap_fail *); static void ktrfault(struct ktr_fault *); static void ktrfaultend(struct ktr_faultend *); @@ -1952,6 +1954,18 @@ ktrsplice(struct splice *sp) (intmax_t)sp->sp_idle.tv_usec); } +static void +ktrthrparam(struct thr_param *tp) +{ + printf("thr param { start=%p arg=%p stack_base=%p " + "stack_size=%#zx tls_base=%p tls_size=%#zx child_tidp=%p " + "parent_tidp=%p flags=", + tp->start_func, tp->arg, tp->stack_base, tp->stack_size, + tp->tls_base, tp->tls_size, tp->child_tid, tp->parent_tid); + print_mask_arg(sysdecode_thr_create_flags, tp->flags); + printf(" rtp=%p }\n", tp->rtp); +} + static void ktrstat(struct stat *statp) { @@ -2147,6 +2161,13 @@ ktrstruct(char *buf, size_t buflen) goto invalid; memcpy(&sp, data, datalen); ktrsplice(&sp); + } else if (strcmp(name, "thrparam") == 0) { + struct thr_param tp; + + if (datalen != sizeof(tp)) + goto invalid; + memcpy(&tp, data, datalen); + ktrthrparam(&tp); } else { #ifdef SYSDECODE_HAVE_LINUX if (ktrstruct_linux(name, data, datalen) == false)