From nobody Wed Sep 13 15:47:57 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 4Rm4bd2spSz4t3xJ; Wed, 13 Sep 2023 15:47:57 +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 4Rm4bd2Qx5z3Sdq; Wed, 13 Sep 2023 15:47:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694620077; 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=VN+2fYmQmBTbli8KIXRvgYDPTzng7JZa/cMqlt5zSDA=; b=DiEWV6vPM9faCUnJAwOMsvGr+4xK8Hdg6K1jSfsTH5epJpMD56M3u78Uu3oIaezv6bP+X6 q3xuzDQAbXb2MceBYORCWbo0AGL/kaKF/MaIkFirKz7VYqEXat5A01Ztc6d69fjcjiqJW/ aU2HgJM1cwUxWg9EhZl5r0n8NG+FH4Wo6W5i4wSXz1Jfdq39krMwLafTB32KOQa4SkSh3L dotAMeeyzJuJglZMEgZjh6Jr9diVaTd4G6n+APiXbA8E2y0lKPAaTN24UrGqQYQvZCS5ij YyOkMYNbeCVubjzsNQ5Dh3ml+uU542AO8yYGA1ENs1b9+gUQrzjciJ1HVqMMfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694620077; a=rsa-sha256; cv=none; b=l4wZgDBFQJm7jC3b4eWXpiyDSLIqhaRhnwjr6jydhUe1s3ibeA70gvLaVJ7ZxHS2MrFrY8 MlQQuTmTS3Kn6x8Eq7iF8jcCV749+xqxskBJ3gajW7jz5e899SNWioPRRE4I4REiKfDTAE uoc7D0Gn6ZaL9ETiCuSpnzx8LPmeBjIhlrCY/JO3kwAtabNyfW0+THHQf4hctpks42vC8k +gjGSueCH2XLmnvLN9NhCkVhuHZysTClcHDgKfIHhUM1rOa6xh+bVIp/zQ+97RFylerEJW pEJlBjxSU/KJC0mAlr7u3sm+t27GD81EzO/CiDv5z2UctvKzrfdA1V7Fywpt3g== 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=1694620077; 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=VN+2fYmQmBTbli8KIXRvgYDPTzng7JZa/cMqlt5zSDA=; b=BrQu+WPZmJapKM4zb2PbJRBKdkwmT7Vnbgl5gShl0dX1452Hbd44FZ1GlUseVj2/54FPP5 dJHRLOnJKBq4Dk0fjq8PZLCcmcIEhaYxjuAUSz0SCJ3qvWcPOrTT5oU7qtbbRRUVbqRwjz ED2b+5hDOuFV6EnZwOmF0D1orceA4uLbzHxQWbGLvQAjKMDYWMARdya9P0A7WYtTQc6H8S c0M/OqvDhtSLJtlvPYHfs/TGRpgtMcxhbSrRqDjgFhpfxVCboLNq20+L4MHlYtRX2CcbZT etp15pWkYYSiKY8QNcciX9hdtDGmih39Rsk1yeIOzXrjWxSy6QY0EYkUykVR6g== 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 4Rm4bd1NGGz502; Wed, 13 Sep 2023 15:47:57 +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 38DFlv2L065646; Wed, 13 Sep 2023 15:47:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DFlvNm065643; Wed, 13 Sep 2023 15:47:57 GMT (envelope-from git) Date: Wed, 13 Sep 2023 15:47:57 GMT Message-Id: <202309131547.38DFlvNm065643@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 144db6a1c9fe - stable/14 - init_main: Switch from SLIST to STAILQ, fix order 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 144db6a1c9fe8bd0bf19aee1d427ad9ceaf292ce Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=144db6a1c9fe8bd0bf19aee1d427ad9ceaf292ce commit 144db6a1c9fe8bd0bf19aee1d427ad9ceaf292ce Author: Colin Percival AuthorDate: 2023-09-05 23:46:38 +0000 Commit: Colin Percival CommitDate: 2023-09-13 15:47:31 +0000 init_main: Switch from SLIST to STAILQ, fix order Constructing an SLIST of SYSINITs by inserting them one by one at the head of the list resulted in them being sorted in anti-stable order: When two SYSINITs tied for (subsystem, order), they were executed in the reverse order to the order in which they appeared in the linker set. Note that while this changes struct sysinit, it doesn't affect ABI since SLIST_ENTRY and STAILQ_ENTRY are compatible (in both cases a single pointer to the next element). Fixes: 9a7add6d01f3 "init_main: Switch from sysinit array to SLIST" Reported by: gallatin Reviewed by: jhb, gallatin, emaste Tested by: gallatin MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41748 (cherry picked from commit 71679cf468ba28c0e3c88371f3fde13fccec99bd) --- sys/kern/init_main.c | 22 +++++++++++----------- sys/sys/kernel.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index aa82eafff9b0..a6b327339c80 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -165,7 +165,7 @@ SET_DECLARE(sysinit_set, struct sysinit); /* * The sysinit list itself. Items are removed as they are run. */ -static SLIST_HEAD(sysinitlist, sysinit) sysinit_list; +static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; /* * Compare two sysinits; return -1, 0, or 1 if a comes before, at the same time @@ -194,12 +194,12 @@ sysinit_mklist(struct sysinitlist *list, struct sysinit **set, TSENTER(); TSENTER2("listify"); - SLIST_INIT(list); + STAILQ_INIT(list); for (sipp = set; sipp < set_end; sipp++) - SLIST_INSERT_HEAD(list, *sipp, next); + STAILQ_INSERT_TAIL(list, *sipp, next); TSEXIT2("listify"); TSENTER2("mergesort"); - SLIST_MERGESORT(list, NULL, sysinit_compar, sysinit, next); + STAILQ_MERGESORT(list, NULL, sysinit_compar, sysinit, next); TSEXIT2("mergesort"); TSEXIT(); } @@ -218,9 +218,9 @@ sysinit_add(struct sysinit **set, struct sysinit **set_end) sysinit_mklist(&new_list, set, set_end); /* Merge the new list into the existing one. */ - TSENTER2("SLIST_MERGE"); - SLIST_MERGE(&sysinit_list, &new_list, NULL, sysinit_compar, sysinit, next); - TSEXIT2("SLIST_MERGE"); + TSENTER2("STAILQ_MERGE"); + STAILQ_MERGE(&sysinit_list, &new_list, NULL, sysinit_compar, sysinit, next); + TSEXIT2("STAILQ_MERGE"); TSEXIT(); } @@ -284,11 +284,11 @@ mi_startup(void) * Perform each system initialization task from the ordered list. Note * that if sysinit_list is modified (e.g. by a KLD) we will nonetheless * always perform the earlist-sorted sysinit at each step; using the - * SLIST_FOREACH macro would result in items being skipped if inserted + * STAILQ_FOREACH macro would result in items being skipped if inserted * earlier than the "current item". */ - while ((sip = SLIST_FIRST(&sysinit_list)) != NULL) { - SLIST_REMOVE_HEAD(&sysinit_list, next); + while ((sip = STAILQ_FIRST(&sysinit_list)) != NULL) { + STAILQ_REMOVE_HEAD(&sysinit_list, next); if (sip->subsystem == SI_SUB_DUMMY) continue; /* skip dummy task(s)*/ @@ -904,7 +904,7 @@ 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"); - SLIST_FOREACH(sip, &sysinit_list, next) { + STAILQ_FOREACH(sip, &sysinit_list, next) { db_show_print_syinit(sip, true); if (db_pager_quit) break; diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 12e346514d1a..62b9e6a02b3c 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -220,7 +220,7 @@ typedef void (*sysinit_cfunc_t)(const void *); struct sysinit { enum sysinit_sub_id subsystem; /* subsystem identifier*/ enum sysinit_elem_order order; /* init order within subsystem*/ - SLIST_ENTRY(sysinit) next; /* singly-linked list */ + STAILQ_ENTRY(sysinit) next; /* singly-linked list */ sysinit_cfunc_t func; /* function */ const void *udata; /* multiplexer/argument */ };