From nobody Sat Sep 19 14:40:32 2026 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 4hnBxD70jRz6srlJ for ; Sat, 19 Sep 2026 14:40:32 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hnBxD4rY7z4WpN for ; Sat, 19 Sep 2026 14:40:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789828832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t8yKxpF9lTHK2WoCQu8ghdYYxcq903fupHETdWOnnN4=; b=JReXVNteSyvQHIdyCy7sP6WWU7cbecL+wRywumWxEmXIRP/6aaINFbKDODhFcbZe0eD9vj dUc+Y3GEp9soUVbkx9RyrCd/E1GqJQBq/4128dQyNLnUr+bVgTISThLW8ZXcwCxbNkr/rT 1g3L4SOhoUcnhoNI1+B1+4EGKG+H5NYiK+GT8Bx6vBRTEeTOtCU7uZ5Bw7G2lcO25I4KiK eKP+mlwzDdVgPlDEuLyqbtsAtUxwYqLKkMmwiC4EWcmcSTa2ZKF3wpdvF4u12WwA45BptG XpNS7ihBiTNfutTYU+TiQrywr4SahPv0LmoVQWQRBdnUAG1JX5mL+RzHuTT1jQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789828832; b=Yp5y7k9nwzvFeAeum+DK7ogE/gbLafZhumJMdhT2QL1rbrG0/UEzki+aFr44D1hapNTJQu l+215kYs10s7mLbBQKYArON7DzRwmufFDt8edcW/0n072RnnpNkt4m/eaA2ouRE0Qko+2v Jf65Nzxnl0EqDdLsv1QX1YuHJaNU8FJ3SDohgLawtsdC39FdqMC9Qd3og0sOzwhnf+o5sV 8p6EdVktlmPlNKyr57PTdji8qSE6oYYlF8J5BLO4ivmmZGsYcBUeOUuzs0ch8UT7wRWlwQ wc4hNztWitQC+Fqahg/ZNiiNnJgOQdA8EeK8R/5Qf29AZv5+jv60CRPEWIFEuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789828832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t8yKxpF9lTHK2WoCQu8ghdYYxcq903fupHETdWOnnN4=; b=MwdUJdQAwIXRp9Z5HRGJYyM4eX4GeFdqyimlHW1PTymtqIJvjxRAfXIZW4xf8euz7dvqlf VH3kajObk7pPVUWfqIFtg/E+LEMSW6Q4rz5heKTOzq+JUueC3gK0jiyFn0l6E7MA0W/Wsm LorM8Khy086yyXFC/twlnQeplZGFg39ZHZeTeghVxsAZZFzCGj4rDf9XtvqSbppnlvyDnG DP5n4An5WAWaH0aZPMIe8Vans+pjMXaqd9iNuy1zAksyou8CPHSai04Xng7S/23NsgZRGh i7REzA4/wy/P6aqrppi/aIUAJv/AUnhZjlF9pz3jCsKsqaGpIMyqwifZUYPU3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hnBxD3tvZz17JF for ; Sat, 19 Sep 2026 14:40:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47a42 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 19 Sep 2026 14:40:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Artem Bunichev From: Bjoern A. Zeeb Subject: git: 9b0e73723f80 - stable/15 - LinuxKPI: 802.11: Always lock around lkpi_80211_mo_{remove_interface,stop}() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: 9b0e73723f80e66cd4391b1da94734a4304c7a8f Auto-Submitted: auto-generated Date: Sat, 19 Sep 2026 14:40:32 +0000 Message-Id: <6aae9ee0.47a42.382173ef@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9b0e73723f80e66cd4391b1da94734a4304c7a8f commit 9b0e73723f80e66cd4391b1da94734a4304c7a8f Author: Artem Bunichev AuthorDate: 2026-09-13 21:21:40 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-09-19 09:34:11 +0000 LinuxKPI: 802.11: Always lock around lkpi_80211_mo_{remove_interface,stop}() Add the missing locking to another two MO driver downcalls, as drivers always expect it (e.g. rtw89 by assertion). Add the lock and might_sleep assertions to the respective lkpi_80211_mo_* downcalls. PR: 298417 Reviewed by: bz Differential Revision: https://reviews.freebsd.org/D59608 (cherry picked from commit 73166d21bd831db264509cbdce1ab3b63ab5b189) --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 ++ sys/compat/linuxkpi/common/src/linux_80211_macops.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 18273bc5fd67..562940e35eb9 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -4616,10 +4616,12 @@ lkpi_ic_vap_delete(struct ieee80211vap *vap) IMPROVE("clear up other bits in this state"); + wiphy_lock(hw->wiphy); lkpi_80211_mo_remove_interface(hw, vif); /* Single VAP, so we can do this here. */ lkpi_80211_mo_stop(hw, false); /* XXX SUSPEND */ + wiphy_unlock(hw->wiphy); mtx_destroy(&lvif->mtx); free(lvif, M_80211_VAP); diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index 06d2ecba8048..1ea6bc1dc916 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -80,6 +80,9 @@ lkpi_80211_mo_stop(struct ieee80211_hw *hw, bool suspend) { struct lkpi_hw *lhw; + might_sleep(); + lockdep_assert_wiphy(hw->wiphy); + lhw = HW_TO_LHW(hw); if (lhw->ops->stop == NULL) return; @@ -197,6 +200,9 @@ lkpi_80211_mo_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vi struct lkpi_hw *lhw; struct lkpi_vif *lvif; + might_sleep(); + lockdep_assert_wiphy(hw->wiphy); + lhw = HW_TO_LHW(hw); if (lhw->ops->remove_interface == NULL) return;