From nobody Thu Aug 27 08:00:40 2026 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 4hVv8Z1Qgfz6qglF for ; Thu, 27 Aug 2026 08:00:46 +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 4hVv8Z0H4Wz45y2 for ; Thu, 27 Aug 2026 08:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787817646; 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=3lu0rEoWrpdDmYB0K6f8J/MN/fjssVJd4bvTX//2qwk=; b=lCY6hGqjv6RDmlbXuf2m1ZvDVO4QqH5P+a4+nnkwwxg1VqL1sGDGIY4q1KPmhE4K+/R4rk p6p92m7AWqN7WkCboGxQkUQUTg24H/BeZrPqOVjGaNlNdM82/tUaqVu7/0pfc8mP+iKKwu kXc19aJnwTzYUB7HcdivnBaMRqX4fJWKFCluOA1FRMcRIXP1F/uZkgmwIlLq7nTH/Ua4QK tVnyZrR/Xuwoa8YuUWe9dAwPMPRaqG/noao2KyVIDGK4vSpdCrQayQdsG+ygATtvFw6V/R 9EKGD1LM70Ied7rwF982K9ya2ZHas74Ok+QfL1gQnKmE4oeihv3ij00HW4VlEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787817646; a=rsa-sha256; cv=none; b=KczvYhOfS/f3JWB1ipp0ieze7cX/h3mwItBlhujSUldfj0N7u3jZ8O6FH+9BAYt4lJH6+U azVOLSrTKiBBp5PiRoSevE5KWLY50W1h+q+dzCd3qYT6+ybRGkiZon6jUDIkIqWlNf2I0t xF6TqxyUu2fGuqIHA7i/hA+20hX1n8mADlNhzILitgZXWXJ+9WuzE/1pcg1Kz7mcB+hrPW HqXVYYacTLIjiJ5MSwUtFQPDusvaE9tIFRETLpYK6B8uCDGjrDgOLjqp6tbL3Mnmky4QIv 6u+yn2Ajuaf5k15CkKi0yzicULDTcvaWNxGPqs4zUPylgBRQQ9niNC6xVUR5pg== 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=1787817646; 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=3lu0rEoWrpdDmYB0K6f8J/MN/fjssVJd4bvTX//2qwk=; b=OGR6mLXXKdG+CL39K25jqxus8s+uIO02+XLbXbN9q6v4VJNk9zP1ZT1x9AlQjj3EVTaHvc Efi/F+817SFLVJwjC6EHTMjcFk7gwc+kLLeq07Sk4ArVRdwqOTEcomvlNgeP72YCYoLDeQ 1iIR7+MnhIVfDFl/VLoWvI2hW370uY8frp8+c0DyYUBITHyH1P81ZOKvbsY/0YirZdAjFw Wj+/ESlpkIPo7fQmOWyBTfn5DkohMCj5OBcbBQ1R0Jv/+VVebuOprTm2nbIMV5VBeVCOuH 6nG6I96PWf9FZKeGHgRYJQcIXn562m9Kf/yHdyhtR1bLP65IYlKrG0+XfH//zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hVv8Y67ykzsP for ; Thu, 27 Aug 2026 08:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26952 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 27 Aug 2026 08:00:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d1057074b277 - main - LinuxKPI: 802.11: assert wiphy lock for lkpi_bss_info_change() and MO 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: d1057074b277443e11b04e8513acdf43fd133123 Auto-Submitted: auto-generated Date: Thu, 27 Aug 2026 08:00:40 +0000 Message-Id: <6a8feea8.26952.21abf29@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d1057074b277443e11b04e8513acdf43fd133123 commit d1057074b277443e11b04e8513acdf43fd133123 Author: Bjoern A. Zeeb AuthorDate: 2026-08-21 14:02:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-08-27 07:59:40 +0000 LinuxKPI: 802.11: assert wiphy lock for lkpi_bss_info_change() and MO Finish reviewing all callers for lkpi_80211_mo_link_info_changed() and lkpi_80211_mo_bss_info_changed(), which are called from lkpi_bss_info_change() only. Add the lockdep_assert_wiphy() to lkpi_bss_info_change() and make sure all callers are holding the wiphy lock. PR: 297228 Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 7 ++++++- sys/compat/linuxkpi/common/src/linux_80211_macops.c | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index a3e15c6e7223..fd92f1dcf75b 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2719,6 +2719,8 @@ lkpi_bss_info_change(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct lkpi_vif *lvif; enum ieee80211_bss_changed vif_cfg_bits, link_info_bits; + lockdep_assert_wiphy(hw->wiphy); + if (ieee80211_vif_is_mld(vif)) { TODO("This likely needs a subset only; split up into 3 parts."); } @@ -4238,8 +4240,10 @@ lkpi_iv_sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, * If this direct call to mo_bss_info_changed will not work due to * locking, see if queue_work() is fast enough. */ + wiphy_lock(hw->wiphy); bss_changed = lkpi_update_dtim_tsf(vif, ni, ni->ni_vap, __func__, __LINE__); lkpi_bss_info_change(hw, vif, bss_changed); + wiphy_unlock(hw->wiphy); } /* @@ -4459,13 +4463,14 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], TAILQ_INSERT_TAIL(&lhw->lvif_head, lvif, lvif_entry); LKPI_80211_LHW_LVIF_UNLOCK(lhw); + wiphy_lock(hw->wiphy); + /* Set bss_info. */ bss_changed = 0; lkpi_bss_info_change(hw, vif, bss_changed); /* Configure tx queues (conf_tx), default WME & send BSS_CHANGED_QOS. */ IMPROVE("Hardcoded values; to fix see 802.11-2016, 9.4.2.29 EDCA Parameter Set element"); - wiphy_lock(hw->wiphy); for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) { bzero(&txqp, sizeof(txqp)); diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index 09199862dfb7..06d2ecba8048 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -602,7 +602,7 @@ lkpi_80211_mo_link_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *v struct lkpi_hw *lhw; might_sleep(); - /* XXX-FINISH all callers for lockdep_assert_wiphy(hw->wiphy); */ + lockdep_assert_wiphy(hw->wiphy); lhw = HW_TO_LHW(hw); if (lhw->ops->link_info_changed == NULL && @@ -634,7 +634,7 @@ lkpi_80211_mo_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vi { struct lkpi_hw *lhw; - /* XXX-FINISH all callers for lockdep_assert_wiphy(hw->wiphy); */ + lockdep_assert_wiphy(hw->wiphy); lhw = HW_TO_LHW(hw); if (lhw->ops->bss_info_changed == NULL)