From nobody Wed Nov 29 16:38:38 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 4SgQ4b4gYkz52xC3; Wed, 29 Nov 2023 16:38:39 +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 4SgQ4Z5YS6z3K8D; Wed, 29 Nov 2023 16:38:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275918; 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=XoYyBSpTJqC2y8kP3oeydSpD72Y0h3nxO0hoVHKuHos=; b=HT8pvKrV7Pf81/vx1VtrVTO2rOiyPStaZkbLCqlfOAuZ8Co/25rKEvtgA8sKdvJKVWAxbu RDZVCvtgJZ0NkMD2d8tOHky4tU4YM+8+ROU0/I6yFjxq5VCeHnVIpcjhJ+NhaBGfBU4m1I OchWx/ES+CXbaW5jlhfY60Qv/b5rV6Qh0jf7sO27qM6Ufo06wuH4TFIa8g2tkgfx9ewDtE GZfs/VzyLEUr7YYSG234yWVdkzO6ZrGi8E5Ap6fxMXbwCmt4Tfh8uK7f8jeKVQAUXanR+S 42XCDbGZjG4GBKrRVPKvtNg+eTbtTy/BvLUOzbvnQtIONufI34gHY5aUKPty2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275918; 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=XoYyBSpTJqC2y8kP3oeydSpD72Y0h3nxO0hoVHKuHos=; b=ugJZhKlAS4JwmyYNiQBaIspSaaS01oMwSf1NE5j86Ept6jYB9yjkMWvQ4vO0VfeNrl6ER1 EzntZRWVoDkmV7IUY39u3/9nbjCsC3Zmc+ImWmK2KCjOL+QeGBuwohZll3WXWZh5PoctHE eHjPaLOgNuU3nG4oNRX7Pao/V4C1s+gzxFDhdsZSadNGsnD3Nqiha73WRKXHtRWYDkM7Dg o4PHQE5wdT8aEgynktupZzBjLx1DDJDezqbceNURJy7l08sov1X6+xfl1neeeAVxFh5Px+ 9s1N6z285GEJnuuPiKtKxCRg2aJRyBBNBODalM/dSAIT2zL15lZC3NwV8/H2rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275918; a=rsa-sha256; cv=none; b=TrX5OlZJUygiaKUZIOv0obSre/lU1QWdrj3QB9C+Si5fLEmbunvYmwkAftQeQtwdRHxMmb ZoMIglRRw13C2ii4GmhNsUXpKs8iQdzx7tqep3eazCHNquMRoeh1+vH7yKy9l1k+K8X/4T ItcXl2MgZ7m7b0A7wMRRXvHBIJa+0S4S4P2c44oJVA+h5lkfZ2t6SIo4yj83JZvVvkjXS+ W1mNVhP5/CucdNLRln/kaB75/OzCk/GCf64juBE58RyLa9slaah8DK/BxcKVnSbhUKkhhu LMZe7wdOr9ndW3l4wpvhvwUTHePo5espMigLURChw48PlOUF3UtKKwffVLvZZA== 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 4SgQ4Z4dHGz1CgT; Wed, 29 Nov 2023 16:38:38 +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 3ATGccex046383; Wed, 29 Nov 2023 16:38:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGccwr046381; Wed, 29 Nov 2023 16:38:38 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:38 GMT Message-Id: <202311291638.3ATGccwr046381@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: 3419d1459715 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 3419d14597153c15756d2737d16c168edf33247d Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3419d14597153c15756d2737d16c168edf33247d commit 3419d14597153c15756d2737d16c168edf33247d Author: Bjoern A. Zeeb AuthorDate: 2023-09-30 15:20:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:09 +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. The solution is not fully developed yet and one may not be able to create a new vap (lkpi_ic_vap_create may fail with error 17) afterwards. It is supposed to be a step towards more stability for now. Sponsored by: The FreeBSD Foundation PR: 269842 (cherry picked from commit dbf7691999abe501e0ebc0fe4d8d9e97718d3890) --- sys/compat/linuxkpi/common/src/linux_80211.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 54c7c5de6627..85965493e5ef 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2473,10 +2473,14 @@ 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); + mtx_destroy(&lvif->mtx); free(lvif, M_80211_VAP); }