From nobody Wed Mar 26 14:58:14 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 4ZN8zq1T93z5s3Sf; Wed, 26 Mar 2025 14:58:15 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZN8zp5gJSz3CGp; Wed, 26 Mar 2025 14:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743001094; 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=ji5Z5kD9iUIyM7Twyh8DqB2cf+2rpee1CVDdE/5AiVk=; b=M9aSbxDfPMlpsy5HOvLkwkA2deFy5RIQCbq3AN7DCqKv+CrsR6QVHoQSLC4z5InhDsb7iz kPFXGivb+KnfIw/HzmyFS+VDySkm/7jg2e4ffgu+prK240Pxqf+ddZsSOzcrDdVEG+aXV1 JUzmXRxrXwPW9SroABOiKObGwc/S9dO5PZY0MvgYzY/0h1tj3YByarwgxhwfuNOZLz0ijV NKtsn1HKsRjYnAsFNsahNLaP7mKuceP0+6YSvEbLR/Mzk5ASwW0fLBp38kvHsabUzCvd0j FKgRRkholj5A1A11Ua9zcP0XFF1Q2FrVxB/ccHvLXIGrsEIFiesZ80HG3ranew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743001094; a=rsa-sha256; cv=none; b=yNNfmJmAbf6O/kvLueO64/Gq0tIdf3A2UHb38BLiPoO828B06HKNxMQupNR3eT8liE8Gpq 5jdQUjkq/a7zRivqY0LcHWVRfVTHZCMgiaigHWveQj3bWhoeg2ipSJIYcNUwHNUkfkaitZ lYYOGry1YQpKeOMhd4KUdcAl2FfQ3Ab5gz+eX6uLdzlneuu+VM3Aj8cHOcupZXDcy4v521 FtjEUCz+nFACRDtx1WYMFV7YF8rvJVWukZQ7bLCbGkNGSf/a9PL3MOGLZEhWExDFfqkxuW ANEVXWOqwn6o8wKAQu8uW5i5jcWBfdbUJA3bUz7AoUP+4pTuYcqkv0yNwfO8pg== 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=1743001094; 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=ji5Z5kD9iUIyM7Twyh8DqB2cf+2rpee1CVDdE/5AiVk=; b=sumjcytv8YdLOuLHtw5CvxokVsHDHD2fPC90NZOHtdbalaC9KMiJPtSl+TVlI+X3d6z7hL Q8h7MEebjJqnJtsxcPPWmUV2RWe4enUVHNOxMp1WRm/pAbbF1p4Q9JANeocmPVx5fKCvho ysKaL2u4dZzyEB3SIB8xVZpUhTfLaqoD6an4xgR2g1w6ypKdm57Fh3R9Ms4nSuqK/lDpvR pp0vRUpDMY/u7wjc1ipnmzdHmP0O/yEFU1eYBTJRNkbhaxWc0siFupneZHRkveyQVb1OOi YvHSTxaRb3WaRMGH6jPaI9VTECOtF4/Z517mQIvGDCKs10KwoMBF45LxJzPVHg== 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 4ZN8zp40f9zsn; Wed, 26 Mar 2025 14:58:14 +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 52QEwEga060250; Wed, 26 Mar 2025 14:58:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52QEwEZ9060247; Wed, 26 Mar 2025 14:58:14 GMT (envelope-from git) Date: Wed, 26 Mar 2025 14:58:14 GMT Message-Id: <202503261458.52QEwEZ9060247@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: c11b70191511 - main - geom: Push GEOM sysinit ordering to after devctl 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c11b701915116bf512f3d77dfdac7a867f51ca0a Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=c11b701915116bf512f3d77dfdac7a867f51ca0a commit c11b701915116bf512f3d77dfdac7a867f51ca0a Author: Justin Hibbits AuthorDate: 2025-03-26 14:43:14 +0000 Commit: Justin Hibbits CommitDate: 2025-03-26 14:55:24 +0000 geom: Push GEOM sysinit ordering to after devctl GEOM depends on devctl being initialized, as it uses devctl_notify, which assumes that devctl is initialized already. However, if devctl is not initialized yet, the devctl UMA zone is NULL, resulting in a panic. Thus far this has worked seemingly by linker luck that lets devctl sort before GEOM, but this is not guaranteed. Instead, enforce the ordering by pushing GEOM to third place, explicitly ordering it after devctl_init, which is ordered second. Since g_raid wants to initialize after GEOM, push that to fourth place as well. Sponsored by: Juniper Networks, Inc. --- sys/geom/geom.h | 2 +- sys/geom/raid/g_raid.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/geom/geom.h b/sys/geom/geom.h index 0eb6775701fd..dcd6f793f9f7 100644 --- a/sys/geom/geom.h +++ b/sys/geom/geom.h @@ -417,7 +417,7 @@ g_free(void *ptr) static moduledata_t name##_mod = { \ #name, g_modevent, &class \ }; \ - DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND); + DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); int g_is_geom_thread(struct thread *td); diff --git a/sys/geom/raid/g_raid.c b/sys/geom/raid/g_raid.c index 6938491d696c..a483622d14a5 100644 --- a/sys/geom/raid/g_raid.c +++ b/sys/geom/raid/g_raid.c @@ -2571,5 +2571,5 @@ static moduledata_t g_raid_mod = { g_modevent, &g_raid_class }; -DECLARE_MODULE(g_raid, g_raid_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); +DECLARE_MODULE(g_raid, g_raid_mod, SI_SUB_DRIVERS, SI_ORDER_FOURTH); MODULE_VERSION(geom_raid, 0);