From nobody Tue Oct 28 22:36:13 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 4cx4wY3sJxz6DbfN; Tue, 28 Oct 2025 22:36:13 +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 4cx4wY3N2cz3v1m; Tue, 28 Oct 2025 22:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761690973; 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=P1biY23yGJQHOyCrmpOG5D7dJI+LdIolbNpyd4ejWNw=; b=cyW1lrdzu2UdTPMr3/gjeuLGiDgE/NYmb/pTpY2aDtPwAI40vC46D2+RgHBGRJybMIzPh6 m2mxSGHnBEb61iSBkB/TOxrNhHvrqpM0sFjnBm5tXWkZbZGVc85j0wJuE0muUeEaThSqQ0 mwk15E6JqKhqXCAxVMsXQntuF3HkFbJr4aINymdIpaJyJWF21/zCReMhxf8XsAKAKVl+ZX O/wDP+I2K1Vl0JXanDBjd7cGOmdoXEMf+KV+sQWIbE5EsJO9YYPH5QnozK2ViLNoxytMN8 lICqRqFtC39qhpRZ9c5my6YaFUu2RH92WRTkJFhZ4n9WIkzKO6vV6Byx3h6WdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761690973; 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=P1biY23yGJQHOyCrmpOG5D7dJI+LdIolbNpyd4ejWNw=; b=dYtQeCEuWnk955mBEae/v6Hak7fzPySAy8mI9AFsQjCETZgSxXlL5x39/HO/mKNSIEbTIq aFojNqJiz3NZyDqNNd9JAR8SVWmxCkn49HWl0sDXjyaohPQNxAhrlaW/zzkQSWb9XmasgD 5/z53+F/i8CybVE5CnZjxCSlU6Jwbm+KQySx6czGSjwHYHBr9mT89dbrV1Yqi4ds3x58au EWZDaT6s3MB71s8kNuJatlfXfa3/qYulz3fAFtS5MiSWop2LGA7PoHMTRj+UpbG7aNgUkj k1AnnMkTNgVHJsGiv5I1uspH1e03B+SEjqvZjCxmhGAqwGMh9uBwmAmog4hWOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761690973; a=rsa-sha256; cv=none; b=J8z7VWMhc6L2gKax8Kias9oHyXI54fD4yBlvqt2xyKB3OZtrX1AzadUmmGErMyCL+4Vvf6 MLPqC5zZwFCeWNZMJaesocAudbTNyrYL/4WKlyPHU1YKCw4A6fyGJfZmjv0Pi+qXkZuubd 59nrH2C6iOgdt/QzBUP/wrUsmngAFp3DSardWK2LLFORk8bM/MtQ87Q2iUt4HmcnLc9UsL 7l9Ras1lyDn8mRERCjUmr4TWJpWkE2mDOPP+4ykcS9i0ETklnjoThXNh9nXa+7UGytzJ8W zIlBfQ/G6crgVCGSwh3HwQFYX3GninCQJ/rhwB31+TFwcaA/x5UfIZWv8PqGOA== 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 4cx4wY2yS4z18FV; Tue, 28 Oct 2025 22:36:13 +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 59SMaDU3008540; Tue, 28 Oct 2025 22:36:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SMaDqM008537; Tue, 28 Oct 2025 22:36:13 GMT (envelope-from git) Date: Tue, 28 Oct 2025 22:36:13 GMT Message-Id: <202510282236.59SMaDqM008537@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 83519c1764f8 - main - bus: Take the topolock in driver_module_handler() 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83519c1764f80ddbdf34e16de08ff110226aba2b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=83519c1764f80ddbdf34e16de08ff110226aba2b commit 83519c1764f80ddbdf34e16de08ff110226aba2b Author: Warner Losh AuthorDate: 2025-10-28 19:48:07 +0000 Commit: Warner Losh CommitDate: 2025-10-28 22:35:32 +0000 bus: Take the topolock in driver_module_handler() And sprinkler some asserts. Right now all module handlers are called with Giant, but I'd like to drop that so push the newbus locking one step further. Sponsored by: Netflix --- sys/kern/subr_bus.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index bf5bda7e058d..d57886bca5e4 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -572,6 +572,8 @@ devclass_find_internal(const char *classname, const char *parentname, { devclass_t dc; + bus_topo_assert(); + PDEBUG(("looking for %s", classname)); if (!classname) return (NULL); @@ -712,6 +714,8 @@ devclass_add_driver(devclass_t dc, driver_t *driver, int pass, devclass_t *dcp) devclass_t child_dc; const char *parentname; + bus_topo_assert(); + PDEBUG(("%s", DRIVERNAME(driver))); /* Don't allow invalid pass values. */ @@ -784,6 +788,8 @@ devclass_driver_deleted(devclass_t busclass, devclass_t dc, driver_t *driver) device_t dev; int error, i; + bus_topo_assert(); + /* * Disassociate from any devices. We iterate through all the * devices in the devclass of the driver and detach any which are @@ -856,6 +862,8 @@ devclass_delete_driver(devclass_t busclass, driver_t *driver) driverlink_t dl; int error; + bus_topo_assert(); + PDEBUG(("%s from devclass %s", driver->name, DEVCLANAME(busclass))); if (!dc) @@ -913,6 +921,8 @@ devclass_quiesce_driver(devclass_t busclass, driver_t *driver) int i; int error; + bus_topo_assert(); + PDEBUG(("%s from devclass %s", driver->name, DEVCLANAME(busclass))); if (!dc) @@ -964,6 +974,8 @@ devclass_find_driver_internal(devclass_t dc, const char *classname) { driverlink_t dl; + bus_topo_assert(); + PDEBUG(("%s in devclass %s", classname, DEVCLANAME(dc))); TAILQ_FOREACH(dl, &dc->drivers, link) { @@ -5255,6 +5267,8 @@ driver_module_handler(module_t mod, int what, void *arg) kobj_class_t driver; int error, pass; + bus_topo_lock(); + dmd = (struct driver_module_data *)arg; bus_devclass = devclass_find_internal(dmd->dmd_busname, NULL, TRUE); error = 0; @@ -5297,6 +5311,8 @@ driver_module_handler(module_t mod, int what, void *arg) break; } + bus_topo_unlock(); + return (error); }