From nobody Wed Sep 10 14:46:46 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 4cMNn23nc4z62kXC; Wed, 10 Sep 2025 14:46:46 +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 4cMNn23FG7z4664; Wed, 10 Sep 2025 14:46:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757515606; 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=DqVaezeALXTKW4HbADqD4D6C73WMGxh/1ftBoE91Uxw=; b=yWQcYGqiYRS1PSkenDyNOaREmEEvS34HY11ijP5hLXxnctexgaDE+r5lQsfpOqa27zCsYe Pm6yead6XgZzgLlR06jVjgEYDPnfHtzenC3O9w7TxWLcVUCEXZ7gwJPQrc6+zfHpHyGkgs qLwIBWJi1YtUsB3JocN5CZu1eZxTuJJLpPrYzX9112vkSC/UdAhqbVYZtbXXiLvIlIvNNe R6pp1p/cwvp3Y10frtP1qEvpjIiFn97ILdWxP/MlRAaGWQFc/lFHD3QSR0LngkySdqZLzP I7rRmaLHPCW+tlwclgrI4ARZJ4SOYOUmJNsEm0HHXDINavWfFTL4DWxsNSMltg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757515606; 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=DqVaezeALXTKW4HbADqD4D6C73WMGxh/1ftBoE91Uxw=; b=u2mSRlY4MTUCauGK40G+eFwcvrRuw+jeQ5IeuRG2IBu+LqJF6HXoTEPk5EQcta6rIPnAdG WTXTfgQwp9nz6Y3gdSfn+BaATmIDv6zQRCh/+ydlvI0bS0FPe+SCeuAQhV08LplDx9gFCD +AknmDVu+0L77M5bBe3e4tanXaoIYk9m8Kew5YrEiHZCFQi5SHv2gXsVPmbKc/KmoK1Fjx hiYB+61RpzWPtNzPCIC0HJ8GehlNqa9el4Q1CpJoifmcEnF+bN/ga+YmdglSMiRZvI0ZzC DCZgxESpoXj9+NzIFQdDxx1bUzGyrYGCbrKVAPWmHlREA/g8LGeKx2JugHbqtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757515606; a=rsa-sha256; cv=none; b=c6GqZo+uB9hoeNWm/EySmQH+aaAbtPzHxnJWnQoSe3PRmYY1UAeJwgzIjyCAJfbyxT04M2 3FOkO92GojbuKwLCLJlrwihhaIzWiaxXHbTsH5gYydWkhnDqhf0F0PiAWTHO3KLKRgCszA tTOfnVzIKBkCABK2LUfWAZGH3SaV0tC3wFQlDBj2V7bSeDa+HKE7tPWjWOUlosAr5axPEh /b3U3HTJgdQIknWMw0YNO+gZOR19BtVwIqw5x58OMzI6vosBMih1YAiLqGBk/NFe5PPpX+ BLhmo7ovIjyBvjsQ7CEb+KOcpYymY7QQeqXKZn3AWnUXimGKnEwT3p3GVJ7d0g== 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 4cMNn22rxDz9dV; Wed, 10 Sep 2025 14:46:46 +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 58AEkkG2016266; Wed, 10 Sep 2025 14:46:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58AEkkVl016263; Wed, 10 Sep 2025 14:46:46 GMT (envelope-from git) Date: Wed, 10 Sep 2025 14:46:46 GMT Message-Id: <202509101446.58AEkkVl016263@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 5f9a05e57405 - main - tslog: Move sysinit_tslog_shim() into kern_tslog.c 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f9a05e574050c8b3f6b444311a12e8fb293ad1a Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5f9a05e574050c8b3f6b444311a12e8fb293ad1a commit 5f9a05e574050c8b3f6b444311a12e8fb293ad1a Author: Zhenlei Huang AuthorDate: 2025-09-10 14:44:36 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-10 14:44:36 +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 --- 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 675d1195043b..417afd4dbbe4 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, \