From nobody Sun Apr 27 18:38:10 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 4ZlwLq4LrLz5vBJ4; Sun, 27 Apr 2025 18:38:11 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZlwLp5j3Jz3GR6; Sun, 27 Apr 2025 18:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745779090; 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=/BstUVG9UgNDaQIEu1kdjDtsie85n5lNjQJTbIJipmI=; b=hhNDlRYysgSOnJBNFx7sMui5M60AzLE0XpNlXnpBXduINzo0FyNrpTi2TAAbWa+KHtH0Dq qIoC2V5Z3RK0co9VN5/qaaGQRi5NttsWJqXN3q2gpDE+QZFxTpBAFm4goTZ3BD8TMN2+4m wIEPuPXtQ02QW8szRsJfzMHWMMwoRM+llkcoJV/wmFxDN7X34tx1hrLorZUqDKWkJcH/By bN8odRjyFDfIlIipCT/HUe17bWR8IAujrguHOgPQlKSh2O4I7uN9Vao4viixjkDox8EbNR E2a0ClS8KVZQKqTAq4c9E0WwidNULtBnGnodz/n7+opa4onFBfA0zJLnffIhkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745779090; a=rsa-sha256; cv=none; b=hKRmOdvS6lWeDpMOI4bN705XpYSpUxp54G7Fb+5nCpDWJ5tHERw7MjUbOYlO5xw0A7BcH1 UREoI9mb+xu8+pEcnbZsncBXhUwu1nHqGATR0HD2r5yn/4t2pTKANX6C40ZibsGmGDrLo/ ccWvZUlHBLt4Of2KS7EPYhqhOI8sazjjXAcr6XF81g/PQchvCsHuHOk4FZMyjuY89AUqWu LDKKdCtEJkyvdueAxtyXEp7NGYNHzucxxd4QfAUEf8j2AlelrQ0jvqIAVtH4YLi2bnaRMC 5zJfVKk8fWwNMpHpkz81K+tjmKtK6wQs5VLvXcoaJP4PhvmD8aMli3CwZF32uQ== 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=1745779090; 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=/BstUVG9UgNDaQIEu1kdjDtsie85n5lNjQJTbIJipmI=; b=CaQkOZl7CiFN3uMtvsLZiV7ubYqqhxJJnA1jROAOpkvsgqslqL9eaL05Bq5YOvUxSSuRna lTTCYrEfI9mESEtH+OkQcU6+zk8tBti4P5iezb3VJNLcUTqsCtxfTn4bLoLZgr+Epl6xzw D87a+HCKxGI3EeER87JosMgccmtFLLLJIupwVBj7c9wLx7zHyEiZdJAkFEOEIEj43PlbOc N5Dr04Nw/NloKnwRhvAksG1tB7UWLqLn+JTh+1OGO2slCkGVZOvx1MsOonDRv+OD3nKrZG dG6BJlrWgmc/FTy0artMGRIg865b0+keY/DVAD1ccLQhFuBgUrN0sb9qPK98lQ== 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 4ZlwLp58SJz1G7b; Sun, 27 Apr 2025 18:38:10 +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 53RIcAPZ020601; Sun, 27 Apr 2025 18:38:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53RIcAF4020598; Sun, 27 Apr 2025 18:38:10 GMT (envelope-from git) Date: Sun, 27 Apr 2025 18:38:10 GMT Message-Id: <202504271838.53RIcAF4020598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: ee7f62faa893 - main - e6000sw: stop / drain the taskqueue (and tick) during detach 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee7f62faa893bd9bbe6650716579072724c427cb Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=ee7f62faa893bd9bbe6650716579072724c427cb commit ee7f62faa893bd9bbe6650716579072724c427cb Author: Adrian Chadd AuthorDate: 2025-04-25 18:41:13 +0000 Commit: Adrian Chadd CommitDate: 2025-04-27 18:05:05 +0000 e6000sw: stop / drain the taskqueue (and tick) during detach Although the tick isn't running every hz right now, when it /is/ running at hz, the shutdown path will race with an existing running tick routine, causing unpredictable panics. * Introduce a shutdown flag which will abort doing the tick work if set * set the shutdown flag and start cancel/draining the taskqueue during detach. Differential Revision: https://reviews.freebsd.org/D50030 --- sys/dev/etherswitch/e6000sw/e6000sw.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sys/dev/etherswitch/e6000sw/e6000sw.c b/sys/dev/etherswitch/e6000sw/e6000sw.c index 85900cebc303..be02edb3d5e6 100644 --- a/sys/dev/etherswitch/e6000sw/e6000sw.c +++ b/sys/dev/etherswitch/e6000sw/e6000sw.c @@ -89,6 +89,7 @@ typedef struct e6000sw_softc { device_t miibus[E6000SW_MAX_PORTS]; struct taskqueue *sc_tq; struct timeout_task sc_tt; + bool is_shutdown; int vlans[E6000SW_NUM_VLANS]; uint32_t swid; @@ -851,13 +852,18 @@ e6000sw_detach(device_t dev) sc = device_get_softc(dev); + E6000SW_LOCK(sc); + sc->is_shutdown = true; + if (sc->sc_tq != NULL) { + while (taskqueue_cancel_timeout(sc->sc_tq, &sc->sc_tt, NULL) != 0) + taskqueue_drain_timeout(sc->sc_tq, &sc->sc_tt); + } + E6000SW_UNLOCK(sc); + error = bus_generic_detach(dev); if (error != 0) return (error); - if (device_is_attached(dev)) - taskqueue_drain_timeout(sc->sc_tq, &sc->sc_tt); - if (sc->sc_tq != NULL) taskqueue_free(sc->sc_tq); @@ -1584,6 +1590,12 @@ e6000sw_tick(void *arg, int p __unused) E6000SW_LOCK_ASSERT(sc, SA_UNLOCKED); E6000SW_LOCK(sc); + + if (sc->is_shutdown) { + E6000SW_UNLOCK(sc); + return; + } + for (port = 0; port < sc->num_ports; port++) { /* Tick only on PHY ports */ if (!e6000sw_is_portenabled(sc, port) ||