From nobody Mon Oct 9 23:16:07 2023 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 4S4FJm0vfKz4wgk4; Mon, 9 Oct 2023 23:16:08 +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 4S4FJm0SVPz3PpV; Mon, 9 Oct 2023 23:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696893368; 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=TtMSYrsYyz57olkvdqRZSE0w6LAndcs/5EZb/PDEhJw=; b=RCfWu5zbL7Cr/p+x8GUTiSbWou+9CDQdhdIRwoHEuNNyCFE0LD1pp2rKn6djUGjokVxKjL JThpgFeFgzxrQvMrug6fcAJczqweKBW4OZCBoPltxQlPRwsIXWzXs2CvpN9zfIVvjBn0q4 1bzu2b7eBGVjlPx1/WFo1BrD/y8+QRnY2W9T5wrn/q7K+qOh72Sb8B+e7XZonW4zeBxM9z VKuZIAoCtBSXAi7BGo9mi9eunMsMTJRx34hnB64rFcXxiwdG061H5zeK4QZY4YNeNYlmL8 vj67/FIVXT9XQyEx+uFyrdYTjDIKWPjYIx65qdIrBEcN6Bdq10MwANfHZbZN2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696893368; a=rsa-sha256; cv=none; b=QXk9UDkS0DvR6UF2G64BargT5OAl5TyPpL+2juBKzjMcAq5+MTFggeEUqrkdLTUbNVivn4 DaJeEnd7JfYSgSowWg1AjsS04SiHHSP7Rqq0/aL4vdKLs8q6sP61otB3uXFF+tiQQ3wzGQ xtp+apjXjhGnLgwxJLm29j29sbKzVEljgIimmtZB18RE9qZj1TDecbgMY/j28gCO0ssHer swyJcZHyjsU//B1Dl885Uz+S3RBuTy44EFG6+9ZspUvTNfhlAx4Qspg3adk75lSG/PZW9n xfppLvy/RgJqsO2eLUhWdVOSj35TDVDcOF51/07oklh/pV/dGfk0UzXOERWjsQ== 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=1696893368; 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=TtMSYrsYyz57olkvdqRZSE0w6LAndcs/5EZb/PDEhJw=; b=EWEscp/uIe+qwXtdiVqrsMwQ2IqMiYngWo5ekBtu7lErmB849nNiJFvTu8Q6JZ0BDQK27e +w2wNPZKKvzG8OwjxbqV876SgkvqGsaOrfK8FQVm39NGC+7jAEciMJp1VJl2375i+XhKWO XheeztkSAF1AcRxzh5AuTTrcGa01LhD5TgJFrxSb5IE8Gc6U0427YS32gzMeawPpbOdb1U ZniDMRyh3ZE36SuhlCOJuyby20EpeYoVBUHBaFa/ijpVzydvYc17JJ2rQsX34zr0K4fmGF B1BpZHLeeaEVBGXBwNpA8u2DU5/gweLU54ZyXOJ8e9CZRR1qRKGZZxxeMj9Tyw== 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 4S4FJl6fqSz17F; Mon, 9 Oct 2023 23:16:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 399NG7bZ070926; Mon, 9 Oct 2023 23:16:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 399NG706070923; Mon, 9 Oct 2023 23:16:07 GMT (envelope-from git) Date: Mon, 9 Oct 2023 23:16:07 GMT Message-Id: <202310092316.399NG706070923@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 914a319cd6ec - releng/14.0 - LinuxKPI: 802.11: improve lkpi_ic_vap_delete() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 914a319cd6ec26415459259d3f7c5c49d11f0654 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=914a319cd6ec26415459259d3f7c5c49d11f0654 commit 914a319cd6ec26415459259d3f7c5c49d11f0654 Author: Bjoern A. Zeeb AuthorDate: 2023-09-30 15:20:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-09 23:14:52 +0000 LinuxKPI: 802.11: improve lkpi_ic_vap_delete() Changing the order of cleanup in lkpi_ic_vap_delete() will avoid firmware crashes or a direct panic as observed as ieee80211_vap_detach() will do most cleanup for us and get us into the correct state. Calling mo_stop() in lkpi_ic_vap_delete() seems to stop the problem that further VAPs could not be created (error 17) after the first one being destroyed. Sponsored by: The FreeBSD Foundation PR: 269842 Approved by: re (gjb) (cherry picked from commit dbf7691999abe501e0ebc0fe4d8d9e97718d3890) (cherry picked from commit 6c38c6b1b917957d420902213f318bf0153214f2) (cherry picked from commit 53ef38313a6dd70e5d929a3d014cc62db807793f) --- sys/compat/linuxkpi/common/src/linux_80211.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 4b9cc598740b..f5951c95a8df 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2424,10 +2424,17 @@ lkpi_ic_vap_delete(struct ieee80211vap *vap) LKPI_80211_LHW_LVIF_LOCK(lhw); TAILQ_REMOVE(&lhw->lvif_head, lvif, lvif_entry); LKPI_80211_LHW_LVIF_UNLOCK(lhw); - lkpi_80211_mo_remove_interface(hw, vif); ieee80211_ratectl_deinit(vap); ieee80211_vap_detach(vap); + + IMPROVE("clear up other bits in this state"); + + lkpi_80211_mo_remove_interface(hw, vif); + + /* Single VAP, so we can do this here. */ + lkpi_80211_mo_stop(hw); + mtx_destroy(&lvif->mtx); free(lvif, M_80211_VAP); }