From nobody Tue Oct 28 22:38:52 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 4cx4zc2PGgz6Dc2m; Tue, 28 Oct 2025 22:38:52 +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 4cx4zc1WSWz3vmr; Tue, 28 Oct 2025 22:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761691132; 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=LrFjSBOk6cW0hrDLMS1SrBJ5HE18sna4Yp4eghFDrik=; b=vfA8HSfHPU5P9kWDIGGSyxdkJ2VC6MME0HBP9+TMqWEr7i3CpYtDD/3t7ILjvbcHcrqee/ Fok2vQu92ZYrJ+ooUfayD4T49AEwvsxY2MrQ61o+9zcMDzaoma1gflVZzE3hzRvWZtLpBp 07FMLDffwOWgyjTDb7pU7LKWwOY0n+svmOsnUPpxxz9j31FCkGn0l9SrrqWqa6IotL4pf/ KiiVGiXA9o5ran85J1deHtrai/5ioj96G/wTsv6B1Gh/0TA9Xwy4TXukWbHVUxLX/n1WCP zdu8c+lRoMJM2eMT2GtQ3fhI3QswHnh8p73g4/zW+D/QuegEFm5KSbVVVfG6Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761691132; 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=LrFjSBOk6cW0hrDLMS1SrBJ5HE18sna4Yp4eghFDrik=; b=eG3qIjXeYvk9Sn6wwDhRaqqJciiVJ59xSk3a9fG7yQiQC9yyIvuZ1C0lxlczSegQjwVMi8 U+Od4gTHXO6tjp3uAIJGAegTp+5/pzDilhV0zq24bQWx2t4xFD7D256xYkK4VFctvaGxWf blqT76QH9gK2+O7Oa2orRBZs9oAXBCSGy3kKOi+q6M3qTz4dh67dY1WnqLoBtoaHLm3jxO ys8/Ki+hhF+roAe7k7B2zJtsUV9BeRE10/B8Hq4C3kLncx3QlkTh/g8t2VWZ6NFPSZZIGP WP/k9qgZf02T6bhE4n2UriLBJzHaDSkd/kCI+HF0ctIx09cjdM/QNH2aSnsmyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761691132; a=rsa-sha256; cv=none; b=bdiWnnqpGsKbZ7+o18XrSM7ghsZh8Ih3ulfmbw4T+KQgnQSMDxMXN8JIrpp910HLKIMIEa TKCjfiiiuMnKKMqPk8rceCy1p4q3tzawuU0rb+s/g3fVJLBC5T4+SF8mk66FGkxFGKr/6R kJpXAx1IvMc6QcgUl/T0Ys3SXpVhWglq+HSUJpAMr1u+5jGtVuoL2Y7wfCHIhPsmo4511l W0NlAPy1p19yY7QBehXJB62JxG0Fwdm5uVbusqw5P7mR4w3QZj9TEtDlun7OHgGi924PMh mnp11p/Hd+fS8a4DJ++LW0zk+8M6IWyL1XK4aB1YV7gLIlcLzHF7FGZaVuVLjA== 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 4cx4zc174qz18R7; Tue, 28 Oct 2025 22:38:52 +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 59SMcqve009433; Tue, 28 Oct 2025 22:38:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SMcqUU009430; Tue, 28 Oct 2025 22:38:52 GMT (envelope-from git) Date: Tue, 28 Oct 2025 22:38:52 GMT Message-Id: <202510282238.59SMcqUU009430@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: 86b259a28a1a - main - bus: Revert "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: 86b259a28a1a47b0506c519b17d8adb67d4a0b0d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=86b259a28a1a47b0506c519b17d8adb67d4a0b0d commit 86b259a28a1a47b0506c519b17d8adb67d4a0b0d Author: Warner Losh AuthorDate: 2025-10-28 22:37:14 +0000 Commit: Warner Losh CommitDate: 2025-10-28 22:37:14 +0000 bus: Revert "bus: Take the topolock in driver_module_handler()" This reverts commit 83519c1764f80ddbdf34e16de08ff110226aba2b. This was accidentally in my main branch when I poushed. It's not ready yet. Sponsored by: Netflix --- sys/kern/subr_bus.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index d57886bca5e4..bf5bda7e058d 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -572,8 +572,6 @@ devclass_find_internal(const char *classname, const char *parentname, { devclass_t dc; - bus_topo_assert(); - PDEBUG(("looking for %s", classname)); if (!classname) return (NULL); @@ -714,8 +712,6 @@ 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. */ @@ -788,8 +784,6 @@ 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 @@ -862,8 +856,6 @@ 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) @@ -921,8 +913,6 @@ 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) @@ -974,8 +964,6 @@ 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) { @@ -5267,8 +5255,6 @@ 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; @@ -5311,8 +5297,6 @@ driver_module_handler(module_t mod, int what, void *arg) break; } - bus_topo_unlock(); - return (error); }