From nobody Wed Sep 3 10:15:21 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 4cGz561LLRz65sRf; Wed, 03 Sep 2025 10:15:22 +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 4cGz560mjyz3MSM; Wed, 03 Sep 2025 10:15:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756894522; 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=2CJPJqy6NSGR74n0YGxvykYtMW6ZwnYUWBV4RWFInVQ=; b=ngz5UXAUPb83koQzTieAmtEVgzu2I+Qvf3SOGzqL7aZfBcAnTpVUXNxAG+uW+bHvMCF2Qq Y3WWGXYvoQ9n5z7xxtxOaQv5qkrSsNsN3EI/kCsJR24Bm0QBh21WiYLFlcpZmF/eq0DKLJ u4RppbilkJyjfyLRHx9dP0mjVV/jw0FdehK6qYt+EZ3KxY5c4jx/teAT9Ip1C2OCMtrCZM +ZH/YXYM23kp0Fme49JYsIR64TVP2O1jg9K0uBHAtQW55wbCx5uOPN257MREEbxh5AIyxF Cw6DHRr8Ib2bDYyc/bN9AGsUYyMLgD+Xe4nUf0/7uBppX5qTJQ+xXvY/KOvG2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756894522; 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=2CJPJqy6NSGR74n0YGxvykYtMW6ZwnYUWBV4RWFInVQ=; b=I0gXKWOZ3qUz0p0dWRkDH7svv5y0W86nFNlwlr0fPK4E6j3yCs+JdCY8qdWtNfcoHu2/du QfzeemJAZlI+LcKJuheo5VWWpKvGSegT/xpw55CQV28xistCdtUQ4h7+xUD2fE6k+0PijN eTiVJn4ezLagOfJBEkeJV2IIGR/vpJ6Dw9J2RKPL8z7TEMP/loG2n35A9/sj2KkOCP5EeS 2OJIudGOsTdbiAc8b7RwAudnMjcgj1lJHUq2hrn+VFLPYPqqOHrgqu6P6rryTIAwgGyX7p 0Cm80qDEMnCnCTSouVD80mxpY0Cwq7gvMkDtZ3i9Lvm4juOHgQEGz/ucpPL9ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756894522; a=rsa-sha256; cv=none; b=aeoj9DDAXCPqHuCxzJuKXFoiW4Wv3nnmJI3td3vY4oZVyU0oeQ9xVLI00uWZ+7/xWccW06 bgE/f8KqbSvkZ22mMjXQPjclbm3WP7PzJ3750NgZjvrEx5Q6YXrTythky+czIHMl2ZmPMQ QdRO1PJVkeqw6cXWf5vgpBNtNDOe52D/EZmzn/0n9YASbNn/hjTTgs+2ZXuA8JmKJ/qlMN RN5cq7JndrRYXxWB4Sqf4PnFBp/mgBXx6WXv2whTXVgZ5bCJEIBGtTDcS4ZraEzvv+C0BL X/P2w91MfQDdE7qK/6ROPo9vaTNgcQLnGTqx/pVLGaqCU2UQ87WbMYkZxGAMGQ== 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 4cGz560MmTz1RCY; Wed, 03 Sep 2025 10:15:22 +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 583AFLTI015397; Wed, 3 Sep 2025 10:15:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 583AFL1q015394; Wed, 3 Sep 2025 10:15:21 GMT (envelope-from git) Date: Wed, 3 Sep 2025 10:15:21 GMT Message-Id: <202509031015.583AFL1q015394@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: 11f1dd193af5 - main - init_main: Fix logging the subsystem of pre-loaded kernel modules 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: 11f1dd193af57dfa5128eadc62b084502292a784 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=11f1dd193af57dfa5128eadc62b084502292a784 commit 11f1dd193af57dfa5128eadc62b084502292a784 Author: Zhenlei Huang AuthorDate: 2025-09-03 10:14:21 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-03 10:14:21 +0000 init_main: Fix logging the subsystem of pre-loaded kernel modules The pre-load, aka linker_preload() runs at the order of SI_SUB_KLD, but a pre-loaded module may have SYSINITs that have startup order prior to SI_SUB_KLD, e.g. TUNABLE_INT() / TUNABLE_LONG(), hence it is possible that we run into abnormal orders. Without this change, the subsystem of the pre-loaded kernel modules will be melted into previous one. That is mostly harmless but confusing. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47904 --- sys/kern/init_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 36ce44b988be..2fa429e6368c 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -296,7 +296,7 @@ mi_startup(void) BOOTTRACE_INIT("sysinit 0x%7x", sip->subsystem); #if defined(VERBOSE_SYSINIT) - if (sip->subsystem > last && verbose_sysinit != 0) { + if (sip->subsystem != last && verbose_sysinit != 0) { verbose = 1; printf("subsystem %x\n", sip->subsystem); }