From nobody Tue May 17 23:34:22 2022 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 0595B1ADD3D6; Tue, 17 May 2022 23:34:23 +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 4L2ssB6jkKz3DF1; Tue, 17 May 2022 23:34:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652830463; 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=B0wn7S6HBzWEvfcCI0whDHs5L0eRml20WeHQmsEeztQ=; b=i9N3HSi65cj6MwrhWnl92aNPl7bOrm4Q2BgNRx/Q7pjx40kXkdMB5FmwyHQ/28t9ntNY1A aisaaAhNHkDhpj223go2JjvDR0YK15ppbICiWuX/9pgt0pbLGM2UBVe5otqDIxxfm9GsTL /Dk/P7QhVUmJyPVz/yue460HF4OwI8goDpKBi/wo8FNOn17ZEdDppOpKJX46l5WfkcI6Fb ojWvOMf2c845rNNXfUUs6g7a5yeq1mWDfLVQrmJgnFph+yjc/n+mTDu8H3w5RE5I8ZQ8ja Z+aj13m/MhvW72qan0CHsZDIUEXqHldawGcQSf3sRuVkUtiz0jBenfDCMU0+gg== 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 C67971E5C6; Tue, 17 May 2022 23:34:22 +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 24HNYMig010809; Tue, 17 May 2022 23:34:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24HNYMJe010808; Tue, 17 May 2022 23:34:22 GMT (envelope-from git) Date: Tue, 17 May 2022 23:34:22 GMT Message-Id: <202205172334.24HNYMJe010808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 12b37f8f9c78 - main - cxgbe: Deactivate upper layer drivers (like TOE) during detach. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 12b37f8f9c789a48ea0e8cd35f403aee0e020ad9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652830462; 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=B0wn7S6HBzWEvfcCI0whDHs5L0eRml20WeHQmsEeztQ=; b=fVnhlzeGSYdH2iUQ5hZxz1hyNdDqmqFZTdymGVThRWNykXl+UfbAl+RXAmWwtZQk/BKnQQ LbdGm21C/iqw4YGVlCcK4N8AndEl7uHxLlPsE830A1KJkmSzfaYk52MDPnY6OxlN5cFt8G ne4vAqwv9pxNyUp5UM43HTAz/3D024DIYjazvA09H1sw6w95raQGt/tRQGwZrHpu1eGV9e 6+HVyMRTZr13Q0eqpwVhF6KGIHUXBmiTUtopvd0luNvkxH9yWuHFTYtaW1nztaK3QIDkZ9 rC745S6W5DAucQDEnWZLq+vUQwPszzLULs4KCZpmeBT0dooRPilm/b1vgIBTgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652830462; a=rsa-sha256; cv=none; b=p01cr0GAUzr4elfy64Vi3bA8O2f/tU+vAD+JBt/cbvU26p9BAt4DxxRaz48hlpmaewztVn HjE0KW2biAHwqfnUKb4ZTIdZlDnAhBxZc6a8+JclC6SL5LpBp/KPTPOqJl3NkfoMImM0SA AUhhOQznTyKGKBmoUkE4Pya7ns3u2y7GJkbUjHZ8rHCHSo9kffyVoqxkonRtl0rcFo3Gpv CoK0QiIGfT2nKeAk9QismObKig+7lVYFmEKa++pivQ/0/ranQLwvsNKajbeuvbuGuhI+eu n3AVPkUdsF4jQR0HNQypGKtRE0+yAtpQdr2NuMkWFcj2Na9GCbYCbi2O0nwzyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=12b37f8f9c789a48ea0e8cd35f403aee0e020ad9 commit 12b37f8f9c789a48ea0e8cd35f403aee0e020ad9 Author: John Baldwin AuthorDate: 2022-05-17 23:33:49 +0000 Commit: John Baldwin CommitDate: 2022-05-17 23:33:49 +0000 cxgbe: Deactivate upper layer drivers (like TOE) during detach. Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D35237 --- 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 94dd70f01132..a4c17cc11505 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -854,6 +854,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 @@ -1686,6 +1687,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; @@ -12591,6 +12601,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) {