From nobody Sat Sep 27 15:14:13 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 4cYrZt6YV5z68DCN; Sat, 27 Sep 2025 15:14:14 +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 4cYrZt1F93z44Wy; Sat, 27 Sep 2025 15:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986054; 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=Rae1RYJF9HM5fdGs04huVzlQo0STTI4Qt9FMOjEIRDU=; b=nsgmQuR515GlB3KxznrVF9vr9kcjOJtdoe4HlrFDtmW8gFl25YHnAOGno9wMbOlwJ94XdD ujY4oyufPsxh3YhCNtDS5qFWYZFgYGxTgkzDdg3suJZJ9VDT3Ve+CDmqc3DmKOmobuJ6c6 1eNUfHeewqXuz83ZmQefHfBq1uClh6AMBgyUMt34Uo7WzOC8S410JMFdtgZyBuLCGyide5 K6BSh5P7kkUsnfokBkJuLoXSMImC+eVUmpCnnXf4ybyj0Su3Zxvi65uZY39pABz5LQO9u8 xbsmayXnIYuLttH644Jcnk3eEu9PQCmvkxuTuAxQWcGfz0TJpMC8XUolGaDm3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986054; 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=Rae1RYJF9HM5fdGs04huVzlQo0STTI4Qt9FMOjEIRDU=; b=WB25meNtdKaYL5cMMF6NF/WlXlqTSakGp3UKGy8XGrjgCcZgQ9zzREKCf4Mvq9Fed0HtPB ro6oRcU+ByN8m10kpdMbKr3+H9WTlcboTQKFiierbMAdn3E5icnJGFHt8/pgUnxCQxiEaD ojKucQojyq0CIJA2LFkjZB+jTcAIQZNPg6YhDjufJ9wiZF4QJNkobBG+NUArsMXdp4/+qg swBf0xxMfta7gkig9lVixqPf70i5yzC7GYOKAa+BdW2a/jmTvyJKavZHUt1mNTP5JiQBLy /uhkpuwx7d8drGgIyRYJIN8hL/VnwrW2ZF7VVrS+qxiq6sgBxTs9pU+Cb3hVYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758986054; a=rsa-sha256; cv=none; b=yPQhttKzksNNoVBKodgR7CmofvR8Onak0TI5Hk16QCX+4aaFFoV0vQVqBYYt5vE9pYMwh0 y1MZry6eyRdpyGnTbWq/bMg7oS/X+RvgjCHq9O/9NQWHMZ9FKLhYc/gU7GURq9nsM/Eajq OJ68Ed25jooXjth2fp2+/6PTR49a2oGrMfU29MgjtJMC7B1Cr1OgXUq0esVIJgQ2gvd8OF rz3/pEFPm2KwLvXWFkCSXqpJsLYlhxRq3Ciay32V4oTa0S19CC/wlSda4SUjPVvQbiQ+sj Xdi0z6s2P61CJlqh+ARg3gMiCepXng5W21bG8LRo3JD1QV1FPOgqHZaRS69NeA== 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 4cYrZt0mfKzfsC; Sat, 27 Sep 2025 15:14:14 +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 58RFED74083640; Sat, 27 Sep 2025 15:14:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58RFEDOA083637; Sat, 27 Sep 2025 15:14:13 GMT (envelope-from git) Date: Sat, 27 Sep 2025 15:14:13 GMT Message-Id: <202509271514.58RFEDOA083637@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: 112d1a5f5df0 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 112d1a5f5df0edb1e530348143413407b2659325 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=112d1a5f5df0edb1e530348143413407b2659325 commit 112d1a5f5df0edb1e530348143413407b2659325 Author: Zhenlei Huang AuthorDate: 2025-09-10 14:44:36 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-27 15:11:39 +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) --- 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 a22370b85b02..0f2b1db5f347 100644 --- a/sys/kern/kern_tslog.c +++ b/sys/kern/kern_tslog.c @@ -221,3 +221,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 1c58775831fa..6f454ec927a8 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -251,15 +251,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, \