From nobody Sat Oct 4 16:44:40 2025 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 4cfBG05vCrz69Jbm; Sat, 04 Oct 2025 16:44:40 +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 4cfBG02KmTz3L0l; Sat, 04 Oct 2025 16:44:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759596280; 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=t4d7MUHg6cCmDRtMTxuibATEogIFGXEjKkz8WPyPDds=; b=ZpzPbayncT84eNWDvnEqHtJpdgI2ONQlJ61vODbVBaC5n9a5o2aJ5QUrjPKq+LJSM2l5vN criSsC8w2RxweVnm4ylWGsy8byGKprkdPyE+S1R0NsFGMGbp08fhRsiMyuOuMVbWX0XISb vT3EnwXWaG3dP4keg496ow02m473hzho0QxyoxJGpL0sKIA4/MGornLnCrX7QoyoUDBjh5 Qu06e0R02Iio1yu5EYzx1eEh6dt+U4CG0zgFdbP70Rx3ZKW0kIdmDo83SZ7CSXgTXXNLCO oq4BV7DuMQhljjd2R9z5TAVe5Z7QmhE5PkUXBT2MyhM5PzsrpnVdG/iWCIhGLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759596280; 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=t4d7MUHg6cCmDRtMTxuibATEogIFGXEjKkz8WPyPDds=; b=ZhsqSRY2VNav+5yIUXvuz6K2dzuUzmVaPTLgD/B6f/AbQLBmaehuT8T9sLBZA+GNKTIXt+ 6JGXmVD9qGeZF2VJwRgse1Iv/eWp+yf0vlNPobzyhk9LrAUyWwss3HQTzaGi2L8ZqseLfn GQNY16sTNdcH1SrGAq5Xk5m/2AsSWpC+h8PEAmnfTURRZzs8uMed4lRFgJtr55PjExkOpl awDoB9v4efAC7RO8B4/qEG2+H9EnvE6L9GAAF/rwnkXBEGHN8NA9yFo9kw640s7k5jRgvE M+JsE7vGUuexvRzGY5CCebhVaFAw1YBY6VG648Z84BDv0N7La40BaMSMOO8e5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759596280; a=rsa-sha256; cv=none; b=mRP6jTC6JxXX7DWRKkfqasP6McWYtqx6e/YGVqR6TeXIokmPnO9PUmshswkN9xauDr+p9i JG36KVargjOAnve3EY4azrsscksWXr9T7vDp+tsv/ccH0R4XBdnXVGJZKxV6etFGt2ndPT FWu5QG8MEr83dGVbGVFrwTuYduJ23lnz8sg575nos0cm/lVGrUwfKr/iG4lNepnwN4AiK0 covE8DGJThXzj99e/2RK2jdt1kTrwlmuZtIF6lvwPEWoQ2J3ojkiHuoq+cSsIkXWN7Nb/0 GedHNmknwTajwCtkHQxTjm+qGSsmmXAiYteghPJexnoptVe1gUJ7M9YVzveEXQ== 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 4cfBG01d9VzqdR; Sat, 04 Oct 2025 16:44:40 +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 594GiefX058295; Sat, 4 Oct 2025 16:44:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 594GieEv058292; Sat, 4 Oct 2025 16:44:40 GMT (envelope-from git) Date: Sat, 4 Oct 2025 16:44:40 GMT Message-Id: <202510041644.594GieEv058292@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: d59a8f27fc07 - stable/13 - tslog: Move sysinit_tslog_shim() into kern_tslog.c 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: d59a8f27fc07cd52797b7d0974f5958d1fc21819 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d59a8f27fc07cd52797b7d0974f5958d1fc21819 commit d59a8f27fc07cd52797b7d0974f5958d1fc21819 Author: Zhenlei Huang AuthorDate: 2025-09-10 14:44:36 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-04 16:43:24 +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) (cherry picked from commit bd721f6e8040f0b9d0546c293954290844b6a070) (cherry picked from commit 112d1a5f5df0edb1e530348143413407b2659325) --- 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 bb4f24c631e3..a9158c887050 100644 --- a/sys/kern/kern_tslog.c +++ b/sys/kern/kern_tslog.c @@ -217,3 +217,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 e1ef7ff10dfa..63846950215e 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -242,15 +242,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, \