From nobody Wed Sep 6 18:37:05 2023 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 4Rgrh13sXrz4stxZ; Wed, 6 Sep 2023 18:37:05 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgrh12Zbdz4TcM; Wed, 6 Sep 2023 18:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694025425; 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=KGTDdrkUsxoVAieKfjlduNNphL4kF64PhNyU+UE1koE=; b=SjqBZIe9/k15fgKPmRgz1J3ftmDzNYIbSph/a4gUJzB2g6lge+SpxX9UtORhMAM1Yw7onx mY2h6czIMzpOhBgc/wK6Gofq4dR7srqMbHMblV5GWaKWeBzJE//dWg/xfxrXMyO5mBFO5K 1DY4D71hfTjPjobNVUMoJ+CH+n3gY17bFltLJ8Lhvw83n+Uxv4P6eeRWWFtT8eDKwwVWrv +9RNdptk2i1GhnZ/vlm8EfbKTZTKSHfpZPU4J/L8JPtw1KKN+86yznA/MQM/FgfuYpQwdN rxJYfPBM5s7/M7rEtkteNmDW4OBRDpJIJvkreK2MZYvBcBt94D5cgPhlmTGJ4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694025425; a=rsa-sha256; cv=none; b=LI21gtnyBTuRn8pDRl5tUBJjrsULLJ5B+5b51nHywRj47OdEYuAfYNvRBUe6YTAq4v8x+V a9lzQYNR0dSt+ArBX02L4Oupl1WpqiO0UsaF1OMNc+skHjZAQf+h4QYxWkqhXbTSKSfH+s o74Gj3OSwT7qP/TPORYzGD75OVhKL/wBSkOB/yBVle+Stw3SSLdNVisc9xZyBn/sQvh1pN Zov5M5O04yEXaBBfav1qlqBt09C0j7/Dm5pTJY+ACdcvoII+RHI5IcD7Fu8Al5GMUxQQ6I a029tiu4chroOGZy+M9FaozROBKs7taDEe2ihHM0Yw72GY0AI4YB7s8/gNDM+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694025425; 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=KGTDdrkUsxoVAieKfjlduNNphL4kF64PhNyU+UE1koE=; b=HDX0jchlXGGNE6ZhG7fBLYTdiznHAHEwfl+gT0Fj6iucOYAN74vg0fHTly7GVX9GmzhbxS xomdpIQ7AuLx+a9DbhB9LHpw30IIQIuzWJmAPBCzY+frV3sXyd/ZZpaWP+waf+iIl+lU3l UKzSMz+1bhNMf5nPN+y9l+nTLvUEl+L6tOIwHEMf/8tYZFQ8pzU1m17JFs/yVo7d3T8Ugt zaNZcM6auuMcdT/OaIhIIpt0N0zllZ3VJs9MNVS++6aY/sWvZ3RxQhAPVBdIU7DU6mx85u esdFf+Qrk6QDpbwxocNGGAZWu/oliOWQFArxiMjzckLkQwWdPwLGKLPg0SdGrA== 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 4Rgrh11Nf7zCqw; Wed, 6 Sep 2023 18:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Ib5fX086267; Wed, 6 Sep 2023 18:37:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Ib5AK086264; Wed, 6 Sep 2023 18:37:05 GMT (envelope-from git) Date: Wed, 6 Sep 2023 18:37:05 GMT Message-Id: <202309061837.386Ib5AK086264@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 1926d5cef6ea - main - init_main: Record completed SYSINITs 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1926d5cef6eaa1302024d6471271c930ad65f9b2 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1926d5cef6eaa1302024d6471271c930ad65f9b2 commit 1926d5cef6eaa1302024d6471271c930ad65f9b2 Author: Colin Percival AuthorDate: 2023-09-05 23:47:57 +0000 Commit: Colin Percival CommitDate: 2023-09-06 18:36:36 +0000 init_main: Record completed SYSINITs When removing them from sysinit_list, append them to sysinit_done_list; print this list from 'show sysinit' along with the list of future sysinits. Reviewed by: jhb, gallatin (previous version) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41749 --- sys/kern/init_main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index a6b327339c80..a8df9f84a29a 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -163,9 +163,11 @@ SYSINIT(placeholder, SI_SUB_DUMMY, SI_ORDER_ANY, NULL, NULL); SET_DECLARE(sysinit_set, struct sysinit); /* - * The sysinit list itself. Items are removed as they are run. + * The sysinit lists. Items are moved to sysinit_done_list when done. */ static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; +static struct sysinitlist sysinit_done_list = + STAILQ_HEAD_INITIALIZER(sysinit_done_list); /* * Compare two sysinits; return -1, 0, or 1 if a comes before, at the same time @@ -289,6 +291,7 @@ mi_startup(void) */ while ((sip = STAILQ_FIRST(&sysinit_list)) != NULL) { STAILQ_REMOVE_HEAD(&sysinit_list, next); + STAILQ_INSERT_TAIL(&sysinit_done_list, sip, next); if (sip->subsystem == SI_SUB_DUMMY) continue; /* skip dummy task(s)*/ @@ -904,6 +907,11 @@ DB_SHOW_COMMAND_FLAGS(sysinit, db_show_sysinit, DB_CMD_MEMSAFE) db_printf("SYSINIT vs Name(Ptr)\n"); db_printf(" Subsystem Order\n"); db_printf(" Function(Name)(Arg)\n"); + STAILQ_FOREACH(sip, &sysinit_done_list, next) { + db_show_print_syinit(sip, true); + if (db_pager_quit) + return; + } STAILQ_FOREACH(sip, &sysinit_list, next) { db_show_print_syinit(sip, true); if (db_pager_quit)