From nobody Sat Oct 4 16:44:34 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 4cfBFv2XP2z69K01; Sat, 04 Oct 2025 16:44:35 +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 4cfBFt5DVRz3KjP; Sat, 04 Oct 2025 16:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759596274; 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=lblLhZSEOiZ6qen21snBSFqvJFvhIy/WWtP2b03Z8aY=; b=iM8RAqmyZRuwIAFEQvn5HAX4TcvEWo49r5uUufMFjIzIsBr2m4rHOKNPX6MuSQm2zFj1Ie pLys9yNpG9ohvuE0A28vzlX7p2NfvBglu3kQGtLoUOd7ad2imw0ETbypF0C90avni8o44V oNs+b9r2gamMF8ZhYTN3pCLWc2HJtAflZqcaIuzp+vXtqxd060WsrLByGbDec0jz0akthx bUtWpNeKe+KmpgD1SDgS1ozgKZtIKqBZ0lt+vpH2aG9AbScGQJ6OEhgmbfXXHKBVYHCFpQ dQZh3mdxBzX/8zFMD2qAeiXkkcPYlimatHbMKN+RbSQWqik5j+oR8MdWmPn5uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759596274; 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=lblLhZSEOiZ6qen21snBSFqvJFvhIy/WWtP2b03Z8aY=; b=g4+ldRLU99PM9LAetYUjhNNwCDE2aj+NNPtqB4eOQDz7ntHhkJG7yx03zLn6CnQrM19he7 /iqPmokryeO/FghCR2bf3AeyHXvEgWytoDbb2FamZ/KYAa5NtSwI/yjZW9xMOwVDJISJPl +0c5ZqbpkxHSdOkLgImA5lFs78/P9Pbb0pytvtaktPDEAFFqy7+NN+sBKIPkfSc59yOdow H0boFeb3wttBnlK0PUV8nb7UFh1mnFbIslz8OYMdnJQRq93kjiOV+KNDcy0SPV7DY+dTI9 4yss22Vm13t2LD05SndFUcv3/UfZP/3iF4Gg5rGium5Iu0IvkZRjBrZ4RNVFWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759596274; a=rsa-sha256; cv=none; b=xYRPkM1N2Vda7UyqeR2OsVSQOfhjHbmLi0Lij76hFbkOjBLSx31OYSu88QuZ8yp+BHj05H 8eOJXEEjwxIa033EEDmcCRAwRZk8FKtdYSyLinfR8d971lHYRJLNcOsWBfPJCMRw7gfP/5 4JktF1cQqAl8iFQBqOMRQb/W1pGATuQ0Vgsst3YIzReEquFcfm4Aev6bxLqI0LEtN1K1Sc wN6S2R77el8VLf12rPRN4h7Khgj2eq0Vt+BaPattwSqpWlCbk8QfKJ5hdlnwhrN4mnfVbY nFRuyvi9lbVIFvWN09XroFw0Bc6El8LN0R/H2NTMbFol7/9+3Ids9BxCDuQLLw== 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 4cfBFt46bnzqYd; Sat, 04 Oct 2025 16:44:34 +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 594GiYGV058114; Sat, 4 Oct 2025 16:44:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 594GiYjK058110; Sat, 4 Oct 2025 16:44:34 GMT (envelope-from git) Date: Sat, 4 Oct 2025 16:44:34 GMT Message-Id: <202510041644.594GiYjK058110@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: 4dc6c65704de - stable/13 - init_main: Fix logging the subsystem of pre-loaded kernel modules 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: 4dc6c65704de05ed4bf74585d28b106fcb50452c Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=4dc6c65704de05ed4bf74585d28b106fcb50452c commit 4dc6c65704de05ed4bf74585d28b106fcb50452c Author: Zhenlei Huang AuthorDate: 2025-09-03 10:14:21 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-04 16:43:22 +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 (cherry picked from commit 11f1dd193af57dfa5128eadc62b084502292a784) (cherry picked from commit b2293f7f60c238e7a83551472aed9452cd017769) --- 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 f827000d9200..438b2fd5c996 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -284,7 +284,7 @@ restart: continue; #if defined(VERBOSE_SYSINIT) - if ((*sipp)->subsystem > last && verbose_sysinit != 0) { + if ((*sipp)->subsystem != last && verbose_sysinit != 0) { verbose = 1; last = (*sipp)->subsystem; printf("subsystem %x\n", last);