From nobody Wed Oct 04 15:23:49 2023 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 4S0z460pZYz4w6Gt; Wed, 4 Oct 2023 15:23:50 +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 4S0z456w8jz4NLt; Wed, 4 Oct 2023 15:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696433030; 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=UQAlD/10d3EQPdvWY9Y/KRD39Tfw1tJ6b3eJzxNCIPw=; b=ByQVeRx6O6jXczpzxQdAjhiA4Y4hjoNByYVBMYV4bO957IiacbrSiU4NLZKRbHjzmhMmgP yNUKEFO7QeVVlu8b52zEeF96FjRAbdwRra4l0n/G3KlydamYzThiOomCGlnyTDjYzEnwRi PlZhzoHfi2++3hLqtXVZ3lb5QO5dCNR+qDeHCjazINoR+zSUC5u0x/Ify3BAzSjapBf3nT 2CaGi+kf8bGhku9wBnGyHNwUcVVbsHqmKVcaeHinzsqbZ1WZmDRyTAPD6py1+gMUMTsP/Y quHekKX6U8tu9NTI3sZ95EAQ1++MGrXTDpUDACT+fCiKDY68LmJI4/bwdAHZCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696433030; a=rsa-sha256; cv=none; b=dq3InMsoorfbSGprscE+8/FnFAvETT7tCTjRt7sfFZ0i6Htkl83wVDBIIb/7AHOjU+Ql6y h19HQFKHNAejE2agG4UeGI2N4qLAPZbSK09YYFnEBgAz9N/w9Od9Q9a4mLRNvv+ggYTTFh URY5wDQZmlSRpwOdwIkGHUSv9FP+2cjiHvckUDUh68u6ZuHnSBfpT4/kZRwhpK3WNccmVH Ew43LYu1NGmzvpglBsH+03VMqskmj7LA6M0b+IeShnUrH9aNPREayrexlCGZhhVFsnCZLD uVUhthiVoTuzYQOsa6N3cbllaT+/HHK9bwPH94pmjT70Ynwq+jH+tKAt8gOuNQ== 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=1696433030; 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=UQAlD/10d3EQPdvWY9Y/KRD39Tfw1tJ6b3eJzxNCIPw=; b=LkWrJvFI1nmG25nt7TP1tRUY4E7SdZFCwW2PgIoMCuaGljL31RcKi7VdJjz4e98cJVafUY r8lwTZB5sfkbP8jOpAko4mSpVSG4CxgjqQFQBkwVaBz3N4dnbP/qIsNpuj9eGAapwNZj6N MUO9jGzfP8FUS7sv9eiOAHYbbubzvddjfwvuqcLMsGxe2TBFbY/LZznvUyX95bvOq6O70O Hhe+L4NK7pPhiunhcahL6FqOOStCikiftNi1hg+MZ0HxCGMMnV4Ph6Gccbftb2NM9txOww QfoWpMm2kiFFzCD/YaTFftlIcpxGL5erU/jca1MgrAzEzKKYI8PznPG8I23JjQ== 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 4S0z455QkMzjVP; Wed, 4 Oct 2023 15:23:49 +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 394FNnlG087174; Wed, 4 Oct 2023 15:23:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394FNnqW087171; Wed, 4 Oct 2023 15:23:49 GMT (envelope-from git) Date: Wed, 4 Oct 2023 15:23:49 GMT Message-Id: <202310041523.394FNnqW087171@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: 53ef38313a6d - stable/14 - LinuxKPI: 802.11: improve lkpi_ic_vap_delete() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 53ef38313a6dd70e5d929a3d014cc62db807793f Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=53ef38313a6dd70e5d929a3d014cc62db807793f commit 53ef38313a6dd70e5d929a3d014cc62db807793f Author: Bjoern A. Zeeb AuthorDate: 2023-09-30 15:20:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-04 15:19:18 +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 (cherry picked from commit dbf7691999abe501e0ebc0fe4d8d9e97718d3890) (cherry picked from commit 6c38c6b1b917957d420902213f318bf0153214f2) --- 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 cb919bfd3f5b..5e7a3ff91b9f 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); }