From nobody Sat Sep 27 15:13:58 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 4cYrZZ6Vtvz68DYm; Sat, 27 Sep 2025 15:13:58 +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 4cYrZZ1v7nz44Gr; Sat, 27 Sep 2025 15:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986038; 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=mTuviX2f/S5pMbvV6jOW/eExhPJ0mrSZgZeW+CbLMGg=; b=QuCnSjZuULrjp2wnFD++yrgkkWCc8osfUl8HLuN9OhxG7nl3NhRC1XInjZXU2cCe22Jfc5 AanCtdrCydu0j7kZfGCAg4349uHBp/ISO06LeDKBHQngYqoXnl9y8+c9/zcprvKpkkXmCl cZSBRJBeV0l+ij1NhMOythUYVsXBXWOL++MotF2i41RxDba4mKO+GTEZw9S5RFIvuid4aj /CvYCm3W/mkI07WedlgGfm0M/mCFKob5YtzgxSBU2x32gCteW5XVgwLD4LHo0S2KJlwhyw naOx1FynjPhUaPfXcsC2a1ta2QpllT32d0nCTj+Kbh4VppiUXietuvXHalamjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986038; 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=mTuviX2f/S5pMbvV6jOW/eExhPJ0mrSZgZeW+CbLMGg=; b=erd5QSKthTWbe3abIz+c+GZX3NogOdVdR6CHxblBqvyS2SQ1ftpSIgb5ybo6Cv1oLUB1kY dBgMyqAcGtACOXp7HDOFSveImoZZI31mEO+3GJDOfww17GjL5UeZgpIldkYlWc3abYnKZ4 T+QykRLOF59xLK4PtdenQiDckwf+efcXhzPuv3Ecude2ao7P6Sw4KOPPnH8jYH/QQmTMZY E0DMEqfpxitud2V8UKm+UzahfCqb73jDhvoJyW2XnNyLI5nrEM/Z0O0sGR5Xv8uOVWx971 4Mm+fD7Ka7nJpjDFcJtMKkPmJgL39cCeBYc58BLZdW5Vfvemf+C8O8NFlz+J3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758986038; a=rsa-sha256; cv=none; b=Q7orkivMyL6UnLZHpt1vQAoCYrITenBNLHLD7rRx02VbF7HIhKYhJ6LwUJhUrA5e86QmC6 1DkAC3JlPKUOiibMK+1ft60scqYHGUbrMF4JefGtDQ+XwP6hRd3KYkNF5bLTZcOoCclp4x fa98tDrqb677zT/emT+mJ/AbmO9b/U9oujX9IhsrmpFm7WhX1fvezCMn+xFnegPBILsRjt tdO2Rs0fVPm78bgn0Us+j7dCvEhTeb59B70sJyH2V2l2gLVREnT+57GH0tICuO259hyaug n91TT030BgHciX+gi8ToDoDJg30+jZJQcsk5P2/A4L9iLhTmh0moUMLEyxnP8g== 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 4cYrZZ1W4bzg50; Sat, 27 Sep 2025 15:13:58 +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 58RFDw5R083168; Sat, 27 Sep 2025 15:13:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58RFDwSb083163; Sat, 27 Sep 2025 15:13:58 GMT (envelope-from git) Date: Sat, 27 Sep 2025 15:13:58 GMT Message-Id: <202509271513.58RFDwSb083163@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: b2293f7f60c2 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: b2293f7f60c238e7a83551472aed9452cd017769 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b2293f7f60c238e7a83551472aed9452cd017769 commit b2293f7f60c238e7a83551472aed9452cd017769 Author: Zhenlei Huang AuthorDate: 2025-09-03 10:14:21 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-27 15:11:36 +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) --- 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 5835db44b853..9fb92dfb12f2 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -300,7 +300,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); }