From nobody Thu Sep 18 16:18:07 2025 X-Original-To: dev-commits-src-branches@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 4cSLQm31bKz67dWC; Thu, 18 Sep 2025 16:18:08 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSLQm1GCmz46BC; Thu, 18 Sep 2025 16:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758212288; 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=zlYwiSI2dYlLdkqMzSAlD2RsH0qzuLfYiOUMDz7rduQ=; b=MVchWE5UXPz1xY9OtgBahKwx20J0LQUvmzLzq4aSYAOYyPS90Wl3vQDdlZqfxal+OSgXdJ wAhTeqH6kNBYgUJq+xMyDoKD/FNHD4JBGotZzGHA2rIgiVYAk/QVzli+IC27xsnN31urVB kvv0Q+Ot4hxcjVkHFjZGT2eMfKuyvgrVCHO0bb/OY19YSGyKILe1NMpqsfZVvlpFYVl8jc VvY99PmEh2Tlpfe9Lzrf/1jYshWVZWuR2JlWhNvqP8sEXn5OmqWq4T1YqFBkmgvDVFncGP MoJOKD87nC2duOFAAkhiFnCgwbOhQcpPRhV/t3aghyvy//IdZ4oJhh0pKeanRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758212288; 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=zlYwiSI2dYlLdkqMzSAlD2RsH0qzuLfYiOUMDz7rduQ=; b=cIoUOFcWoHMKxYZ3wEEGKd7Zbi+0ShunZFXKh99bz4KFK+Uf0UGww/JMA0QFoGLICO67jp Ksp8E2vjctsGjiX/7856gjY0MBIbVGu9s2V363rLX1smhkd5tSKKrNcpBKHZlkI9P5yxWi ffvhUq860pwOULUzAB1cPNKXRk/5c43jxFcBwV7Ee0443FMzoDrqwszK5Cquz4Jc9O8UyC I0L1J5X62MGYTGSFwltfJO/4ZDoa/SxJVZyxs21DZKVtRd7abwTee3f4Lc95ctJTtFmsi4 A2FJR8y7LVP42XLk7efLlBkNz3h8TIfuE3hd7Mm8Zqh3XR4quUMfsySBEznRfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758212288; a=rsa-sha256; cv=none; b=PoCkPSxdbea2izKYpjmvPQCpiGdWQW17KTuvHSjBLD+ege5ymLw08OtHwo/xyBbwZ9BAd9 /xo70wKljhSz/hCQ52EMzxjaY1t+TfytWzbjgs6hJtwwzIDm4a6BL5ahWS3Rs9/W+gVVCa 7noUPX9WXhGhaiiXAQQ+2LKDF/2iBFmcyIQcNJosIlfNOCaLhEaW9SRhjB0CRGjdL+QZBY TwfxiB10FjDhf9liLnm3iB/oaWxuHLTg33JQ5dVkG6qWSFIDZZ/6isNXhHwKtYA5tvbnQq mbj7bewZB1RG4HFrHieeVv3zAsnP4gw6YU8jS2w7wn3Fgc84WAmg2CwRlrBbJA== 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 4cSLQl6lrDz3h7; Thu, 18 Sep 2025 16:18:07 +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 58IGI7M2050932; Thu, 18 Sep 2025 16:18:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58IGI72X050929; Thu, 18 Sep 2025 16:18:07 GMT (envelope-from git) Date: Thu, 18 Sep 2025 16:18:07 GMT Message-Id: <202509181618.58IGI72X050929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: bd721f6e8040 - stable/15 - tslog: Move sysinit_tslog_shim() into kern_tslog.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bd721f6e8040f0b9d0546c293954290844b6a070 Auto-Submitted: auto-generated The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=bd721f6e8040f0b9d0546c293954290844b6a070 commit bd721f6e8040f0b9d0546c293954290844b6a070 Author: Zhenlei Huang AuthorDate: 2025-09-10 14:44:36 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-18 16:15:53 +0000 tslog: Move sysinit_tslog_shim() into kern_tslog.c struct sysinit's func pointer requires its address, thus a real function is generated in every translation unit when the source file has SYSINITs declared. That results in plenty of identical sysinit_tslog_shim in the final kernel file, in which only one is used and others are left useless. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52413 (cherry picked from commit 5f9a05e574050c8b3f6b444311a12e8fb293ad1a) --- sys/kern/kern_tslog.c | 10 ++++++++++ sys/sys/kernel.h | 11 ++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sys/kern/kern_tslog.c b/sys/kern/kern_tslog.c index fbf81d423b95..09070eea284f 100644 --- a/sys/kern/kern_tslog.c +++ b/sys/kern/kern_tslog.c @@ -220,3 +220,13 @@ SYSCTL_PROC(_debug, OID_AUTO, tslog_user, CTLTYPE_STRING|CTLFLAG_RD|CTLFLAG_MPSAFE|CTLFLAG_SKIP, 0, 0, sysctl_debug_tslog_user, "", "Dump recorded userland event timestamps"); + +void +sysinit_tslog_shim(const void *data) +{ + const struct sysinit_tslog *x = data; + + tslog(curthread, TS_ENTER, "SYSINIT", x->name); + (x->func)(x->data); + tslog(curthread, TS_EXIT, "SYSINIT", x->name); +} diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 380099092107..81efeff527f5 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -249,15 +249,8 @@ struct sysinit_tslog { const void *data; const char *name; }; -static inline void -sysinit_tslog_shim(const void *data) -{ - const struct sysinit_tslog *x = data; - - TSRAW(curthread, TS_ENTER, "SYSINIT", x->name); - (x->func)(x->data); - TSRAW(curthread, TS_EXIT, "SYSINIT", x->name); -} +void sysinit_tslog_shim(const void *); + #define C_SYSINIT(uniquifier, subsystem, order, func, ident) \ static struct sysinit_tslog uniquifier ## _sys_init_tslog = { \ func, \