From nobody Thu Aug 25 17:31:30 2022 X-Original-To: dev-commits-src-branches@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 4MD94M1DLrz4b2qX; Thu, 25 Aug 2022 17:31:31 +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 4MD94M0mRMz3KC4; Thu, 25 Aug 2022 17:31:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661448691; 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=v0NWABiilUej9MzmYOXTyaiutayaDrMjHkQSckkKGGQ=; b=TyV7ddrmOgvGLOQF6RUawYu+RHvxWOboCpC874UdeJUbNZTdljNh/FrA6av6PzPLfkdsIK w0KfCwWOjLBDyTZe09JbIiKAxx2ZRzepthT+9N+rFR3PoRRRcxrz5eucVAlM/gf8PKdJLu Ct7zN9+AUGX+90q2fQ18OJx9StUsgffPi+D2ZGe7TMkcZX/TLqSqA/naxy7kkjTatO/uIh tfFMBG7pWxPrF9ueiHPK+I0wiTFoDGNG8Yum9Nr5EhQ+AMXYs1cW2QusoNJQZt/LBhtpnH gqvAzl95w0OWoLCQVZiKgHeDVtsSlpxWsJHP5fwzp2iT5s9U2U/mNZ4+cN63bA== 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 4MD94L6yC6zwsc; Thu, 25 Aug 2022 17:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27PHVUNP041441; Thu, 25 Aug 2022 17:31:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PHVUgU041440; Thu, 25 Aug 2022 17:31:30 GMT (envelope-from git) Date: Thu, 25 Aug 2022 17:31:30 GMT Message-Id: <202208251731.27PHVUgU041440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 84fc080266e1 - stable/13 - cxgbe: Deactivate upper layer drivers (like TOE) during detach. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 84fc080266e1b00134d23217e918b4a48b7963d2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661448691; 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=v0NWABiilUej9MzmYOXTyaiutayaDrMjHkQSckkKGGQ=; b=uIiOnA258lor0wcwrYFhpJtnYZUQE4gDDU42337KHaTsaV1Be6pXzz3pUazMbU9e3RCL0Q PDGqJz3ShX5vxvTtZ3SJpZSqcgHjTVo5s9ulnq5kP/BUDmpf0h9en4Er5q/ZOtPik0Rbcv aQPSwUi8UrJyn7my8eBflvxTVxGu+OFuwCTomCLPHF73CjDktBfJtfPqjZDQ5NmD8Izzi1 8q3EMMjIprnYhs+pIIz28qBIaSajFAmiX64YahI0Su5CFYzg05prOkzYgFSnSbRHa9Eult K1McDUHV5RuoOOoIGum8uLhUKWkvZhhO5CEPZieodaJsFqaoXReM2QAcU03v6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661448691; a=rsa-sha256; cv=none; b=iO4FJKIezsZNV6wNUNyrrn84Eqqe5abbqUmm/qQJfLP8WqZEOR4gjko7yR9pRvMEfOz9Ym HezU6f5QNa5Gpb2hvkDdenu7XiFpv5BczAnlN8OEEKCPWRYz/VcP3Tv2jTkdxO9UZ70S8r JmQvmdJi4x6s0pB8gA7stuKEk7I9IXkEO0lzn0PNmRh2ZCIA6LD9lef1BgZglxfORt4YjQ +0+y4oPJ9Vki29zHpEjwk7piu0VyY89YDbH7OiWyzxR0vy/0wgamWamkDeyaSgpkryPfQy sR3S/8Ute55LQ07oa3NF2Q1iA1spVYJuw1dIKaXjJJGgmH2050yAPOdhQ55QWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=84fc080266e1b00134d23217e918b4a48b7963d2 commit 84fc080266e1b00134d23217e918b4a48b7963d2 Author: John Baldwin AuthorDate: 2022-05-17 23:33:49 +0000 Commit: John Baldwin CommitDate: 2022-08-25 16:29:22 +0000 cxgbe: Deactivate upper layer drivers (like TOE) during detach. Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D35237 (cherry picked from commit 12b37f8f9c789a48ea0e8cd35f403aee0e020ad9) --- sys/dev/cxgbe/t4_main.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 40e2b1b9dbe4..6c1a8162b477 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -859,6 +859,7 @@ static int hold_clip_addr(struct adapter *, struct t4_clip_addr *); static int release_clip_addr(struct adapter *, struct t4_clip_addr *); #ifdef TCP_OFFLOAD static int toe_capability(struct vi_info *, bool); +static int t4_deactivate_all_uld(struct adapter *); static void t4_async_event(struct adapter *); #endif #ifdef KERN_TLS @@ -1692,6 +1693,15 @@ t4_detach_common(device_t dev) sc = device_get_softc(dev); +#ifdef TCP_OFFLOAD + rc = t4_deactivate_all_uld(sc); + if (rc) { + device_printf(dev, + "failed to detach upper layer drivers: %d\n", rc); + return (rc); + } +#endif + if (sc->cdev) { destroy_dev(sc->cdev); sc->cdev = NULL; @@ -12624,6 +12634,34 @@ t4_deactivate_uld(struct adapter *sc, int id) return (rc); } +static int +t4_deactivate_all_uld(struct adapter *sc) +{ + int rc; + struct uld_info *ui; + + rc = begin_synchronized_op(sc, NULL, SLEEP_OK, "t4detuld"); + if (rc != 0) + return (ENXIO); + + sx_slock(&t4_uld_list_lock); + + SLIST_FOREACH(ui, &t4_uld_list, link) { + if (isset(&sc->active_ulds, ui->uld_id)) { + rc = ui->deactivate(sc); + if (rc != 0) + break; + clrbit(&sc->active_ulds, ui->uld_id); + ui->refcount--; + } + } + + sx_sunlock(&t4_uld_list_lock); + end_synchronized_op(sc, 0); + + return (rc); +} + static void t4_async_event(struct adapter *sc) {