git: 897cf423a394 - main - linuxKPI: 802.11: assert wihpy lock in lkpi_80211_mo_start()

[Bjoern A. Zeeb]

The branch main has been updated by bz:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=897cf423a39474096dc699f7b9d173e4a97d3510

commit 897cf423a39474096dc699f7b9d173e4a97d3510
Author:     Bjoern A. Zeeb <b...@freebsd.org>
AuthorDate: 2025-08-01 05:28:28 +0000
Commit:     Bjoern A. Zeeb <b...@freebsd.org>
CommitDate: 2025-08-24 10:26:38 +0000

    linuxKPI: 802.11: assert wihpy lock in lkpi_80211_mo_start()
    
    Newer versions of Linux wifi drivers assert the wiphy lock in the
    (*start)() path.  Make sure we do too and do hold the wiphy lock.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      3 days
---
 sys/compat/linuxkpi/common/src/linux_80211.c        | 4 ++++
 sys/compat/linuxkpi/common/src/linux_80211_macops.c | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c 
b/sys/compat/linuxkpi/common/src/linux_80211.c
index a7d6003843ba..7ea7622744db 100644
--- a/sys/compat/linuxkpi/common/src/linux_80211.c
+++ b/sys/compat/linuxkpi/common/src/linux_80211.c
@@ -3826,8 +3826,10 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char 
name[IFNAMSIZ],
 
        IMPROVE();
 
+       wiphy_lock(hw->wiphy);
        error = lkpi_80211_mo_start(hw);
        if (error != 0) {
+               wiphy_unlock(hw->wiphy);
                ic_printf(ic, "%s: failed to start hw: %d\n", __func__, error);
                mtx_destroy(&lvif->mtx);
                free(lvif, M_80211_VAP);
@@ -3837,11 +3839,13 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char 
name[IFNAMSIZ],
        error = lkpi_80211_mo_add_interface(hw, vif);
        if (error != 0) {
                IMPROVE();      /* XXX-BZ mo_stop()? */
+               wiphy_unlock(hw->wiphy);
                ic_printf(ic, "%s: failed to add interface: %d\n", __func__, 
error);
                mtx_destroy(&lvif->mtx);
                free(lvif, M_80211_VAP);
                return (NULL);
        }
+       wiphy_unlock(hw->wiphy);
 
        LKPI_80211_LHW_LVIF_LOCK(lhw);
        TAILQ_INSERT_TAIL(&lhw->lvif_head, lvif, lvif_entry);
diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c 
b/sys/compat/linuxkpi/common/src/linux_80211_macops.c
index 78b2120f2d8c..1046b753574f 100644
--- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c
+++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c
@@ -53,6 +53,8 @@ lkpi_80211_mo_start(struct ieee80211_hw *hw)
        struct lkpi_hw *lhw;
        int error;
 
+       lockdep_assert_wiphy(hw->wiphy);
+
        lhw = HW_TO_LHW(hw);
        if (lhw->ops->start == NULL) {
                error = EOPNOTSUPP;