From nobody Mon Nov 16 19:50:57 2026 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 4jSz4f1Bfnz70mC1 for ; Mon, 16 Nov 2026 19:50:58 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jSz4d5Kl2z4qyK for ; Mon, 16 Nov 2026 19:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794858657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cJy5JXZZfQsamuvjB0teRvTcRXsi1E+jHCABUXSnxh4=; b=Fz5mM0Thhi6Ad5H3JQ1Xq76LGUFjaG1IeqV43HhWvrI7Q69+2AtKnzZVOJwkKoA+KYbQ+3 6UJrxDWZkJnfEIOowhrTC4vuldGjqoEWTmlhVD3YhXlVONhlbkCPJZkXJ4z6LmtJStyWls BXI/rrKb1za8JzYxyxGoWrFctfzBeZk471Zb8gIInVrXmrj9+P3LdV0h/kgBJ3Pj4nNC4v gdlWGC6ZAGB+HwURfuJcsKrfydUiF17qoIQY10LczOUtmBZfcO4xnwB6I2+70DXQ+YCOAJ +HZo3PsLkWgHewfl4idjmeRRe9ifqAhxF3eKxJqOnjCadmnDlvfLSa2Oois5yg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794858657; b=uz2TzMyA0t4Zbr5wH+3tVq2kix4TosfASV0Z6xgtt69Twp/1hu8AXwjhBFNbE7hUkmb+uz md4k3rTpToljzvUzqRVp6omLt1iSaNF/aJ0vIgBGzJZdy4TrkxUgLWgBGakfylxVFgsiPP 9iNnhW1vBplK7vEvZdb0IK5JV5WSRIhUIyDOQvapJrtthPcJMPiPd3NEM6zlI/tg5gVxHd QS3Js94oELWZ0R92ukh78MmpLMbx9J/mt4alWguWPUDFze9aKoondiPYWktE7p/czLivzm E+0gw0B2ZlvkepWHuE+fCKtba33+rQ/2t9nUjffiGCq9JvnmesIcrpjGbcG0uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794858657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cJy5JXZZfQsamuvjB0teRvTcRXsi1E+jHCABUXSnxh4=; b=B4NfAzLGA8dgpM4XJsVfi+iYIG9YdzLPmntBPBgBtFqVJYIbDCNc8JKfWMV5INysDSSCRj gU4s9nSnV6gNefMLbIv2oEpF3lR1fmq8hPMzATzvBfK0+c75XLSPMPp3YdhNmXy1d6fXaC 73BF9QNn8XJ/asKuAid0ZU4wiZS0Fsm0sb4rfFUMOIUkdtixMSwaP9My0dElN5ZIGIOXgn oTRWPlYVI8fBAzPvf3pbGu8suqxHEBa9ba6NY5HbVvtJidxkjHwAeEd484p/fa6Q3dtu8w Ol2mUzzMOvMntbcYVcfdyjzKhqpl20Z67EQY7FZs0Fn+NTtbm5zua446MgLfmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jSz4d49Hnz17c4 for ; Mon, 16 Nov 2026 19:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f7fa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 19:50:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Andre Silva From: Mitchell Horne Subject: git: bf7bb731d8a2 - main - hwpmc: call the thread-create hook for Linux and kernel threads List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf7bb731d8a2f42f2eb5d6f1f7a2183e40915545 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 19:50:57 +0000 Message-Id: <6afb5ea1.1f7fa.fdc9102@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=bf7bb731d8a2f42f2eb5d6f1f7a2183e40915545 commit bf7bb731d8a2f42f2eb5d6f1f7a2183e40915545 Author: Andre Silva AuthorDate: 2026-11-16 19:47:46 +0000 Commit: Mitchell Horne CommitDate: 2026-11-16 19:50:52 +0000 hwpmc: call the thread-create hook for Linux and kernel threads linux_clone_thread() and kthread_add() did not call the PMC_FN_THR_CREATE hook. Their new threads had no hwpmc thread descriptor. If the process had a sampling PMC, the first switch-in of such a thread hit KASSERT(pt != NULL) in pmc_process_csw_in(). An unprivileged user could panic an INVARIANTS kernel with "pmcstat -P" on a threaded Linux program. Call the hook in both functions, as thread_create() does. kern_kthread.c did not include opt_hwpmc_hooks.h, so its hwpmc code never compiled. Include it, and use newtd in kthread_add1(). Remove the exit log call from kthread_exit(), because thread_exit() already logs the exit. Reported by: llm-postcr Reviewed by: kib, mhorne Fixes: 6161b98c9935 ("hwpmc: Implement per-thread counters for PMC sampling") Differential Revision: https://reviews.freebsd.org/D61524 --- sys/compat/linux/linux_fork.c | 11 +++++++++++ sys/kern/kern_kthread.c | 15 +++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/sys/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c index 24c5d3351623..89fe93c039f2 100644 --- a/sys/compat/linux/linux_fork.c +++ b/sys/compat/linux/linux_fork.c @@ -28,10 +28,15 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_hwpmc_hooks.h" + #include #include #include #include +#ifdef HWPMC_HOOKS +#include +#endif #include #include #include @@ -318,6 +323,12 @@ linux_clone_thread(struct thread *td, struct l_clone_args *args) if (p->p_ptevents & PTRACE_LWP) newtd->td_dbgflags |= TDB_BORN; PROC_UNLOCK(p); +#ifdef HWPMC_HOOKS + if (PMC_PROC_IS_USING_PMCS(p)) + PMC_CALL_HOOK(newtd, PMC_FN_THR_CREATE, NULL); + else if (PMC_SYSTEM_SAMPLING_ACTIVE()) + PMC_CALL_HOOK_UNLOCKED(newtd, PMC_FN_THR_CREATE_LOG, NULL); +#endif tidhash_add(newtd); diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index 6650ab868f78..565631c4f213 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -26,12 +26,17 @@ * SUCH DAMAGE. */ +#include "opt_hwpmc_hooks.h" + #include #include #include #include #include #include +#ifdef HWPMC_HOOKS +#include +#endif #include #include #include @@ -329,8 +334,10 @@ kthread_add1(void (*func)(void *), void *arg, struct proc *p, /* Avoid inheriting affinity from a random parent. */ cpuset_kernthread(newtd); #ifdef HWPMC_HOOKS - if (PMC_SYSTEM_SAMPLING_ACTIVE()) - PMC_CALL_HOOK_UNLOCKED(td, PMC_FN_THR_CREATE_LOG, NULL); + if (PMC_PROC_IS_USING_PMCS(p)) + PMC_CALL_HOOK(newtd, PMC_FN_THR_CREATE, NULL); + else if (PMC_SYSTEM_SAMPLING_ACTIVE()) + PMC_CALL_HOOK_UNLOCKED(newtd, PMC_FN_THR_CREATE_LOG, NULL); #endif /* Delay putting it on the run queue until now. */ if ((flags & RFSTOPPED) == 0) { @@ -366,10 +373,6 @@ kthread_exit(void) td = curthread; p = td->td_proc; -#ifdef HWPMC_HOOKS - if (PMC_SYSTEM_SAMPLING_ACTIVE()) - PMC_CALL_HOOK_UNLOCKED(td, PMC_FN_THR_EXIT_LOG, NULL); -#endif /* A module may be waiting for us to exit. */ wakeup(td);